From ef478755b1e2a21875fc70a7dad156d7b711f35e Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sun, 19 Jan 2014 21:03:03 +0800 Subject: [PATCH] Clean up --- .../api/fluid/IFluidNetwork.java | 73 +- .../api/fluid/IPressureInput.java | 10 +- .../api/fluid/IPressureOutput.java | 8 +- .../archaic/blocks/BlockTurntable.java | 5 - .../engineering/BlockEngineeringTable.java | 2 +- .../archaic/firebox/BlockFirebox.java | 3 - .../archaic/firebox/BlockHotPlate.java | 8 +- .../archaic/firebox/TileFirebox.java | 6 - .../archaic/trough/EnumPipeMaterial.java | 2 - .../core/ResonantInduction.java | 2 - .../core/prefab/ContainerDummy.java | 1 + .../core/prefab/block/BlockImprintable.java | 1 - .../core/prefab/block/BlockRI.java | 2 +- .../core/prefab/block/BlockRIRotatable.java | 1 - .../core/prefab/item/ItemBase.java | 22 +- .../core/prefab/part/PartAdvanced.java | 2 - .../prefab/part/PartColorableMaterial.java | 1 - .../prefab/part/PartFramedConnection.java | 3 - .../core/render/RenderImprintable.java | 2 +- .../core/render/RenderItemOverlayTile.java | 6 +- .../core/resource/ResourceGenerator.java | 1 - .../core/resource/item/ItemOreResource.java | 6 +- .../electrical/CommonProxy.java | 4 +- .../electrical/armbot/BlockArmbot.java | 1 - .../encoder/gui/GuiEncoderCoder.java | 10 +- .../electrical/tesla/TileTesla.java | 2 +- .../electrical/wire/ItemWire.java | 1 - .../electrical/wire/PartAdvancedWire.java | 2 + .../electrical/wire/trait/TraitConductor.java | 2 +- .../mechanical/belt/TileConveyorBelt.java | 2 - .../fluid/pipe/EnumPipeMaterial.java | 3 - .../fluid/pipe/ModelOpenTrough.java | 796 +++++++++--------- .../mechanical/fluid/pipe/PartPipe.java | 5 +- .../mechanical/fluid/pipe/RenderPipe.java | 3 - .../mechanical/fluid/pump/BlockGrate.java | 3 - .../mechanical/fluid/tank/BlockTank.java | 6 - .../mechanical/fluid/tank/RenderTank.java | 15 +- .../mechanical/fluid/tank/TankNetwork.java | 2 +- .../mechanical/fluid/tank/TileTank.java | 2 +- .../mechanical/gear/PartGear.java | 2 +- .../mechanical/item/ItemPipeGauge.java | 92 +- .../mechanical/logistic/BlockDetector.java | 1 - .../mechanical/logistic/BlockManipulator.java | 1 - .../mechanical/logistic/BlockRejector.java | 1 - .../mechanical/logistic/TileRejector.java | 4 +- .../network/IMechanicalConnector.java | 1 - .../network/IMechanicalNetwork.java | 1 + .../mechanical/network/MechanicalNetwork.java | 2 +- .../mechanical/network/PartMechanical.java | 22 +- .../mechanical/process/BlockGrinderWheel.java | 1 - .../mechanical/process/TileGrinderWheel.java | 4 +- .../mechanical/trait/TraitMechanical.java | 2 +- .../trait/TraitMechanicalConnector.java | 3 +- 53 files changed, 562 insertions(+), 601 deletions(-) diff --git a/src/main/java/resonantinduction/api/fluid/IFluidNetwork.java b/src/main/java/resonantinduction/api/fluid/IFluidNetwork.java index 3d83139d..6a526579 100644 --- a/src/main/java/resonantinduction/api/fluid/IFluidNetwork.java +++ b/src/main/java/resonantinduction/api/fluid/IFluidNetwork.java @@ -7,45 +7,54 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.api.net.INetwork; -/** Interface version of the fluid network. +/** + * Interface version of the fluid network. * - * @author DarkGuardsman */ + * @author DarkGuardsman + */ public interface IFluidNetwork extends INetwork { - /** Called to build the network when something changes such as addition of a pipe */ - void reconstruct(); + /** Called to build the network when something changes such as addition of a pipe */ + @Override + void reconstruct(); - /** Called to add fluid into the network - * - * @param source - part that is receiving the fluid for the network - * @param from - direction of this connection - * @param resource - fluid stack that is being filled into the network - * @param doFill - true causes the action to be taken, false simulates the action - * @return amount of fluid filled into the network */ - int fill(IFluidConnector source, ForgeDirection from, FluidStack resource, boolean doFill); + /** + * Called to add fluid into the network + * + * @param source - part that is receiving the fluid for the network + * @param from - direction of this connection + * @param resource - fluid stack that is being filled into the network + * @param doFill - true causes the action to be taken, false simulates the action + * @return amount of fluid filled into the network + */ + int fill(IFluidConnector source, ForgeDirection from, FluidStack resource, boolean doFill); - /** Called to remove fluid from a network, not supported by all networks - * - * @param source - part that is receiving the fluid for the network - * @param from - direction of this connection - * @param resource - fluid stack that is being filled into the network - * @param doDrain - true causes the action to be taken, false simulates the action - * @return FluidStack that contains the fluid drained from the network */ - FluidStack drain(IFluidConnector source, ForgeDirection from, FluidStack resource, boolean doDrain); + /** + * Called to remove fluid from a network, not supported by all networks + * + * @param source - part that is receiving the fluid for the network + * @param from - direction of this connection + * @param resource - fluid stack that is being filled into the network + * @param doDrain - true causes the action to be taken, false simulates the action + * @return FluidStack that contains the fluid drained from the network + */ + FluidStack drain(IFluidConnector source, ForgeDirection from, FluidStack resource, boolean doDrain); - /** Called to remove fluid from a network, not supported by all networks - * - * @param source - part that is receiving the fluid for the network - * @param from - direction of this connection - * @param resource - fluid stack that is being filled into the network - * @param doDrain - true causes the action to be taken, false simulates the action - * @return FluidStack that contains the fluid drained from the network */ - FluidStack drain(IFluidConnector source, ForgeDirection from, int resource, boolean doDrain); + /** + * Called to remove fluid from a network, not supported by all networks + * + * @param source - part that is receiving the fluid for the network + * @param from - direction of this connection + * @param resource - fluid stack that is being filled into the network + * @param doDrain - true causes the action to be taken, false simulates the action + * @return FluidStack that contains the fluid drained from the network + */ + FluidStack drain(IFluidConnector source, ForgeDirection from, int resource, boolean doDrain); - /** Fluid tank that represents the entire network */ - FluidTank getTank(); + /** Fluid tank that represents the entire network */ + FluidTank getTank(); - /** Information about the network's tank */ - FluidTankInfo[] getTankInfo(); + /** Information about the network's tank */ + FluidTankInfo[] getTankInfo(); } diff --git a/src/main/java/resonantinduction/api/fluid/IPressureInput.java b/src/main/java/resonantinduction/api/fluid/IPressureInput.java index 5700661c..3d5df069 100644 --- a/src/main/java/resonantinduction/api/fluid/IPressureInput.java +++ b/src/main/java/resonantinduction/api/fluid/IPressureInput.java @@ -2,12 +2,14 @@ package resonantinduction.api.fluid; import net.minecraftforge.common.ForgeDirection; -/** Applied to tiles that work with pressure for there inputs +/** + * Applied to tiles that work with pressure for there inputs * - * @author DarkGaurdsman */ + * @author DarkGaurdsman + */ public interface IPressureInput { - public int getPressureIn(ForgeDirection side); + public int getPressureIn(ForgeDirection side); - public void onWrongPressure(ForgeDirection side, int pressure); + public void onWrongPressure(ForgeDirection side, int pressure); } diff --git a/src/main/java/resonantinduction/api/fluid/IPressureOutput.java b/src/main/java/resonantinduction/api/fluid/IPressureOutput.java index b7be9175..3bd2fddd 100644 --- a/src/main/java/resonantinduction/api/fluid/IPressureOutput.java +++ b/src/main/java/resonantinduction/api/fluid/IPressureOutput.java @@ -2,10 +2,12 @@ package resonantinduction.api.fluid; import net.minecraftforge.common.ForgeDirection; -/** Applied to tiles that are a source of pressure in a fluid network +/** + * Applied to tiles that are a source of pressure in a fluid network * - * @author Darkguardsman */ + * @author Darkguardsman + */ public interface IPressureOutput { - public int getPressureOut(ForgeDirection side); + public int getPressureOut(ForgeDirection side); } diff --git a/src/main/java/resonantinduction/archaic/blocks/BlockTurntable.java b/src/main/java/resonantinduction/archaic/blocks/BlockTurntable.java index eb159d01..3d861a1c 100644 --- a/src/main/java/resonantinduction/archaic/blocks/BlockTurntable.java +++ b/src/main/java/resonantinduction/archaic/blocks/BlockTurntable.java @@ -3,14 +3,9 @@ package resonantinduction.archaic.blocks; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; -import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; diff --git a/src/main/java/resonantinduction/archaic/engineering/BlockEngineeringTable.java b/src/main/java/resonantinduction/archaic/engineering/BlockEngineeringTable.java index bf65b90b..c36a0c8c 100644 --- a/src/main/java/resonantinduction/archaic/engineering/BlockEngineeringTable.java +++ b/src/main/java/resonantinduction/archaic/engineering/BlockEngineeringTable.java @@ -158,7 +158,7 @@ public class BlockEngineeringTable extends BlockRI { InventoryUtility.dropItemStack(world, new Vector3(player), output, 0); } - + tile.setInventorySlotContents(9, null); tile.onInventoryChanged(); diff --git a/src/main/java/resonantinduction/archaic/firebox/BlockFirebox.java b/src/main/java/resonantinduction/archaic/firebox/BlockFirebox.java index e48fe7a6..c803586f 100644 --- a/src/main/java/resonantinduction/archaic/firebox/BlockFirebox.java +++ b/src/main/java/resonantinduction/archaic/firebox/BlockFirebox.java @@ -2,7 +2,6 @@ package resonantinduction.archaic.firebox; import java.util.Random; -import codechicken.multipart.ControlKeyModifer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -12,8 +11,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import resonantinduction.core.Reference; import resonantinduction.core.prefab.block.BlockRI; -import universalelectricity.api.vector.Vector3; -import calclavia.lib.utility.inventory.InventoryUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java b/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java index f8cf0c63..c2fad563 100644 --- a/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java +++ b/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java @@ -3,8 +3,6 @@ package resonantinduction.archaic.firebox; import java.util.List; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -19,6 +17,8 @@ import resonantinduction.core.Reference; import resonantinduction.core.prefab.block.BlockRI; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockHotPlate extends BlockRI { @@ -134,12 +134,12 @@ public class BlockHotPlate extends BlockRI for (int spawn = 0; spawn < maxParticles; spawn++) { - Vector3 particlePosition = new Vector3(x, y, z).translate((double) (i / 2) / ((double) 2) + (0.5 / ((double) 2)), 0.2, (double) (i % 2) / ((double) 2) + (0.5 / ((double) 2))); + Vector3 particlePosition = new Vector3(x, y, z).translate((double) (i / 2) / ((double) 2) + (0.5 / (2)), 0.2, (double) (i % 2) / ((double) 2) + (0.5 / (2))); particlePosition.translate(new Vector3((random.nextFloat() - 0.5) * 0.2, (random.nextFloat() - 0.5) * 0.2, (random.nextFloat() - 0.5) * 0.2)); world.spawnParticle("smoke", particlePosition.x, particlePosition.y, particlePosition.z, 0.0D, 0.0D, 0.0D); } - Vector3 particlePosition = new Vector3(x, y, z).translate((double) (i / 2) / ((double) 2) + (0.5 / ((double) 2)), 0.2, (double) (i % 2) / ((double) 2) + (0.5 / ((double) 2))); + Vector3 particlePosition = new Vector3(x, y, z).translate((double) (i / 2) / ((double) 2) + (0.5 / (2)), 0.2, (double) (i % 2) / ((double) 2) + (0.5 / (2))); world.spawnParticle("flame", particlePosition.x, particlePosition.y, particlePosition.z, 0.0D, 0.01D, 0.0D); } } diff --git a/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java b/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java index e71ae06d..bd1e53c1 100644 --- a/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java +++ b/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java @@ -5,16 +5,10 @@ import java.util.ArrayList; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; -import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.ResonantInduction; -import resonantinduction.core.Settings; -import universalelectricity.api.CompatibilityModule; -import universalelectricity.api.vector.Vector3; import calclavia.lib.network.IPacketReceiver; import calclavia.lib.network.IPacketSender; import calclavia.lib.prefab.tile.TileExternalInventory; diff --git a/src/main/java/resonantinduction/archaic/trough/EnumPipeMaterial.java b/src/main/java/resonantinduction/archaic/trough/EnumPipeMaterial.java index d96fdc15..93ca281a 100644 --- a/src/main/java/resonantinduction/archaic/trough/EnumPipeMaterial.java +++ b/src/main/java/resonantinduction/archaic/trough/EnumPipeMaterial.java @@ -7,9 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import resonantinduction.mechanical.Mechanical; import resonantinduction.mechanical.fluid.prefab.TileFluidNetwork; -import calclavia.lib.render.ColorCode; /** * Enum to hold info about each pipe material. Values are by default and some can change with pipe diff --git a/src/main/java/resonantinduction/core/ResonantInduction.java b/src/main/java/resonantinduction/core/ResonantInduction.java index ba276628..0b736aa6 100644 --- a/src/main/java/resonantinduction/core/ResonantInduction.java +++ b/src/main/java/resonantinduction/core/ResonantInduction.java @@ -17,8 +17,6 @@ import resonantinduction.core.resource.ResourceGenerator; import resonantinduction.core.resource.fluid.BlockFluidMixture; import resonantinduction.core.resource.fluid.TileFluidMixture; import resonantinduction.core.resource.item.ItemOreResource; -import calclavia.lib.multiblock.fake.BlockMultiFake; -import calclavia.lib.multiblock.fake.TileMultiBlockPart; import calclavia.lib.network.PacketHandler; import calclavia.lib.network.PacketTile; import calclavia.lib.utility.LanguageUtility; diff --git a/src/main/java/resonantinduction/core/prefab/ContainerDummy.java b/src/main/java/resonantinduction/core/prefab/ContainerDummy.java index 6f7354c4..e078ccb0 100644 --- a/src/main/java/resonantinduction/core/prefab/ContainerDummy.java +++ b/src/main/java/resonantinduction/core/prefab/ContainerDummy.java @@ -30,6 +30,7 @@ public class ContainerDummy extends Container } } + @Override public void onContainerClosed(EntityPlayer player) { if (tile instanceof IPlayerUsing) diff --git a/src/main/java/resonantinduction/core/prefab/block/BlockImprintable.java b/src/main/java/resonantinduction/core/prefab/block/BlockImprintable.java index f410b2e6..5cd80d1a 100644 --- a/src/main/java/resonantinduction/core/prefab/block/BlockImprintable.java +++ b/src/main/java/resonantinduction/core/prefab/block/BlockImprintable.java @@ -1,6 +1,5 @@ package resonantinduction.core.prefab.block; -import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/resonantinduction/core/prefab/block/BlockRI.java b/src/main/java/resonantinduction/core/prefab/block/BlockRI.java index 716ec6ee..7f89cf83 100644 --- a/src/main/java/resonantinduction/core/prefab/block/BlockRI.java +++ b/src/main/java/resonantinduction/core/prefab/block/BlockRI.java @@ -1,6 +1,5 @@ package resonantinduction.core.prefab.block; -import codechicken.multipart.ControlKeyModifer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.Configuration; @@ -9,6 +8,7 @@ import resonantinduction.core.ResonantInductionTabs; import resonantinduction.core.Settings; import universalelectricity.api.UniversalElectricity; import calclavia.lib.prefab.block.BlockTile; +import codechicken.multipart.ControlKeyModifer; /** * Basic prefab for machine diff --git a/src/main/java/resonantinduction/core/prefab/block/BlockRIRotatable.java b/src/main/java/resonantinduction/core/prefab/block/BlockRIRotatable.java index 91d4d25c..5731eff2 100644 --- a/src/main/java/resonantinduction/core/prefab/block/BlockRIRotatable.java +++ b/src/main/java/resonantinduction/core/prefab/block/BlockRIRotatable.java @@ -1,6 +1,5 @@ package resonantinduction.core.prefab.block; -import net.minecraft.block.material.Material; import net.minecraftforge.common.Configuration; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInductionTabs; diff --git a/src/main/java/resonantinduction/core/prefab/item/ItemBase.java b/src/main/java/resonantinduction/core/prefab/item/ItemBase.java index 8c1e5de5..2aff5f4c 100644 --- a/src/main/java/resonantinduction/core/prefab/item/ItemBase.java +++ b/src/main/java/resonantinduction/core/prefab/item/ItemBase.java @@ -9,16 +9,16 @@ import resonantinduction.core.Settings; /** @author AidanBrady */ public class ItemBase extends Item { - public ItemBase(String name) - { - this(name, Settings.getNextItemID()); - } + public ItemBase(String name) + { + this(name, Settings.getNextItemID()); + } - public ItemBase(String name, int id) - { - super(Settings.CONFIGURATION.get(Configuration.CATEGORY_ITEM, name, id).getInt(id)); - this.setCreativeTab(ResonantInductionTabs.CORE); - this.setUnlocalizedName(Reference.PREFIX + name); - this.setTextureName(Reference.PREFIX + name); - } + public ItemBase(String name, int id) + { + super(Settings.CONFIGURATION.get(Configuration.CATEGORY_ITEM, name, id).getInt(id)); + this.setCreativeTab(ResonantInductionTabs.CORE); + this.setUnlocalizedName(Reference.PREFIX + name); + this.setTextureName(Reference.PREFIX + name); + } } diff --git a/src/main/java/resonantinduction/core/prefab/part/PartAdvanced.java b/src/main/java/resonantinduction/core/prefab/part/PartAdvanced.java index 7e6aa957..7e2c6f80 100644 --- a/src/main/java/resonantinduction/core/prefab/part/PartAdvanced.java +++ b/src/main/java/resonantinduction/core/prefab/part/PartAdvanced.java @@ -3,8 +3,6 @@ package resonantinduction.core.prefab.part; import java.util.ArrayList; import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.block.BlockColored; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; diff --git a/src/main/java/resonantinduction/core/prefab/part/PartColorableMaterial.java b/src/main/java/resonantinduction/core/prefab/part/PartColorableMaterial.java index 54b155a5..f03f45b3 100644 --- a/src/main/java/resonantinduction/core/prefab/part/PartColorableMaterial.java +++ b/src/main/java/resonantinduction/core/prefab/part/PartColorableMaterial.java @@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MovingObjectPosition; import resonantinduction.core.Utility; -import resonantinduction.electrical.wire.EnumWireMaterial; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; diff --git a/src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java b/src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java index 41485eb3..cba1596c 100644 --- a/src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java +++ b/src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java @@ -4,16 +4,13 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import resonantinduction.mechanical.fluid.pipe.PartPipe; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.ForgeDirection; -import universalelectricity.api.CompatibilityModule; import universalelectricity.api.net.IConnector; import universalelectricity.api.net.INetwork; import universalelectricity.api.vector.Vector3; diff --git a/src/main/java/resonantinduction/core/render/RenderImprintable.java b/src/main/java/resonantinduction/core/render/RenderImprintable.java index 740fc5a6..06da7ada 100644 --- a/src/main/java/resonantinduction/core/render/RenderImprintable.java +++ b/src/main/java/resonantinduction/core/render/RenderImprintable.java @@ -41,7 +41,7 @@ public abstract class RenderImprintable extends TileEntitySpecialRenderer if (objectPosition.blockX == tileFilterable.xCoord && objectPosition.blockY == tileFilterable.yCoord && objectPosition.blockZ == tileFilterable.zCoord) { Set filters = ItemBlockImprint.getFilters(filter); - + int i = 0; for (ItemStack filterStack : filters) { diff --git a/src/main/java/resonantinduction/core/render/RenderItemOverlayTile.java b/src/main/java/resonantinduction/core/render/RenderItemOverlayTile.java index 68ce222b..6f1da15d 100644 --- a/src/main/java/resonantinduction/core/render/RenderItemOverlayTile.java +++ b/src/main/java/resonantinduction/core/render/RenderItemOverlayTile.java @@ -52,7 +52,7 @@ public abstract class RenderItemOverlayTile extends TileEntitySpecialRenderer { if (inventory[i] != null) { - Vector3 translation = new Vector3(x + (double) (i / matrixX) / ((double) matrixX) + (0.5 / ((double) matrixX)), y + 1.1, z + (double) (i % matrixZ) / ((double) matrixZ) + (0.5 / ((double) matrixZ))); + Vector3 translation = new Vector3(x + (double) (i / matrixX) / ((double) matrixX) + (0.5 / (matrixX)), y + 1.1, z + (double) (i % matrixZ) / ((double) matrixZ) + (0.5 / (matrixZ))); GL11.glPushMatrix(); GL11.glTranslated(translation.x, translation.y, translation.z); GL11.glScalef(0.7f, 0.7f, 0.7f); @@ -243,9 +243,9 @@ public abstract class RenderItemOverlayTile extends TileEntitySpecialRenderer entityitem.getEntityItem().stackSize = 1; entityitem.hoverStart = 0.0F; GL11.glPushMatrix(); - GL11.glTranslated(-0.453125F * (float) dir.offsetX + position.x, position.y, -0.453125F * (float) dir.offsetZ + position.z); + GL11.glTranslated(-0.453125F * dir.offsetX + position.x, position.y, -0.453125F * dir.offsetZ + position.z); GL11.glRotatef(180.0F + rotationYaw, 0.0F, 1.0F, 0.0F); - GL11.glRotatef((float) (90 * angle), 1, 0, 0); + GL11.glRotatef(90 * angle, 1, 0, 0); RenderItem.renderInFrame = true; RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); diff --git a/src/main/java/resonantinduction/core/resource/ResourceGenerator.java b/src/main/java/resonantinduction/core/resource/ResourceGenerator.java index 2ebf741a..76c60949 100644 --- a/src/main/java/resonantinduction/core/resource/ResourceGenerator.java +++ b/src/main/java/resonantinduction/core/resource/ResourceGenerator.java @@ -23,7 +23,6 @@ import resonantinduction.api.recipe.MachineRecipes.RecipeType; import resonantinduction.api.recipe.OreDetectionBlackList; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; -import resonantinduction.core.resource.item.ItemOreResource; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java b/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java index 5ea5c88f..2ea70277 100644 --- a/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java +++ b/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java @@ -1,15 +1,11 @@ package resonantinduction.core.resource.item; -import java.util.HashSet; import java.util.List; -import java.util.Set; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; -import resonantinduction.core.Reference; -import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.item.ItemBase; import resonantinduction.core.resource.ResourceGenerator; import calclavia.lib.utility.LanguageUtility; @@ -35,7 +31,7 @@ public class ItemOreResource extends ItemBase { String dustName = getDustFromStack(is); List list = OreDictionary.getOres("ingot" + dustName.substring(0, 1).toUpperCase() + dustName.substring(1)); - + if (list.size() > 0) { ItemStack type = list.get(0); diff --git a/src/main/java/resonantinduction/electrical/CommonProxy.java b/src/main/java/resonantinduction/electrical/CommonProxy.java index 33273fdc..1752cfd3 100644 --- a/src/main/java/resonantinduction/electrical/CommonProxy.java +++ b/src/main/java/resonantinduction/electrical/CommonProxy.java @@ -28,12 +28,12 @@ public class CommonProxy extends ProxyBase { return new ContainerMultimeter(player.inventory, ((PartMultimeter) part)); } - }else if (tileEntity instanceof TileEncoder) + } + else if (tileEntity instanceof TileEncoder) { return new ContainerEncoder(player.inventory, (TileEncoder) tileEntity); } - return null; } diff --git a/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java b/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java index d19216d7..c3549fc9 100644 --- a/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java +++ b/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java @@ -11,7 +11,6 @@ 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.BlockRI; import resonantinduction.core.render.RIBlockRenderingHandler; import calclavia.components.CalclaviaLoader; diff --git a/src/main/java/resonantinduction/electrical/encoder/gui/GuiEncoderCoder.java b/src/main/java/resonantinduction/electrical/encoder/gui/GuiEncoderCoder.java index 30082e50..ad83ea8d 100644 --- a/src/main/java/resonantinduction/electrical/encoder/gui/GuiEncoderCoder.java +++ b/src/main/java/resonantinduction/electrical/encoder/gui/GuiEncoderCoder.java @@ -49,7 +49,7 @@ public class GuiEncoderCoder extends GuiEncoderBase protected void actionPerformed(GuiButton button) { super.actionPerformed(button); - if (((TileEncoder) tileEntity).getProgram() != null) + if (tileEntity.getProgram() != null) { switch (button.id) { @@ -101,7 +101,7 @@ public class GuiEncoderCoder extends GuiEncoderBase { super.handleMouseInput(); int wheel = Mouse.getEventDWheel(); - if (((TileEncoder) tileEntity).getProgram() != null) + if (tileEntity.getProgram() != null) { if (wheel > 0) { @@ -121,7 +121,7 @@ public class GuiEncoderCoder extends GuiEncoderBase { this.mc.thePlayer.closeScreen(); } - else if (((TileEncoder) tileEntity).getProgram() != null) + else if (tileEntity.getProgram() != null) { if (keycode == Keyboard.KEY_UP) // PAGE UP (no constant) { @@ -138,7 +138,7 @@ public class GuiEncoderCoder extends GuiEncoderBase } else if (keycode == Keyboard.KEY_RIGHT) // PAGE RIGHT (no constant) { - if (this.getTaskListElement().scrollX < ((TileEncoder) tileEntity).getProgram().getSize().intX()) + if (this.getTaskListElement().scrollX < tileEntity.getProgram().getSize().intX()) this.getTaskListElement().scrollSide(1); } } @@ -181,7 +181,7 @@ public class GuiEncoderCoder extends GuiEncoderBase public TileEncoder getTile() { - return (TileEncoder) this.tileEntity; + return this.tileEntity; } } diff --git a/src/main/java/resonantinduction/electrical/tesla/TileTesla.java b/src/main/java/resonantinduction/electrical/tesla/TileTesla.java index 43267490..de0e43a6 100644 --- a/src/main/java/resonantinduction/electrical/tesla/TileTesla.java +++ b/src/main/java/resonantinduction/electrical/tesla/TileTesla.java @@ -636,7 +636,7 @@ public class TileTesla extends TileElectrical implements IMultiBlockStructure 100) - { - output = output.substring(0, 100); - } - output.trim(); - player.sendChatToPlayer(ChatMessageComponent.createFromText("ReadOut> " + output)); - return true; - } - } - if (tileEntity instanceof IFluidHandler) - { - FluidTankInfo[] tanks = ((IFluidHandler) tileEntity).getTankInfo(ForgeDirection.getOrientation(side)); - if (tanks != null) - { - player.sendChatToPlayer(ChatMessageComponent.createFromText("FluidHandler> Side:" + hitSide.toString() + " Tanks:" + tanks.length)); - for (FluidStack stack : FluidUtility.getFluidList(tanks)) - { - player.sendChatToPlayer(ChatMessageComponent.createFromText("Fluid>" + stack.amount + "mb of " + stack.getFluid().getName())); - } - return true; - } - } + @Override + public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) + { + if (!world.isRemote) + { + TileEntity tileEntity = world.getBlockTileEntity(x, y, z); + ForgeDirection hitSide = ForgeDirection.getOrientation(side); + if (tileEntity instanceof IReadOut) + { + String output = ((IReadOut) tileEntity).getMeterReading(player, hitSide, EnumTools.PIPE_GUAGE); + if (output != null && !output.isEmpty()) + { + if (output.length() > 100) + { + output = output.substring(0, 100); + } + output.trim(); + player.sendChatToPlayer(ChatMessageComponent.createFromText("ReadOut> " + output)); + return true; + } + } + if (tileEntity instanceof IFluidHandler) + { + FluidTankInfo[] tanks = ((IFluidHandler) tileEntity).getTankInfo(ForgeDirection.getOrientation(side)); + if (tanks != null) + { + player.sendChatToPlayer(ChatMessageComponent.createFromText("FluidHandler> Side:" + hitSide.toString() + " Tanks:" + tanks.length)); + for (FluidStack stack : FluidUtility.getFluidList(tanks)) + { + player.sendChatToPlayer(ChatMessageComponent.createFromText("Fluid>" + stack.amount + "mb of " + stack.getFluid().getName())); + } + return true; + } + } - } + } - return false; - } + return false; + } } diff --git a/src/main/java/resonantinduction/mechanical/logistic/BlockDetector.java b/src/main/java/resonantinduction/mechanical/logistic/BlockDetector.java index 3b79d16c..76cb47c4 100644 --- a/src/main/java/resonantinduction/mechanical/logistic/BlockDetector.java +++ b/src/main/java/resonantinduction/mechanical/logistic/BlockDetector.java @@ -12,7 +12,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.Reference; import resonantinduction.core.prefab.block.BlockImprintable; -import universalelectricity.api.UniversalElectricity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/mechanical/logistic/BlockManipulator.java b/src/main/java/resonantinduction/mechanical/logistic/BlockManipulator.java index 2db83957..d40a9cb6 100644 --- a/src/main/java/resonantinduction/mechanical/logistic/BlockManipulator.java +++ b/src/main/java/resonantinduction/mechanical/logistic/BlockManipulator.java @@ -7,7 +7,6 @@ import net.minecraft.util.ChatMessageComponent; import net.minecraft.world.World; import resonantinduction.core.prefab.block.BlockImprintable; import resonantinduction.core.render.RIBlockRenderingHandler; -import universalelectricity.api.UniversalElectricity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/mechanical/logistic/BlockRejector.java b/src/main/java/resonantinduction/mechanical/logistic/BlockRejector.java index be754d83..258a3521 100644 --- a/src/main/java/resonantinduction/mechanical/logistic/BlockRejector.java +++ b/src/main/java/resonantinduction/mechanical/logistic/BlockRejector.java @@ -7,7 +7,6 @@ import net.minecraft.world.World; import resonantinduction.core.Reference; import resonantinduction.core.prefab.block.BlockImprintable; import resonantinduction.core.render.RIBlockRenderingHandler; -import universalelectricity.api.UniversalElectricity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/mechanical/logistic/TileRejector.java b/src/main/java/resonantinduction/mechanical/logistic/TileRejector.java index 9a247033..4cda5ce1 100644 --- a/src/main/java/resonantinduction/mechanical/logistic/TileRejector.java +++ b/src/main/java/resonantinduction/mechanical/logistic/TileRejector.java @@ -18,8 +18,6 @@ import calclavia.lib.network.IPacketReceiverWithID; import com.google.common.io.ByteArrayDataInput; -import cpw.mods.fml.common.network.Player; - /** @author Darkguardsman */ public class TileRejector extends TileEntityFilterable implements IPacketReceiverWithID { @@ -74,7 +72,7 @@ public class TileRejector extends TileEntityFilterable implements IPacketReceive entity.posX += side.offsetX; // entity.motionY += 0.10000000298023224D; entity.posZ += side.offsetZ; - + if (!this.worldObj.isRemote && tileEntity instanceof IBelt) { ((IBelt) tileEntity).ignoreEntity(entity); diff --git a/src/main/java/resonantinduction/mechanical/network/IMechanicalConnector.java b/src/main/java/resonantinduction/mechanical/network/IMechanicalConnector.java index 702569e9..dbd78da7 100644 --- a/src/main/java/resonantinduction/mechanical/network/IMechanicalConnector.java +++ b/src/main/java/resonantinduction/mechanical/network/IMechanicalConnector.java @@ -1,6 +1,5 @@ package resonantinduction.mechanical.network; -import universalelectricity.api.net.IConnectable; import universalelectricity.api.net.IConnector; /** diff --git a/src/main/java/resonantinduction/mechanical/network/IMechanicalNetwork.java b/src/main/java/resonantinduction/mechanical/network/IMechanicalNetwork.java index b980aa48..35c6b89f 100644 --- a/src/main/java/resonantinduction/mechanical/network/IMechanicalNetwork.java +++ b/src/main/java/resonantinduction/mechanical/network/IMechanicalNetwork.java @@ -33,6 +33,7 @@ public interface IMechanicalNetwork extends INetwork 1) { - rotation = (float) (((angularVelocity) * ((float) deltaTime / 1000f) + rotation) % Math.PI); + rotation = (float) (((angularVelocity) * (deltaTime / 1000f) + rotation) % Math.PI); lastRotateTime = System.currentTimeMillis(); } diff --git a/src/main/java/resonantinduction/mechanical/network/PartMechanical.java b/src/main/java/resonantinduction/mechanical/network/PartMechanical.java index a929598f..c442b29f 100644 --- a/src/main/java/resonantinduction/mechanical/network/PartMechanical.java +++ b/src/main/java/resonantinduction/mechanical/network/PartMechanical.java @@ -4,17 +4,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.ForgeDirection; -import resonantinduction.mechanical.Mechanical; -import resonantinduction.mechanical.network.IMechanical; -import resonantinduction.mechanical.network.IMechanicalConnector; -import resonantinduction.mechanical.network.IMechanicalNetwork; -import resonantinduction.mechanical.network.MechanicalNetwork; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Cuboid6; @@ -27,8 +21,6 @@ import codechicken.multipart.JNormalOcclusion; import codechicken.multipart.TFacePart; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * We assume all the force acting on the gear is 90 degrees. @@ -269,17 +261,18 @@ public abstract class PartMechanical extends JCuboidPart implements JNormalOcclu { if (isPositive) { - ((PartMechanical) neighbor).setClockwise(isClockwise); + neighbor.setClockwise(isClockwise); } else { - ((PartMechanical) neighbor).setClockwise(!isClockwise); + neighbor.setClockwise(!isClockwise); } neighbor.markRotationUpdate = true; } } + @Override public long onReceiveEnergy(ForgeDirection from, long torque, float angularVelocity, boolean doReceive) { if (!world().isRemote && doReceive) @@ -367,6 +360,15 @@ public abstract class PartMechanical extends JCuboidPart implements JNormalOcclu @Override public void setClockwise(boolean isClockwise) { + if (this.isClockwise != isClockwise) + { + if (getNetwork().getPower() > 0) + { + getNetwork().setPower(0, 0); + } + + } + this.isClockwise = isClockwise; } diff --git a/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java b/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java index 80aada1b..bfe6b615 100644 --- a/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java +++ b/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java @@ -1,6 +1,5 @@ package resonantinduction.mechanical.process; -import calclavia.lib.render.block.BlockRenderingHandler; import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/resonantinduction/mechanical/process/TileGrinderWheel.java b/src/main/java/resonantinduction/mechanical/process/TileGrinderWheel.java index 2e8b4dd5..1b0479aa 100644 --- a/src/main/java/resonantinduction/mechanical/process/TileGrinderWheel.java +++ b/src/main/java/resonantinduction/mechanical/process/TileGrinderWheel.java @@ -2,7 +2,6 @@ package resonantinduction.mechanical.process; import java.util.HashMap; -import calclavia.lib.prefab.tile.IRotatable; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -15,6 +14,7 @@ import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.mechanical.network.TileMechanical; import universalelectricity.api.vector.Vector3; +import calclavia.lib.prefab.tile.IRotatable; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; @@ -167,7 +167,7 @@ public class TileGrinderWheel extends TileMechanical implements IRotatable { return !(getBlockMetadata() % 2 == 0); } - + return false; } diff --git a/src/main/java/resonantinduction/mechanical/trait/TraitMechanical.java b/src/main/java/resonantinduction/mechanical/trait/TraitMechanical.java index 2aab1d38..d69099a0 100644 --- a/src/main/java/resonantinduction/mechanical/trait/TraitMechanical.java +++ b/src/main/java/resonantinduction/mechanical/trait/TraitMechanical.java @@ -3,8 +3,8 @@ package resonantinduction.mechanical.trait; import java.util.HashSet; import java.util.Set; -import resonantinduction.mechanical.network.IMechanical; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.mechanical.network.IMechanical; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/src/main/java/resonantinduction/mechanical/trait/TraitMechanicalConnector.java b/src/main/java/resonantinduction/mechanical/trait/TraitMechanicalConnector.java index a9e7068b..b5cdbd4f 100644 --- a/src/main/java/resonantinduction/mechanical/trait/TraitMechanicalConnector.java +++ b/src/main/java/resonantinduction/mechanical/trait/TraitMechanicalConnector.java @@ -4,7 +4,6 @@ import java.util.HashSet; import java.util.Set; import net.minecraftforge.common.ForgeDirection; -import resonantinduction.mechanical.network.IMechanical; import resonantinduction.mechanical.network.IMechanicalConnector; import resonantinduction.mechanical.network.IMechanicalNetwork; import codechicken.multipart.TMultiPart; @@ -123,6 +122,6 @@ public class TraitMechanicalConnector extends TileMultipart implements IMechanic @Override public void setClockwise(boolean isClockwise) { - + } }