diff --git a/src/main/java/resonantinduction/core/ResonantInduction.java b/src/main/java/resonantinduction/core/ResonantInduction.java index b7f1514b6..43fc271fc 100644 --- a/src/main/java/resonantinduction/core/ResonantInduction.java +++ b/src/main/java/resonantinduction/core/ResonantInduction.java @@ -17,6 +17,8 @@ import resonantinduction.core.resource.ResourceGenerator; import resonantinduction.core.resource.fluid.BlockFluidMixture; import resonantinduction.core.resource.fluid.TileFluidMixture; import resonantinduction.core.resource.item.ItemDust; +import calclavia.lib.multiblock.link.BlockMulti; +import calclavia.lib.multiblock.link.TileMultiBlockPart; import calclavia.lib.network.PacketHandler; import calclavia.lib.network.PacketTile; import calclavia.lib.utility.LanguageUtility; @@ -65,6 +67,8 @@ public class ResonantInduction /** * Blocks and Items */ + public static BlockMulti blockMulti; + public static ItemDust itemDust; public static Block blockFluidMixture; @@ -85,6 +89,8 @@ public class ResonantInduction Settings.CONFIGURATION.load(); + blockMulti = new BlockMulti(Settings.getNextBlockID()).setPacketType(PACKET_TILE); + MIXTURE = new Fluid("mixture"); FluidRegistry.registerFluid(MIXTURE); blockFluidMixture = new BlockFluidMixture(Settings.getNextBlockID(), MIXTURE); @@ -93,6 +99,9 @@ public class ResonantInduction itemDust = new ItemDust(Settings.getNextItemID()); GameRegistry.registerItem(itemDust, itemDust.getUnlocalizedName()); + GameRegistry.registerTileEntity(TileMultiBlockPart.class, "TileEntityMultiBlockPart"); + GameRegistry.registerBlock(blockMulti, "blockMulti"); + GameRegistry.registerBlock(blockFluidMixture, blockFluidMixture.getUnlocalizedName()); GameRegistry.registerTileEntity(TileFluidMixture.class, blockFluidMixture.getUnlocalizedName()); diff --git a/src/main/java/resonantinduction/core/prefab/tile/TileEntityMachine.java b/src/main/java/resonantinduction/core/prefab/tile/TileEntityMachine.java index 40b194fe9..8f1de63f2 100644 --- a/src/main/java/resonantinduction/core/prefab/tile/TileEntityMachine.java +++ b/src/main/java/resonantinduction/core/prefab/tile/TileEntityMachine.java @@ -9,6 +9,7 @@ import net.minecraft.network.packet.Packet; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.network.ISimplePacketReceiver; import universalelectricity.api.vector.Vector3; @@ -183,7 +184,7 @@ public abstract class TileEntityMachine extends TileEntityInv implements ISidedI { NBTTagCompound tag = new NBTTagCompound(); this.writeToNBT(tag); - PacketHandler.sendPacketToClients(PacketHandler.getTilePacket(this.getChannel(), SimplePacketTypes.NBT.name, this, tag), worldObj, new Vector3(this), 64); + PacketHandler.sendPacketToClients(ResonantInduction.PACKET_TILE.getPacket(this, SimplePacketTypes.NBT.name, this, tag), worldObj, new Vector3(this), 64); } } @@ -192,7 +193,7 @@ public abstract class TileEntityMachine extends TileEntityInv implements ISidedI { if (!this.worldObj.isRemote) { - PacketHandler.sendPacketToClients(PacketHandler.getTilePacket(this.getChannel(), SimplePacketTypes.RUNNING.name, this, this.functioning), worldObj, new Vector3(this), 64); + PacketHandler.sendPacketToClients(ResonantInduction.PACKET_TILE.getPacket(this, SimplePacketTypes.RUNNING.name, this, this.functioning), worldObj, new Vector3(this), 64); } } diff --git a/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java b/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java index 62aceb6be..26b6864b6 100644 --- a/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java +++ b/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java @@ -11,9 +11,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; +import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.block.BlockMachine; import resonantinduction.old.client.render.BlockRenderingHandler; import resonantinduction.old.client.render.RenderArmbot; +import calclavia.lib.multiblock.link.IBlockActivate; import calclavia.lib.multiblock.link.IMultiBlock; import com.builtbroken.common.Pair; @@ -42,7 +44,7 @@ public class BlockArmbot extends BlockMachine implements IExtraBlockInfo if (tileEntity instanceof IMultiBlock) { - DarkCore.multiBlock.createMultiBlockStructure((IMultiBlock) tileEntity); + ResonantInduction.blockMulti.createMultiBlockStructure((IMultiBlock) tileEntity); } } @@ -51,9 +53,9 @@ public class BlockArmbot extends BlockMachine implements IExtraBlockInfo { TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - if (tileEntity instanceof IBlockActivated) + if (tileEntity instanceof IBlockActivate) { - return ((IBlockActivated) tileEntity).onActivated(player); + return ((IBlockActivate) tileEntity).onActivated(player); } return false; @@ -67,7 +69,7 @@ public class BlockArmbot extends BlockMachine implements IExtraBlockInfo if (tileEntity instanceof TileEntityArmbot) { ((TileEntityArmbot) tileEntity).dropHeldObject(); - DarkCore.multiBlock.destroyMultiBlockStructure((TileEntityArmbot) tileEntity); + ResonantInduction.blockMulti.destroyMultiBlockStructure((TileEntityArmbot) tileEntity); } this.dropBlockAsItem_do(world, x, y, z, new ItemStack(this)); super.breakBlock(world, x, y, z, par5, par6); @@ -117,24 +119,24 @@ public class BlockArmbot extends BlockMachine implements IExtraBlockInfo return false; } - @Override - public boolean hasExtraConfigs() - { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean hasExtraConfigs() + { + // TODO Auto-generated method stub + return false; + } - @Override - public void loadExtraConfigs(Configuration config) - { - // TODO Auto-generated method stub - - } + @Override + public void loadExtraConfigs(Configuration config) + { + // TODO Auto-generated method stub - @Override - public void loadOreNames() - { - // TODO Auto-generated method stub - - } + } + + @Override + public void loadOreNames() + { + // TODO Auto-generated method stub + + } } diff --git a/src/main/java/resonantinduction/electrical/armbot/TileEntityArmbot.java b/src/main/java/resonantinduction/electrical/armbot/TileEntityArmbot.java index e2b353287..4c8ac89a5 100644 --- a/src/main/java/resonantinduction/electrical/armbot/TileEntityArmbot.java +++ b/src/main/java/resonantinduction/electrical/armbot/TileEntityArmbot.java @@ -301,7 +301,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock, @Override public Packet getDescriptionPacket() { - return ResonantInduction.getTilePacket().getPacket(this, "armbot", this.functioning, this.targetYaw, this.targetPitch, this.actualYaw, this.actualPitch); + return ResonantInduction.PACKET_TILE.getPacket(this, "armbot", this.functioning, this.targetYaw, this.targetPitch, this.actualYaw, this.actualPitch); } public void sendGrabItemToClient() diff --git a/src/main/java/resonantinduction/electrical/armbot/command/TaskGive.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskGive.java index 41a4d84d7..953e91c5c 100644 --- a/src/main/java/resonantinduction/electrical/armbot/command/TaskGive.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskGive.java @@ -16,6 +16,7 @@ import resonantinduction.old.api.coding.args.ArgumentIntData; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; import calclavia.lib.utility.InvInteractionHelper; +import calclavia.lib.utility.MathUtility; import com.builtbroken.common.science.units.UnitHelper; diff --git a/src/main/java/resonantinduction/electrical/armbot/command/TaskRotateBy.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskRotateBy.java index da2b3d858..544685055 100644 --- a/src/main/java/resonantinduction/electrical/armbot/command/TaskRotateBy.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskRotateBy.java @@ -8,6 +8,7 @@ import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.coding.args.ArgumentIntData; import universalelectricity.api.vector.Vector2; +import calclavia.lib.utility.MathUtility; import com.builtbroken.common.science.units.UnitHelper; diff --git a/src/main/java/resonantinduction/electrical/armbot/command/TaskRotateTo.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskRotateTo.java index 313ccec94..6fc544a14 100644 --- a/src/main/java/resonantinduction/electrical/armbot/command/TaskRotateTo.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskRotateTo.java @@ -8,6 +8,7 @@ import resonantinduction.electrical.armbot.TaskBaseProcess; import resonantinduction.old.api.IArmbot; import resonantinduction.old.api.coding.args.ArgumentIntData; import universalelectricity.api.vector.Vector2; +import calclavia.lib.utility.MathUtility; import com.builtbroken.common.science.units.UnitHelper; diff --git a/src/main/java/resonantinduction/electrical/armbot/command/TaskTake.java b/src/main/java/resonantinduction/electrical/armbot/command/TaskTake.java index 4cca976be..7b059fc77 100644 --- a/src/main/java/resonantinduction/electrical/armbot/command/TaskTake.java +++ b/src/main/java/resonantinduction/electrical/armbot/command/TaskTake.java @@ -15,6 +15,7 @@ import resonantinduction.old.api.coding.args.ArgumentIntData; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; import calclavia.lib.utility.InvInteractionHelper; +import calclavia.lib.utility.MathUtility; import com.builtbroken.common.science.units.UnitHelper;