From a1ff916506b9873f6ca5f1ad86ab32c88fd0bbbb Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 9 Jun 2014 18:17:54 -0400 Subject: [PATCH] #720 DSAxe not working in farm. Axes were ONLY being damaged on leaves. (Instead of vice versa). Organize imports. --- .../enderio/conduit/BlockConduitBundle.java | 1 - .../enderio/conduit/ConduitRecipes.java | 2 +- .../conduit/geom/ConnectionModeGeometry.java | 2 +- .../gui/ExternalConnectionContainer.java | 4 ---- .../conduit/gui/GuiExternalConnection.java | 1 - .../conduit/gui/item/BaseSettingsPanel.java | 1 - .../gui/item/ExistingItemFilterGui.java | 7 +------ .../PacketExistingItemFilterSnapshot.java | 3 ++- .../enderio/conduit/item/FilterRegister.java | 5 ++--- .../enderio/conduit/item/ItemConduit.java | 1 - .../conduit/item/ItemExtractSpeedUpgrade.java | 2 -- .../item/filter/ExistingItemFilter.java | 2 -- .../conduit/item/filter/IItemFilter.java | 3 +-- .../item/filter/ItemExistingItemFilter.java | 10 ---------- .../conduit/item/filter/ItemFilter.java | 8 ++------ .../liquid/AdvancedLiquidConduitRenderer.java | 2 +- .../conduit/liquid/LiquidConduitRenderer.java | 3 +-- .../render/DefaultConduitRenderer.java | 11 ++--------- .../render/RoundedSegmentRenderer.java | 4 ++-- .../item/darksteel/ItemDarkSteelAxe.java | 19 ++++++++++++++++++- .../item/darksteel/ItemDarkSteelPickaxe.java | 2 +- .../enderio/machine/MachineRecipes.java | 2 +- .../enderio/machine/PacketCurrentTask.java | 6 ++---- .../enderio/machine/PacketIoMode.java | 2 -- .../enderio/machine/PacketPowerStorage.java | 1 - .../machine/alloy/PacketClientState.java | 1 - .../enderio/machine/crusher/BlockCrusher.java | 2 +- .../machine/crusher/PacketGrindingBall.java | 2 -- .../machine/farm/BlockFarmStation.java | 2 +- .../machine/farm/PacketFarmAction.java | 2 -- .../enderio/machine/farm/TileFarmStation.java | 15 +++++++++++---- .../enderio/machine/farm/TreeFarmer.java | 4 ++-- .../combustion/BlockCombustionGenerator.java | 2 +- .../zombie/BlockZombieGenerator.java | 3 +-- .../generator/zombie/PacketZombieTank.java | 8 +++----- .../hypercube/PacketAddRemoveChannel.java | 2 -- .../machine/hypercube/PacketChannelList.java | 1 - .../machine/hypercube/PacketClientState.java | 1 - .../machine/monitor/BlockPowerMonitor.java | 2 +- .../machine/monitor/GuiPowerMonitor.java | 3 +-- .../machine/monitor/PacketConduitProbe.java | 2 +- .../machine/monitor/PacketPowerInfo.java | 8 +++----- .../machine/monitor/PacketPowerMonitor.java | 2 -- .../machine/painter/BasicPainterTemplate.java | 2 +- .../machine/power/PacketClientState.java | 2 -- .../machine/power/PacketPowerStorage.java | 1 - .../machine/reservoir/TileReservoir.java | 2 +- .../enderio/machine/still/PacketTanks.java | 9 +++------ .../enderio/machine/tank/PacketTank.java | 9 +++------ .../enderio/network/MessageTileEntity.java | 3 --- .../java/crazypants/render/RenderUtil.java | 7 +------ src/main/java/crazypants/util/ClientUtil.java | 1 - 52 files changed, 73 insertions(+), 129 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index 8dff9465..74c0de30 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -25,7 +25,6 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index e751dc37..32ac80db 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -1,6 +1,6 @@ package crazypants.enderio.conduit; -import static crazypants.enderio.ModObject.blockPainter; +import static crazypants.enderio.ModObject.*; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java b/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java index 0027f712..2ede91f9 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java +++ b/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java @@ -1,6 +1,6 @@ package crazypants.enderio.conduit.geom; -import static crazypants.util.ForgeDirectionOffsets.offsetScaled; +import static crazypants.util.ForgeDirectionOffsets.*; import java.util.ArrayList; import java.util.EnumMap; diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java index e8827d96..c531c8d1 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java @@ -11,15 +11,11 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.gui.item.InventoryFilterUpgrade; import crazypants.enderio.conduit.gui.item.InventorySpeedUpgrades; -import crazypants.enderio.conduit.item.FilterRegister; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.IItemFilter; -import crazypants.enderio.conduit.item.filter.ItemFilter; -import crazypants.gui.TemplateSlot; public class ExternalConnectionContainer extends Container { diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java index a394f93d..193b3524 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java @@ -1,7 +1,6 @@ package crazypants.enderio.conduit.gui; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/item/BaseSettingsPanel.java index 229e80d3..1db1b46c 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/BaseSettingsPanel.java @@ -5,7 +5,6 @@ import java.awt.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; -import net.minecraftforge.event.terraingen.BiomeEvent.GetGrassColor; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java index 613c2a3e..ad51ddfa 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java @@ -1,19 +1,14 @@ package crazypants.enderio.conduit.gui.item; -import org.lwjgl.opengl.GL11; - +import net.minecraft.client.gui.GuiButton; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.ExistingItemFilter; -import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.conduit.packet.PacketItemConduitFilter; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.network.PacketHandler; -import crazypants.render.RenderUtil; import crazypants.util.Lang; -import net.minecraft.client.gui.GuiButton; public class ExistingItemFilterGui implements IItemFilterGui { diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java b/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java index 6ea7750e..9febf436 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java @@ -1,8 +1,9 @@ package crazypants.enderio.conduit.gui.item; +import io.netty.buffer.ByteBuf; + import java.util.List; -import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java b/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java index 8cbd1ca2..d36f4a9e 100644 --- a/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java +++ b/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java @@ -1,15 +1,14 @@ package crazypants.enderio.conduit.item; -import cpw.mods.fml.common.network.ByteBufUtils; -import net.minecraft.init.Items; +import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.network.ByteBufUtils; import crazypants.enderio.Log; import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.enderio.conduit.item.filter.IItemFilterUpgrade; import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.network.NetworkUtil; -import io.netty.buffer.ByteBuf; public class FilterRegister { diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index 8a94f253..6aa33ee1 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -1,7 +1,6 @@ package crazypants.enderio.conduit.item; import java.util.ArrayList; -import java.util.Collections; import java.util.EnumMap; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java index 15cb99bd..32e78c58 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java @@ -7,8 +7,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.machine.monitor.PacketConduitProbe; -import crazypants.enderio.network.PacketHandler; public class ItemExtractSpeedUpgrade extends Item { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java index 2c28d7e6..be66587e 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java @@ -1,7 +1,5 @@ package crazypants.enderio.conduit.item.filter; -import io.netty.util.NetUtil; - import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java index 16879167..c9bbd076 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java @@ -2,11 +2,10 @@ package crazypants.enderio.conduit.item.filter; import java.util.List; -import crazypants.enderio.conduit.item.NetworkedInventory; - import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import crazypants.enderio.conduit.item.NetworkedInventory; public interface IItemFilter { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java index 534b3115..6f383cfc 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java @@ -1,22 +1,12 @@ package crazypants.enderio.conduit.item.filter; -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.gui.IResourceTooltipProvider; -import crazypants.util.Lang; public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java index bb9f4619..69a4139a 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java @@ -1,15 +1,9 @@ package crazypants.enderio.conduit.item.filter; -import java.awt.Point; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.swing.text.html.HTMLDocument.HTMLReader.IsindexAction; - -import crazypants.enderio.conduit.item.NetworkedInventory; -import crazypants.gui.TemplateSlot; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; @@ -18,6 +12,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; +import crazypants.enderio.conduit.item.NetworkedInventory; +import crazypants.gui.TemplateSlot; public class ItemFilter implements IInventory, IItemFilter { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java index c5734df5..020557b4 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java @@ -1,6 +1,6 @@ package crazypants.enderio.conduit.liquid; -import static crazypants.render.CubeRenderer.addVecWithUV; +import static crazypants.render.CubeRenderer.*; import java.util.List; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java index 920bba6b..76b23589 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java @@ -1,7 +1,6 @@ package crazypants.enderio.conduit.liquid; -import static crazypants.render.CubeRenderer.addVecWithUV; -import static crazypants.render.CubeRenderer.setupVertices; +import static crazypants.render.CubeRenderer.*; import java.util.Collection; import java.util.List; diff --git a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java index eac251ae..e3582c29 100644 --- a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java @@ -1,14 +1,7 @@ package crazypants.enderio.conduit.render; -import static crazypants.render.CubeRenderer.addVecWithUV; -import static crazypants.render.CubeRenderer.setupVertices; -import static crazypants.render.CubeRenderer.verts; -import static net.minecraftforge.common.util.ForgeDirection.DOWN; -import static net.minecraftforge.common.util.ForgeDirection.EAST; -import static net.minecraftforge.common.util.ForgeDirection.NORTH; -import static net.minecraftforge.common.util.ForgeDirection.SOUTH; -import static net.minecraftforge.common.util.ForgeDirection.UP; -import static net.minecraftforge.common.util.ForgeDirection.WEST; +import static crazypants.render.CubeRenderer.*; +import static net.minecraftforge.common.util.ForgeDirection.*; import java.util.Collection; import java.util.List; diff --git a/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java b/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java index d880d3cc..8510f8e1 100644 --- a/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java @@ -1,7 +1,7 @@ package crazypants.enderio.conduit.render; -import static crazypants.util.ForgeDirectionOffsets.offsetScaled; -import static net.minecraftforge.common.util.ForgeDirection.SOUTH; +import static crazypants.util.ForgeDirectionOffsets.*; +import static net.minecraftforge.common.util.ForgeDirection.*; import java.util.List; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 2089e72b..63a99ff8 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -226,7 +226,24 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I eu.setAbsorbDamageWithPower(!eu.isAbsorbDamageWithPower()); eu.writeToItem(item); } - + } + + public void applyBasicDamage(ItemStack stack, int damage) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); + if(eu != null && eu.isAbsorbDamageWithPower() && eu.getEnergy() > 0) { + int powerUse = Config.darkSteelAxePowerUsePerDamagePoint; + eu.extractEnergy(damage * powerUse, false); + } else { + damage = stack.getItemDamage() + damage; + if(damage >= getMaxDamage()) { + stack.stackSize = 0; + } + stack.setItemDamage(damage); + } + if(eu != null) { + eu.setAbsorbDamageWithPower(!eu.isAbsorbDamageWithPower()); + eu.writeToItem(stack); + } } @Override diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 328934df..d6f9d99c 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -131,7 +131,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine } } - + @Override public float func_150893_a(ItemStack item, Block block) { if(block == Blocks.obsidian && getEnergyStored(item) > 0) { diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index cc1cd431..47dfc595 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -1,6 +1,6 @@ package crazypants.enderio.machine; -import static crazypants.enderio.EnderIO.itemBasicCapacitor; +import static crazypants.enderio.EnderIO.*; import java.util.ArrayList; diff --git a/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java b/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java index 8295e4ab..16c9241a 100644 --- a/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java +++ b/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java @@ -1,12 +1,10 @@ package crazypants.enderio.machine; +import io.netty.buffer.ByteBuf; +import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import crazypants.enderio.EnderIO; import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.NetworkUtil; diff --git a/src/main/java/crazypants/enderio/machine/PacketIoMode.java b/src/main/java/crazypants/enderio/machine/PacketIoMode.java index 8bcfa045..f9071c58 100644 --- a/src/main/java/crazypants/enderio/machine/PacketIoMode.java +++ b/src/main/java/crazypants/enderio/machine/PacketIoMode.java @@ -1,14 +1,12 @@ package crazypants.enderio.machine; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.teleport.packet.PacketAccessMode; public class PacketIoMode implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java b/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java index 1cd89c98..9c25f40b 100644 --- a/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java +++ b/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java b/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java index e03db4ab..9faef242 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine.alloy; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/crazypants/enderio/machine/crusher/BlockCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/BlockCrusher.java index db72f8ab..593b524f 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/BlockCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/BlockCrusher.java @@ -1,9 +1,9 @@ package crazypants.enderio.machine.crusher; -import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; diff --git a/src/main/java/crazypants/enderio/machine/crusher/PacketGrindingBall.java b/src/main/java/crazypants/enderio/machine/crusher/PacketGrindingBall.java index d1e709f0..4668fbe8 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/PacketGrindingBall.java +++ b/src/main/java/crazypants/enderio/machine/crusher/PacketGrindingBall.java @@ -7,8 +7,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.machine.PacketPowerStorage; public class PacketGrindingBall implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java index 09215f2c..9ee93f86 100644 --- a/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java @@ -2,13 +2,13 @@ package crazypants.enderio.machine.farm; import java.util.Random; -import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; diff --git a/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java index 88debebb..d06617f3 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java @@ -1,13 +1,11 @@ package crazypants.enderio.machine.farm; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import java.util.ArrayList; import java.util.List; import java.util.Random; -import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 09de2619..66d3241a 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -17,6 +17,7 @@ import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; +import crazypants.enderio.item.darksteel.ItemDarkSteelAxe; import crazypants.enderio.machine.AbstractPoweredTaskEntity; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.IMachineRecipe.ResultStack; @@ -152,11 +153,17 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt private void damageTool(Class class1, int damage) { ItemStack tool = getTool(class1); - if(tool != null && tool.getItem().isDamageable()) { + if(tool == null) { + return; + } + if(tool.getItem() instanceof ItemDarkSteelAxe) { + ((ItemDarkSteelAxe) tool.getItem()).applyBasicDamage(tool, damage); + } else if(tool.getItem().isDamageable()) { tool.damageItem(damage, farmerJoe); - if(tool.getItemDamage() >= tool.getMaxDamage()) { - destroyTool(class1); - } + } + + if(tool.getItemDamage() >= tool.getMaxDamage()) { + destroyTool(class1); } } diff --git a/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java b/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java index 59195b49..d0482730 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java @@ -100,9 +100,9 @@ public class TreeFarmer implements IFarmerJoe { res.drops.add(new EntityItem(farm.getWorld(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, drop.copy())); } } - boolean isWood = false; + boolean isWood = true; if(blk != wood) { //leaves - isWood = true; + isWood = false; int leaveMeta = farm.getBlockMeta(coord); boolean canDropApple = (blk instanceof BlockOldLeaf && (leaveMeta == 0 || leaveMeta == 8)) || //oak diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java index a9ec941e..d642cd02 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java @@ -2,7 +2,6 @@ package crazypants.enderio.machine.generator.combustion; import java.util.Random; -import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -10,6 +9,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.relauncher.Side; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java index 65b27fd0..a5918748 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java @@ -2,8 +2,6 @@ package crazypants.enderio.machine.generator.zombie; import java.util.Random; -import cpw.mods.fml.relauncher.Side; - import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,6 +10,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.relauncher.Side; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/PacketZombieTank.java b/src/main/java/crazypants/enderio/machine/generator/zombie/PacketZombieTank.java index 919eabfb..e3d4982d 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/PacketZombieTank.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/PacketZombieTank.java @@ -1,13 +1,11 @@ package crazypants.enderio.machine.generator.zombie; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import crazypants.enderio.EnderIO; import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.NetworkUtil; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java index 7cd178bf..9209a9a2 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java @@ -1,8 +1,6 @@ package crazypants.enderio.machine.hypercube; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java index 48beaa9d..e0eeaaa5 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine.hypercube; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java index 60e0e01d..ecf3565a 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine.hypercube; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java index 4b538990..483456e4 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java @@ -1,12 +1,12 @@ package crazypants.enderio.machine.monitor; -import cpw.mods.fml.relauncher.Side; import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; diff --git a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java index 0a12642f..d421fa04 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine.monitor; -import static crazypants.enderio.machine.power.PowerDisplayUtil.formatPower; -import static crazypants.enderio.machine.power.PowerDisplayUtil.formatPowerFloat; +import static crazypants.enderio.machine.power.PowerDisplayUtil.*; import java.awt.Color; import java.awt.Rectangle; diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java b/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java index 4bb7baa8..94e1079b 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java @@ -1,6 +1,6 @@ package crazypants.enderio.machine.monitor; -import static crazypants.enderio.power.PowerInterfaceBC.fromRF; +import static crazypants.enderio.power.PowerInterfaceBC.*; import io.netty.buffer.ByteBuf; import java.util.List; diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java index 725ab554..b61293da 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java @@ -1,13 +1,11 @@ package crazypants.enderio.machine.monitor; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import crazypants.enderio.EnderIO; import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.NetworkUtil; diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java index 90bbbd25..038a31a2 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java @@ -1,13 +1,11 @@ package crazypants.enderio.machine.monitor; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.EnderIO; import crazypants.enderio.Log; public class PacketPowerMonitor implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java b/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java index 855950ff..e7e66ac5 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java +++ b/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java @@ -1,6 +1,6 @@ package crazypants.enderio.machine.painter; -import static crazypants.enderio.machine.MachineRecipeInput.getInputForSlot; +import static crazypants.enderio.machine.MachineRecipeInput.*; import java.util.Collections; import java.util.List; diff --git a/src/main/java/crazypants/enderio/machine/power/PacketClientState.java b/src/main/java/crazypants/enderio/machine/power/PacketClientState.java index 0a7b586a..32f189ad 100644 --- a/src/main/java/crazypants/enderio/machine/power/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/power/PacketClientState.java @@ -1,13 +1,11 @@ package crazypants.enderio.machine.power; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.EnderIO; import crazypants.enderio.machine.RedstoneControlMode; public class PacketClientState implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java b/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java index 21f4e3a4..f78297ed 100644 --- a/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java +++ b/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine.power; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import java.util.List; diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index a3dc24bc..e5a9f595 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -1,6 +1,6 @@ package crazypants.enderio.machine.reservoir; -import static net.minecraftforge.fluids.FluidContainerRegistry.BUCKET_VOLUME; +import static net.minecraftforge.fluids.FluidContainerRegistry.*; import java.util.ArrayList; diff --git a/src/main/java/crazypants/enderio/machine/still/PacketTanks.java b/src/main/java/crazypants/enderio/machine/still/PacketTanks.java index 9e013d9a..25fcc2c2 100644 --- a/src/main/java/crazypants/enderio/machine/still/PacketTanks.java +++ b/src/main/java/crazypants/enderio/machine/still/PacketTanks.java @@ -1,15 +1,12 @@ package crazypants.enderio.machine.still; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.tank.PacketTank; import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.NetworkUtil; diff --git a/src/main/java/crazypants/enderio/machine/tank/PacketTank.java b/src/main/java/crazypants/enderio/machine/tank/PacketTank.java index 47bcba09..50aa0f7c 100644 --- a/src/main/java/crazypants/enderio/machine/tank/PacketTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/PacketTank.java @@ -1,14 +1,11 @@ package crazypants.enderio.machine.tank; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import crazypants.enderio.EnderIO; import crazypants.enderio.network.MessageTileEntity; import crazypants.enderio.network.NetworkUtil; diff --git a/src/main/java/crazypants/enderio/network/MessageTileEntity.java b/src/main/java/crazypants/enderio/network/MessageTileEntity.java index 02a2ef1b..9c6b2762 100644 --- a/src/main/java/crazypants/enderio/network/MessageTileEntity.java +++ b/src/main/java/crazypants/enderio/network/MessageTileEntity.java @@ -5,11 +5,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.Log; -import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.machine.PacketPowerStorage; public abstract class MessageTileEntity implements IMessage { diff --git a/src/main/java/crazypants/render/RenderUtil.java b/src/main/java/crazypants/render/RenderUtil.java index b02fef01..ece1bb51 100644 --- a/src/main/java/crazypants/render/RenderUtil.java +++ b/src/main/java/crazypants/render/RenderUtil.java @@ -1,11 +1,6 @@ package crazypants.render; -import static net.minecraftforge.common.util.ForgeDirection.DOWN; -import static net.minecraftforge.common.util.ForgeDirection.EAST; -import static net.minecraftforge.common.util.ForgeDirection.NORTH; -import static net.minecraftforge.common.util.ForgeDirection.SOUTH; -import static net.minecraftforge.common.util.ForgeDirection.UP; -import static net.minecraftforge.common.util.ForgeDirection.WEST; +import static net.minecraftforge.common.util.ForgeDirection.*; import java.nio.FloatBuffer; import java.util.ArrayList; diff --git a/src/main/java/crazypants/util/ClientUtil.java b/src/main/java/crazypants/util/ClientUtil.java index f29dae05..8ab0d978 100644 --- a/src/main/java/crazypants/util/ClientUtil.java +++ b/src/main/java/crazypants/util/ClientUtil.java @@ -5,7 +5,6 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.liquid.ILiquidConduit;