Skip to content

Commit 9828f50

Browse files
LolHensLolHens
authored
Merge pull request #46 from LolHens/feature/fix/load-chunks
don't load chunks for rain refill
2 parents 09367a0 + de311d7 commit 9828f50

File tree

9 files changed

+30
-21
lines changed
  • fabric-1.15.2/src/main/scala/de/lolhens/minecraft/fluidphysics/util
  • fabric-1.16.1/src/main/scala/de/lolhens/minecraft/fluidphysics/util
  • fabric-1.16.2/src/main/scala/de/lolhens/minecraft/fluidphysics/util
  • fabric-1.16.4/src/main/scala/de/lolhens/minecraft/fluidphysics/util
  • fabric-1.17/src/main/scala/de/lolhens/minecraft/fluidphysics/util
  • forge-1.15.2/src/main/scala/de/lolhens/minecraft/fluidphysics/util
  • forge-1.16.1/src/main/scala/de/lolhens/minecraft/fluidphysics/util
  • forge-1.16.2/src/main/scala/de/lolhens/minecraft/fluidphysics/util
  • forge-1.16.4/src/main/scala/de/lolhens/minecraft/fluidphysics/util

9 files changed

+30
-21
lines changed

‎fabric-1.15.2/src/main/scala/de/lolhens/minecraft/fluidphysics/util/RainRefill.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ 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.{BaseFluid, FluidState}
9-
import net.minecraft.server.world.{ServerChunkManager, ServerWorld}
9+
import net.minecraft.server.world.{ChunkHolder, ServerChunkManager, ServerWorld}
1010
import net.minecraft.util.math.{BlockPos, ChunkPos}
1111
import net.minecraft.world.chunk.{ChunkStatus, WorldChunk}
1212
import net.minecraft.world.{Heightmap, World}
1313

1414
import scala.jdk.CollectionConverters._
15+
import scala.jdk.OptionConverters._
1516
import scala.util.Random
1617

1718
object RainRefill {
@@ -29,7 +30,7 @@ object RainRefill {
2930
.threadedAnvilChunkStorage.asInstanceOf[ThreadedAnvilChunkStorageAccessor]
3031
.callEntryIterator()
3132
.asScala
32-
.filterNot(_.getLevel > maxLevel)
33+
.flatMap(_.getTickingFuture.getNow(ChunkHolder.UNLOADED_WORLD_CHUNK).left.toScala)
3334
.map(_.getPos)
3435
.toSeq
3536
}

‎fabric-1.16.1/src/main/scala/de/lolhens/minecraft/fluidphysics/util/RainRefill.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ 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}
9-
import net.minecraft.server.world.{ServerChunkManager, ServerWorld}
9+
import net.minecraft.server.world.{ChunkHolder, ServerChunkManager, ServerWorld}
1010
import net.minecraft.util.math.{BlockPos, ChunkPos}
1111
import net.minecraft.world.chunk.{ChunkStatus, WorldChunk}
1212
import net.minecraft.world.{Heightmap, World}
1313

1414
import scala.jdk.CollectionConverters._
15+
import scala.jdk.OptionConverters._
1516
import scala.util.Random
1617

1718
object RainRefill {
@@ -29,7 +30,7 @@ object RainRefill {
2930
.threadedAnvilChunkStorage.asInstanceOf[ThreadedAnvilChunkStorageAccessor]
3031
.callEntryIterator()
3132
.asScala
32-
.filterNot(_.getLevel > maxLevel)
33+
.flatMap(_.getTickingFuture.getNow(ChunkHolder.UNLOADED_WORLD_CHUNK).left.toScala)
3334
.map(_.getPos)
3435
.toSeq
3536
}

‎fabric-1.16.2/src/main/scala/de/lolhens/minecraft/fluidphysics/util/RainRefill.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ 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}
9-
import net.minecraft.server.world.{ServerChunkManager, ServerWorld}
9+
import net.minecraft.server.world.{ChunkHolder, ServerChunkManager, ServerWorld}
1010
import net.minecraft.util.math.{BlockPos, ChunkPos}
1111
import net.minecraft.world.chunk.{ChunkStatus, WorldChunk}
1212
import net.minecraft.world.{Heightmap, World}
1313

1414
import scala.jdk.CollectionConverters._
15+
import scala.jdk.OptionConverters._
1516
import scala.util.Random
1617

1718
object RainRefill {
@@ -29,7 +30,7 @@ object RainRefill {
2930
.threadedAnvilChunkStorage.asInstanceOf[ThreadedAnvilChunkStorageAccessor]
3031
.callEntryIterator()
3132
.asScala
32-
.filterNot(_.getLevel > maxLevel)
33+
.flatMap(_.getTickingFuture.getNow(ChunkHolder.UNLOADED_WORLD_CHUNK).left.toScala)
3334
.map(_.getPos)
3435
.toSeq
3536
}

‎fabric-1.16.4/src/main/scala/de/lolhens/minecraft/fluidphysics/util/RainRefill.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ 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}
9-
import net.minecraft.server.world.{ServerChunkManager, ServerWorld}
9+
import net.minecraft.server.world.{ChunkHolder, ServerChunkManager, ServerWorld}
1010
import net.minecraft.util.math.{BlockPos, ChunkPos}
1111
import net.minecraft.world.chunk.{ChunkStatus, WorldChunk}
1212
import net.minecraft.world.{Heightmap, World}
1313

1414
import scala.jdk.CollectionConverters._
15+
import scala.jdk.OptionConverters._
1516
import scala.util.Random
1617

1718
object RainRefill {
@@ -29,7 +30,7 @@ object RainRefill {
2930
.threadedAnvilChunkStorage.asInstanceOf[ThreadedAnvilChunkStorageAccessor]
3031
.callEntryIterator()
3132
.asScala
32-
.filterNot(_.getLevel > maxLevel)
33+
.flatMap(_.getTickingFuture.getNow(ChunkHolder.UNLOADED_WORLD_CHUNK).left.toScala)
3334
.map(_.getPos)
3435
.toSeq
3536
}

‎fabric-1.17/src/main/scala/de/lolhens/minecraft/fluidphysics/util/RainRefill.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ 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}
9-
import net.minecraft.server.world.{ServerChunkManager, ServerWorld}
9+
import net.minecraft.server.world.{ChunkHolder, ServerChunkManager, ServerWorld}
1010
import net.minecraft.util.math.{BlockPos, ChunkPos}
1111
import net.minecraft.world.chunk.{ChunkStatus, WorldChunk}
1212
import net.minecraft.world.{Heightmap, World}
1313

1414
import scala.jdk.CollectionConverters._
15+
import scala.jdk.OptionConverters._
1516
import scala.util.Random
1617

1718
object RainRefill {
@@ -29,7 +30,7 @@ object RainRefill {
2930
.threadedAnvilChunkStorage.asInstanceOf[ThreadedAnvilChunkStorageAccessor]
3031
.callEntryIterator()
3132
.asScala
32-
.filterNot(_.getLevel > maxLevel)
33+
.flatMap(_.getTickingFuture.getNow(ChunkHolder.UNLOADED_WORLD_CHUNK).left.toScala)
3334
.map(_.getPos)
3435
.toSeq
3536
}

‎forge-1.15.2/src/main/scala/de/lolhens/minecraft/fluidphysics/util/RainRefill.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ import net.minecraft.util.math.{BlockPos, ChunkPos}
99
import net.minecraft.world.World
1010
import net.minecraft.world.chunk.{Chunk, ChunkStatus}
1111
import net.minecraft.world.gen.Heightmap
12-
import net.minecraft.world.server.{ServerChunkProvider, ServerWorld}
12+
import net.minecraft.world.server.{ChunkHolder, ServerChunkProvider, ServerWorld}
1313
import net.minecraftforge.common.MinecraftForge
1414
import net.minecraftforge.event.TickEvent
1515
import net.minecraftforge.event.TickEvent.Phase
1616

1717
import scala.jdk.CollectionConverters._
18+
import scala.jdk.OptionConverters._
1819
import scala.util.Random
1920

2021
object RainRefill {
@@ -37,8 +38,8 @@ object RainRefill {
3738
.chunkManager.asInstanceOf[ThreadedAnvilChunkStorageAccessor]
3839
.callGetLoadedChunksIterable()
3940
.asScala
40-
.filterNot(_.func_219281_j() > maxLevel)
41-
.map(_.getPosition)
41+
.flatMap(_.getTickingFuture.getNow(ChunkHolder.UNLOADED_CHUNK).left.toScala)
42+
.map(_.getPos)
4243
.toSeq
4344
}
4445

‎forge-1.16.1/src/main/scala/de/lolhens/minecraft/fluidphysics/util/RainRefill.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ import net.minecraft.util.math.{BlockPos, ChunkPos}
99
import net.minecraft.world.World
1010
import net.minecraft.world.chunk.{Chunk, ChunkStatus}
1111
import net.minecraft.world.gen.Heightmap
12-
import net.minecraft.world.server.{ServerChunkProvider, ServerWorld}
12+
import net.minecraft.world.server.{ChunkHolder, ServerChunkProvider, ServerWorld}
1313
import net.minecraftforge.common.MinecraftForge
1414
import net.minecraftforge.event.TickEvent
1515
import net.minecraftforge.event.TickEvent.Phase
1616

1717
import scala.jdk.CollectionConverters._
18+
import scala.jdk.OptionConverters._
1819
import scala.util.Random
1920

2021
object RainRefill {
@@ -37,8 +38,8 @@ object RainRefill {
3738
.chunkManager.asInstanceOf[ThreadedAnvilChunkStorageAccessor]
3839
.callGetLoadedChunksIterable()
3940
.asScala
40-
.filterNot(_.func_219281_j() > maxLevel)
41-
.map(_.getPosition)
41+
.flatMap(_.getTickingFuture.getNow(ChunkHolder.UNLOADED_CHUNK).left.toScala)
42+
.map(_.getPos)
4243
.toSeq
4344
}
4445

‎forge-1.16.2/src/main/scala/de/lolhens/minecraft/fluidphysics/util/RainRefill.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ import net.minecraft.util.math.{BlockPos, ChunkPos}
99
import net.minecraft.world.World
1010
import net.minecraft.world.chunk.{Chunk, ChunkStatus}
1111
import net.minecraft.world.gen.Heightmap
12-
import net.minecraft.world.server.{ServerChunkProvider, ServerWorld}
12+
import net.minecraft.world.server.{ChunkHolder, ServerChunkProvider, ServerWorld}
1313
import net.minecraftforge.common.MinecraftForge
1414
import net.minecraftforge.event.TickEvent
1515
import net.minecraftforge.event.TickEvent.Phase
1616

1717
import scala.jdk.CollectionConverters._
18+
import scala.jdk.OptionConverters._
1819
import scala.util.Random
1920

2021
object RainRefill {
@@ -37,8 +38,8 @@ object RainRefill {
3738
.chunkManager.asInstanceOf[ThreadedAnvilChunkStorageAccessor]
3839
.callGetLoadedChunksIterable()
3940
.asScala
40-
.filterNot(_.func_219281_j() > maxLevel)
41-
.map(_.getPosition)
41+
.flatMap(_.getTickingFuture.getNow(ChunkHolder.UNLOADED_CHUNK).left.toScala)
42+
.map(_.getPos)
4243
.toSeq
4344
}
4445

‎forge-1.16.4/src/main/scala/de/lolhens/minecraft/fluidphysics/util/RainRefill.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ import net.minecraft.util.math.{BlockPos, ChunkPos}
99
import net.minecraft.world.World
1010
import net.minecraft.world.chunk.{Chunk, ChunkStatus}
1111
import net.minecraft.world.gen.Heightmap
12-
import net.minecraft.world.server.{ServerChunkProvider, ServerWorld}
12+
import net.minecraft.world.server.{ChunkHolder, ServerChunkProvider, ServerWorld}
1313
import net.minecraftforge.common.MinecraftForge
1414
import net.minecraftforge.event.TickEvent
1515
import net.minecraftforge.event.TickEvent.Phase
1616

1717
import scala.jdk.CollectionConverters._
18+
import scala.jdk.OptionConverters._
1819
import scala.util.Random
1920

2021
object RainRefill {
@@ -37,7 +38,7 @@ object RainRefill {
3738
.chunkMap.asInstanceOf[ThreadedAnvilChunkStorageAccessor]
3839
.callGetChunks()
3940
.asScala
40-
.filterNot(_.getTicketLevel > maxLevel)
41+
.flatMap(_.getTickingChunkFuture.getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK).left.toScala)
4142
.map(_.getPos)
4243
.toSeq
4344
}

0 commit comments

Comments
 (0)