Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated Mekanism compatibility to 1.12.2

Browse source
This commit is contained in:
Unknown 2018-12-01 01:47:45 +01:00 • committed by unknown
parent 231a092e15
commit a1ee966df3
3 changed files with 56 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/main/java/cr0s/warpdrive/compat/CompatMekanism.java
View file

@ -13,15 +13,23 @@ import net.minecraft.block.Block;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public class CompatMekanism implements IBlockTransformer {
private static Class<?> tileEntityBasicBlock;
private static Class<?> tileEntityBoundingBlock;
private static Class<?> tileEntityGlowPanel;
private static Class<?> tileEntitySidedPipe;
public static void register() {
try {
tileEntityBasicBlock = Class.forName("mekanism.common.tile.TileEntityBasicBlock");
tileEntityBasicBlock = Class.forName("mekanism.common.tile.prefab.TileEntityBasicBlock");
tileEntityBoundingBlock = Class.forName("mekanism.common.tile.TileEntityBoundingBlock");
// (not needed: mekanism.common.tile.TileEntityCardboardBox)
tileEntityGlowPanel = Class.forName("mekanism.common.tile.TileEntityGlowPanel");
tileEntitySidedPipe = Class.forName("mekanism.common.tile.transmitter.TileEntitySidedPipe");
WarpDriveConfig.registerBlockTransformer("Mekanism", new CompatMekanism());
} catch(final ClassNotFoundException exception) {
@ -31,7 +39,10 @@ public class CompatMekanism implements IBlockTransformer {
@Override
public boolean isApplicable(final Block block, final int metadata, final TileEntity tileEntity) {
return tileEntityBasicBlock.isInstance(tileEntity);
return tileEntityBasicBlock.isInstance(tileEntity)
|| tileEntityBoundingBlock.isInstance(tileEntity)
|| tileEntityGlowPanel.isInstance(tileEntity)
|| tileEntitySidedPipe.isInstance(tileEntity);
}
@Override
@ -53,18 +64,14 @@ public class CompatMekanism implements IBlockTransformer {
private static final int[] rotFacing = { 0, 1, 5, 4, 2, 3 };
private static final Map<String, String> rotConAttachmentNames;
private static final Map<String, String> rotConnectionNames;
static {
final Map<String, String> map = new HashMap<>();
map.put("conTypes2", "conTypes5");
map.put("conTypes5", "conTypes3");
map.put("conTypes3", "conTypes4");
map.put("conTypes4", "conTypes2");
map.put("attachment2", "attachment5");
map.put("attachment5", "attachment3");
map.put("attachment3", "attachment4");
map.put("attachment4", "attachment2");
rotConAttachmentNames = Collections.unmodifiableMap(map);
map.put("connection2", "connection5");
map.put("connection5", "connection3");
map.put("connection3", "connection4");
map.put("connection4", "connection2");
rotConnectionNames = Collections.unmodifiableMap(map);
}
@Override
@ -74,7 +81,7 @@ public class CompatMekanism implements IBlockTransformer {
return metadata;
}
// machines
// basic blocks
if (nbtTileEntity.hasKey("facing")) {
final int facing = nbtTileEntity.getInteger("facing");
switch (rotationSteps) {
@ -92,21 +99,39 @@ public class CompatMekanism implements IBlockTransformer {
}
}
// ducts
final HashMap<String, NBTBase> mapRotated = new HashMap<>(9);
for (final String key : rotConAttachmentNames.keySet()) {
// glowstone panels
if (nbtTileEntity.hasKey("side")) {
final int side = nbtTileEntity.getInteger("side");
switch (rotationSteps) {
case 1:
nbtTileEntity.setInteger("side", rotFacing[side]);
break;
case 2:
nbtTileEntity.setInteger("side", rotFacing[rotFacing[side]]);
break;
case 3:
nbtTileEntity.setInteger("side", rotFacing[rotFacing[rotFacing[side]]]);
break;
default:
break;
}
}
// sided pipes, including duct/pipe/cable/etc.
final HashMap<String, NBTBase> mapRotated = new HashMap<>(rotConnectionNames.size());
for (final String key : rotConnectionNames.keySet()) {
if (nbtTileEntity.hasKey(key)) {
final NBTBase nbtBase = nbtTileEntity.getTag(key);
nbtTileEntity.removeTag(key);
switch (rotationSteps) {
case 1:
mapRotated.put(rotConAttachmentNames.get(key), nbtBase);
mapRotated.put(rotConnectionNames.get(key), nbtBase);
break;
case 2:
mapRotated.put(rotConAttachmentNames.get(rotConAttachmentNames.get(key)), nbtBase);
mapRotated.put(rotConnectionNames.get(rotConnectionNames.get(key)), nbtBase);
break;
case 3:
mapRotated.put(rotConAttachmentNames.get(rotConAttachmentNames.get(rotConAttachmentNames.get(key))), nbtBase);
mapRotated.put(rotConnectionNames.get(rotConnectionNames.get(rotConnectionNames.get(key))), nbtBase);
break;
default:
mapRotated.put(key, nbtBase);
@ -118,6 +143,16 @@ public class CompatMekanism implements IBlockTransformer {
nbtTileEntity.setTag(entry.getKey(), entry.getValue());
}
// bounding blocks
if ( nbtTileEntity.hasKey("mainX")
&& nbtTileEntity.hasKey("mainY")
&& nbtTileEntity.hasKey("mainZ") ) {
final BlockPos mainTarget = transformation.apply(nbtTileEntity.getInteger("mainX"), nbtTileEntity.getInteger("mainY"), nbtTileEntity.getInteger("mainZ"));
nbtTileEntity.setInteger("mainX", mainTarget.getX());
nbtTileEntity.setInteger("mainY", mainTarget.getY());
nbtTileEntity.setInteger("mainZ", mainTarget.getZ());
}
return metadata;
}

2
src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java
View file

@ -1270,7 +1270,7 @@ public class WarpDriveConfig {
CompatJABBA.register();
}
final boolean isMekanismLoaded = Loader.isModLoaded("Mekanism");
final boolean isMekanismLoaded = Loader.isModLoaded("mekanism");
if (isMekanismLoaded) {
CompatMekanism.register();
}

12
src/main/java/cr0s/warpdrive/data/JumpBlock.java
View file

@ -291,16 +291,6 @@ public class JumpBlock {
nbtToDeploy.setInteger("y", target.getY());
nbtToDeploy.setInteger("z", target.getZ());
if (nbtToDeploy.hasKey("mainX") && nbtToDeploy.hasKey("mainY") && nbtToDeploy.hasKey("mainZ")) {// Mekanism 6.0.4.44
if (WarpDriveConfig.LOGGING_JUMPBLOCKS) {
WarpDrive.logger.info(String.format("%s deploy: TileEntity has mainXYZ", this));
}
final BlockPos mainTarget = transformation.apply(nbtToDeploy.getInteger("mainX"), nbtToDeploy.getInteger("mainY"), nbtToDeploy.getInteger("mainZ"));
nbtToDeploy.setInteger("mainX", mainTarget.getX());
nbtToDeploy.setInteger("mainY", mainTarget.getY());
nbtToDeploy.setInteger("mainZ", mainTarget.getZ());
}
if (nbtToDeploy.hasKey("screenData")) {// IC2NuclearControl 2.2.5a
final NBTTagCompound nbtScreenData = nbtToDeploy.getCompoundTag("screenData");
if ( nbtScreenData.hasKey("minX") && nbtScreenData.hasKey("minY") && nbtScreenData.hasKey("minZ")
@ -422,7 +412,7 @@ public class JumpBlock {
}
// not needed: if ic2.core.block.machine.tileentity.TileEntityMatter then updated "state"
}
} else {// IC2 extensions without network optimization (transferring all fields)
} else if (!superClassName.startsWith("mekanism.")) {// IC2 extensions without network optimization (transferring all fields)
try {
final Method getNetworkedFields = teClass.getMethod("getNetworkedFields");
@SuppressWarnings("unchecked")