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

Fixed YABBA compatibility erroring at boot

Browse source 
We were falling back to the generic transformer which was working fine, so we're just removing the module altogether
This commit is contained in:
Unknown 2019-12-23 22:48:49 +01:00 • committed by unknown
parent 30bd6f2120
commit 4a16a845d4
2 changed files with 0 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
src/main/java/cr0s/warpdrive/compat/CompatYABBA.java
View file

@ -1,84 +0,0 @@
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 CompatYABBA implements IBlockTransformer {
private static Class<?> classBlockAdvancedBarrelBase;
private static Class<?> classBlockDecorativeBlock;
public static void register() {
try {
classBlockAdvancedBarrelBase = Class.forName("com.latmod.yabba.block.BlockAdvancedBarrelBase");
classBlockDecorativeBlock = Class.forName("com.latmod.yabba.block.BlockDecorativeBlock");
WarpDriveConfig.registerBlockTransformer("YABBA", new CompatYABBA());
} catch(final ClassNotFoundException exception) {
exception.printStackTrace();
}
}
@Override
public boolean isApplicable(final Block block, final int metadata, final TileEntity tileEntity) {
return classBlockAdvancedBarrelBase.isInstance(block)
|| classBlockDecorativeBlock.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) {
// nothing to do
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
}
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
private static final byte[] rotHorizontal = { 1, 2, 3, 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
@Override
public int rotate(final Block block, final int metadata, final NBTTagCompound nbtTileEntity, final ITransformation transformation) {
final byte rotationSteps = transformation.getRotationSteps();
if (rotationSteps == 0) {
return metadata;
}
// barrels
switch (rotationSteps) {
case 1:
return rotHorizontal[metadata];
case 2:
return rotHorizontal[rotHorizontal[metadata]];
case 3:
return rotHorizontal[rotHorizontal[rotHorizontal[metadata]]];
default:
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/WarpDriveConfig.java
View file

@ -55,7 +55,6 @@ import cr0s.warpdrive.compat.CompatUndergroundBiomes;
import cr0s.warpdrive.compat.CompatVariedCommodities;
import cr0s.warpdrive.compat.CompatWarpDrive;
import cr0s.warpdrive.compat.CompatWoot;
import cr0s.warpdrive.compat.CompatYABBA;
import cr0s.warpdrive.config.structures.StructureManager;
import cr0s.warpdrive.data.CelestialObject;
import cr0s.warpdrive.data.CelestialObjectManager;
@ -1681,11 +1680,6 @@ public class WarpDriveConfig {
if (isWootloaded) {
CompatWoot.register();
}
final boolean isYABBAloaded = Loader.isModLoaded("yabba");
if (isYABBAloaded) {
CompatYABBA.register();
}
}
public static void onFMLPostInitialization() {