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

Added EnderIO reservoir & faces rotation

Browse source
This commit is contained in:
LemADEC 2016-03-26 21:29:19 +01:00
parent ef6499b318
commit 5b56cd2e97
1 changed files with 132 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
src/main/java/cr0s/warpdrive/compat/CompatEnderIO.java
View file

@ -3,6 +3,7 @@ package cr0s.warpdrive.compat;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -10,6 +11,7 @@ import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChunkCoordinates;
import cr0s.warpdrive.api.IBlockTransformer; import cr0s.warpdrive.api.IBlockTransformer;
import cr0s.warpdrive.api.ITransformation; import cr0s.warpdrive.api.ITransformation;
import cr0s.warpdrive.config.WarpDriveConfig; import cr0s.warpdrive.config.WarpDriveConfig;
@ -17,10 +19,12 @@ import cr0s.warpdrive.config.WarpDriveConfig;
public class CompatEnderIO implements IBlockTransformer { public class CompatEnderIO implements IBlockTransformer {
private static Class<?> classTileEntityEIO; private static Class<?> classTileEntityEIO;
private static Class<?> classBlockReservoir;
public static void register() { public static void register() {
try { try {
classTileEntityEIO = Class.forName("crazypants.enderio.TileEntityEio"); classTileEntityEIO = Class.forName("crazypants.enderio.TileEntityEio");
classBlockReservoir = Class.forName("crazypants.enderio.machine.reservoir.BlockReservoir");
WarpDriveConfig.registerBlockTransformer("EnderIO", new CompatEnderIO()); WarpDriveConfig.registerBlockTransformer("EnderIO", new CompatEnderIO());
} catch(ClassNotFoundException exception) { } catch(ClassNotFoundException exception) {
exception.printStackTrace(); exception.printStackTrace();
@ -53,6 +57,7 @@ public class CompatEnderIO implements IBlockTransformer {
private static final byte NBTTagCompoundId = 10; // new NBTTagCompound().getId(); private static final byte NBTTagCompoundId = 10; // new NBTTagCompound().getId();
private static final byte NBTTagIntArrayId = 11; // new NBTTagIntArray(null).getId(); private static final byte NBTTagIntArrayId = 11; // new NBTTagIntArray(null).getId();
private static final Map<String, String> rotSideNames; private static final Map<String, String> rotSideNames;
private static final Map<String, String> rotFaceNames;
static { static {
Map<String, String> map = new HashMap(); Map<String, String> map = new HashMap();
map.put("EAST", "SOUTH"); map.put("EAST", "SOUTH");
@ -60,7 +65,20 @@ public class CompatEnderIO implements IBlockTransformer {
map.put("WEST", "NORTH"); map.put("WEST", "NORTH");
map.put("NORTH", "EAST"); map.put("NORTH", "EAST");
rotSideNames = Collections.unmodifiableMap(map); rotSideNames = Collections.unmodifiableMap(map);
map = new HashMap();
map.put("face2", "face5");
map.put("face5", "face3");
map.put("face3", "face4");
map.put("face4", "face2");
map.put("faceDisplay2", "faceDisplay5");
map.put("faceDisplay5", "faceDisplay3");
map.put("faceDisplay3", "faceDisplay4");
map.put("faceDisplay4", "faceDisplay2");
rotFaceNames = Collections.unmodifiableMap(map);
} }
private static final short[] rotFront = { 0, 1, 5, 3, 4, 2, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
private static final short[] rotRight = { 0, 1, 4, 3, 2, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
private static final short[] rotPosHorizontal = { 1, 3, 0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
private byte[] rotate_byteArray(final byte rotationSteps, final byte[] data) { private byte[] rotate_byteArray(final byte rotationSteps, final byte[] data) {
byte[] newData = data.clone(); byte[] newData = data.clone();
@ -138,12 +156,88 @@ public class CompatEnderIO implements IBlockTransformer {
return newConduit; return newConduit;
} }
public void rotateReservoir(NBTTagCompound nbtTileEntity, final ITransformation transformation, final byte rotationSteps) {
if (nbtTileEntity.hasKey("front")) {
short front = nbtTileEntity.getShort("front");
switch (rotationSteps) {
case 1:
nbtTileEntity.setShort("front", rotFront[front]);
break;
case 2:
nbtTileEntity.setShort("front", rotFront[rotFront[front]]);
break;
case 3:
nbtTileEntity.setShort("front", rotFront[rotFront[rotFront[front]]]);
break;
default:
break;
}
}
if (nbtTileEntity.hasKey("right")) {
short right = nbtTileEntity.getShort("right");
switch (rotationSteps) {
case 1:
nbtTileEntity.setShort("right", rotRight[right]);
break;
case 2:
nbtTileEntity.setShort("right", rotRight[rotRight[right]]);
break;
case 3:
nbtTileEntity.setShort("right", rotRight[rotRight[rotRight[right]]]);
break;
default:
break;
}
}
// Multiblock
if (nbtTileEntity.hasKey("multiblock") && nbtTileEntity.hasKey("pos")) {
int[] oldCoords = nbtTileEntity.getIntArray("multiblock");
ChunkCoordinates[] targets = new ChunkCoordinates[oldCoords.length / 3];
for (int index = 0; index < oldCoords.length / 3; index++) {
targets[index] = transformation.apply(oldCoords[3 * index], oldCoords[3 * index + 1], oldCoords[3 * index + 2]);
}
if (targets[0].posY == targets[1].posY && targets[1].posY == targets[2].posY && targets[2].posY == targets[3].posY) {
short pos = nbtTileEntity.getShort("pos");
switch (rotationSteps) {
case 1:
nbtTileEntity.setShort("pos", rotPosHorizontal[pos]);
break;
case 2:
nbtTileEntity.setShort("pos", rotPosHorizontal[rotPosHorizontal[pos]]);
break;
case 3:
nbtTileEntity.setShort("pos", rotPosHorizontal[rotPosHorizontal[rotPosHorizontal[pos]]]);
break;
default:
break;
}
} else {
ChunkCoordinates newPos = transformation.apply(nbtTileEntity.getInteger("x"), nbtTileEntity.getInteger("y"), nbtTileEntity.getInteger("z"));
if (targets[0].posX == targets[1].posX && targets[1].posX == targets[2].posX && targets[2].posX == targets[3].posX) {
int minZ = Math.min(targets[0].posZ, Math.min(targets[1].posZ, targets[2].posZ));
short pos = (short) ((nbtTileEntity.getShort("pos") & 2) + (newPos.posZ == minZ ? 1 : 0)); // 2 & 3 are for bottom
nbtTileEntity.setShort("pos", pos);
} else {
int minX = Math.min(targets[0].posX, Math.min(targets[1].posX, targets[2].posX));
short pos = (short) ((nbtTileEntity.getShort("pos") & 2) + (newPos.posX == minX ? 1 : 0)); // 2 & 3 are for bottom
nbtTileEntity.setShort("pos", pos);
}
}
int[] newCoords = new int[oldCoords.length];
for (int index = 0; index < oldCoords.length / 3; index++) {
newCoords[3 * index ] = targets[index].posX;
newCoords[3 * index + 1] = targets[index].posY;
newCoords[3 * index + 2] = targets[index].posZ;
}
nbtTileEntity.setIntArray("multiblock", newCoords);
}
}
@Override @Override
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final ITransformation transformation) { public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final ITransformation transformation) {
byte rotationSteps = transformation.getRotationSteps(); byte rotationSteps = transformation.getRotationSteps();
if (rotationSteps == 0) {
return metadata;
}
if (nbtTileEntity.hasKey("facing")) { if (nbtTileEntity.hasKey("facing")) {
short facing = nbtTileEntity.getShort("facing"); short facing = nbtTileEntity.getShort("facing");
@ -161,6 +255,41 @@ public class CompatEnderIO implements IBlockTransformer {
return metadata; return metadata;
} }
} }
// Reservoir
if (classBlockReservoir.isInstance(block)) {
rotateReservoir(nbtTileEntity, transformation, rotationSteps);
}
// Faces
Map<String, Short> map = new HashMap();
for (String key : rotFaceNames.keySet()) {
if (nbtTileEntity.hasKey(key)) {
short face = nbtTileEntity.getShort(key);
switch (rotationSteps) {
case 1:
map.put(rotFaceNames.get(key), face);
break;
case 2:
map.put(rotFaceNames.get(rotFaceNames.get(key)), face);
break;
case 3:
map.put(rotFaceNames.get(rotFaceNames.get(rotFaceNames.get(key))), face);
break;
default:
map.put(key, face);
break;
}
nbtTileEntity.removeTag(key);
}
}
if (!map.isEmpty()) {
for (Entry<String, Short> entry : map.entrySet()) {
nbtTileEntity.setShort(entry.getKey(), entry.getValue());
}
}
// Conduits
if (nbtTileEntity.hasKey("conduits")) { if (nbtTileEntity.hasKey("conduits")) {
NBTTagList conduits = nbtTileEntity.getTagList("conduits", NBTTagCompoundId); NBTTagList conduits = nbtTileEntity.getTagList("conduits", NBTTagCompoundId);
NBTTagList newConduits = new NBTTagList(); NBTTagList newConduits = new NBTTagList();