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

Added ActuallyAddition compatibility for 1.12.2

Browse source 
Lasers aren't supported
This commit is contained in:
Unknown 2019-01-02 20:44:53 +01:00 • committed by unknown
parent 991f9817a9
commit cc583a4423
3 changed files with 126 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
src/main/java/cr0s/warpdrive/compat/CompatActuallyAdditions.java Normal file
View file

@ -0,0 +1,114 @@
package cr0s.warpdrive.compat;
import cr0s.warpdrive.api.IBlockTransformer;
import cr0s.warpdrive.api.ITransformation;
import cr0s.warpdrive.api.WarpDriveText;
import cr0s.warpdrive.config.WarpDriveConfig;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
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 CompatActuallyAdditions implements IBlockTransformer {
private static Class<?> classBlockInputter;
public static void register() {
try {
classBlockInputter = Class.forName("de.ellpeck.actuallyadditions.mod.blocks.BlockInputter");
WarpDriveConfig.registerBlockTransformer("ActuallyAdditions", new CompatActuallyAdditions());
} catch(final ClassNotFoundException | RuntimeException exception) {
exception.printStackTrace();
}
}
@Override
public boolean isApplicable(final Block block, final int metadata, final TileEntity tileEntity) {
return classBlockInputter.isInstance(block);
}
@Override
public boolean isJumpReady(final Block block, final int metadata, final TileEntity tileEntity, final WarpDriveText reason) {
return true;
}
@Override
public NBTBase saveExternals(final World world, final int x, final int y, final int z, final Block block, final int blockMeta, final TileEntity tileEntity) {
return null;
}
@Override
public void removeExternals(final World world, final int x, final int y, final int z,
final Block block, final int blockMeta, final TileEntity tileEntity) {
// nothing to do
}
/*
inputter & advanced inputter
SideToPull -1 / 0 / 1 / 2 3 4 5
SideToPut -1 / 0 / 1 / 2 3 4 5
*/
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
private static final byte[] rotInputter = { 0, 1, 3, 4, 5, 2 }; // -1 / 0 / 1 / 2 3 4 5
@Override
public int rotate(final Block block, final int metadata, final NBTTagCompound nbtTileEntity, final ITransformation transformation) {
final byte rotationSteps = transformation.getRotationSteps();
if (rotationSteps == 0 || nbtTileEntity == null) {
return metadata;
}
// inputter
if (nbtTileEntity.hasKey("SideToPull")) {
final int side = nbtTileEntity.getInteger("SideToPull");
if (side > 1) {
switch (rotationSteps) {
case 1:
nbtTileEntity.setInteger("SideToPull", rotInputter[side]);
break;
case 2:
nbtTileEntity.setInteger("SideToPull", rotInputter[rotInputter[side]]);
break;
case 3:
nbtTileEntity.setInteger("SideToPull", rotInputter[rotInputter[rotInputter[side]]]);
break;
default:
break;
}
}
}
if (nbtTileEntity.hasKey("SideToPut")) {
final int side = nbtTileEntity.getInteger("SideToPut");
if (side > 1) {
switch (rotationSteps) {
case 1:
nbtTileEntity.setInteger("SideToPut", rotInputter[side]);
break;
case 2:
nbtTileEntity.setInteger("SideToPut", rotInputter[rotInputter[side]]);
break;
case 3:
nbtTileEntity.setInteger("SideToPut", rotInputter[rotInputter[rotInputter[side]]]);
break;
default:
break;
}
}
}
return metadata;
}
@Override
public void restoreExternals(final World world, final BlockPos blockPos,
final IBlockState blockState, final TileEntity tileEntity,
final ITransformation transformation, final NBTBase nbtBase) {
// nothing to do
}
}

6
src/main/java/cr0s/warpdrive/config/Dictionary.java
View file

@ -150,6 +150,12 @@ public class Dictionary {
config.get("block_tags", "rustic:stake_tied" , "Anchor").getString();
config.get("block_tags", "storagedrawers:framingtable" , "Anchor").getString(); // invalid metadata conversion, see https://github.com/jaquadro/StorageDrawers/issues/683
config.get("block_tags", "warpdrive:bedrock_glass" , "Anchor StopMining NoBlink").getString();
config.get("block_tags", "actuallyadditions:block_laser_relay" , "Anchor").getString(); // network is saved outside the map, not supported
config.get("block_tags", "actuallyadditions:block_laser_relay_advanced" , "Anchor").getString(); // network is saved outside the map, not supported
config.get("block_tags", "actuallyadditions:block_laser_relay_extreme" , "Anchor").getString(); // network is saved outside the map, not supported
config.get("block_tags", "actuallyadditions:block_laser_relay_fluids" , "Anchor").getString(); // network is saved outside the map, not supported
config.get("block_tags", "actuallyadditions:block_laser_relay_item" , "Anchor").getString(); // network is saved outside the map, not supported
config.get("block_tags", "actuallyadditions:block_laser_relay_item_whitelist" , "Anchor").getString(); // network is saved outside the map, not supported
// placement priorities
config.get("block_tags", "minecraft:lever" , "PlaceLatest").getString();

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

@ -3,6 +3,7 @@ package cr0s.warpdrive.config;
import cr0s.warpdrive.Commons;
import cr0s.warpdrive.WarpDrive;
import cr0s.warpdrive.api.IBlockTransformer;
import cr0s.warpdrive.compat.CompatActuallyAdditions;
import cr0s.warpdrive.compat.CompatAdvancedRepulsionSystems;
import cr0s.warpdrive.compat.CompatAppliedEnergistics2;
import cr0s.warpdrive.compat.CompatArsMagica2;
@ -1229,6 +1230,11 @@ public class WarpDriveConfig {
CompatAppliedEnergistics2.register();
}
final boolean isActuallyAdditionsLoaded = Loader.isModLoaded("actuallyadditions");
if (isActuallyAdditionsLoaded) {
CompatActuallyAdditions.register();
}
final boolean isArsMagica2Loaded = Loader.isModLoaded("arsmagica2");
if (isArsMagica2Loaded) {
CompatArsMagica2.register();