diff --git a/src/main/java/crazypants/enderio/BlockEio.java b/src/main/java/crazypants/enderio/BlockEio.java index 77f1c7a8..0892b37e 100644 --- a/src/main/java/crazypants/enderio/BlockEio.java +++ b/src/main/java/crazypants/enderio/BlockEio.java @@ -4,7 +4,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/crazypants/enderio/Config.java b/src/main/java/crazypants/enderio/Config.java index b2400581..ce9fde38 100644 --- a/src/main/java/crazypants/enderio/Config.java +++ b/src/main/java/crazypants/enderio/Config.java @@ -139,6 +139,8 @@ public final class Config { public static float farmContinuousEnergyUse = 4; public static float farmActionEnergyUse = 50; public static int farmDefaultSize = 3; + public static boolean farmAxeDamageOnLeafBreak = false; + public static float farmToolTakeDamageChance = 1; public static int magnetPowerUsePerSecondRF = 1; public static int magnetPowerCapacityRF = 100000; @@ -446,6 +448,10 @@ public final class Config { "The amount of power used by a farm per action (eg plant, till, harvest) ").getDouble(farmActionEnergyUse); farmDefaultSize = config.get("Farm Settings", "farmDefaultSize", farmDefaultSize, "The number of blocks a farm will extend from its center").getInt(farmDefaultSize); + farmAxeDamageOnLeafBreak = config.get("Farm Settings", "farmAxeDamageOnLeafBreak", farmAxeDamageOnLeafBreak, + "Should axes in a farm take damage when breaking leaves?").getBoolean(farmAxeDamageOnLeafBreak); + farmToolTakeDamageChance = (float) config.get("Farm Settings", "farmToolTakeDamageChance", farmToolTakeDamageChance, + "The chance that a tool in the farm will take damage.").getDouble(farmToolTakeDamageChance); combustionGeneratorUseOpaqueModel = config.get("Aesthetic Settings", "combustionGeneratorUseOpaqueModel", combustionGeneratorUseOpaqueModel, "If set to true: fluid will not be shown in combustion generator tanks. Improves FPS. ").getBoolean(combustionGeneratorUseOpaqueModel); diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java index cb962c11..b1371f14 100644 --- a/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java +++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java @@ -1,14 +1,14 @@ package crazypants.enderio.block; -import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IResourceTooltipProvider; import net.minecraft.block.Block; import net.minecraft.block.BlockPressurePlate; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.gui.IResourceTooltipProvider; public class BlockDarkSteelPressurePlate extends BlockPressurePlate implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index 50d116df..46354b51 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -10,7 +10,6 @@ import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadePainterRecipe; import crazypants.enderio.machine.MachineRecipeRegistry; -import crazypants.enderio.machine.recipe.OreDictionaryRecipeInput; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.Material; diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index 8fe10338..7e323642 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -5,14 +5,15 @@ import java.awt.Rectangle; import java.util.Collections; import java.util.List; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.Fluid; + +import org.lwjgl.opengl.GL11; + import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java index 512cf0c5..87805cc1 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java @@ -1,19 +1,17 @@ package crazypants.enderio.conduit.gui; +import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import io.netty.buffer.ByteBuf; 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.conduit.item.IItemConduit; import crazypants.enderio.conduit.liquid.EnderLiquidConduit; import crazypants.enderio.conduit.liquid.FluidFilter; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.packet.AbstractConduitPacket; import crazypants.enderio.conduit.packet.ConTypeEnum; -import crazypants.enderio.conduit.packet.PacketExtractMode; public class PacketFluidFilter extends AbstractConduitPacket implements IMessageHandler{ diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index 7a21147d..fe87b6c0 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -3,7 +3,6 @@ package crazypants.enderio.conduit.item; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java index 9dd22cdc..67cf35b5 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java @@ -8,11 +8,8 @@ import java.util.Map.Entry; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; -import buildcraft.api.transport.IPipeTile; -import buildcraft.api.transport.IPipeTile.PipeType; import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java index 654ecd14..0521099b 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java @@ -6,8 +6,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -18,7 +16,8 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import crazypants.enderio.Config; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConduitUtil; @@ -26,8 +25,6 @@ import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.conduit.geom.CollidableComponent; -import crazypants.enderio.conduit.item.FilterRegister; -import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.render.IconUtil; import crazypants.util.BlockCoord; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java index 25a2f31f..616762fa 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java @@ -2,7 +2,6 @@ package crazypants.enderio.conduit.liquid; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitRenderer.java index ed019960..c50cac0a 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitRenderer.java @@ -1,6 +1,5 @@ package crazypants.enderio.conduit.liquid; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.ConnectionMode; @@ -8,10 +7,8 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.geom.ConnectionModeGeometry; import crazypants.enderio.conduit.geom.Offset; -import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; -import crazypants.util.DyeColor; public class EnderLiquidConduitRenderer extends DefaultConduitRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/FluidFilter.java b/src/main/java/crazypants/enderio/conduit/liquid/FluidFilter.java index 4dfb5eb5..4f4c30a0 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/FluidFilter.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/FluidFilter.java @@ -1,17 +1,12 @@ package crazypants.enderio.conduit.liquid; -import java.util.ArrayList; -import java.util.List; - -import crazypants.util.FluidUtil; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import crazypants.util.FluidUtil; public class FluidFilter { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index addf5e10..068cb142 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -13,7 +13,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 84dfb48a..68498b17 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -126,6 +126,7 @@ public abstract class AbstractMachineBlock exte } @Override + @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iIconRegister) { iconBuffer = new IIcon[1][12]; @@ -151,6 +152,7 @@ public abstract class AbstractMachineBlock exte } + @SideOnly(Side.CLIENT) protected void registerOverlayIcons(IIconRegister iIconRegister) { overlayIconPull = iIconRegister.registerIcon("enderio:machineOverlayPull"); overlayIconPush = iIconRegister.registerIcon("enderio:machineOverlayPush"); @@ -160,6 +162,7 @@ public abstract class AbstractMachineBlock exte selectedFaceIcon= iIconRegister.registerIcon("enderio:machineOverlaySelectedFace"); } + @SideOnly(Side.CLIENT) public IIcon getOverlayIconForMode(IoMode mode) { if(mode == null) { return null; @@ -179,6 +182,7 @@ public abstract class AbstractMachineBlock exte } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { // used to render the block in the world @@ -196,6 +200,7 @@ public abstract class AbstractMachineBlock exte } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int blockSide, int blockMeta) { // This is used to render the block as an item return iconBuffer[0][blockSide]; diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java index 351408cd..8bc2b2dc 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java @@ -2,10 +2,7 @@ package crazypants.enderio.machine; import java.util.List; -import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; @@ -13,8 +10,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.render.BoundingBox; diff --git a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java index 02dd68e0..20a67735 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java @@ -12,7 +12,6 @@ import net.minecraftforge.oredict.OreDictionary; import crazypants.enderio.Config; import crazypants.enderio.Log; import crazypants.enderio.ModObject; -import crazypants.enderio.crafting.IRecipeInput; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.recipe.IRecipe; diff --git a/src/main/java/crazypants/enderio/machine/crusher/GrindingBallTagHandler.java b/src/main/java/crazypants/enderio/machine/crusher/GrindingBallTagHandler.java index 563e147f..11b1cd79 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GrindingBallTagHandler.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GrindingBallTagHandler.java @@ -6,7 +6,6 @@ import java.util.List; import org.xml.sax.Attributes; import org.xml.sax.SAXException; -import crazypants.enderio.crafting.IRecipeInput; import crazypants.enderio.machine.recipe.CustomTagHandler; import crazypants.enderio.machine.recipe.RecipeConfigParser; import crazypants.enderio.machine.recipe.RecipeInput; diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index a5b99111..a787ad27 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -17,7 +17,6 @@ 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; @@ -149,10 +148,14 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt return; } } - } private void damageTool(Class class1, Block blk, BlockCoord bc, int damage) { + + float rand = worldObj.rand.nextFloat(); + if (rand >= Config.farmToolTakeDamageChance) + return; + ItemStack tool = getTool(class1); if(tool == null) { return; diff --git a/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java b/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java index 63a8e5a3..5eaf9089 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/TreeFarmer.java @@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.Config; import crazypants.util.BlockCoord; public class TreeFarmer implements IFarmerJoe { @@ -102,7 +103,7 @@ public class TreeFarmer implements IFarmerJoe { } boolean isWood = true; if(blk != wood) { //leaves - isWood = false; + isWood = Config.farmAxeDamageOnLeafBreak; int leaveMeta = farm.getBlockMeta(coord); boolean canDropApple = (blk instanceof BlockOldLeaf && (leaveMeta == 0 || leaveMeta == 8)) || //oak diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index 81879137..951faf51 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -30,7 +30,6 @@ import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; -import crazypants.enderio.machine.power.PacketPowerStorage; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.Util; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketStoredPower.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketStoredPower.java index 18d939e0..bc31e634 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketStoredPower.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketStoredPower.java @@ -1,16 +1,13 @@ package crazypants.enderio.machine.hypercube; -import buildcraft.api.power.PowerHandler; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import buildcraft.api.power.PowerHandler; 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.power.PacketPowerStorage; -import crazypants.enderio.machine.power.TileCapacitorBank; -import crazypants.util.BlockCoord; public class PacketStoredPower implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java index 179f2d59..4e500a53 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java @@ -19,9 +19,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IResourceTooltipProvider; -import crazypants.enderio.machine.power.BlockItemCapacitorBank; -import crazypants.enderio.machine.power.TileCapacitorBank; import crazypants.vecmath.Vector3f; public class BlockElectricLight extends BlockEio { diff --git a/src/main/java/crazypants/enderio/machine/light/BlockItemElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockItemElectricLight.java index 520117c6..5177738a 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockItemElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockItemElectricLight.java @@ -12,12 +12,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.gui.IResourceTooltipProvider; -import crazypants.enderio.material.BlockFusedQuartz; -import crazypants.util.Lang; public class BlockItemElectricLight extends ItemBlockWithMetadata implements IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java index 7275d42f..ba7e0f75 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java @@ -4,26 +4,9 @@ import java.util.Collections; import java.util.List; import java.util.Random; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.crafting.IEnderIoRecipe; -import crazypants.enderio.crafting.IRecipeInput; -import crazypants.enderio.crafting.IRecipeOutput; -import crazypants.enderio.crafting.impl.EnderIoRecipe; -import crazypants.enderio.crafting.impl.RecipeInputClass; -import crazypants.enderio.crafting.impl.RecipeOutput; -import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.MachineRecipeRegistry; -import crazypants.enderio.machine.IMachineRecipe.ResultStack; -import crazypants.enderio.machine.painter.BlockPaintedGlowstone.PainterTemplate; import net.minecraft.block.Block; import net.minecraft.block.BlockCarpet; -import net.minecraft.block.BlockGlowstone; import net.minecraft.block.ITileEntityProvider; -import net.minecraft.block.material.Material; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.renderer.texture.IIconRegister; @@ -37,6 +20,19 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.crafting.IEnderIoRecipe; +import crazypants.enderio.crafting.IRecipeInput; +import crazypants.enderio.crafting.IRecipeOutput; +import crazypants.enderio.crafting.impl.EnderIoRecipe; +import crazypants.enderio.crafting.impl.RecipeInputClass; +import crazypants.enderio.crafting.impl.RecipeOutput; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.MachineRecipeRegistry; public class BlockPaintedCarpet extends BlockCarpet implements ITileEntityProvider { diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index 3f1c1865..052c6faa 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -4,25 +4,8 @@ import java.util.Collections; import java.util.List; import java.util.Random; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.crafting.IEnderIoRecipe; -import crazypants.enderio.crafting.IRecipeInput; -import crazypants.enderio.crafting.IRecipeOutput; -import crazypants.enderio.crafting.impl.EnderIoRecipe; -import crazypants.enderio.crafting.impl.RecipeInputClass; -import crazypants.enderio.crafting.impl.RecipeOutput; -import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.MachineRecipeRegistry; -import crazypants.enderio.machine.IMachineRecipe.ResultStack; -import crazypants.enderio.machine.painter.BlockPaintedStair.PainterTemplate; import net.minecraft.block.Block; import net.minecraft.block.BlockGlowstone; -import net.minecraft.block.BlockStairs; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; import net.minecraft.client.particle.EffectRenderer; @@ -38,6 +21,19 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.crafting.IEnderIoRecipe; +import crazypants.enderio.crafting.IRecipeInput; +import crazypants.enderio.crafting.IRecipeOutput; +import crazypants.enderio.crafting.impl.EnderIoRecipe; +import crazypants.enderio.crafting.impl.RecipeInputClass; +import crazypants.enderio.crafting.impl.RecipeOutput; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.MachineRecipeRegistry; public class BlockPaintedGlowstone extends Block implements ITileEntityProvider { diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index c9e849f5..85105c32 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -2,27 +2,19 @@ package crazypants.enderio.machine.spawner; import java.util.List; -import scala.tools.nsc.settings.AdvancedScalaSettings; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; import net.minecraft.block.BlockMobSpawner; -import net.minecraft.block.BlockSponge; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.AnvilUpdateEvent; import net.minecraftforge.event.world.BlockEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; @@ -31,12 +23,6 @@ import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.MachineRecipeRegistry; -import crazypants.enderio.machine.crusher.BlockCrusher; -import crazypants.enderio.machine.crusher.PacketGrindingBall; -import crazypants.enderio.machine.power.BlockItemCapacitorBank; -import crazypants.enderio.machine.power.TileCapacitorBank; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.Lang; import crazypants.util.Util; diff --git a/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java b/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java index 05335009..f16322b9 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java @@ -1,11 +1,10 @@ package crazypants.enderio.machine.spawner; -import crazypants.enderio.EnderIO; -import crazypants.render.IconUtil; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; +import crazypants.enderio.EnderIO; public class BrokenSpawnerRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/spawner/DummyRecipe.java b/src/main/java/crazypants/enderio/machine/spawner/DummyRecipe.java index 968158eb..2ad4bc4e 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/DummyRecipe.java +++ b/src/main/java/crazypants/enderio/machine/spawner/DummyRecipe.java @@ -8,8 +8,6 @@ import crazypants.enderio.ModObject; import crazypants.enderio.crafting.IEnderIoRecipe; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.IMachineRecipe.ResultStack; -import crazypants.enderio.power.Capacitors; public class DummyRecipe implements IMachineRecipe { diff --git a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java index be225376..5b5ebf8f 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java @@ -1,10 +1,9 @@ package crazypants.enderio.machine.spawner; +import net.minecraft.entity.player.InventoryPlayer; + import org.lwjgl.opengl.GL11; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.GuiMachineBase; import crazypants.render.RenderUtil; diff --git a/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java index 948e7aa5..4c0cf18c 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java @@ -8,18 +8,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -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.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.material.ItemCapacitor; -import crazypants.enderio.power.Capacitors; -import crazypants.enderio.power.ICapacitor; -import crazypants.util.Lang; public class ItemBrokenSpawner extends Item { diff --git a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java index 206a9e04..213630ec 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java @@ -4,25 +4,19 @@ package crazypants.enderio.machine.spawner; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.MobSpawnerBaseLogic; -import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; -import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.AbstractPoweredTaskEntity; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.IPoweredTask; import crazypants.enderio.machine.PoweredTask; import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.power.Capacitors; public class TilePoweredSpawner extends AbstractPoweredTaskEntity { diff --git a/src/main/java/crazypants/enderio/machine/still/VatRenderer.java b/src/main/java/crazypants/enderio/machine/still/VatRenderer.java index 8aeadc29..ea1d6ed9 100644 --- a/src/main/java/crazypants/enderio/machine/still/VatRenderer.java +++ b/src/main/java/crazypants/enderio/machine/still/VatRenderer.java @@ -5,15 +5,12 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/crazypants/util/FluidUtil.java b/src/main/java/crazypants/util/FluidUtil.java index 0e414274..0d260e70 100644 --- a/src/main/java/crazypants/util/FluidUtil.java +++ b/src/main/java/crazypants/util/FluidUtil.java @@ -1,6 +1,5 @@ package crazypants.util; -import crazypants.enderio.conduit.IConduitBundle; import net.minecraft.init.Items; import net.minecraft.item.ItemPotion; import net.minecraft.item.ItemStack; @@ -12,6 +11,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile.PipeType; +import crazypants.enderio.conduit.IConduitBundle; public class FluidUtil {