mirror of
https://github.com/GTNewHorizons/ForgeMultipart.git
synced 2026-11-18 11:29:33 +00:00
Merge master with Cubic Chunks compatibility
Port PR #49's tile insertion and cube-load fixes to the Java implementation while preserving the legacy chunk loader ABI.
This commit is contained in:
commit
d3f1b561a3
9 files changed
+82
-8
No files matched your search
+4
-2
@@ -14,9 +14,11 @@ dependencies {
|
||||
functionalTestImplementation("org.junit.platform:junit-platform-reporting")
|
||||
|
||||
implementation("com.github.GTNewHorizons:CodeChickenCore:1.4.20: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")
|
||||
|
||||
+26
@@ -11,6 +11,8 @@ import java.nio.charset.StandardCharsets;
|
||||
import java.util.Arrays;
|
||||
import java.util.Base64;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Scanner;
|
||||
|
||||
@@ -148,6 +150,30 @@ class MultipartSaveLoadFunctionalTest {
|
||||
assertSame(foreignDummy, chunk.chunkTileEntityMap.get(foreignPosition));
|
||||
}
|
||||
|
||||
@Test
|
||||
void rebuildsTilesFromAStandaloneCubeMapWithTheEventWorld() {
|
||||
World world = world();
|
||||
TileMultipart savedTile = MultipartHelper.createTileFromParts(Arrays.asList(new TorchPart(5)));
|
||||
savedTile.xCoord = 5;
|
||||
savedTile.yCoord = 70;
|
||||
savedTile.zCoord = 6;
|
||||
NBTTagCompound savedTag = new NBTTagCompound();
|
||||
savedTile.writeToNBT(savedTag);
|
||||
ChunkPosition position = new ChunkPosition(5, 70, 6);
|
||||
Map<ChunkPosition, TileEntity> tiles = new HashMap<>();
|
||||
tiles.put(position, dummy(savedTag, null));
|
||||
|
||||
MultipartSaveLoad.loadTiles(world, tiles);
|
||||
|
||||
TileMultipart rebuilt = assertInstanceOf(TileMultipart.class, tiles.get(position));
|
||||
assertSame(world, MultipartSaveLoad.loadingWorld());
|
||||
assertSame(world, rebuilt.getWorldObj());
|
||||
assertEquals(5, rebuilt.xCoord);
|
||||
assertEquals(70, rebuilt.yCoord);
|
||||
assertEquals(6, rebuilt.zCoord);
|
||||
assertEquals("mc_torch", rebuilt.jPartList().get(0).getType());
|
||||
}
|
||||
|
||||
private static TileEntity dummy(NBTTagCompound tag, World world) {
|
||||
try {
|
||||
TileEntity dummy = (TileEntity) Class
|
||||
|
||||
@@ -144,8 +144,11 @@ public final class MultipartGenerator$ implements ScratchBitSet {
|
||||
}
|
||||
|
||||
public void silentAddTile(World world, BlockCoord pos, TileEntity tile) {
|
||||
tile.xCoord = pos.x;
|
||||
tile.yCoord = pos.y;
|
||||
tile.zCoord = pos.z;
|
||||
Chunk 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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package codechicken.multipart.handler;
|
||||
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
import com.cardinalstar.cubicchunks.api.event.CubeEvent;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.EventPriority;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
public final class CubicChunksCompat {
|
||||
|
||||
private static final CubicChunksCompat INSTANCE = new CubicChunksCompat();
|
||||
|
||||
private CubicChunksCompat() {}
|
||||
|
||||
public static void init() {
|
||||
MinecraftForge.EVENT_BUS.register(INSTANCE);
|
||||
}
|
||||
|
||||
@SubscribeEvent(priority = EventPriority.HIGHEST)
|
||||
public void onTileEntitiesLoad(CubeEvent.DataLoad event) {
|
||||
MultipartSaveLoad.loadTiles(event.world, event.cube.cubeTileEntityMap);
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,13 @@
|
||||
package codechicken.multipart.handler;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
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.ChunkDataEvent;
|
||||
import net.minecraftforge.event.world.ChunkWatchEvent;
|
||||
@@ -41,8 +44,11 @@ public final class MultipartEventHandler$ {
|
||||
}
|
||||
|
||||
@SubscribeEvent(priority = EventPriority.HIGHEST)
|
||||
@SuppressWarnings("unchecked")
|
||||
public void tileEntityLoad(ChunkDataEvent.Load event) {
|
||||
MultipartSaveLoad.loadTiles(event.getChunk());
|
||||
MultipartSaveLoad.loadTiles(
|
||||
event.getChunk().worldObj,
|
||||
(Map<ChunkPosition, TileEntity>) event.getChunk().chunkTileEntityMap);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
|
||||
@@ -16,6 +16,7 @@ import codechicken.multipart.BlockMultipart;
|
||||
import codechicken.multipart.MultipartGenerator;
|
||||
import codechicken.multipart.TickScheduler$;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class MultipartProxy_serverImpl {
|
||||
@@ -96,6 +97,9 @@ public class MultipartProxy_serverImpl {
|
||||
TileChunkLoadHook.init();
|
||||
|
||||
MultipartCompatiblity.load();
|
||||
if (Loader.isModLoaded("cubicchunks")) {
|
||||
CubicChunksCompat.init();
|
||||
}
|
||||
}
|
||||
|
||||
public void onTileClassBuilt(Class<? extends TileEntity> type) {
|
||||
|
||||
@@ -72,9 +72,12 @@ public final class MultipartSaveLoad$ {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public void loadTiles(Chunk chunk) {
|
||||
loadingWorld = chunk.worldObj;
|
||||
Iterator<Map.Entry<ChunkPosition, TileEntity>> iterator = ((Map<ChunkPosition, TileEntity>) chunk.chunkTileEntityMap)
|
||||
.entrySet().iterator();
|
||||
loadTiles(chunk.worldObj, (Map<ChunkPosition, TileEntity>) chunk.chunkTileEntityMap);
|
||||
}
|
||||
|
||||
public void loadTiles(World world, Map<ChunkPosition, TileEntity> tiles) {
|
||||
loadingWorld = world;
|
||||
Iterator<Map.Entry<ChunkPosition, TileEntity>> iterator = tiles.entrySet().iterator();
|
||||
|
||||
while (iterator.hasNext()) {
|
||||
Map.Entry<ChunkPosition, TileEntity> entry = iterator.next();
|
||||
@@ -100,7 +103,7 @@ public final class MultipartSaveLoad$ {
|
||||
replacement.xCoord = oldTile.xCoord;
|
||||
replacement.yCoord = oldTile.yCoord;
|
||||
replacement.zCoord = oldTile.zCoord;
|
||||
replacement.setWorldObj(oldTile.getWorldObj());
|
||||
replacement.setWorldObj(world);
|
||||
replacement.validate();
|
||||
entry.setValue(replacement);
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import java.util.Map;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.ChunkPosition;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
|
||||
@@ -43,6 +44,10 @@ public final class MultipartSaveLoad {
|
||||
MultipartSaveLoad$.MODULE$.loadTiles(chunk);
|
||||
}
|
||||
|
||||
public static void loadTiles(World world, Map<ChunkPosition, TileEntity> tiles) {
|
||||
MultipartSaveLoad$.MODULE$.loadTiles(world, tiles);
|
||||
}
|
||||
|
||||
/** Dummy registered tile that holds multipart NBT until its chunk finishes loading. */
|
||||
public static class TileNBTContainer extends TileEntity {
|
||||
|
||||
|
||||
@@ -27,6 +27,7 @@ class MultipartSaveLoadCharacterizationTest {
|
||||
"getClassToNameMap()Ljava/util/Map;",
|
||||
"hookLoader()V",
|
||||
"loadTiles(Lnet/minecraft/world/chunk/Chunk;)V",
|
||||
"loadTiles(Lnet/minecraft/world/World;Ljava/util/Map;)V",
|
||||
"loadingWorld()Lnet/minecraft/world/World;",
|
||||
"loadingWorld_$eq(Lnet/minecraft/world/World;)V",
|
||||
"registerTileClass(Ljava/lang/Class;)V"));
|
||||
|
||||
Reference in new issue
Block a user