From 780825446525f0a45599e1823e9e80dc45c83177 Mon Sep 17 00:00:00 2001 From: RecursivePineapple Date: Tue, 15 Sep 2026 14:29:59 -0400 Subject: [PATCH] Fix TE interceptor for CC (#49) Co-authored-by: Martin Robertz --- dependencies.gradle | 6 ++-- .../multipart/MultipartGenerator.scala | 9 +++-- .../multipart/handler/CubicChunksCompat.scala | 18 ++++++++++ .../handler/MultipartEventHandler.scala | 36 +++++++++---------- .../multipart/handler/MultipartSaveLoad.scala | 15 ++++---- .../multipart/handler/proxies.scala | 4 ++- 6 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 src/main/scala/codechicken/multipart/handler/CubicChunksCompat.scala diff --git a/dependencies.gradle b/dependencies.gradle index c6ed093..9ca53df 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,9 +2,11 @@ dependencies { implementation("com.github.GTNewHorizons:CodeChickenCore:1.4.19:dev") - compileOnly("com.github.GTNewHorizons:Angelica:2.1.19:dev") + compileOnly("com.cardinalstar.cubicchunks:CubicChunks1710:v0.1.8-alpha:dev") + compileOnly("com.github.GTNewHorizons:Angelica:2.1.54:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.7.174:dev") compileOnly("com.github.GTNewHorizons:Postea:1.2.5:dev") {transitive = false} - devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.93-GTNH:dev") { + devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.114-GTNH:dev") { exclude group: 'com.github.GTNewHorizons', module: 'CodeChickenCore' } compileOnly("com.github.GTNewHorizons:GTNHLib:0.11.44:dev") diff --git a/src/main/scala/codechicken/multipart/MultipartGenerator.scala b/src/main/scala/codechicken/multipart/MultipartGenerator.scala index c7423c5..9ab3894 100644 --- a/src/main/scala/codechicken/multipart/MultipartGenerator.scala +++ b/src/main/scala/codechicken/multipart/MultipartGenerator.scala @@ -122,9 +122,14 @@ object MultipartGenerator extends ScratchBitSet { * adding it to the tick list */ def silentAddTile(world: World, pos: BlockCoord, tile: TileEntity) { + tile.xCoord = pos.x; + tile.yCoord = pos.y; + tile.zCoord = pos.z; + val chunk = world.getChunkFromBlockCoords(pos.x, pos.z) - if (chunk != null) - chunk.func_150812_a(pos.x & 15, pos.y, pos.z & 15, tile) + if (chunk != null) { + chunk.addTileEntity(tile) + } } /** Check if tile satisfies all the interfaces required by parts. If not, diff --git a/src/main/scala/codechicken/multipart/handler/CubicChunksCompat.scala b/src/main/scala/codechicken/multipart/handler/CubicChunksCompat.scala new file mode 100644 index 0000000..a80743c --- /dev/null +++ b/src/main/scala/codechicken/multipart/handler/CubicChunksCompat.scala @@ -0,0 +1,18 @@ +package codechicken.multipart.handler + +import com.cardinalstar.cubicchunks.api.event.CubeEvent +import cpw.mods.fml.common.eventhandler.{EventPriority, SubscribeEvent} +import net.minecraftforge.common.MinecraftForge +import scala.collection.JavaConversions._ + +object CubicChunksCompat { + def init(): Unit = MinecraftForge.EVENT_BUS.register(this) + + @SubscribeEvent(priority = EventPriority.HIGHEST) + def onTileEntitiesLoad(event: CubeEvent.DataLoad): Unit = { + val cube = event.cube + val world = event.world + + MultipartSaveLoad.loadTiles(world, cube.cubeTileEntityMap) + } +} diff --git a/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.scala b/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.scala index 67e16a8..8807a56 100644 --- a/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.scala +++ b/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.scala @@ -1,30 +1,28 @@ package codechicken.multipart.handler -import codechicken.multipart.{ - TileCache, - TileMultipart, - MultiPartRegistry, - BlockMultipart -} +import codechicken.multipart.{BlockMultipart, TileCache, TileMultipart} import cpw.mods.fml.common.eventhandler.{EventPriority, SubscribeEvent} -import net.minecraft.server.MinecraftServer -import codechicken.lib.packet.PacketCustom -import net.minecraftforge.event.world._ -import java.util.EnumSet -import scala.collection.JavaConverters._ -import java.util.List -import net.minecraft.entity.player.EntityPlayerMP -import cpw.mods.fml.relauncher.SideOnly -import cpw.mods.fml.relauncher.Side -import net.minecraftforge.client.event.DrawBlockHighlightEvent -import net.minecraft.util.MovingObjectPosition -import net.minecraft.util.MovingObjectPosition.MovingObjectType import cpw.mods.fml.common.gameevent.TickEvent +import cpw.mods.fml.relauncher.{Side, SideOnly} +import net.minecraft.entity.player.EntityPlayerMP +import net.minecraft.server.MinecraftServer +import net.minecraft.tileentity.TileEntity +import net.minecraft.util.MovingObjectPosition.MovingObjectType +import net.minecraft.world.ChunkPosition +import net.minecraftforge.client.event.DrawBlockHighlightEvent +import net.minecraftforge.event.world._ + +import java.util.List +import scala.collection.JavaConverters._ object MultipartEventHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) def tileEntityLoad(event: ChunkDataEvent.Load) { - MultipartSaveLoad.loadTiles(event.getChunk) + MultipartSaveLoad.loadTiles( + event.getChunk.worldObj, + event.getChunk.chunkTileEntityMap + .asInstanceOf[java.util.Map[ChunkPosition, TileEntity]] + ) } @SubscribeEvent diff --git a/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala b/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala index 5fa299f..a0b76c6 100644 --- a/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala +++ b/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala @@ -2,14 +2,16 @@ package codechicken.multipart.handler import net.minecraft.tileentity.TileEntity import net.minecraft.nbt.NBTTagCompound + import java.util.Map -import net.minecraft.world.chunk.Chunk import net.minecraft.world.ChunkPosition import codechicken.multipart.{MultipartHelper, TileMultipart} import codechicken.lib.asm.ObfMapping import net.minecraft.world.World + import scala.collection.mutable import codechicken.multipart.MultipartHelper.IPartTileConverter + import scala.collection.JavaConversions._ /** Hack due to lack of TileEntityLoadEvent in forge @@ -58,12 +60,9 @@ object MultipartSaveLoad { field.get(null).asInstanceOf[Map[Class[_ <: TileEntity], String]] } - def loadTiles(chunk: Chunk) { - loadingWorld = chunk.worldObj - val iterator = chunk.chunkTileEntityMap - .asInstanceOf[Map[ChunkPosition, TileEntity]] - .entrySet - .iterator + def loadTiles(world: World, tiles: Map[ChunkPosition, TileEntity]) { + loadingWorld = world + val iterator = tiles.entrySet.iterator while (iterator.hasNext) { val e = iterator.next var next = false @@ -88,7 +87,7 @@ object MultipartSaveLoad { if (!next) { if (t != null) { - t.setWorldObj(e.getValue.getWorldObj) + t.setWorldObj(world) t.validate() e.setValue(t) } else diff --git a/src/main/scala/codechicken/multipart/handler/proxies.scala b/src/main/scala/codechicken/multipart/handler/proxies.scala index 3abb28a..a26451d 100644 --- a/src/main/scala/codechicken/multipart/handler/proxies.scala +++ b/src/main/scala/codechicken/multipart/handler/proxies.scala @@ -13,7 +13,7 @@ import codechicken.lib.packet.PacketCustom import net.minecraft.world.ChunkCoordIntPair import codechicken.lib.vec.BlockCoord import codechicken.lib.world.{TileChunkLoadHook, WorldExtensionManager} -import cpw.mods.fml.common.FMLCommonHandler +import cpw.mods.fml.common.{FMLCommonHandler, Loader} import cpw.mods.fml.common.registry.GameRegistry import net.minecraft.block.Block import org.apache.logging.log4j.Logger @@ -90,6 +90,8 @@ class MultipartProxy_serverImpl { TileChunkLoadHook.init() MultipartCompatiblity.load() + if (Loader.isModLoaded("cubicchunks")) + CubicChunksCompat.init() } def onTileClassBuilt(t: Class[_ <: TileEntity]) {