diff --git a/archaic/src/main/java/resonantinduction/archaic/ClientProxy.java b/archaic/src/main/java/resonantinduction/archaic/ClientProxy.java index 065b38ed..ea129a4f 100644 --- a/archaic/src/main/java/resonantinduction/archaic/ClientProxy.java +++ b/archaic/src/main/java/resonantinduction/archaic/ClientProxy.java @@ -8,15 +8,15 @@ import cpw.mods.fml.client.registry.ClientRegistry; public class ClientProxy extends CommonProxy { - @Override - public void preInit() - { - ClientRegistry.bindTileEntitySpecialRenderer(TileChannel.class, RenderChannel.INSTANCE); - } + @Override + public void preInit() + { + ClientRegistry.bindTileEntitySpecialRenderer(TileChannel.class, RenderChannel.INSTANCE); + } - @Override - public void init() - { - MinecraftForgeClient.registerItemRenderer(Archaic.blockChannel.blockID, new ItemChannelRenderer()); - } + @Override + public void init() + { + MinecraftForgeClient.registerItemRenderer(Archaic.blockChannel.blockID, new ItemChannelRenderer()); + } } diff --git a/archaic/src/main/java/resonantinduction/archaic/CommonProxy.java b/archaic/src/main/java/resonantinduction/archaic/CommonProxy.java index 686c5e9d..805cbfec 100644 --- a/archaic/src/main/java/resonantinduction/archaic/CommonProxy.java +++ b/archaic/src/main/java/resonantinduction/archaic/CommonProxy.java @@ -1,11 +1,8 @@ package resonantinduction.archaic; -import resonantinduction.archaic.channel.RenderChannel; -import resonantinduction.archaic.channel.TileChannel; import calclavia.lib.prefab.ProxyBase; -import cpw.mods.fml.client.registry.ClientRegistry; public class CommonProxy extends ProxyBase { - + } diff --git a/archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java b/archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java index 47bd237f..141c1599 100644 --- a/archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java +++ b/archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java @@ -11,54 +11,56 @@ import calclavia.lib.utility.FluidUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -/** Early tier version of the basic pipe. Open on the top, and can't support pressure. +/** + * Early tier version of the basic pipe. Open on the top, and can't support pressure. * - * @author Darkguardsman */ + * @author Darkguardsman + */ public class BlockChannel extends BlockFluidNetwork { - public BlockChannel(int id) - { - super(id, UniversalElectricity.machine); - setTextureName(Reference.PREFIX + "material_wood_surface"); - } + public BlockChannel(int id) + { + super(id, UniversalElectricity.machine); + setTextureName(Reference.PREFIX + "material_wood_surface"); + } - @Override - public boolean isOpaqueCube() - { - return false; - } + @Override + public boolean isOpaqueCube() + { + return false; + } - @Override - @SideOnly(Side.CLIENT) - public boolean renderAsNormalBlock() - { - return false; - } + @Override + @SideOnly(Side.CLIENT) + public boolean renderAsNormalBlock() + { + return false; + } - @Override - public TileEntity createNewTileEntity(World world) - { - return new TileChannel(); - } + @Override + public TileEntity createNewTileEntity(World world) + { + return new TileChannel(); + } - @Override - @SideOnly(Side.CLIENT) - public int getRenderType() - { - return RIBlockRenderingHandler.ID; - } + @Override + @SideOnly(Side.CLIENT) + public int getRenderType() + { + return RIBlockRenderingHandler.ID; + } - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float hitX, float hitY, float hitZ) - { - TileEntity tile = world.getBlockTileEntity(x, y, z); - if (!world.isRemote && tile instanceof TileChannel) - { - if (!((TileChannel) tile).onActivated(entityplayer)) - { - return FluidUtility.playerActivatedFluidItem(world, x, y, z, entityplayer, side); - } - } - return true; - } + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float hitX, float hitY, float hitZ) + { + TileEntity tile = world.getBlockTileEntity(x, y, z); + if (!world.isRemote && tile instanceof TileChannel) + { + if (!((TileChannel) tile).onActivated(entityplayer)) + { + return FluidUtility.playerActivatedFluidItem(world, x, y, z, entityplayer, side); + } + } + return true; + } } diff --git a/archaic/src/main/java/resonantinduction/archaic/channel/RenderChannel.java b/archaic/src/main/java/resonantinduction/archaic/channel/RenderChannel.java index 49c74f48..031c1e84 100644 --- a/archaic/src/main/java/resonantinduction/archaic/channel/RenderChannel.java +++ b/archaic/src/main/java/resonantinduction/archaic/channel/RenderChannel.java @@ -4,7 +4,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; diff --git a/archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java b/archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java index 50fa22e6..43c2b293 100644 --- a/archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java +++ b/archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java @@ -7,12 +7,10 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; -import resonantinduction.api.mechanical.fluid.IFluidConnector; import resonantinduction.api.mechanical.fluid.IFluidNetwork; import resonantinduction.api.mechanical.fluid.IFluidPipe; import resonantinduction.core.prefab.fluid.PipeNetwork; import resonantinduction.core.prefab.fluid.TileFluidNetwork; -import resonantinduction.mechanical.fluid.tank.TileTank; import calclavia.lib.multiblock.fake.IBlockActivate; import calclavia.lib.utility.WrenchUtility; diff --git a/archaic/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java b/archaic/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java index b9f2016a..7ad40014 100644 --- a/archaic/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java +++ b/archaic/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java @@ -123,7 +123,7 @@ public class TileFirebox extends TileElectricalInventory implements IPacketRecei String name = ((TileMaterial) dustTile).name; int meta = worldObj.getBlockMetadata(xCoord, yCoord + 1, zCoord); - if (heatEnergy >= getMeltIronEnergy(((float) meta / 8f) * 1000)) + if (heatEnergy >= getMeltIronEnergy((meta / 8f) * 1000)) { // TODO: Make refined dust yield more molten fluid than normal dust. worldObj.setBlock(xCoord, yCoord + 1, zCoord, ResourceGenerator.getFluidMaterial(name).blockID, meta, 3); diff --git a/archaic/src/main/java/resonantinduction/archaic/process/BlockCast.java b/archaic/src/main/java/resonantinduction/archaic/process/BlockCast.java index 46866d82..d28d664a 100644 --- a/archaic/src/main/java/resonantinduction/archaic/process/BlockCast.java +++ b/archaic/src/main/java/resonantinduction/archaic/process/BlockCast.java @@ -6,7 +6,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import resonantinduction.core.Reference; import universalelectricity.api.vector.Vector3; diff --git a/electrical/src/main/java/resonantinduction/electrical/ClientProxy.java b/electrical/src/main/java/resonantinduction/electrical/ClientProxy.java index 99760e0d..583f8aca 100644 --- a/electrical/src/main/java/resonantinduction/electrical/ClientProxy.java +++ b/electrical/src/main/java/resonantinduction/electrical/ClientProxy.java @@ -3,7 +3,6 @@ package resonantinduction.electrical; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; import resonantinduction.electrical.battery.RenderBattery; import resonantinduction.electrical.battery.TileBattery; import resonantinduction.electrical.charger.RenderCharger; diff --git a/electrical/src/main/java/resonantinduction/electrical/battery/RenderBattery.java b/electrical/src/main/java/resonantinduction/electrical/battery/RenderBattery.java index 7e205f5c..b25c7a18 100644 --- a/electrical/src/main/java/resonantinduction/electrical/battery/RenderBattery.java +++ b/electrical/src/main/java/resonantinduction/electrical/battery/RenderBattery.java @@ -39,6 +39,7 @@ public class RenderBattery extends TileEntitySpecialRenderer implements ISimpleI public static final ResourceLocation TEXTURE_CASE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "battery/bat_case_tex.png"); public static final WavefrontObject MODEL = (WavefrontObject) AdvancedModelLoader.loadModel(Reference.MODEL_DIRECTORY + "battery/battery.obj"); + @Override public void renderInventoryItem(ItemStack itemStack) { glPushMatrix(); diff --git a/electrical/src/main/java/resonantinduction/electrical/battery/TileBattery.java b/electrical/src/main/java/resonantinduction/electrical/battery/TileBattery.java index cbe925b2..4596ed38 100644 --- a/electrical/src/main/java/resonantinduction/electrical/battery/TileBattery.java +++ b/electrical/src/main/java/resonantinduction/electrical/battery/TileBattery.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.packet.Packet; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.ResonantInduction; import universalelectricity.api.UniversalElectricity; @@ -13,11 +12,8 @@ import universalelectricity.api.electricity.IVoltageOutput; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.energy.IEnergyContainer; import universalelectricity.api.energy.IEnergyInterface; -import universalelectricity.api.net.IConnector; -import universalelectricity.api.vector.Vector3; import calclavia.lib.network.IPacketReceiver; import calclavia.lib.network.IPacketSender; -import calclavia.lib.prefab.tile.TileElectrical; import com.google.common.io.ByteArrayDataInput; @@ -51,7 +47,7 @@ public class TileBattery extends TileEnergyDistribution implements IVoltageInput */ public static long getEnergyForTier(int tier) { - return (long) Math.pow(100000000, ((float) tier / (float) (MAX_TIER + 0.25f)) + 1); + return (long) Math.pow(100000000, (tier / (MAX_TIER + 0.25f)) + 1); } @Override diff --git a/electrical/src/main/java/resonantinduction/electrical/charger/RenderCharger.java b/electrical/src/main/java/resonantinduction/electrical/charger/RenderCharger.java index d34c0e24..21aca3fd 100644 --- a/electrical/src/main/java/resonantinduction/electrical/charger/RenderCharger.java +++ b/electrical/src/main/java/resonantinduction/electrical/charger/RenderCharger.java @@ -8,40 +8,42 @@ import universalelectricity.api.energy.UnitDisplay.Unit; import universalelectricity.api.vector.Vector3; import calclavia.lib.render.RenderUtility; -/** Renderer for electric item charger +/** + * Renderer for electric item charger * - * @author DarkGuardsman */ + * @author DarkGuardsman + */ public class RenderCharger extends RenderItemOverlayTile { - @Override - public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float f) - { - if (tile instanceof TileCharger) - { - Vector3 d = new Vector3(); - switch (((TileCharger) tile).getDirection()) - { - case NORTH: - d.translate(0, 0, .58); - break; - case SOUTH: - d.translate(0, 0, -.58); - break; - case WEST: - d.translate(.58, 0, 0); - break; - case EAST: - d.translate(-.58, 0, 0); - break; - } - this.renderItemSingleSide(tile, x + d.x, y + d.y, z + d.z, ((TileCharger) tile).getStackInSlot(0), ((TileCharger) tile).getDirection(), "IDLE"); - if (CompatibilityModule.getMaxEnergyItem(((TileCharger) tile).getStackInSlot(0)) > 0) - { - long energy = CompatibilityModule.getEnergyItem(((TileCharger) tile).getStackInSlot(0)); - long maxEnergy = CompatibilityModule.getMaxEnergyItem(((TileCharger) tile).getStackInSlot(0)); - RenderUtility.renderText(UnitDisplay.getDisplay(energy, Unit.JOULES,2,true) + "/" + UnitDisplay.getDisplay(maxEnergy, Unit.JOULES,2,true), ((TileCharger) tile).getDirection(), 0.02f, x + d.x, y + d.y + 0.4, z + d.z); - } - } - } + @Override + public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float f) + { + if (tile instanceof TileCharger) + { + Vector3 d = new Vector3(); + switch (((TileCharger) tile).getDirection()) + { + case NORTH: + d.translate(0, 0, .58); + break; + case SOUTH: + d.translate(0, 0, -.58); + break; + case WEST: + d.translate(.58, 0, 0); + break; + case EAST: + d.translate(-.58, 0, 0); + break; + } + this.renderItemSingleSide(tile, x + d.x, y + d.y, z + d.z, ((TileCharger) tile).getStackInSlot(0), ((TileCharger) tile).getDirection(), "IDLE"); + if (CompatibilityModule.getMaxEnergyItem(((TileCharger) tile).getStackInSlot(0)) > 0) + { + long energy = CompatibilityModule.getEnergyItem(((TileCharger) tile).getStackInSlot(0)); + long maxEnergy = CompatibilityModule.getMaxEnergyItem(((TileCharger) tile).getStackInSlot(0)); + RenderUtility.renderText(UnitDisplay.getDisplay(energy, Unit.JOULES, 2, true) + "/" + UnitDisplay.getDisplay(maxEnergy, Unit.JOULES, 2, true), ((TileCharger) tile).getDirection(), 0.02f, x + d.x, y + d.y + 0.4, z + d.z); + } + } + } } diff --git a/electrical/src/main/java/resonantinduction/electrical/levitator/TileLevitator.java b/electrical/src/main/java/resonantinduction/electrical/levitator/TileLevitator.java index 0c7ac07f..9f1311db 100644 --- a/electrical/src/main/java/resonantinduction/electrical/levitator/TileLevitator.java +++ b/electrical/src/main/java/resonantinduction/electrical/levitator/TileLevitator.java @@ -130,8 +130,8 @@ public class TileLevitator extends TileAdvanced implements IPacketReceiver, IPac { item.setEntityItemStack(remains); } - - //TODO: Add redstone pulse? + + // TODO: Add redstone pulse? } } } @@ -447,11 +447,13 @@ public class TileLevitator extends TileAdvanced implements IPacketReceiver, IPac return null; } + @Override public ForgeDirection getDirection() { return ForgeDirection.getOrientation(getBlockType() != null ? getBlockMetadata() : 0); } + @Override public void setDirection(ForgeDirection side) { this.worldObj.setBlockMetadataWithNotify(this.xCoord, this.yCoord, this.zCoord, side.ordinal(), 3); diff --git a/electrical/src/main/java/resonantinduction/electrical/wire/flat/PartFlatWire.java b/electrical/src/main/java/resonantinduction/electrical/wire/flat/PartFlatWire.java index aa5c2070..077c3e4e 100644 --- a/electrical/src/main/java/resonantinduction/electrical/wire/flat/PartFlatWire.java +++ b/electrical/src/main/java/resonantinduction/electrical/wire/flat/PartFlatWire.java @@ -3,7 +3,6 @@ package resonantinduction.electrical.wire.flat; import java.util.Arrays; import net.minecraft.block.Block; -import net.minecraft.block.BlockColored; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemDye; @@ -20,10 +19,8 @@ import org.lwjgl.opengl.GL11; import resonantinduction.core.MultipartUtility; import resonantinduction.electrical.wire.EnumWireMaterial; import resonantinduction.electrical.wire.PartAdvancedWire; -import calclavia.lib.render.EnumColor; import codechicken.lib.colour.Colour; import codechicken.lib.colour.ColourARGB; -import codechicken.lib.colour.ColourRGBA; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.lighting.LazyLightMatrix; @@ -903,7 +900,7 @@ public class PartFlatWire extends PartAdvancedWire implements TFacePart, JNormal color.a = (byte) 255; return color; } - + return getMaterial().color; } diff --git a/electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java b/electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java index 0c046f61..765c7ffd 100644 --- a/electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java +++ b/electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java @@ -23,7 +23,6 @@ import universalelectricity.api.energy.IConductor; import universalelectricity.api.energy.IEnergyNetwork; import universalelectricity.api.vector.Vector3; import codechicken.lib.lighting.LazyLightMatrix; -import codechicken.lib.raytracer.IndexedCuboid6; import codechicken.lib.render.CCRenderState; import codechicken.lib.render.IconTransformation; import codechicken.lib.render.RenderUtils; @@ -34,9 +33,7 @@ import codechicken.microblock.IHollowConnect; import codechicken.multipart.JIconHitEffects; import codechicken.multipart.JNormalOcclusion; import codechicken.multipart.MultiPartRegistry; -import codechicken.multipart.NormalOcclusionTest; import codechicken.multipart.PartMap; -import codechicken.multipart.TMultiPart; import codechicken.multipart.TSlottedPart; import codechicken.multipart.TileMultipart; import cpw.mods.fml.relauncher.Side; @@ -101,6 +98,7 @@ public class PartFramedWire extends PartFramedConnection getBlockDropped(World world, int x, int y, int z, int metadata, int fortune) - { - ArrayList ret = new ArrayList(); - TileEntity entity = world.getBlockTileEntity(x, y, z); - if (entity instanceof TileTank) - { - ret.add(new ItemStack(this, 1, 0)); - } - return ret; - } + @Override + public ArrayList getBlockDropped(World world, int x, int y, int z, int metadata, int fortune) + { + ArrayList ret = new ArrayList(); + TileEntity entity = world.getBlockTileEntity(x, y, z); + if (entity instanceof TileTank) + { + ret.add(new ItemStack(this, 1, 0)); + } + return ret; + } - @SuppressWarnings("unchecked") - @Override - public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) - { - par3List.add(new ItemStack(this, 1, 0)); + @SuppressWarnings("unchecked") + @Override + public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) + { + par3List.add(new ItemStack(this, 1, 0)); - } + } - @Override - public boolean onSneakMachineActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - ItemStack dropStack = ItemBlockFluidContainer.getWrenchedItem(world, new Vector3(x, y, z)); - if (dropStack != null) - { - if (entityPlayer.getHeldItem() == null) - { - entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, dropStack); - } - else - { - InventoryUtility.dropItemStack(world, new Vector3(x, y, z), dropStack); - } - world.setBlockToAir(x, y, z); - } - } - return true; - } + @Override + public boolean onSneakMachineActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) + { + if (!world.isRemote) + { + ItemStack dropStack = ItemBlockFluidContainer.getWrenchedItem(world, new Vector3(x, y, z)); + if (dropStack != null) + { + if (entityPlayer.getHeldItem() == null) + { + entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, dropStack); + } + else + { + InventoryUtility.dropItemStack(world, new Vector3(x, y, z), dropStack); + } + world.setBlockToAir(x, y, z); + } + } + return true; + } } diff --git a/mechanical/src/main/java/resonantinduction/mechanical/gear/GearMultiBlockHandler.java b/mechanical/src/main/java/resonantinduction/mechanical/gear/GearMultiBlockHandler.java index 5d7c7b9a..060b9580 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/gear/GearMultiBlockHandler.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/gear/GearMultiBlockHandler.java @@ -3,7 +3,6 @@ package resonantinduction.mechanical.gear; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.vector.Vector3; -import calclavia.lib.multiblock.reference.IMultiBlockStructure; import calclavia.lib.multiblock.reference.MultiBlockHandler; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/mechanical/src/main/java/resonantinduction/mechanical/gear/PartGear.java b/mechanical/src/main/java/resonantinduction/mechanical/gear/PartGear.java index 11d26106..a3146350 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/gear/PartGear.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/gear/PartGear.java @@ -9,7 +9,6 @@ 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.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; diff --git a/mechanical/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java b/mechanical/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java index a4632ec1..512d99f6 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java @@ -79,7 +79,7 @@ public class MechanicalNetwork extends Network if (adjacentMech != null && adjacent != mechanical) { - //System.out.println("UPDATING: " + mechanical + " with " + adjacentMech); + // System.out.println("UPDATING: " + mechanical + " with " + adjacentMech); float ratio = adjacentMech.getRatio(dir.getOpposite(), mechanical) / mechanical.getRatio(dir, adjacentMech); long torque = mechanical.getTorque(); diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/RenderMixer.java b/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/RenderMixer.java index 6cdb4640..608013a4 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/RenderMixer.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/RenderMixer.java @@ -52,7 +52,7 @@ public class RenderMixer extends TileEntitySpecialRenderer implements ISimpleIte { glPushMatrix(); GL11.glScalef(0.5f, 0.5f, 0.5f); - glTranslatef((float) 0.5F, (float) 0.5f, (float) 1.5F); + glTranslatef(0.5F, 0.5f, 1.5F); RenderUtility.bind(TEXTURE); MODEL.renderAll(); glPopMatrix(); diff --git a/mechanical/src/main/java/resonantinduction/mechanical/turbine/BlockWindTurbine.java b/mechanical/src/main/java/resonantinduction/mechanical/turbine/BlockWindTurbine.java index 4ee26da6..7b41b1e7 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/turbine/BlockWindTurbine.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/turbine/BlockWindTurbine.java @@ -20,6 +20,7 @@ public class BlockWindTurbine extends BlockTurbine rotationMask = Byte.parseByte("111111", 2); } + @Override public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) { if (entityPlayer.getCurrentEquippedItem() == null) @@ -41,6 +42,7 @@ public class BlockWindTurbine extends BlockTurbine return false; } + @Override public boolean onSneakMachineActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) { TileEntity tileEntity = world.getBlockTileEntity(x, y, z); diff --git a/mechanical/src/main/java/resonantinduction/mechanical/turbine/TileWaterTurbine.java b/mechanical/src/main/java/resonantinduction/mechanical/turbine/TileWaterTurbine.java index 88ec9ef5..d59de962 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/turbine/TileWaterTurbine.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/turbine/TileWaterTurbine.java @@ -1,18 +1,6 @@ package resonantinduction.mechanical.turbine; import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.packet.Packet; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; -import resonantinduction.api.mechanical.IMechanical; -import resonantinduction.api.mechanical.IMechanicalNetwork; -import resonantinduction.core.ResonantInduction; -import resonantinduction.mechanical.gear.PartGearShaft; -import resonantinduction.mechanical.network.MechanicalNetwork; -import universalelectricity.api.vector.Vector3; -import calclavia.lib.network.PacketHandler; -import calclavia.lib.prefab.turbine.TileTurbine; /** * The vertical wind turbine collects airflow. diff --git a/mechanical/src/main/java/resonantinduction/mechanical/turbine/TileWindTurbine.java b/mechanical/src/main/java/resonantinduction/mechanical/turbine/TileWindTurbine.java index 736b0eea..11befd08 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/turbine/TileWindTurbine.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/turbine/TileWindTurbine.java @@ -3,7 +3,6 @@ package resonantinduction.mechanical.turbine; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenOcean; import net.minecraft.world.biome.BiomeGenPlains; -import net.minecraftforge.common.ForgeDirection; /** * The vertical wind turbine collects airflow. diff --git a/src/main/java/resonantinduction/core/prefab/fluid/BlockFluidNetwork.java b/src/main/java/resonantinduction/core/prefab/fluid/BlockFluidNetwork.java index 030e963c..ba63c7a7 100644 --- a/src/main/java/resonantinduction/core/prefab/fluid/BlockFluidNetwork.java +++ b/src/main/java/resonantinduction/core/prefab/fluid/BlockFluidNetwork.java @@ -8,32 +8,32 @@ import calclavia.lib.prefab.block.BlockTile; /** @author Calclavia */ public abstract class BlockFluidNetwork extends BlockTile { - public BlockFluidNetwork(int id, Material material) - { - super(id, material); - } + public BlockFluidNetwork(int id, Material material) + { + super(id, material); + } - @Override - public void onBlockAdded(World world, int x, int y, int z) - { - TileEntity tile = world.getBlockTileEntity(x, y, z); + @Override + public void onBlockAdded(World world, int x, int y, int z) + { + TileEntity tile = world.getBlockTileEntity(x, y, z); - if (tile instanceof TileFluidNetwork) - { - ((TileFluidNetwork) tile).refresh(); - ((TileFluidNetwork) tile).getNetwork().reconstruct(); - } - } + if (tile instanceof TileFluidNetwork) + { + ((TileFluidNetwork) tile).refresh(); + ((TileFluidNetwork) tile).getNetwork().reconstruct(); + } + } - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, int par5) - { - TileEntity tile = world.getBlockTileEntity(x, y, z); + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, int par5) + { + TileEntity tile = world.getBlockTileEntity(x, y, z); - if (tile instanceof TileFluidNetwork) - { - ((TileFluidNetwork) tile).refresh(); - } - } + if (tile instanceof TileFluidNetwork) + { + ((TileFluidNetwork) tile).refresh(); + } + } } diff --git a/src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java b/src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java index 37ad81ca..f28c2220 100644 --- a/src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java +++ b/src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java @@ -38,7 +38,7 @@ public abstract class FluidNetwork extends NodeNetwork