Fix some of the things that were broken, add more type-specs.

This commit is contained in:
Ben Spiers committed 2016-02-08 22:46:06 +00:00
1 parent 7440adb103
commit 7b4fefeb60
55 files changed
+152 -118

No files matched your search

+1 -1
View File
@@ -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)
@@ -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) {
@@ -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"),
@@ -22,5 +22,5 @@ public interface ITileNetwork
* @param data - list of data
* @return ArrayList
*/
public ArrayList getNetworkedData(ArrayList<Object> data);
public ArrayList<Object> getNetworkedData(ArrayList<Object> data);
}
@@ -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);
@@ -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();
@@ -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<ItemStack> 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()));
}
}
}
@@ -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;
}
@@ -71,13 +71,17 @@ public class BlockStateBasic extends BlockStateFacing
TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, Predicates.<EnumFacing>alwaysFalse(), false),
STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, Predicates.<EnumFacing>alwaysFalse(), false),
DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, Predicates.<EnumFacing>alwaysFalse(), false),
DYNAMIC_GLASS(BasicBlock.BASIC_BLOCK_1, 10, Predicates.<EnumFacing>alwaysFalse(), false),
STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, Predicates.<EnumFacing>alwaysFalse(), false),
DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, Predicates.<EnumFacing>alwaysFalse(), false),
COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, Predicates.<EnumFacing>alwaysFalse(), false),
TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, Predicates.<EnumFacing>alwaysFalse(), false),
SALINATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, Plane.HORIZONTAL, false),
SALINATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, Predicates.<EnumFacing>alwaysFalse(), false),
SALINATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, Predicates.<EnumFacing>alwaysFalse(), false);
SOLAR_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, Plane.HORIZONTAL, false),
SOLAR_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, Predicates.<EnumFacing>alwaysFalse(), false),
SOLAR_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, Predicates.<EnumFacing>alwaysFalse(), false),
INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, Predicates.<EnumFacing>alwaysFalse(), false),
INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, Predicates.<EnumFacing>alwaysFalse(), false),
INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, Predicates.<EnumFacing>alwaysFalse(), false),
INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, Predicates.<EnumFacing>alwaysFalse(), false);
public BasicBlock blockType;
public int meta;
@@ -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<EnumOreType> typeProperty = PropertyEnum.create("type", EnumOreType.class);
public BlockStateOre(BlockOre block)
{
@@ -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<EnumDyeColor> colorProperty = PropertyEnum.create("color", EnumDyeColor.class);
public static PropertyEnum<PlasticBlockType> typeProperty = PropertyEnum.create("type", PlasticBlockType.class);
public BlockStatePlastic(BlockPlastic block)
{
@@ -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()));
}
}
@@ -317,7 +317,7 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
}
@Override
public ArrayList getNetworkedData(ArrayList data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -96,7 +96,7 @@ public class TileEntityAmbientAccumulator extends TileEntityContainerBlock imple
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
if(collectedGas.getGasType() != null)
{
@@ -126,7 +126,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
data.add(facing == null ? -1 : facing.ordinal());
data.add(redstone);
@@ -161,7 +161,7 @@ public abstract class TileEntityBasicMachine<INPUT extends MachineInput<INPUT>,
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -263,7 +263,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -107,7 +107,7 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork
}
@Override
public ArrayList getNetworkedData(ArrayList data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
data.add(mainPos.getX());
data.add(mainPos.getY());
@@ -190,7 +190,7 @@ public class TileEntityChargepad extends TileEntityNoisyElectricBlock
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
data.add(isActive);
@@ -226,13 +226,13 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
data.add(isActive);
data.add(operatingTicks);
data.add(controlType);
data.add(controlType.ordinal());
if(inputTank.getGas() != null)
{
@@ -288,12 +288,12 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
data.add(isActive);
data.add(controlType);
data.add(controlType.ordinal());
data.add(operatingTicks);
if(injectTank.getGas() != null)
@@ -251,12 +251,12 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
data.add(isActive);
data.add(controlType);
data.add(controlType.ordinal());
data.add(clientEnergyUsed);
if(leftTank.getGas() != null)
@@ -254,12 +254,12 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp
}
@Override
public ArrayList getNetworkedData(ArrayList data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
data.add(isActive);
data.add(controlType);
data.add(controlType.ordinal());
data.add(operatingTicks);
if(gasTank.getGas() != null)
@@ -313,12 +313,12 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple
}
@Override
public ArrayList getNetworkedData(ArrayList data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
data.add(isActive);
data.add(controlType);
data.add(controlType.ordinal());
data.add(clientEnergyUsed);
if(fluidTank.getFluid() != null)
@@ -852,7 +852,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -329,7 +329,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock<SynchronizedTank
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -139,7 +139,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -110,7 +110,7 @@ public class TileEntityElectricChest extends TileEntityElectricBlock
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -337,7 +337,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> 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;
}
@@ -488,7 +488,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> 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);
@@ -207,7 +207,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
data.add(tier.ordinal());
@@ -66,7 +66,7 @@ public class TileEntityEntangledBlock extends TileEntityElectricBlock implements
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
data.add(getEnergy());
@@ -859,14 +859,14 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> 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);
@@ -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<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -263,7 +263,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -72,7 +72,7 @@ public class TileEntityInductionCasing extends TileEntityMultiblock<Synchronized
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -37,9 +37,9 @@ public class TileEntityInductionCell extends TileEntityBasicBlock implements ISt
}
@Override
public ArrayList getNetworkedData(ArrayList data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
data.add(tier);
data.add(tier.ordinal());
super.getNetworkedData(data);
@@ -163,7 +163,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -32,9 +32,9 @@ public class TileEntityInductionProvider extends TileEntityBasicBlock
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
data.add(tier);
data.add(tier.ordinal());
super.getNetworkedData(data);
@@ -152,7 +152,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -193,7 +193,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> 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);
@@ -195,7 +195,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -376,14 +376,14 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> 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)
{
@@ -404,14 +404,14 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> 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)
{
@@ -173,7 +173,7 @@ public abstract class TileEntityMultiblock<T extends SynchronizedData<T>> extend
public abstract MultiblockManager<T> getManager();
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -255,13 +255,13 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> 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;
@@ -194,7 +194,7 @@ public class TileEntityPRC extends TileEntityBasicMachine<PressurizedInput, Pres
}
@Override
public ArrayList getNetworkedData(ArrayList data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -428,13 +428,13 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
data.add(isActive);
data.add(valve);
data.add(editMode);
data.add(editMode.ordinal());
if(valve > 0)
{
@@ -392,13 +392,13 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
data.add(mode);
data.add(isActive);
data.add(controlType);
data.add(controlType.ordinal());
data.add(clientEnergyUsed);
if(fluidTank.getFluid() != null)
@@ -133,12 +133,12 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
data.add(isActive);
data.add(controlType);
data.add(controlType.ordinal());
return data;
}
@@ -648,7 +648,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -195,13 +195,13 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
data.add(isActive);
data.add(recipeTicks);
data.add(controlType);
data.add(controlType.ordinal());
if(inputTank.getGas() != null)
{
@@ -644,7 +644,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -302,7 +302,7 @@ public class TileEntityThermoelectricBoiler extends TileEntityMultiblock<Synchro
}
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
super.getNetworkedData(data);
@@ -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<Object>())), new Range4D(Coord4D.get(tileEntity)));
tileEntity.markDirty();
}
}