From 7b4fefeb60969320fb4ce845dd962f15ee3beab0 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 8 Feb 2016 22:46:06 +0000 Subject: [PATCH] Fix some of the things that were broken, add more type-specs. --- src/main/java/mekanism/api/Coord4D.java | 2 +- .../client/render/MekanismRenderer.java | 8 ---- .../java/mekanism/common/MekanismBlocks.java | 13 +++--- .../mekanism/common/base/ITileNetwork.java | 2 +- .../mekanism/common/block/BlockBasic.java | 1 - .../mekanism/common/block/BlockMachine.java | 8 ++-- .../java/mekanism/common/block/BlockOre.java | 33 ++++++++++----- .../mekanism/common/block/BlockPlastic.java | 42 +++++++++++++++---- .../common/block/states/BlockStateBasic.java | 12 ++++-- .../common/block/states/BlockStateOre.java | 2 +- .../block/states/BlockStatePlastic.java | 4 +- .../common/item/ItemBlockPlastic.java | 9 ++-- .../TileEntityAdvancedElectricMachine.java | 2 +- .../tile/TileEntityAmbientAccumulator.java | 2 +- .../common/tile/TileEntityBasicBlock.java | 2 +- .../common/tile/TileEntityBasicMachine.java | 2 +- .../mekanism/common/tile/TileEntityBin.java | 2 +- .../common/tile/TileEntityBoundingBlock.java | 2 +- .../common/tile/TileEntityChargepad.java | 2 +- .../tile/TileEntityChemicalCrystallizer.java | 4 +- .../TileEntityChemicalDissolutionChamber.java | 4 +- .../tile/TileEntityChemicalInfuser.java | 4 +- .../tile/TileEntityChemicalOxidizer.java | 4 +- .../common/tile/TileEntityChemicalWasher.java | 4 +- .../common/tile/TileEntityDigitalMiner.java | 2 +- .../common/tile/TileEntityDynamicTank.java | 2 +- .../common/tile/TileEntityElectricBlock.java | 2 +- .../common/tile/TileEntityElectricChest.java | 2 +- .../common/tile/TileEntityElectricPump.java | 4 +- .../tile/TileEntityElectrolyticSeparator.java | 8 ++-- .../common/tile/TileEntityEnergyCube.java | 2 +- .../common/tile/TileEntityEntangledBlock.java | 2 +- .../common/tile/TileEntityFactory.java | 6 +-- .../tile/TileEntityFluidicPlenisher.java | 4 +- .../common/tile/TileEntityGasTank.java | 2 +- .../tile/TileEntityInductionCasing.java | 2 +- .../common/tile/TileEntityInductionCell.java | 4 +- .../common/tile/TileEntityInductionPort.java | 2 +- .../tile/TileEntityInductionProvider.java | 4 +- .../mekanism/common/tile/TileEntityLaser.java | 2 +- .../common/tile/TileEntityLaserAmplifier.java | 4 +- .../tile/TileEntityLaserTractorBeam.java | 2 +- .../tile/TileEntityLogisticalSorter.java | 6 +-- .../tile/TileEntityMetallurgicInfuser.java | 4 +- .../common/tile/TileEntityMultiblock.java | 2 +- .../tile/TileEntityOredictionificator.java | 6 +-- .../mekanism/common/tile/TileEntityPRC.java | 2 +- .../common/tile/TileEntityPortableTank.java | 4 +- .../tile/TileEntityRotaryCondensentrator.java | 4 +- .../tile/TileEntitySeismicVibrator.java | 4 +- .../TileEntitySolarEvaporationController.java | 2 +- .../tile/TileEntitySolarNeutronActivator.java | 4 +- .../common/tile/TileEntityTeleporter.java | 2 +- .../tile/TileEntityThermoelectricBoiler.java | 2 +- .../tile/component/TileComponentUpgrade.java | 2 +- 55 files changed, 152 insertions(+), 118 deletions(-) diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 4dbaf23be..e08348559 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -227,7 +227,7 @@ public class Coord4D extends BlockPos */ public Coord4D offset(EnumFacing facing, int n) { - return n == 0 ? this : new Coord4D(this.getX() + facing.getFrontOffsetX() * n, this.getY() + facing.getFrontOffsetY() * n, this.getZ() + facing.getFrontOffsetZ() * n); + return (facing == null || n == 0) ? this : new Coord4D(this.getX() + facing.getFrontOffsetX() * n, this.getY() + facing.getFrontOffsetY() * n, this.getZ() + facing.getFrontOffsetZ() * n); } public ItemStack getStack(IBlockAccess world) diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 4a81d2887..b462ae47f 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -93,11 +93,6 @@ public class MekanismRenderer @SubscribeEvent public void onStitch(TextureStitchEvent.Pre event) { -/* - if(event.map.locationBlocksTexture) - { - -*/ initFluidTextures(event.map); for(EnumColor color : EnumColor.values()) @@ -156,9 +151,6 @@ public class MekanismRenderer RenderDynamicTank.resetDisplayInts(); RenderSalinationController.resetDisplayInts(); RenderPortableTank.resetDisplayInts(); -/* - } -*/ } public static void initFluidTextures(TextureMap map) { diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 4455705ff..06d3a58c1 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -17,6 +17,7 @@ import mekanism.common.block.BlockPlastic; import mekanism.common.block.BlockPlasticFence; import mekanism.common.block.BlockSalt; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.block.states.BlockStatePlastic.PlasticBlockType; import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemBlockCardboardBox; import mekanism.common.item.ItemBlockEnergyCube; @@ -59,11 +60,11 @@ public class MekanismBlocks public static final Block BoundingBlock = (BlockBounding)new BlockBounding().setUnlocalizedName("BoundingBlock"); public static final Block GasTank = new BlockGasTank().setUnlocalizedName("GasTank"); public static final Block CardboardBox = new BlockCardboardBox().setUnlocalizedName("CardboardBox"); - public static final Block PlasticBlock = new BlockPlastic().setUnlocalizedName("PlasticBlock"); - public static final Block SlickPlasticBlock = new BlockPlastic().setUnlocalizedName("SlickPlasticBlock"); - public static final Block GlowPlasticBlock = new BlockPlastic().setUnlocalizedName("GlowPlasticBlock"); - public static final Block ReinforcedPlasticBlock = new BlockPlastic().setUnlocalizedName("ReinforcedPlasticBlock"); - public static final Block RoadPlasticBlock = new BlockPlastic().setUnlocalizedName("RoadPlasticBlock"); + public static final Block PlasticBlock = new BlockPlastic(PlasticBlockType.PLASTIC).setUnlocalizedName("PlasticBlock"); + public static final Block SlickPlasticBlock = new BlockPlastic(PlasticBlockType.SLICK).setUnlocalizedName("SlickPlasticBlock"); + public static final Block GlowPlasticBlock = new BlockPlastic(PlasticBlockType.GLOW).setUnlocalizedName("GlowPlasticBlock"); + public static final Block ReinforcedPlasticBlock = new BlockPlastic(PlasticBlockType.REINFORCED).setUnlocalizedName("ReinforcedPlasticBlock"); + public static final Block RoadPlasticBlock = new BlockPlastic(PlasticBlockType.ROAD).setUnlocalizedName("RoadPlasticBlock"); public static final Block PlasticFence = new BlockPlasticFence().setUnlocalizedName("PlasticFence"); public static final Block SaltBlock = new BlockSalt().setUnlocalizedName("SaltBlock"); @@ -123,7 +124,7 @@ public class MekanismBlocks new ResourceLocation("mekanism", "basic_factory"), new ResourceLocation("mekanism", "advanced_factory"), new ResourceLocation("mekanism", "elite_factory"), - //new ResourceLocation("mekanism", "metallurgic_infuser"), + new ResourceLocation("mekanism", "metallurgic_infuser"), new ResourceLocation("mekanism", "purification_chamber"), new ResourceLocation("mekanism", "energized_smelter"), new ResourceLocation("mekanism", "teleporter"), diff --git a/src/main/java/mekanism/common/base/ITileNetwork.java b/src/main/java/mekanism/common/base/ITileNetwork.java index 45c3a5be0..156f9213f 100644 --- a/src/main/java/mekanism/common/base/ITileNetwork.java +++ b/src/main/java/mekanism/common/base/ITileNetwork.java @@ -22,5 +22,5 @@ public interface ITileNetwork * @param data - list of data * @return ArrayList */ - public ArrayList getNetworkedData(ArrayList data); + public ArrayList getNetworkedData(ArrayList data); } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index fd7891ed1..c5ebddff9 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -394,7 +394,6 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus switch(meta) { case 9: - case 10: case 11: TileEntityDynamicTank tileEntity = (TileEntityDynamicTank)world.getTileEntity(pos); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 2b6e4bacd..8b46e26e4 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -302,6 +302,9 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou } } + tileEntity.setFacing((short)change); + tileEntity.redstone = world.isBlockIndirectlyGettingPowered(pos) > 0; + if(tileEntity instanceof TileEntityLogisticalSorter) { TileEntityLogisticalSorter transporter = (TileEntityLogisticalSorter)tileEntity; @@ -314,7 +317,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou if(tile instanceof IInventory) { - change = dir.getOpposite().ordinal(); + tileEntity.setFacing((short)dir.getOpposite().ordinal()); break; } } @@ -326,9 +329,6 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou teleporter.owner = placer.getName(); } - tileEntity.setFacing((short)change); - tileEntity.redstone = world.isBlockIndirectlyGettingPowered(pos) > 0; - if(tileEntity instanceof IBoundingBlock) { ((IBoundingBlock)tileEntity).onPlace(); diff --git a/src/main/java/mekanism/common/block/BlockOre.java b/src/main/java/mekanism/common/block/BlockOre.java index 7810ef60e..b30f7ceb8 100644 --- a/src/main/java/mekanism/common/block/BlockOre.java +++ b/src/main/java/mekanism/common/block/BlockOre.java @@ -3,12 +3,17 @@ package mekanism.common.block; import java.util.List; import mekanism.common.Mekanism; +import mekanism.common.block.states.BlockStateOre; +import mekanism.common.block.states.BlockStateOre.EnumOreType; +import mekanism.common.block.states.BlockStatePlastic; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; @@ -32,16 +37,23 @@ public class BlockOre extends Block setCreativeTab(Mekanism.tabMekanism); } -/* @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) + protected BlockState createBlockState() { - icons[0] = register.registerIcon("mekanism:OsmiumOre"); - icons[1] = register.registerIcon("mekanism:CopperOre"); - icons[2] = register.registerIcon("mekanism:TinOre"); + return new BlockStateOre(this); + } + + @Override + public IBlockState getStateFromMeta(int meta) + { + return this.getDefaultState().withProperty(BlockStateOre.typeProperty, EnumOreType.values()[meta]); + } + + @Override + public int getMetaFromState(IBlockState state) + { + return state.getValue(BlockStateOre.typeProperty).ordinal(); } -*/ @Override public int damageDropped(IBlockState state) @@ -53,8 +65,9 @@ public class BlockOre extends Block @SideOnly(Side.CLIENT) public void getSubBlocks(Item item, CreativeTabs creativetabs, List list) { - list.add(new ItemStack(item, 1, 0)); - list.add(new ItemStack(item, 1, 1)); - list.add(new ItemStack(item, 1, 2)); + for(EnumOreType ore : EnumOreType.values()) + { + list.add(new ItemStack(item, 1, ore.ordinal())); + } } } diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 689e1541a..e8069e9c3 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -3,41 +3,65 @@ package mekanism.common.block; import java.util.List; import mekanism.api.EnumColor; -import mekanism.client.ClientProxy; import mekanism.common.Mekanism; -import mekanism.common.MekanismBlocks; +import mekanism.common.block.states.BlockStatePlastic; +import mekanism.common.block.states.BlockStatePlastic.PlasticBlockType; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPlastic extends Block { - public BlockPlastic() + public PlasticBlockType type; + public BlockPlastic(PlasticBlockType blockType) { super(Material.wood); - setHardness(this == MekanismBlocks.ReinforcedPlasticBlock ? 50F : 5F); - setResistance(this == MekanismBlocks.ReinforcedPlasticBlock ? 2000F : 10F); + type = blockType; + setHardness(type == PlasticBlockType.REINFORCED ? 50F : 5F); + setResistance(type == PlasticBlockType.REINFORCED ? 2000F : 10F); setCreativeTab(Mekanism.tabMekanism); - if(this == MekanismBlocks.SlickPlasticBlock) + if(type == PlasticBlockType.SLICK) { slipperiness = 0.98F; } + + setDefaultState(blockState.getBaseState().withProperty(BlockStatePlastic.typeProperty, type)); } + @Override + protected BlockState createBlockState() + { + return new BlockStatePlastic(this); + } + + @Override + public IBlockState getStateFromMeta(int meta) + { + return this.getDefaultState().withProperty(BlockStatePlastic.colorProperty, EnumDyeColor.byMetadata(meta)); + } + + @Override + public int getMetaFromState(IBlockState state) + { + return state.getValue(BlockStatePlastic.colorProperty).getMetadata(); + } + + /* @Override @SideOnly(Side.CLIENT) @@ -69,7 +93,7 @@ public class BlockPlastic extends Block @Override public Vec3 modifyAcceleration(World world, BlockPos pos, Entity e, Vec3 motion) { - if(this == MekanismBlocks.RoadPlasticBlock) + if(type == PlasticBlockType.ROAD) { double boost = 1.6; @@ -111,7 +135,7 @@ public class BlockPlastic extends Block @Override public int getLightValue() { - if(this == MekanismBlocks.GlowPlasticBlock) + if(type == PlasticBlockType.GLOW) { return 10; } diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index c8e8f2210..8500d3ea6 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -71,13 +71,17 @@ public class BlockStateBasic extends BlockStateFacing TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, Predicates.alwaysFalse(), false), STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, Predicates.alwaysFalse(), false), DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, Predicates.alwaysFalse(), false), - DYNAMIC_GLASS(BasicBlock.BASIC_BLOCK_1, 10, Predicates.alwaysFalse(), false), + STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, Predicates.alwaysFalse(), false), DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, Predicates.alwaysFalse(), false), COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, Predicates.alwaysFalse(), false), TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, Predicates.alwaysFalse(), false), - SALINATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, Plane.HORIZONTAL, false), - SALINATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, Predicates.alwaysFalse(), false), - SALINATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, Predicates.alwaysFalse(), false); + SOLAR_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, Plane.HORIZONTAL, false), + SOLAR_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, Predicates.alwaysFalse(), false), + SOLAR_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, Predicates.alwaysFalse(), false), + INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, Predicates.alwaysFalse(), false), + INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, Predicates.alwaysFalse(), false), + INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, Predicates.alwaysFalse(), false), + INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, Predicates.alwaysFalse(), false); public BasicBlock blockType; public int meta; diff --git a/src/main/java/mekanism/common/block/states/BlockStateOre.java b/src/main/java/mekanism/common/block/states/BlockStateOre.java index d42234d32..e632fcc22 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateOre.java +++ b/src/main/java/mekanism/common/block/states/BlockStateOre.java @@ -12,7 +12,7 @@ import net.minecraft.util.IStringSerializable; */ public class BlockStateOre extends BlockState { - public static final PropertyEnum typeProperty = PropertyEnum.create("type", EnumOreType.class); + public static final PropertyEnum typeProperty = PropertyEnum.create("type", EnumOreType.class); public BlockStateOre(BlockOre block) { diff --git a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java index 9a285a4af..bb88ee51e 100644 --- a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java +++ b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java @@ -13,8 +13,8 @@ import net.minecraft.util.IStringSerializable; public class BlockStatePlastic extends BlockState { - public static PropertyEnum colorProperty = PropertyEnum.create("color", EnumDyeColor.class); - public static PropertyEnum typeProperty = PropertyEnum.create("type", PlasticBlockType.class); + public static PropertyEnum colorProperty = PropertyEnum.create("color", EnumDyeColor.class); + public static PropertyEnum typeProperty = PropertyEnum.create("type", PlasticBlockType.class); public BlockStatePlastic(BlockPlastic block) { diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index df437a9d7..a378d607a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -5,6 +5,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; @@ -37,7 +38,8 @@ public class ItemBlockPlastic extends ItemBlock @Override public String getItemStackDisplayName(ItemStack stack) { - EnumColor colour = EnumColor.DYES[stack.getItemDamage()&15]; + EnumDyeColor dyeColour = EnumDyeColor.byMetadata(stack.getItemDamage()&15); + EnumColor colour = EnumColor.DYES[dyeColour.getDyeDamage()]; String colourName; if(StatCollector.canTranslate(getUnlocalizedName(stack) + "." + colour.dyeName)) @@ -57,9 +59,8 @@ public class ItemBlockPlastic extends ItemBlock } @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int par2) + public int getColorFromItemStack(ItemStack stack, int renderPass) { - EnumColor colour = EnumColor.DYES[stack.getItemDamage()&15]; - return (int)(colour.getColor(0)*255) << 16 | (int)(colour.getColor(1)*255) << 8 | (int)(colour.getColor(2)*255); + return this.metaBlock.getRenderColor(this.metaBlock.getStateFromMeta(stack.getMetadata())); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 2917c7e23..dc6339176 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -317,7 +317,7 @@ public abstract class TileEntityAdvancedElectricMachine getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java index c0045c442..6a0d3c0a5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java +++ b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java @@ -96,7 +96,7 @@ public class TileEntityAmbientAccumulator extends TileEntityContainerBlock imple } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { if(collectedGas.getGasType() != null) { diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java index 3179dd253..422d5ef7c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java @@ -126,7 +126,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { data.add(facing == null ? -1 : facing.ordinal()); data.add(redstone); diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java index b00746c3f..2e65a3cf4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java @@ -161,7 +161,7 @@ public abstract class TileEntityBasicMachine, } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 98a91e166..9ede02c06 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -263,7 +263,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index 34a8cc8a9..4531aa946 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -107,7 +107,7 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { data.add(mainPos.getX()); data.add(mainPos.getY()); diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 770e3b428..fda840607 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -190,7 +190,7 @@ public class TileEntityChargepad extends TileEntityNoisyElectricBlock } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(isActive); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 766ce3316..868c39a0e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -226,13 +226,13 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(isActive); data.add(operatingTicks); - data.add(controlType); + data.add(controlType.ordinal()); if(inputTank.getGas() != null) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index 22c68955d..91c34b51c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -288,12 +288,12 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(isActive); - data.add(controlType); + data.add(controlType.ordinal()); data.add(operatingTicks); if(injectTank.getGas() != null) diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 8ec84b84f..939e362d7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -251,12 +251,12 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(isActive); - data.add(controlType); + data.add(controlType.ordinal()); data.add(clientEnergyUsed); if(leftTank.getGas() != null) diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index 672711fba..69e1348e2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -254,12 +254,12 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(isActive); - data.add(controlType); + data.add(controlType.ordinal()); data.add(operatingTicks); if(gasTank.getGas() != null) diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 53568c83b..3565c3e94 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -313,12 +313,12 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(isActive); - data.add(controlType); + data.add(controlType.ordinal()); data.add(clientEnergyUsed); if(fluidTank.getFluid() != null) diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index bd43e8542..defed5330 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -852,7 +852,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 869d15bef..11415f149 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -329,7 +329,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 9441b30b8..dcb70b3b1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -139,7 +139,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java b/src/main/java/mekanism/common/tile/TileEntityElectricChest.java index 7f929a0fe..aa91233fc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricChest.java @@ -110,7 +110,7 @@ public class TileEntityElectricChest extends TileEntityElectricBlock } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index b67a076df..14e3b134c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -337,7 +337,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); @@ -351,7 +351,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I data.add(0); } - data.add(controlType); + data.add(controlType.ordinal()); return data; } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 8edd035ae..77a2e8b5c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -488,7 +488,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); @@ -522,9 +522,9 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp data.add(false); } - data.add(controlType); - data.add(dumpLeft); - data.add(dumpRight); + data.add(controlType.ordinal()); + data.add(dumpLeft.ordinal()); + data.add(dumpRight.ordinal()); data.add(clientDumpLeft); data.add(clientDumpRight); data.add(isActive); diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 044ae3c5a..cf9e85e74 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -207,7 +207,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { data.add(tier.ordinal()); diff --git a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java index 1053c5d90..74ebd2c85 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java @@ -66,7 +66,7 @@ public class TileEntityEntangledBlock extends TileEntityElectricBlock implements } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(getEnergy()); diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index f85fe4044..c3d7796f7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -859,14 +859,14 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(isActive); - data.add(recipeType); + data.add(recipeType.ordinal()); data.add(recipeTicks); - data.add(controlType); + data.add(controlType.ordinal()); data.add(sorting); data.add(upgraded); data.add(infuseStored.amount); diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 3f24dbf66..629cf8d58 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -70,7 +70,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen public TileEntityFluidicPlenisher() { super("FluidicPlenisher", MachineType.FLUIDIC_PLENISHER.baseEnergy); - inventory = new ItemStack[3]; + inventory = new ItemStack[4]; } @Override @@ -294,7 +294,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 8b89737b8..7c1d6948e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -263,7 +263,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index 88f514b81..4af19dc52 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -72,7 +72,7 @@ public class TileEntityInductionCasing extends TileEntityMultiblock data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java index fbbcc44e6..d391543b7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java @@ -37,9 +37,9 @@ public class TileEntityInductionCell extends TileEntityBasicBlock implements ISt } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { - data.add(tier); + data.add(tier.ordinal()); super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 65bb1571d..4f5a60f28 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -163,7 +163,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java b/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java index d808b6fac..1002a5887 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java @@ -32,9 +32,9 @@ public class TileEntityInductionProvider extends TileEntityBasicBlock } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { - data.add(tier); + data.add(tier.ordinal()); super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 69f9b4e64..e8cd09553 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -152,7 +152,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 4508f7729..46c2571da 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -193,7 +193,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); @@ -203,7 +203,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement data.add(time); data.add(collectedEnergy); data.add(lastFired); - data.add(controlType); + data.add(controlType.ordinal()); data.add(emittingRedstone); data.add(entityDetection); diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index 17cd23030..135ddb0ab 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -195,7 +195,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 9d3a08409..c165fcb8f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -376,14 +376,14 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(0); data.add(isActive); - data.add(controlType); + data.add(controlType.ordinal()); if(color != null) { @@ -413,7 +413,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen data.add(1); data.add(isActive); - data.add(controlType); + data.add(controlType.ordinal()); if(color != null) { diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index a2eaa4edf..9d5679b3f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -404,14 +404,14 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(isActive); data.add(operatingTicks); data.add(infuseStored.amount); - data.add(controlType); + data.add(controlType.ordinal()); if(infuseStored.type != null) { diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index a2ea2eddd..86dc2ac66 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -173,7 +173,7 @@ public abstract class TileEntityMultiblock> extend public abstract MultiblockManager getManager(); @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index 79d233c05..439b8a954 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -255,13 +255,13 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(0); - data.add(controlType); + data.add(controlType.ordinal()); data.add(didProcess); data.add(filters.size()); @@ -280,7 +280,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple data.add(1); - data.add(controlType); + data.add(controlType.ordinal()); data.add(didProcess); return data; diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 8c095039d..4bd6156aa 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -194,7 +194,7 @@ public class TileEntityPRC extends TileEntityBasicMachine getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java index 6b5562a26..b00380fbc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java @@ -428,13 +428,13 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(isActive); data.add(valve); - data.add(editMode); + data.add(editMode.ordinal()); if(valve > 0) { diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index fc9cbab6f..d946cee8d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -392,13 +392,13 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(mode); data.add(isActive); - data.add(controlType); + data.add(controlType.ordinal()); data.add(clientEnergyUsed); if(fluidTank.getFluid() != null) diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 717b151b0..cf43ab7e2 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -133,12 +133,12 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(isActive); - data.add(controlType); + data.add(controlType.ordinal()); return data; } diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java index e4325b26e..097719573 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarEvaporationController.java @@ -648,7 +648,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index b798efe28..f423f574a 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -195,13 +195,13 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(isActive); data.add(recipeTicks); - data.add(controlType); + data.add(controlType.ordinal()); if(inputTank.getGas() != null) { diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 9a3f565a5..7f5e91428 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -644,7 +644,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityThermoelectricBoiler.java b/src/main/java/mekanism/common/tile/TileEntityThermoelectricBoiler.java index 8c834e56e..d88269f14 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermoelectricBoiler.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermoelectricBoiler.java @@ -302,7 +302,7 @@ public class TileEntityThermoelectricBoiler extends TileEntityMultiblock data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index 26fb14255..6c15bfca5 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -82,7 +82,7 @@ public class TileComponentUpgrade implements ITileComponent tileEntity.inventory[upgradeSlot] = null; } - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); tileEntity.markDirty(); } }