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

Updated transformation API

Browse source
This commit is contained in:
LemADEC 2016-03-26 15:55:08 +01:00
parent 97d9cd18e9
commit a83ed55777
10 changed files with 112 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/cr0s/warpdrive/api/IBlockTransformer.java
View file

@ -30,7 +30,7 @@ public interface IBlockTransformer {
// Use this to apply metadata & NBT rotation, right before block & tile entity placement.
// Use priority placement to ensure dependent blocks are placed first.
// Warning: do NOT place the block or tile entity!
int rotate(final Block block, int metadata, NBTTagCompound nbtTileEntity, final byte rotationSteps, final float rotationYaw);
int rotate(final Block block, int metadata, NBTTagCompound nbtTileEntity, ITransformation transformation);
// Called when placing back a ship in the world.
// Use this to restore external data from the ship schematic, right after block & tile entity placement.

91
src/main/java/cr0s/warpdrive/compat/CompatArsMagica2.java
View file

@ -12,19 +12,40 @@ import net.minecraftforge.common.util.Constants;
import am2.api.power.IPowerNode;
import am2.power.PowerNodeRegistry;
import cpw.mods.fml.common.Optional;
import cr0s.warpdrive.WarpDrive;
import cr0s.warpdrive.api.IBlockTransformer;
import cr0s.warpdrive.api.ITransformation;
import cr0s.warpdrive.config.WarpDriveConfig;
public class CompatArsMagica2 implements IBlockTransformer {
private static Class<?> classBlockInscriptionTable;
private static Class<?> classBlockKeystoneReceptacle;
private static Class<?> classBlockLectern;
private static Class<?> classBlockMagiciansWorkbench;
private static Class<?> classBlockOcculus;
public static void register() {
WarpDriveConfig.registerBlockTransformer("arsmagica2", new CompatArsMagica2());
try {
classBlockInscriptionTable = Class.forName("am2.blocks.BlockInscriptionTable");
classBlockKeystoneReceptacle = Class.forName("am2.blocks.BlockKeystoneReceptacle");
classBlockLectern = Class.forName("am2.blocks.BlockLectern");
classBlockMagiciansWorkbench = Class.forName("am2.blocks.BlockMagiciansWorkbench");
classBlockOcculus = Class.forName("am2.blocks.BlockOcculus");
WarpDriveConfig.registerBlockTransformer("arsmagica2", new CompatArsMagica2());
} catch(ClassNotFoundException exception) {
exception.printStackTrace();
}
}
@Override
public boolean isApplicable(final Block block, final int metadata, final TileEntity tileEntity) {
return tileEntity instanceof IPowerNode;
return classBlockInscriptionTable.isInstance(block)
|| classBlockKeystoneReceptacle.isInstance(block)
|| classBlockLectern.isInstance(block)
|| classBlockMagiciansWorkbench.isInstance(block)
|| classBlockOcculus.isInstance(block)
|| tileEntity instanceof IPowerNode;
}
@Override
@ -45,17 +66,70 @@ public class CompatArsMagica2 implements IBlockTransformer {
@Override
@Optional.Method(modid = "arsmagica2")
public void remove(TileEntity tileEntity) {
PowerNodeRegistry.For(tileEntity.getWorldObj()).removePowerNode((IPowerNode) tileEntity);
if (tileEntity instanceof IPowerNode) {
PowerNodeRegistry.For(tileEntity.getWorldObj()).removePowerNode((IPowerNode) tileEntity);
}
}
private static final int[] mrotInscriptionTable = { 0, 4, 1, 2, 3, 5, 6, 7, 8, 12, 9, 10, 11, 13, 14, 15 };
private static final int[] mrotKeystoneReceptacle = { 3, 0, 1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
private static final int[] mrotLectern = { 0, 4, 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; // same as Magicians workbench & Occulus
@Override
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final byte rotationSteps, final float rotationYaw) {
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final ITransformation transformation) {
byte rotationSteps = transformation.getRotationSteps();
if (rotationSteps == 0) {
return metadata;
}
if (classBlockInscriptionTable.isInstance(block)) {
switch (rotationSteps) {
case 1:
return mrotInscriptionTable[metadata];
case 2:
return mrotInscriptionTable[mrotInscriptionTable[metadata]];
case 3:
return mrotInscriptionTable[mrotInscriptionTable[mrotInscriptionTable[metadata]]];
default:
return metadata;
}
}
if (classBlockKeystoneReceptacle.isInstance(block)) {
switch (rotationSteps) {
case 1:
return mrotKeystoneReceptacle[metadata];
case 2:
return mrotKeystoneReceptacle[mrotKeystoneReceptacle[metadata]];
case 3:
return mrotKeystoneReceptacle[mrotKeystoneReceptacle[mrotKeystoneReceptacle[metadata]]];
default:
return metadata;
}
}
if (classBlockLectern.isInstance(block) || classBlockMagiciansWorkbench.isInstance(block) || classBlockOcculus.isInstance(block)) {
switch (rotationSteps) {
case 1:
return mrotLectern[metadata];
case 2:
return mrotLectern[mrotLectern[metadata]];
case 3:
return mrotLectern[mrotLectern[mrotLectern[metadata]]];
default:
return metadata;
}
}
return metadata;
}
@Override
@Optional.Method(modid = "arsmagica2")
public void restoreExternals(TileEntity tileEntity, ITransformation transformation, NBTBase nbtBase) {
if (!(tileEntity instanceof IPowerNode) || nbtBase == null) {
return;
}
NBTTagCompound nbtTagCompound = (NBTTagCompound) nbtBase;
// powerAmounts
@ -99,6 +173,13 @@ public class CompatArsMagica2 implements IBlockTransformer {
World targetWorld = transformation.getTargetWorld();
ChunkCoordinates target = transformation.apply(tileEntity);
PowerNodeRegistry.For(targetWorld).setDataCompoundForNode((IPowerNode) targetWorld.getTileEntity(target.posX, target.posY, target.posZ), nbtTagCompound);
TileEntity tileEntityTarget = targetWorld.getTileEntity(target.posX, target.posY, target.posZ);
if (tileEntityTarget == null) {
WarpDrive.logger.error("ArsMagica2 compat: No tile entity found at target location " + target + ". We might loose mana network " + nbtBase + ".");
} else if (!(tileEntityTarget instanceof IPowerNode)) {
WarpDrive.logger.error("ArsMagica2 compat: invalid tile entity " + tileEntityTarget + " found at target location " + target + ".");
} else {
PowerNodeRegistry.For(targetWorld).setDataCompoundForNode((IPowerNode) tileEntityTarget, nbtTagCompound);
}
}
}

3
src/main/java/cr0s/warpdrive/compat/CompatBiblioCraft.java
View file

@ -49,7 +49,8 @@ public class CompatBiblioCraft implements IBlockTransformer {
private static final int[] rotCaseAngle = { 0, 1, 2, 3, 5, 6, 7, 4, 8, 9, 10, 11, 12, 13, 14, 15 };
@Override
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final byte rotationSteps, final float rotationYaw) {
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final ITransformation transformation) {
byte rotationSteps = transformation.getRotationSteps();
if (rotationSteps == 0) {
return metadata;
}

3
src/main/java/cr0s/warpdrive/compat/CompatComputerCraft.java
View file

@ -62,7 +62,8 @@ public class CompatComputerCraft implements IBlockTransformer {
private static final int[] rotDir = { 0, 1, 5, 4, 2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }; // printer, monitor, turtle
@Override
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final byte rotationSteps, final float rotationYaw) {
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final ITransformation transformation) {
byte rotationSteps = transformation.getRotationSteps();
if (rotationSteps == 0) {
return metadata;
}

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

@ -52,15 +52,16 @@ public class CompatEnderIO implements IBlockTransformer {
private static final byte NBTTagByteArrayId = 7; // new NBTTagByteArray(null).getId();
private static final byte NBTTagCompoundId = 10; // new NBTTagCompound().getId();
private static final byte NBTTagIntArrayId = 11; // new NBTTagIntArray(null).getId();
private static final Map<String, String> rotSideNames;
static {
Map<String, String> map = new HashMap();
map.put("EAST", "SOUTH");
map.put("SOUTH", "WEST");
map.put("WEST", "NORTH");
map.put("NORTH", "EAST");
rotSideNames = Collections.unmodifiableMap(map);
}
private static final Map<String, String> rotSideNames;
static {
Map<String, String> map = new HashMap();
map.put("EAST", "SOUTH");
map.put("SOUTH", "WEST");
map.put("WEST", "NORTH");
map.put("NORTH", "EAST");
rotSideNames = Collections.unmodifiableMap(map);
}
private byte[] rotate_byteArray(final byte rotationSteps, final byte[] data) {
byte[] newData = data.clone();
for (int index = 0; index < data.length; index++) {
@ -138,7 +139,8 @@ public class CompatEnderIO implements IBlockTransformer {
}
@Override
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final byte rotationSteps, final float rotationYaw) {
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final ITransformation transformation) {
byte rotationSteps = transformation.getRotationSteps();
if (rotationSteps == 0) {
return metadata;
}

3
src/main/java/cr0s/warpdrive/compat/CompatImmersiveEngineering.java
View file

@ -66,7 +66,8 @@ public class CompatImmersiveEngineering implements IBlockTransformer {
}
@Override
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final byte rotationSteps, final float rotationYaw) {
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final ITransformation transformation) {
byte rotationSteps = transformation.getRotationSteps();
if (rotationSteps == 0 || !nbtTileEntity.hasKey("facing")) {
return metadata;
}

3
src/main/java/cr0s/warpdrive/compat/CompatIndustrialCraft2.java
View file

@ -44,7 +44,8 @@ public class CompatIndustrialCraft2 implements IBlockTransformer {
}
@Override
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final byte rotationSteps, final float rotationYaw) {
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final ITransformation transformation) {
byte rotationSteps = transformation.getRotationSteps();
if (rotationSteps == 0 || !nbtTileEntity.hasKey("facing")) {
return metadata;
}

3
src/main/java/cr0s/warpdrive/compat/CompatOpenComputers.java
View file

@ -44,7 +44,8 @@ public class CompatOpenComputers implements IBlockTransformer {
}
@Override
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final byte rotationSteps, final float rotationYaw) {
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final ITransformation transformation) {
byte rotationSteps = transformation.getRotationSteps();
if (rotationSteps == 0 || !nbtTileEntity.hasKey("oc:yaw")) {
return metadata;
}

3
src/main/java/cr0s/warpdrive/compat/CompatTConstruct.java
View file

@ -58,7 +58,8 @@ public class CompatTConstruct implements IBlockTransformer {
private static final byte[] rotDirection = { 0, 1, 5, 4, 2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
@Override
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final byte rotationSteps, final float rotationYaw) {
public int rotate(final Block block, final int metadata, NBTTagCompound nbtTileEntity, final ITransformation transformation) {
byte rotationSteps = transformation.getRotationSteps();
if (rotationSteps == 0) {
return metadata;
}

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

@ -241,7 +241,7 @@ public class JumpBlock {
for (Entry<String, NBTBase> external : externals.entrySet()) {
IBlockTransformer blockTransformer = WarpDriveConfig.blockTransformers.get(external.getKey());
if (blockTransformer != null) {
newBlockMeta = blockTransformer.rotate(block, blockMeta, nbtToDeploy, transformation.getRotationSteps(), transformation.getRotationYaw());
newBlockMeta = blockTransformer.rotate(block, blockMeta, nbtToDeploy, transformation);
}
}
} else {