Skip to content

Commit 12e3047

Browse files
committed
updated for minecraft 1.16.2
1 parent 82ebf16 commit 12e3047

File tree

5 files changed

+17
-29
lines changed

5 files changed

+17
-29
lines changed

gradle.properties

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
# Done to increase the memory available to gradle.
22
org.gradle.jvmargs=-Xmx1G
3-
43
# Fabric Properties
5-
# check these on https://fabricmc.net/use
6-
minecraft_version=1.16.1
7-
yarn_mappings=1.16.1+build.20
8-
loader_version=0.8.9+build.203
9-
4+
# check these on https://fabricmc.net/use
5+
minecraft_version=1.16.2
6+
yarn_mappings=1.16.2+build.6
7+
loader_version=0.9.1+build.205
108
# Mod Properties
11-
mod_version = 1.0.0-SNAPSHOT
12-
maven_group = de.lolhens
13-
archives_base_name = fluidphysics
14-
9+
mod_version=0.0.1-SNAPSHOT
10+
maven_group=de.lolhens
11+
archives_base_name=fluidphysics
1512
# Dependencies
16-
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
17-
fabric_version=0.14.1+build.372-1.16
13+
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
14+
fabric_version=0.17.2+build.396-1.16

src/main/scala/de/lolhens/minecraft/fluidphysics/mixin/SpringFeatureMixin.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
import de.lolhens.minecraft.fluidphysics.util.SpringFeature;
44
import net.minecraft.util.math.BlockPos;
5-
import net.minecraft.world.ServerWorldAccess;
6-
import net.minecraft.world.gen.StructureAccessor;
5+
import net.minecraft.world.StructureWorldAccess;
76
import net.minecraft.world.gen.chunk.ChunkGenerator;
87
import net.minecraft.world.gen.feature.SpringFeatureConfig;
98
import org.spongepowered.asm.mixin.Mixin;
@@ -16,15 +15,14 @@
1615
@Mixin(net.minecraft.world.gen.feature.SpringFeature.class)
1716
public class SpringFeatureMixin {
1817
@Inject(at = @At("RETURN"), method = "generate", cancellable = true)
19-
public void generate(ServerWorldAccess world,
20-
StructureAccessor structureAccessor,
18+
public void generate(StructureWorldAccess structureWorldAccess,
2119
ChunkGenerator chunkGenerator,
2220
Random random,
2321
BlockPos blockPos,
2422
SpringFeatureConfig springFeatureConfig,
2523
CallbackInfoReturnable<Boolean> info) {
2624
if (info.getReturnValue()) {
27-
SpringFeature.generate(world, structureAccessor, chunkGenerator, random, blockPos, springFeatureConfig);
25+
SpringFeature.generate(structureWorldAccess, blockPos, springFeatureConfig);
2826
}
2927
}
3028
}

src/main/scala/de/lolhens/minecraft/fluidphysics/util/FluidSourceFinder.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ object FluidSourceFinder {
7171

7272
if (!fluidState.isEmpty && fluid.matchesType(fluidState.getFluid)) {
7373
if (direction != Direction.DOWN) {
74-
val up = blockPos.up()
74+
val up: BlockPos = blockPos.up()
7575
val upFluidState = world.getFluidState(up)
7676
if (!upFluidState.isEmpty && fluid.matchesType(upFluidState.getFluid)) {
7777
val sourcePos = findSourceInternal(world, up, upFluidState, fluid, Direction.UP, ignoreBlocks, ignoreFirst = false, ignoreLevel = false, maxIterations, iteration + 1)

src/main/scala/de/lolhens/minecraft/fluidphysics/util/RainRefill.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package de.lolhens.minecraft.fluidphysics.util
22

33
import de.lolhens.minecraft.fluidphysics.config.FluidPhysicsConfig.RainRefillConfig
4-
import de.lolhens.minecraft.fluidphysics.{FluidPhysicsMod, horizontal}
54
import de.lolhens.minecraft.fluidphysics.mixin.ThreadedAnvilChunkStorageAccessor
5+
import de.lolhens.minecraft.fluidphysics.{FluidPhysicsMod, horizontal}
66
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents
77
import net.minecraft.block.BlockState
88
import net.minecraft.fluid.{FlowableFluid, FluidState}
@@ -21,7 +21,7 @@ object RainRefill {
2121
}
2222
}
2323

24-
private lazy val maxLevel = 33 + ChunkStatus.getTargetGenerationRadius(ChunkStatus.FULL)
24+
private lazy val maxLevel = 33 + ChunkStatus.getDistanceFromFull(ChunkStatus.FULL)
2525

2626
private def loadedChunks(serverWorld: ServerWorld): Seq[ChunkPos] = {
2727
val chunkManager: ServerChunkManager = serverWorld.getChunkManager

src/main/scala/de/lolhens/minecraft/fluidphysics/util/SpringFeature.scala

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
package de.lolhens.minecraft.fluidphysics.util
22

3-
import java.util.Random
4-
53
import de.lolhens.minecraft.fluidphysics.{FluidPhysicsMod, horizontal}
64
import net.minecraft.util.math.{BlockPos, Direction}
7-
import net.minecraft.world.ServerWorldAccess
8-
import net.minecraft.world.gen.StructureAccessor
9-
import net.minecraft.world.gen.chunk.ChunkGenerator
5+
import net.minecraft.world.WorldAccess
106
import net.minecraft.world.gen.feature.SpringFeatureConfig
117

128
object SpringFeature {
13-
def generate(world: ServerWorldAccess,
14-
structureAccessor: StructureAccessor,
15-
chunkGenerator: ChunkGenerator,
16-
random: Random,
9+
def generate(world: WorldAccess,
1710
blockPos: BlockPos,
1811
springFeatureConfig: SpringFeatureConfig): Unit =
1912
FluidPhysicsMod.config.spring.map(_.getBlock) match {

0 commit comments

Comments
 (0)