diff --git a/api/buildcraft/api/core/EnumColor.java b/api/buildcraft/api/core/EnumColor.java index 88dd82b0..95b40913 100644 --- a/api/buildcraft/api/core/EnumColor.java +++ b/api/buildcraft/api/core/EnumColor.java @@ -11,7 +11,6 @@ package buildcraft.api.core; import java.util.Locale; import java.util.Random; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; diff --git a/api/buildcraft/api/core/IPathProvider.java b/api/buildcraft/api/core/IPathProvider.java index f682f67a..2ff392a9 100644 --- a/api/buildcraft/api/core/IPathProvider.java +++ b/api/buildcraft/api/core/IPathProvider.java @@ -1,7 +1,6 @@ package buildcraft.api.core; import java.util.List; -import buildcraft.api.core.BlockIndex; /** * To be implemented by TileEntities able to provide a path on the world, typically BuildCraft path markers. diff --git a/api/buildcraft/api/facades/FacadeAPI.java b/api/buildcraft/api/facades/FacadeAPI.java index f5749255..987f329b 100644 --- a/api/buildcraft/api/facades/FacadeAPI.java +++ b/api/buildcraft/api/facades/FacadeAPI.java @@ -1,5 +1,9 @@ package buildcraft.api.facades; -public class FacadeAPI { +public final class FacadeAPI { public static IFacadeItem facadeItem; + + private FacadeAPI() { + + } } diff --git a/api/buildcraft/api/gates/GateExpansions.java b/api/buildcraft/api/gates/GateExpansions.java index ebcd53eb..d9186d1d 100644 --- a/api/buildcraft/api/gates/GateExpansions.java +++ b/api/buildcraft/api/gates/GateExpansions.java @@ -13,7 +13,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public final class GateExpansions { diff --git a/api/buildcraft/api/library/LibraryAPI.java b/api/buildcraft/api/library/LibraryAPI.java index 590935a5..e1280e40 100644 --- a/api/buildcraft/api/library/LibraryAPI.java +++ b/api/buildcraft/api/library/LibraryAPI.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -public class LibraryAPI { +public final class LibraryAPI { private static final Set handlers = new HashSet(); private static final Map handlersByExt = new HashMap(); diff --git a/api/buildcraft/api/robots/ResourceIdBlock.java b/api/buildcraft/api/robots/ResourceIdBlock.java index d958d4fe..47144dc2 100755 --- a/api/buildcraft/api/robots/ResourceIdBlock.java +++ b/api/buildcraft/api/robots/ResourceIdBlock.java @@ -11,7 +11,6 @@ package buildcraft.api.robots; import net.minecraft.tileentity.TileEntity; import buildcraft.api.core.BlockIndex; -import buildcraft.api.robots.ResourceId; public class ResourceIdBlock extends ResourceId { diff --git a/api/buildcraft/api/robots/ResourceIdRequest.java b/api/buildcraft/api/robots/ResourceIdRequest.java index f7d138a8..21dac439 100755 --- a/api/buildcraft/api/robots/ResourceIdRequest.java +++ b/api/buildcraft/api/robots/ResourceIdRequest.java @@ -11,7 +11,6 @@ package buildcraft.api.robots; import net.minecraft.tileentity.TileEntity; import buildcraft.api.core.BlockIndex; -import buildcraft.api.robots.ResourceId; public class ResourceIdRequest extends ResourceId { diff --git a/api/buildcraft/api/statements/IStatementContainer.java b/api/buildcraft/api/statements/IStatementContainer.java index 834ec255..43a4f51e 100644 --- a/api/buildcraft/api/statements/IStatementContainer.java +++ b/api/buildcraft/api/statements/IStatementContainer.java @@ -8,7 +8,6 @@ */ package buildcraft.api.statements; -import java.util.List; import net.minecraft.tileentity.TileEntity; /** diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index 9a40daad..76a2b819 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -12,7 +12,6 @@ import java.io.BufferedReader; import java.io.File; import java.io.InputStreamReader; import java.io.PrintWriter; - import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.item.EntityMinecartChest; import net.minecraft.entity.item.EntityMinecartEmpty; @@ -26,7 +25,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.launchwrapper.Launch; import net.minecraft.stats.Achievement; - import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; @@ -39,12 +37,10 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; - import buildcraft.api.blueprints.BlueprintDeployer; import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.ISchematicRegistry; @@ -60,7 +56,6 @@ import buildcraft.api.library.LibraryAPI; import buildcraft.api.statements.StatementManager; import buildcraft.builders.BlockArchitect; import buildcraft.builders.BlockBlueprintLibrary; -import buildcraft.core.BlockBuildTool; import buildcraft.builders.BlockBuilder; import buildcraft.builders.BlockConstructionMarker; import buildcraft.builders.BlockFiller; @@ -68,14 +63,15 @@ import buildcraft.builders.BlockMarker; import buildcraft.builders.BlockPathMarker; import buildcraft.builders.BlueprintServerDatabase; import buildcraft.builders.BuilderProxy; -import buildcraft.builders.EventHandlerBuilders; import buildcraft.builders.BuildersGuiHandler; +import buildcraft.builders.EventHandlerBuilders; import buildcraft.builders.HeuristicBlockDetection; import buildcraft.builders.ItemBlueprintStandard; import buildcraft.builders.ItemBlueprintTemplate; import buildcraft.builders.ItemConstructionMarker; import buildcraft.builders.LibraryBlueprintTypeHandler; import buildcraft.builders.LibraryBookTypeHandler; +import buildcraft.builders.LibraryDatabase; import buildcraft.builders.TileArchitect; import buildcraft.builders.TileBlueprintLibrary; import buildcraft.builders.TileBuilder; @@ -83,10 +79,10 @@ import buildcraft.builders.TileConstructionMarker; import buildcraft.builders.TileFiller; import buildcraft.builders.TileMarker; import buildcraft.builders.TilePathMarker; -import buildcraft.builders.LibraryDatabase; +import buildcraft.builders.blueprints.RealBlueprintDeployer; import buildcraft.builders.schematics.SchematicAir; import buildcraft.builders.schematics.SchematicBed; -import buildcraft.builders.schematics.SchematicBlockCreative; +import buildcraft.core.builders.schematics.SchematicBlockCreative; import buildcraft.builders.schematics.SchematicCactus; import buildcraft.builders.schematics.SchematicCustomStack; import buildcraft.builders.schematics.SchematicDirt; @@ -100,7 +96,7 @@ import buildcraft.builders.schematics.SchematicFire; import buildcraft.builders.schematics.SchematicGlassPane; import buildcraft.builders.schematics.SchematicGravel; import buildcraft.builders.schematics.SchematicHanging; -import buildcraft.builders.schematics.SchematicIgnore; +import buildcraft.core.builders.schematics.SchematicIgnore; import buildcraft.builders.schematics.SchematicLever; import buildcraft.builders.schematics.SchematicMinecart; import buildcraft.builders.schematics.SchematicPiston; @@ -110,16 +106,16 @@ import buildcraft.builders.schematics.SchematicRail; import buildcraft.builders.schematics.SchematicRedstoneDiode; import buildcraft.builders.schematics.SchematicRedstoneLamp; import buildcraft.builders.schematics.SchematicRedstoneWire; -import buildcraft.builders.schematics.SchematicRotateMeta; +import buildcraft.core.builders.schematics.SchematicRotateMeta; import buildcraft.builders.schematics.SchematicSeeds; import buildcraft.builders.schematics.SchematicSign; import buildcraft.builders.schematics.SchematicSkull; import buildcraft.builders.schematics.SchematicStairs; -import buildcraft.builders.schematics.SchematicStandalone; +import buildcraft.core.builders.schematics.SchematicStandalone; import buildcraft.builders.schematics.SchematicStone; -import buildcraft.builders.schematics.SchematicTileCreative; +import buildcraft.core.builders.schematics.SchematicTileCreative; import buildcraft.builders.schematics.SchematicTripWireHook; -import buildcraft.builders.schematics.SchematicWallSide; +import buildcraft.core.builders.schematics.SchematicWallSide; import buildcraft.builders.statements.BuildersActionProvider; import buildcraft.builders.urbanism.BlockUrbanist; import buildcraft.builders.urbanism.TileUrbanist; @@ -128,7 +124,6 @@ import buildcraft.core.CompatHooks; import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; import buildcraft.core.Version; -import buildcraft.builders.blueprints.RealBlueprintDeployer; import buildcraft.core.blueprints.SchematicRegistry; import buildcraft.core.builders.patterns.FillerPattern; import buildcraft.core.builders.patterns.FillerRegistry; diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index db5e7bc1..bc98eafe 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -14,13 +14,10 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.util.HashSet; import java.util.UUID; - import com.mojang.authlib.GameProfile; - import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.util.glu.GLU; - import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.client.renderer.GLAllocation; @@ -31,7 +28,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.IIcon; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -43,7 +39,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.IPlantable; @@ -52,7 +47,6 @@ import net.minecraftforge.common.config.Property; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.oredict.OreDictionary; - import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.core.BCLog; import buildcraft.api.core.BuildCraftAPI; @@ -60,7 +54,6 @@ import buildcraft.api.core.EnumColor; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.IWorldProperty; import buildcraft.api.core.JavaTools; -import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.recipes.BuildcraftRecipeRegistry; import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; @@ -73,13 +66,14 @@ import buildcraft.api.tiles.IControllable; import buildcraft.core.AchievementManager; import buildcraft.core.BCCreativeTab; import buildcraft.core.BlockBuildTool; +import buildcraft.core.BlockEngine; import buildcraft.core.BlockSpring; import buildcraft.core.BuildCraftConfiguration; import buildcraft.core.CommandBuildCraft; import buildcraft.core.CompatHooks; +import buildcraft.core.CoreGuiHandler; import buildcraft.core.CoreIconProvider; import buildcraft.core.DefaultProps; -import buildcraft.core.CoreGuiHandler; import buildcraft.core.InterModComms; import buildcraft.core.ItemDebugger; import buildcraft.core.ItemGear; @@ -88,16 +82,27 @@ import buildcraft.core.ItemMapLocation; import buildcraft.core.ItemPaintbrush; import buildcraft.core.ItemSpring; import buildcraft.core.ItemWrench; +import buildcraft.core.SchematicEngine; import buildcraft.core.SpringPopulate; import buildcraft.core.TickHandlerCore; +import buildcraft.core.TileEngineWood; import buildcraft.core.Version; import buildcraft.core.blueprints.SchematicRegistry; -import buildcraft.core.BlockEngine; +import buildcraft.core.lib.engines.ItemEngine; import buildcraft.core.lib.engines.TileEngineBase; -import buildcraft.core.TileEngineWood; import buildcraft.core.lib.network.ChannelHandler; import buildcraft.core.lib.network.PacketHandler; +import buildcraft.core.lib.utils.ColorUtils; import buildcraft.core.lib.utils.NBTUtils; +import buildcraft.core.properties.WorldPropertyIsDirt; +import buildcraft.core.properties.WorldPropertyIsFarmland; +import buildcraft.core.properties.WorldPropertyIsFluidSource; +import buildcraft.core.properties.WorldPropertyIsHarvestable; +import buildcraft.core.properties.WorldPropertyIsLeaf; +import buildcraft.core.properties.WorldPropertyIsOre; +import buildcraft.core.properties.WorldPropertyIsShoveled; +import buildcraft.core.properties.WorldPropertyIsSoft; +import buildcraft.core.properties.WorldPropertyIsWood; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.recipes.AssemblyRecipeManager; import buildcraft.core.recipes.IntegrationRecipeManager; @@ -117,20 +122,6 @@ import buildcraft.core.statements.TriggerInventory; import buildcraft.core.statements.TriggerInventoryLevel; import buildcraft.core.statements.TriggerMachine; import buildcraft.core.statements.TriggerRedstoneInput; -import buildcraft.core.lib.utils.ColorUtils; -import buildcraft.core.properties.WorldPropertyIsDirt; -import buildcraft.core.properties.WorldPropertyIsFarmland; -import buildcraft.core.properties.WorldPropertyIsFluidSource; -import buildcraft.core.properties.WorldPropertyIsHarvestable; -import buildcraft.core.properties.WorldPropertyIsLeaf; -import buildcraft.core.properties.WorldPropertyIsOre; -import buildcraft.core.properties.WorldPropertyIsShoveled; -import buildcraft.core.properties.WorldPropertyIsSoft; -import buildcraft.core.properties.WorldPropertyIsWood; -import buildcraft.core.lib.engines.ItemEngine; -import buildcraft.core.SchematicEngine; -import buildcraft.energy.fuels.CoolantManager; -import buildcraft.energy.fuels.FuelManager; @Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", acceptedMinecraftVersions = "[1.7.10,1.8)", dependencies = "required-after:Forge@[10.13.2.1236,)") public class BuildCraftCore extends BuildCraftMod { @@ -142,6 +133,7 @@ public class BuildCraftCore extends BuildCraftMod { public static enum RenderMode { Full, NoDynamic } + public static RenderMode render = RenderMode.Full; public static boolean debugWorldgen = false; public static boolean modifyWorld = false; @@ -241,9 +233,6 @@ public class BuildCraftCore extends BuildCraftMod { BuildcraftRecipeRegistry.refinery = RefineryRecipeManager.INSTANCE; BuildcraftRecipeRegistry.programmingTable = ProgrammingRecipeManager.INSTANCE; - BuildcraftFuelRegistry.fuel = FuelManager.INSTANCE; - BuildcraftFuelRegistry.coolant = CoolantManager.INSTANCE; - BuilderAPI.schematicRegistry = SchematicRegistry.INSTANCE; mainConfiguration = new BuildCraftConfiguration(new File(evt.getModConfigurationDirectory(), "buildcraft/main.conf")); diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 6b7fcef2..05fd149a 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -9,9 +9,7 @@ package buildcraft; import java.util.Set; - import org.apache.logging.log4j.Level; - import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -21,7 +19,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.world.biome.BiomeGenBase; - import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; @@ -33,7 +30,6 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.MinecraftForge; @@ -42,7 +38,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.core.BCLog; import buildcraft.api.core.JavaTools; import buildcraft.api.core.StackKey; @@ -54,26 +49,28 @@ import buildcraft.core.BlockSpring; import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; import buildcraft.core.Version; -import buildcraft.core.lib.network.ChannelHandler; -import buildcraft.core.proxy.CoreProxy; import buildcraft.core.lib.block.BlockBuildCraftFluid; -import buildcraft.energy.BucketHandler; -import buildcraft.energy.EnergyProxy; -import buildcraft.energy.EnergyGuiHandler; -import buildcraft.energy.IMCHandlerEnergy; -import buildcraft.energy.ItemBucketBuildcraft; import buildcraft.core.lib.engines.TileEngineBase; import buildcraft.core.lib.engines.TileEngineBase.EnergyStage; +import buildcraft.core.lib.network.ChannelHandler; +import buildcraft.core.lib.network.PacketHandler; +import buildcraft.core.proxy.CoreProxy; +import buildcraft.energy.BucketHandler; +import buildcraft.energy.EnergyGuiHandler; +import buildcraft.energy.EnergyProxy; +import buildcraft.energy.IMCHandlerEnergy; +import buildcraft.energy.ItemBucketBuildcraft; import buildcraft.energy.TileEngineCreative; import buildcraft.energy.TileEngineIron; import buildcraft.energy.TileEngineStone; +import buildcraft.energy.fuels.CoolantManager; +import buildcraft.energy.fuels.FuelManager; import buildcraft.energy.statements.EnergyStatementProvider; import buildcraft.energy.statements.TriggerEngineHeat; import buildcraft.energy.worldgen.BiomeGenOilDesert; import buildcraft.energy.worldgen.BiomeGenOilOcean; import buildcraft.energy.worldgen.BiomeInitializer; import buildcraft.energy.worldgen.OilPopulate; -import buildcraft.transport.network.PacketHandlerTransport; @Mod(name = "BuildCraft Energy", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Energy", dependencies = DefaultProps.DEPENDENCY_CORE) public class BuildCraftEnergy extends BuildCraftMod { @@ -115,6 +112,9 @@ public class BuildCraftEnergy extends BuildCraftMod { @Mod.EventHandler public void preInit(FMLPreInitializationEvent evt) { + BuildcraftFuelRegistry.fuel = FuelManager.INSTANCE; + BuildcraftFuelRegistry.coolant = CoolantManager.INSTANCE; + int oilDesertBiomeId = BuildCraftCore.mainConfiguration.get("biomes", "biomeOilDesert", DefaultProps.BIOME_OIL_DESERT).getInt(DefaultProps.BIOME_OIL_DESERT); int oilOceanBiomeId = BuildCraftCore.mainConfiguration.get("biomes", "biomeOilOcean", DefaultProps.BIOME_OIL_OCEAN).getInt(DefaultProps.BIOME_OIL_OCEAN); canOilBurn = BuildCraftCore.mainConfiguration.get("general", "burnOil", true, "Can oil burn?").getBoolean(true); @@ -329,7 +329,7 @@ public class BuildCraftEnergy extends BuildCraftMod { @Mod.EventHandler public void init(FMLInitializationEvent evt) { channels = NetworkRegistry.INSTANCE.newChannel - (DefaultProps.NET_CHANNEL_NAME + "-ENERGY", new ChannelHandler(), new PacketHandlerTransport()); + (DefaultProps.NET_CHANNEL_NAME + "-ENERGY", new ChannelHandler(), new PacketHandler()); NetworkRegistry.INSTANCE.registerGuiHandler(instance, new EnergyGuiHandler()); diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index 845ae27c..cc65d048 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -9,9 +9,7 @@ package buildcraft; import java.util.List; - import com.google.common.collect.Lists; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Blocks; @@ -19,7 +17,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.world.World; - import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; @@ -29,24 +26,22 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Property; - import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.SchematicTile; -import buildcraft.builders.schematics.SchematicIgnoreMeta; +import buildcraft.core.builders.schematics.SchematicIgnoreMeta; import buildcraft.core.CompatHooks; import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; import buildcraft.core.Version; import buildcraft.core.lib.network.ChannelHandler; import buildcraft.core.lib.network.PacketHandler; -import buildcraft.core.proxy.CoreProxy; import buildcraft.core.lib.utils.ConfigUtils; +import buildcraft.core.proxy.CoreProxy; import buildcraft.factory.BlockAutoWorkbench; import buildcraft.factory.BlockFloodGate; import buildcraft.factory.BlockFrame; @@ -57,9 +52,9 @@ import buildcraft.factory.BlockPump; import buildcraft.factory.BlockQuarry; import buildcraft.factory.BlockRefinery; import buildcraft.factory.BlockTank; +import buildcraft.factory.FactoryGuiHandler; import buildcraft.factory.FactoryProxy; import buildcraft.factory.FactoryProxyClient; -import buildcraft.factory.FactoryGuiHandler; import buildcraft.factory.PumpDimensionList; import buildcraft.factory.TileAutoWorkbench; import buildcraft.factory.TileFloodGate; @@ -295,11 +290,16 @@ public class BuildCraftFactory extends BuildCraftMod { if (autoWorkbenchBlock != null) { CoreProxy.proxy.addCraftingRecipe(new ItemStack(autoWorkbenchBlock), - " g ", "gwg", - " g ", 'w', Blocks.crafting_table, - 'g', "gearWood"); + 'g', "gearStone"); + + CoreProxy.proxy.addCraftingRecipe(new ItemStack(autoWorkbenchBlock), + "g", + "w", + "g", + 'w', Blocks.crafting_table, + 'g', "gearStone"); } diff --git a/common/buildcraft/BuildCraftMod.java b/common/buildcraft/BuildCraftMod.java index 00690ea4..ae76dffc 100644 --- a/common/buildcraft/BuildCraftMod.java +++ b/common/buildcraft/BuildCraftMod.java @@ -12,11 +12,6 @@ import java.util.EnumMap; import java.util.List; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedDeque; - -import org.apache.logging.log4j.Level; - -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.NetHandlerPlayServer; @@ -25,23 +20,20 @@ import net.minecraft.network.play.server.S3FPacketCustomPayload; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.FMLEmbeddedChannel; import cpw.mods.fml.common.network.FMLOutboundHandler; import cpw.mods.fml.common.network.FMLOutboundHandler.OutboundTarget; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; import cpw.mods.fml.relauncher.Side; - -import buildcraft.api.core.BCLog; import buildcraft.core.DefaultProps; import buildcraft.core.lib.network.Packet; public class BuildCraftMod { + private static PacketSender sender = new PacketSender(); + private static Thread senderThread = new Thread(sender); + public EnumMap channels; - static abstract class SendRequest { + abstract static class SendRequest { final Packet packet; final BuildCraftMod source; @@ -103,10 +95,10 @@ public class BuildCraftMod { @Override public void run() { - while(true) { + while (true) { try { Thread.sleep(10); - } catch(Exception e) { + } catch (Exception e) { } @@ -138,9 +130,6 @@ public class BuildCraftMod { } } - private static PacketSender sender = new PacketSender(); - private static Thread senderThread = new Thread(sender); - static { senderThread.start(); } diff --git a/common/buildcraft/BuildCraftRobotics.java b/common/buildcraft/BuildCraftRobotics.java index afdbb5b9..71a4cd51 100644 --- a/common/buildcraft/BuildCraftRobotics.java +++ b/common/buildcraft/BuildCraftRobotics.java @@ -24,8 +24,12 @@ import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; import buildcraft.api.boards.RedstoneBoardRegistry; @@ -35,6 +39,7 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.StatementManager; import buildcraft.api.transport.PipeManager; +import buildcraft.builders.urbanism.UrbanistToolsIconProvider; import buildcraft.core.BCCreativeTab; import buildcraft.core.CompatHooks; import buildcraft.core.DefaultProps; @@ -50,11 +55,13 @@ import buildcraft.robotics.ImplRedstoneBoardRegistry; import buildcraft.robotics.ItemRedstoneBoard; import buildcraft.robotics.ItemRobot; import buildcraft.robotics.ItemRobotStation; +import buildcraft.robotics.RobotIntegrationRecipe; import buildcraft.robotics.RobotRegistryProvider; import buildcraft.robotics.RobotStationPluggable; import buildcraft.robotics.RoboticsGuiHandler; -import buildcraft.robotics.RobotIntegrationRecipe; import buildcraft.robotics.RoboticsProxy; +import buildcraft.robotics.TileRequester; +import buildcraft.robotics.TileZonePlan; import buildcraft.robotics.ai.AIRobotAttack; import buildcraft.robotics.ai.AIRobotBreak; import buildcraft.robotics.ai.AIRobotCraftAssemblyTable; @@ -150,7 +157,7 @@ import buildcraft.robotics.statements.TriggerRobotLinked; import buildcraft.robotics.statements.TriggerRobotSleep; import buildcraft.silicon.ItemRedstoneChipset; -@Mod(name = "BuildCraft Robotics", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Robotics", dependencies = DefaultProps.DEPENDENCY_SILICON_TRANSPORT) +@Mod(name = "BuildCraft Robotics", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Robotics", dependencies = DefaultProps.DEPENDENCY_CORE) public class BuildCraftRobotics extends BuildCraftMod { @Mod.Instance("BuildCraft|Robotics") public static BuildCraftRobotics instance; @@ -254,8 +261,9 @@ public class BuildCraftRobotics extends BuildCraftMod { @Mod.EventHandler public void init(FMLInitializationEvent evt) { NetworkRegistry.INSTANCE.registerGuiHandler(instance, new RoboticsGuiHandler()); + MinecraftForge.EVENT_BUS.register(this); - if (BuildCraftCore.loadDefaultRecipes) { + if (BuildCraftCore.loadDefaultRecipes && Loader.isModLoaded("BuildCraft|Silicon")) { loadRecipes(); } @@ -264,6 +272,9 @@ public class BuildCraftRobotics extends BuildCraftMod { PipeManager.registerPipePluggable(RobotStationPluggable.class, "robotStation"); EntityRegistry.registerModEntity(EntityRobot.class, "bcRobot", EntityIds.ROBOT, instance, 50, 1, true); + CoreProxy.proxy.registerTileEntity(TileZonePlan.class, "net.minecraft.src.buildcraft.commander.TileZonePlan"); + CoreProxy.proxy.registerTileEntity(TileRequester.class, "net.minecraft.src.buildcraft.commander.TileRequester"); + RobotManager.registryProvider = new RobotRegistryProvider(); RobotManager.registerAIRobot(AIRobotMain.class, "aiRobotMain", "buildcraft.core.robots.AIRobotMain"); @@ -372,6 +383,13 @@ public class BuildCraftRobotics extends BuildCraftMod { BuildcraftRecipeRegistry.integrationTable.addRecipe(new RobotIntegrationRecipe("buildcraft:robotIntegration")); } + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void textureHook(TextureStitchEvent.Pre event) { + if (event.map.getTextureType() == 1) { + RedstoneBoardRegistry.instance.registerIcons(event.map); + } + } @Mod.EventHandler public void serverUnload(FMLServerStoppingEvent event) { diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index 72bc8e6a..b7f806c3 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -14,7 +14,6 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; - import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; @@ -22,29 +21,25 @@ import cpw.mods.fml.common.event.FMLMissingMappingsEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; - import net.minecraftforge.oredict.OreDictionary; - import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.recipes.BuildcraftRecipeRegistry; import buildcraft.api.robots.RobotManager; -import buildcraft.builders.schematics.SchematicRotateMeta; -import buildcraft.robotics.TileRequester; -import buildcraft.robotics.TileZonePlan; +import buildcraft.core.builders.schematics.SchematicRotateMeta; import buildcraft.core.CompatHooks; import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; -import buildcraft.core.lib.items.ItemBuildCraft; import buildcraft.core.Version; +import buildcraft.core.lib.items.ItemBuildCraft; import buildcraft.core.lib.network.ChannelHandler; import buildcraft.core.proxy.CoreProxy; import buildcraft.silicon.BlockLaser; import buildcraft.silicon.BlockLaserTable; -import buildcraft.silicon.SiliconGuiHandler; import buildcraft.silicon.ItemLaserTable; import buildcraft.silicon.ItemRedstoneChipset; import buildcraft.silicon.ItemRedstoneChipset.Chipset; import buildcraft.silicon.ResourceIdAssemblyTable; +import buildcraft.silicon.SiliconGuiHandler; import buildcraft.silicon.SiliconProxy; import buildcraft.silicon.TileAdvancedCraftingTable; import buildcraft.silicon.TileAssemblyTable; @@ -111,8 +106,6 @@ public class BuildCraftSilicon extends BuildCraftMod { "net.minecraft.src.buildcraft.factory.TileChargingTable"); CoreProxy.proxy.registerTileEntity(TileProgrammingTable.class, "net.minecraft.src.buildcraft.factory.TileProgrammingTable"); - CoreProxy.proxy.registerTileEntity(TileZonePlan.class, "net.minecraft.src.buildcraft.commander.TileZonePlan"); - CoreProxy.proxy.registerTileEntity(TileRequester.class, "net.minecraft.src.buildcraft.commander.TileRequester"); BuilderAPI.schematicRegistry.registerSchematicBlock(laserBlock, SchematicRotateMeta.class, new int[] {2, 5, 3, 4}, true); diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index f6baa2b0..cc7dc621 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -13,7 +13,6 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -22,7 +21,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemMinecart; import net.minecraft.item.ItemStack; import net.minecraft.world.WorldServer; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -38,14 +36,11 @@ import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; - import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Property; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.ShapedOreRecipe; - import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.core.BCLog; import buildcraft.api.core.EnumColor; @@ -60,21 +55,20 @@ import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.StatementManager; import buildcraft.api.transport.PipeManager; import buildcraft.api.transport.PipeWire; -import buildcraft.core.CompatHooks; import buildcraft.core.BCCreativeTab; +import buildcraft.core.CompatHooks; import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; -import buildcraft.core.lib.items.ItemBuildCraft; import buildcraft.core.PowerMode; import buildcraft.core.Version; +import buildcraft.core.lib.items.ItemBuildCraft; import buildcraft.core.lib.network.ChannelHandler; -import buildcraft.core.proxy.CoreProxy; import buildcraft.core.lib.utils.ColorUtils; +import buildcraft.core.proxy.CoreProxy; import buildcraft.silicon.ItemRedstoneChipset.Chipset; import buildcraft.transport.BlockFilteredBuffer; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.FacadePluggable; -import buildcraft.transport.TransportGuiHandler; import buildcraft.transport.IMCHandlerTransport; import buildcraft.transport.ItemFacade; import buildcraft.transport.ItemGateCopier; @@ -87,6 +81,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTriggerProvider; import buildcraft.transport.TileFilteredBuffer; import buildcraft.transport.TileGenericPipe; +import buildcraft.transport.TransportGuiHandler; import buildcraft.transport.TransportProxy; import buildcraft.transport.WireIconProvider; import buildcraft.transport.gates.GateDefinition.GateLogic; diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index 88df9e96..4ab452af 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -15,9 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftBuilders; import buildcraft.core.BlockBuildCraftLED; import buildcraft.core.GuiIds; diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index 65e57971..b53e7587 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -9,21 +9,13 @@ package buildcraft.builders; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.BuildCraftBuilders; -import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; import buildcraft.core.GuiIds; +import buildcraft.core.lib.block.BlockBuildCraft; public class BlockBlueprintLibrary extends BlockBuildCraft { public BlockBlueprintLibrary() { diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java index 52d178a0..bf5480fb 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -8,32 +8,19 @@ */ package buildcraft.builders; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -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.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftBuilders; -import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.api.tools.IToolWrench; -import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; import buildcraft.core.GuiIds; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.lib.fluids.TankUtils; -import buildcraft.core.lib.utils.Utils; public class BlockBuilder extends BlockBuildCraft { diff --git a/common/buildcraft/builders/BlockConstructionMarker.java b/common/buildcraft/builders/BlockConstructionMarker.java index 7d2db7d4..99c2a0f8 100755 --- a/common/buildcraft/builders/BlockConstructionMarker.java +++ b/common/buildcraft/builders/BlockConstructionMarker.java @@ -9,7 +9,6 @@ package buildcraft.builders; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -17,12 +16,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import buildcraft.api.events.BlockInteractionEvent; import buildcraft.core.lib.utils.Utils; public class BlockConstructionMarker extends BlockMarker { diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index 89b675f0..cdea4001 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -14,12 +14,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftBuilders; -import buildcraft.core.BlockBuildCraftLED; import buildcraft.core.BCCreativeTab; +import buildcraft.core.BlockBuildCraftLED; import buildcraft.core.GuiIds; public class BlockFiller extends BlockBuildCraftLED { diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index c36c6811..78e0a4fb 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -10,25 +10,16 @@ package buildcraft.builders; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftCore; -import buildcraft.api.events.BlockInteractionEvent; import buildcraft.api.items.IMapLocation; -import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; -import buildcraft.core.lib.utils.Utils; +import buildcraft.core.lib.block.BlockBuildCraft; public class BlockMarker extends BlockBuildCraft { diff --git a/common/buildcraft/builders/BlockPathMarker.java b/common/buildcraft/builders/BlockPathMarker.java index 2231f9dd..8dde2489 100644 --- a/common/buildcraft/builders/BlockPathMarker.java +++ b/common/buildcraft/builders/BlockPathMarker.java @@ -8,18 +8,14 @@ */ package buildcraft.builders; -import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; 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 cpw.mods.fml.relauncher.SideOnly; -import buildcraft.core.lib.utils.Utils; - public class BlockPathMarker extends BlockMarker { private IIcon activeMarker; diff --git a/common/buildcraft/builders/BlueprintServerDatabase.java b/common/buildcraft/builders/BlueprintServerDatabase.java index 692479fa..c0b81a33 100644 --- a/common/buildcraft/builders/BlueprintServerDatabase.java +++ b/common/buildcraft/builders/BlueprintServerDatabase.java @@ -1,14 +1,5 @@ package buildcraft.builders; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import net.minecraft.nbt.NBTTagCompound; -import buildcraft.api.core.BCLog; -import buildcraft.core.blueprints.BlueprintBase; -import buildcraft.core.blueprints.LibraryId; -import buildcraft.core.lib.utils.NBTUtils; - public class BlueprintServerDatabase extends LibraryDatabase { } diff --git a/common/buildcraft/builders/BuilderProxyClient.java b/common/buildcraft/builders/BuilderProxyClient.java index 00d4a986..f847453b 100644 --- a/common/buildcraft/builders/BuilderProxyClient.java +++ b/common/buildcraft/builders/BuilderProxyClient.java @@ -9,7 +9,6 @@ package buildcraft.builders; import cpw.mods.fml.client.registry.ClientRegistry; - import buildcraft.builders.urbanism.TileUrbanist; import buildcraft.core.render.RenderBoxProvider; import buildcraft.core.render.RenderBuilder; diff --git a/common/buildcraft/builders/BuildersGuiHandler.java b/common/buildcraft/builders/BuildersGuiHandler.java index edadc317..372a65ac 100644 --- a/common/buildcraft/builders/BuildersGuiHandler.java +++ b/common/buildcraft/builders/BuildersGuiHandler.java @@ -11,9 +11,7 @@ package buildcraft.builders; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import cpw.mods.fml.common.network.IGuiHandler; - import buildcraft.builders.gui.ContainerArchitect; import buildcraft.builders.gui.ContainerBlueprintLibrary; import buildcraft.builders.gui.ContainerBuilder; diff --git a/common/buildcraft/builders/EventHandlerBuilders.java b/common/buildcraft/builders/EventHandlerBuilders.java index 92e4f0d0..d9796f80 100644 --- a/common/buildcraft/builders/EventHandlerBuilders.java +++ b/common/buildcraft/builders/EventHandlerBuilders.java @@ -11,7 +11,6 @@ package buildcraft.builders; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; - import net.minecraftforge.event.world.WorldEvent; public class EventHandlerBuilders { diff --git a/common/buildcraft/builders/HeuristicBlockDetection.java b/common/buildcraft/builders/HeuristicBlockDetection.java index e0214c95..ea1bff93 100644 --- a/common/buildcraft/builders/HeuristicBlockDetection.java +++ b/common/buildcraft/builders/HeuristicBlockDetection.java @@ -2,17 +2,14 @@ package buildcraft.builders; import java.util.BitSet; import java.util.Iterator; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; - import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; - import buildcraft.api.blueprints.SchematicBlock; import buildcraft.api.blueprints.SchematicFluid; -import buildcraft.builders.schematics.SchematicBlockCreative; -import buildcraft.builders.schematics.SchematicTileCreative; +import buildcraft.core.builders.schematics.SchematicBlockCreative; +import buildcraft.core.builders.schematics.SchematicTileCreative; import buildcraft.core.blueprints.SchematicRegistry; public final class HeuristicBlockDetection { diff --git a/common/buildcraft/builders/ItemBlueprint.java b/common/buildcraft/builders/ItemBlueprint.java index f3020c6f..c5d61bc6 100644 --- a/common/buildcraft/builders/ItemBlueprint.java +++ b/common/buildcraft/builders/ItemBlueprint.java @@ -9,22 +9,19 @@ package buildcraft.builders; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; - import buildcraft.BuildCraftBuilders; import buildcraft.api.blueprints.BuildingPermission; import buildcraft.api.items.IBlueprintItem; -import buildcraft.api.items.INamedItem; -import buildcraft.core.blueprints.Blueprint; -import buildcraft.core.blueprints.LibraryId; import buildcraft.core.BCCreativeTab; +import buildcraft.core.blueprints.Blueprint; +import buildcraft.core.blueprints.BlueprintBase; +import buildcraft.core.blueprints.LibraryId; import buildcraft.core.blueprints.Template; import buildcraft.core.lib.items.ItemBuildCraft; -import buildcraft.core.blueprints.BlueprintBase; import buildcraft.core.lib.utils.NBTUtils; import buildcraft.core.lib.utils.StringUtils; diff --git a/common/buildcraft/builders/ItemConstructionMarker.java b/common/buildcraft/builders/ItemConstructionMarker.java index 2772c9e0..264d62ce 100755 --- a/common/buildcraft/builders/ItemConstructionMarker.java +++ b/common/buildcraft/builders/ItemConstructionMarker.java @@ -17,10 +17,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.core.Position; import buildcraft.core.lib.utils.NBTUtils; diff --git a/common/buildcraft/builders/LibraryDatabase.java b/common/buildcraft/builders/LibraryDatabase.java index 9c281d2b..2b541975 100644 --- a/common/buildcraft/builders/LibraryDatabase.java +++ b/common/buildcraft/builders/LibraryDatabase.java @@ -18,27 +18,21 @@ import java.util.ArrayList; import java.util.Locale; import java.util.Set; import java.util.TreeSet; - -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; - -import buildcraft.BuildCraftBuilders; import buildcraft.api.core.BCLog; import buildcraft.api.library.LibraryAPI; import buildcraft.core.blueprints.LibraryId; -import buildcraft.core.blueprints.BlueprintBase; import buildcraft.core.lib.utils.NBTUtils; public class LibraryDatabase { private static final int PAGE_SIZE = 12; - private File outputDir; - private File[] inputDirs; - protected Set blueprintIds; protected LibraryId[] pages = new LibraryId[0]; + private File outputDir; + private File[] inputDirs; + /** * Initialize the blueprint database. * diff --git a/common/buildcraft/builders/RenderArchitect.java b/common/buildcraft/builders/RenderArchitect.java index f5e8a83c..ec5d3e93 100755 --- a/common/buildcraft/builders/RenderArchitect.java +++ b/common/buildcraft/builders/RenderArchitect.java @@ -9,10 +9,8 @@ package buildcraft.builders; import org.lwjgl.opengl.GL11; - import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.tileentity.TileEntity; - import buildcraft.core.EntityLaser; import buildcraft.core.LaserData; import buildcraft.core.render.RenderBoxProvider; diff --git a/common/buildcraft/builders/RenderConstructionMarker.java b/common/buildcraft/builders/RenderConstructionMarker.java index 59425f12..151c30a3 100755 --- a/common/buildcraft/builders/RenderConstructionMarker.java +++ b/common/buildcraft/builders/RenderConstructionMarker.java @@ -9,7 +9,6 @@ package buildcraft.builders; import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.entity.RenderItem; @@ -18,7 +17,6 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - import buildcraft.core.EntityLaser; import buildcraft.core.render.RenderBoxProvider; import buildcraft.core.render.RenderBuildingItems; diff --git a/common/buildcraft/builders/RenderPathMarker.java b/common/buildcraft/builders/RenderPathMarker.java index a26136c5..99880734 100755 --- a/common/buildcraft/builders/RenderPathMarker.java +++ b/common/buildcraft/builders/RenderPathMarker.java @@ -9,13 +9,11 @@ package buildcraft.builders; import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - import buildcraft.core.EntityLaser; import buildcraft.core.LaserData; import buildcraft.core.render.RenderLaser; diff --git a/common/buildcraft/builders/TileArchitect.java b/common/buildcraft/builders/TileArchitect.java index 98c38ca7..ef46d1eb 100644 --- a/common/buildcraft/builders/TileArchitect.java +++ b/common/buildcraft/builders/TileArchitect.java @@ -10,9 +10,7 @@ package buildcraft.builders; import java.util.ArrayList; import java.util.LinkedList; - import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -20,11 +18,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; - import cpw.mods.fml.relauncher.Side; - import net.minecraftforge.common.util.Constants; - import buildcraft.BuildCraftCore; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IAreaProvider; @@ -34,8 +29,8 @@ import buildcraft.core.Box; import buildcraft.core.Box.Kind; import buildcraft.core.IBoxProvider; import buildcraft.core.LaserData; -import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.blueprints.BlueprintReadConfiguration; +import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.lib.inventory.SimpleInventory; import buildcraft.core.lib.network.Packet; import buildcraft.core.lib.network.command.CommandWriter; diff --git a/common/buildcraft/builders/TileBlueprintLibrary.java b/common/buildcraft/builders/TileBlueprintLibrary.java index 43557352..6e41c2f7 100644 --- a/common/buildcraft/builders/TileBlueprintLibrary.java +++ b/common/buildcraft/builders/TileBlueprintLibrary.java @@ -10,25 +10,20 @@ package buildcraft.builders; import java.io.IOException; import java.util.ArrayList; - import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; - import cpw.mods.fml.relauncher.Side; - import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftCore; import buildcraft.api.library.ILibraryTypeHandler; import buildcraft.api.library.LibraryAPI; import buildcraft.core.blueprints.LibraryId; import buildcraft.core.lib.block.TileBuildCraft; -import buildcraft.core.blueprints.BlueprintBase; import buildcraft.core.lib.inventory.SimpleInventory; import buildcraft.core.lib.network.command.CommandWriter; import buildcraft.core.lib.network.command.ICommandReceiver; diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index add0ed14..492cab9a 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -12,9 +12,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.LinkedList; - import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -22,9 +20,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.WorldSettings.GameType; - import cpw.mods.fml.relauncher.Side; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -32,7 +28,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftCore; import buildcraft.api.core.BlockIndex; @@ -40,6 +35,7 @@ import buildcraft.api.core.IInvSlot; import buildcraft.api.core.Position; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IRequestProvider; +import buildcraft.api.robots.ResourceIdRequest; import buildcraft.api.robots.RobotManager; import buildcraft.api.robots.StackRequest; import buildcraft.api.tiles.IControllable; @@ -66,7 +62,6 @@ import buildcraft.core.lib.network.Packet; import buildcraft.core.lib.network.command.CommandWriter; import buildcraft.core.lib.network.command.PacketCommand; import buildcraft.core.lib.utils.NetworkUtils; -import buildcraft.api.robots.ResourceIdRequest; public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluidHandler, IRequestProvider, IControllable { diff --git a/common/buildcraft/builders/TileConstructionMarker.java b/common/buildcraft/builders/TileConstructionMarker.java index b983c2d2..d835f207 100755 --- a/common/buildcraft/builders/TileConstructionMarker.java +++ b/common/buildcraft/builders/TileConstructionMarker.java @@ -10,25 +10,19 @@ package buildcraft.builders; import java.util.ArrayList; import java.util.HashSet; - import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; - import cpw.mods.fml.relauncher.Side; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftCore; import buildcraft.api.core.Position; import buildcraft.core.Box; import buildcraft.core.Box.Kind; import buildcraft.core.IBoxProvider; import buildcraft.core.LaserData; -import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.blueprints.Blueprint; import buildcraft.core.blueprints.BlueprintBase; import buildcraft.core.blueprints.BptBuilderBase; @@ -36,6 +30,7 @@ import buildcraft.core.blueprints.BptBuilderBlueprint; import buildcraft.core.blueprints.BptContext; import buildcraft.core.builders.BuildingItem; import buildcraft.core.builders.IBuildingItemsProvider; +import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.lib.network.Packet; import buildcraft.core.lib.network.command.CommandWriter; import buildcraft.core.lib.network.command.ICommandReceiver; diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index b64cfda5..ae868c7e 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -9,15 +9,12 @@ package buildcraft.builders; import io.netty.buffer.ByteBuf; - 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 cpw.mods.fml.relauncher.Side; - import buildcraft.BuildCraftCore; import buildcraft.api.core.IAreaProvider; import buildcraft.api.filler.FillerManager; diff --git a/common/buildcraft/builders/TileMarker.java b/common/buildcraft/builders/TileMarker.java index e3a9cc38..c82adb1e 100644 --- a/common/buildcraft/builders/TileMarker.java +++ b/common/buildcraft/builders/TileMarker.java @@ -9,23 +9,20 @@ package buildcraft.builders; import io.netty.buffer.ByteBuf; - import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import buildcraft.BuildCraftBuilders; -import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.ISerializable; import buildcraft.api.core.Position; import buildcraft.api.tiles.ITileAreaProvider; import buildcraft.core.DefaultProps; -import buildcraft.core.lib.EntityBlock; import buildcraft.core.LaserKind; +import buildcraft.core.lib.EntityBlock; import buildcraft.core.lib.block.TileBuildCraft; -import buildcraft.core.proxy.CoreProxy; import buildcraft.core.lib.utils.Utils; +import buildcraft.core.proxy.CoreProxy; public class TileMarker extends TileBuildCraft implements ITileAreaProvider { public static class TileWrapper implements ISerializable { diff --git a/common/buildcraft/builders/TilePathMarker.java b/common/buildcraft/builders/TilePathMarker.java index 6864046f..f2215700 100644 --- a/common/buildcraft/builders/TilePathMarker.java +++ b/common/buildcraft/builders/TilePathMarker.java @@ -11,16 +11,13 @@ package buildcraft.builders; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; - import io.netty.buffer.ByteBuf; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import buildcraft.api.core.BlockIndex; -import buildcraft.api.core.Position; import buildcraft.api.core.IPathProvider; +import buildcraft.api.core.Position; import buildcraft.core.DefaultProps; import buildcraft.core.LaserData; diff --git a/common/buildcraft/builders/blueprints/RealBlueprintDeployer.java b/common/buildcraft/builders/blueprints/RealBlueprintDeployer.java index e2e26e2b..ae29afc0 100755 --- a/common/buildcraft/builders/blueprints/RealBlueprintDeployer.java +++ b/common/buildcraft/builders/blueprints/RealBlueprintDeployer.java @@ -9,19 +9,16 @@ package buildcraft.builders.blueprints; import java.io.File; - import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.blueprints.BlueprintDeployer; import buildcraft.api.blueprints.Translation; import buildcraft.builders.LibraryDatabase; -import buildcraft.core.blueprints.BlueprintBase; -import buildcraft.core.blueprints.LibraryId; import buildcraft.core.blueprints.Blueprint; +import buildcraft.core.blueprints.BlueprintBase; import buildcraft.core.blueprints.BptBuilderBlueprint; import buildcraft.core.blueprints.BptContext; +import buildcraft.core.blueprints.LibraryId; import buildcraft.core.lib.utils.NBTUtils; public class RealBlueprintDeployer extends BlueprintDeployer { diff --git a/common/buildcraft/builders/blueprints/RecursiveBlueprintBuilder.java b/common/buildcraft/builders/blueprints/RecursiveBlueprintBuilder.java index 63333e72..687de073 100755 --- a/common/buildcraft/builders/blueprints/RecursiveBlueprintBuilder.java +++ b/common/buildcraft/builders/blueprints/RecursiveBlueprintBuilder.java @@ -9,12 +9,9 @@ package buildcraft.builders.blueprints; import java.util.ArrayList; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.core.Box; import buildcraft.core.blueprints.Blueprint; import buildcraft.core.blueprints.BlueprintBase; diff --git a/common/buildcraft/builders/blueprints/RecursiveBlueprintReader.java b/common/buildcraft/builders/blueprints/RecursiveBlueprintReader.java index 5cbdfb82..26a4eca1 100644 --- a/common/buildcraft/builders/blueprints/RecursiveBlueprintReader.java +++ b/common/buildcraft/builders/blueprints/RecursiveBlueprintReader.java @@ -11,9 +11,7 @@ package buildcraft.builders.blueprints; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftBuilders; import buildcraft.api.blueprints.Translation; import buildcraft.api.core.BlockIndex; @@ -23,11 +21,11 @@ import buildcraft.builders.ItemBlueprintTemplate; import buildcraft.builders.TileArchitect; import buildcraft.builders.TileBuilder; import buildcraft.builders.TileConstructionMarker; -import buildcraft.core.lib.utils.BlockScanner; import buildcraft.core.blueprints.Blueprint; import buildcraft.core.blueprints.BlueprintBase; import buildcraft.core.blueprints.BptContext; import buildcraft.core.blueprints.Template; +import buildcraft.core.lib.utils.BlockScanner; public class RecursiveBlueprintReader { diff --git a/common/buildcraft/builders/gui/ContainerArchitect.java b/common/buildcraft/builders/gui/ContainerArchitect.java index 25928e61..8798b13b 100644 --- a/common/buildcraft/builders/gui/ContainerArchitect.java +++ b/common/buildcraft/builders/gui/ContainerArchitect.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; - import buildcraft.builders.TileArchitect; import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.slots.SlotOutput; diff --git a/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java b/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java index a3a0ae9d..b13e0aff 100644 --- a/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; - import buildcraft.builders.TileBlueprintLibrary; import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.slots.SlotOutput; diff --git a/common/buildcraft/builders/gui/ContainerBuilder.java b/common/buildcraft/builders/gui/ContainerBuilder.java index a7a72b06..8a1ae024 100644 --- a/common/buildcraft/builders/gui/ContainerBuilder.java +++ b/common/buildcraft/builders/gui/ContainerBuilder.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; - import buildcraft.builders.TileBuilder; import buildcraft.core.lib.gui.BuildCraftContainer; diff --git a/common/buildcraft/builders/gui/ContainerFiller.java b/common/buildcraft/builders/gui/ContainerFiller.java index 239e0328..726c3414 100644 --- a/common/buildcraft/builders/gui/ContainerFiller.java +++ b/common/buildcraft/builders/gui/ContainerFiller.java @@ -12,10 +12,8 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.builders.TileFiller; import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.GuiBuildCraft; diff --git a/common/buildcraft/builders/gui/GuiArchitect.java b/common/buildcraft/builders/gui/GuiArchitect.java index e0282535..4a342de1 100644 --- a/common/buildcraft/builders/gui/GuiArchitect.java +++ b/common/buildcraft/builders/gui/GuiArchitect.java @@ -10,14 +10,11 @@ package buildcraft.builders.gui; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; - import io.netty.buffer.ByteBuf; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; - import buildcraft.BuildCraftCore; import buildcraft.builders.TileArchitect; import buildcraft.core.DefaultProps; diff --git a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java index 08e928c9..b41da0f6 100644 --- a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java @@ -9,11 +9,9 @@ package buildcraft.builders.gui; import org.lwjgl.opengl.GL11; - import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; - import buildcraft.BuildCraftBuilders; import buildcraft.api.library.LibraryAPI; import buildcraft.builders.TileBlueprintLibrary; diff --git a/common/buildcraft/builders/gui/GuiBuilder.java b/common/buildcraft/builders/gui/GuiBuilder.java index 66699fba..0996746b 100644 --- a/common/buildcraft/builders/gui/GuiBuilder.java +++ b/common/buildcraft/builders/gui/GuiBuilder.java @@ -9,20 +9,15 @@ package buildcraft.builders.gui; import java.util.Collection; - import org.lwjgl.opengl.GL11; - import io.netty.buffer.ByteBuf; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import buildcraft.BuildCraftCore; import buildcraft.builders.TileBuilder; -import buildcraft.core.DefaultProps; import buildcraft.core.lib.fluids.Tank; import buildcraft.core.lib.gui.AdvancedSlot; import buildcraft.core.lib.gui.GuiAdvancedInterface; diff --git a/common/buildcraft/builders/gui/GuiFiller.java b/common/buildcraft/builders/gui/GuiFiller.java index f09b3707..032ba8e4 100644 --- a/common/buildcraft/builders/gui/GuiFiller.java +++ b/common/buildcraft/builders/gui/GuiFiller.java @@ -11,13 +11,11 @@ package buildcraft.builders.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; - import buildcraft.api.filler.FillerManager; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementMouseClick; import buildcraft.builders.TileFiller; -import buildcraft.core.DefaultProps; import buildcraft.core.builders.patterns.FillerPattern; import buildcraft.core.lib.gui.AdvancedSlot; import buildcraft.core.lib.gui.GuiAdvancedInterface; diff --git a/common/buildcraft/builders/gui/SlotArchitect.java b/common/buildcraft/builders/gui/SlotArchitect.java index ed4f15f0..8bb8becf 100644 --- a/common/buildcraft/builders/gui/SlotArchitect.java +++ b/common/buildcraft/builders/gui/SlotArchitect.java @@ -10,7 +10,6 @@ package buildcraft.builders.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; - import buildcraft.builders.TileArchitect; import buildcraft.core.lib.gui.slots.SlotBase; diff --git a/common/buildcraft/builders/gui/SlotBlueprintLibrary.java b/common/buildcraft/builders/gui/SlotBlueprintLibrary.java index dc241529..e253bbf3 100644 --- a/common/buildcraft/builders/gui/SlotBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/SlotBlueprintLibrary.java @@ -10,7 +10,6 @@ package buildcraft.builders.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; - import buildcraft.builders.TileBlueprintLibrary; import buildcraft.core.lib.gui.slots.SlotBase; diff --git a/common/buildcraft/builders/schematics/SchematicAir.java b/common/buildcraft/builders/schematics/SchematicAir.java index 5f0ae79d..e2449826 100644 --- a/common/buildcraft/builders/schematics/SchematicAir.java +++ b/common/buildcraft/builders/schematics/SchematicAir.java @@ -1,9 +1,7 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicBed.java b/common/buildcraft/builders/schematics/SchematicBed.java index 3038b66f..a0c40d29 100644 --- a/common/buildcraft/builders/schematics/SchematicBed.java +++ b/common/buildcraft/builders/schematics/SchematicBed.java @@ -9,10 +9,8 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicCactus.java b/common/buildcraft/builders/schematics/SchematicCactus.java index df900ea9..c93ebe11 100755 --- a/common/buildcraft/builders/schematics/SchematicCactus.java +++ b/common/buildcraft/builders/schematics/SchematicCactus.java @@ -9,10 +9,8 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicCustomStack.java b/common/buildcraft/builders/schematics/SchematicCustomStack.java index 0e3d9439..38c807a4 100644 --- a/common/buildcraft/builders/schematics/SchematicCustomStack.java +++ b/common/buildcraft/builders/schematics/SchematicCustomStack.java @@ -9,9 +9,7 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicDirt.java b/common/buildcraft/builders/schematics/SchematicDirt.java index f917c92e..7a8aabcb 100644 --- a/common/buildcraft/builders/schematics/SchematicDirt.java +++ b/common/buildcraft/builders/schematics/SchematicDirt.java @@ -9,11 +9,9 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicDoor.java b/common/buildcraft/builders/schematics/SchematicDoor.java index 3a930fe2..54a955be 100644 --- a/common/buildcraft/builders/schematics/SchematicDoor.java +++ b/common/buildcraft/builders/schematics/SchematicDoor.java @@ -9,10 +9,8 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicEnderChest.java b/common/buildcraft/builders/schematics/SchematicEnderChest.java index be08d703..2a7a2367 100755 --- a/common/buildcraft/builders/schematics/SchematicEnderChest.java +++ b/common/buildcraft/builders/schematics/SchematicEnderChest.java @@ -9,12 +9,11 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; +import buildcraft.core.builders.schematics.SchematicRotateMeta; public class SchematicEnderChest extends SchematicRotateMeta { diff --git a/common/buildcraft/builders/schematics/SchematicFactoryBlock.java b/common/buildcraft/builders/schematics/SchematicFactoryBlock.java index e7199642..5df6895f 100755 --- a/common/buildcraft/builders/schematics/SchematicFactoryBlock.java +++ b/common/buildcraft/builders/schematics/SchematicFactoryBlock.java @@ -11,7 +11,6 @@ package buildcraft.builders.schematics; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.blueprints.MappingNotFoundException; import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicFactoryEntity.java b/common/buildcraft/builders/schematics/SchematicFactoryEntity.java index 39e4dcdb..f2045bec 100755 --- a/common/buildcraft/builders/schematics/SchematicFactoryEntity.java +++ b/common/buildcraft/builders/schematics/SchematicFactoryEntity.java @@ -9,7 +9,6 @@ package buildcraft.builders.schematics; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.blueprints.MappingNotFoundException; import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.blueprints.SchematicEntity; diff --git a/common/buildcraft/builders/schematics/SchematicFactoryMask.java b/common/buildcraft/builders/schematics/SchematicFactoryMask.java index 03bd2145..2207bd68 100755 --- a/common/buildcraft/builders/schematics/SchematicFactoryMask.java +++ b/common/buildcraft/builders/schematics/SchematicFactoryMask.java @@ -9,7 +9,6 @@ package buildcraft.builders.schematics; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.blueprints.SchematicFactory; import buildcraft.api.blueprints.SchematicMask; diff --git a/common/buildcraft/builders/schematics/SchematicFarmland.java b/common/buildcraft/builders/schematics/SchematicFarmland.java index ccf3c8a1..6457bcec 100755 --- a/common/buildcraft/builders/schematics/SchematicFarmland.java +++ b/common/buildcraft/builders/schematics/SchematicFarmland.java @@ -9,11 +9,9 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicFire.java b/common/buildcraft/builders/schematics/SchematicFire.java index 885d61c5..239c5caf 100755 --- a/common/buildcraft/builders/schematics/SchematicFire.java +++ b/common/buildcraft/builders/schematics/SchematicFire.java @@ -9,10 +9,8 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicGlassPane.java b/common/buildcraft/builders/schematics/SchematicGlassPane.java index 82308e27..ca490853 100755 --- a/common/buildcraft/builders/schematics/SchematicGlassPane.java +++ b/common/buildcraft/builders/schematics/SchematicGlassPane.java @@ -9,9 +9,7 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicGravel.java b/common/buildcraft/builders/schematics/SchematicGravel.java index cfaea1a1..6074e7c9 100755 --- a/common/buildcraft/builders/schematics/SchematicGravel.java +++ b/common/buildcraft/builders/schematics/SchematicGravel.java @@ -9,11 +9,9 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicHanging.java b/common/buildcraft/builders/schematics/SchematicHanging.java index 9729221c..6b0d9bff 100755 --- a/common/buildcraft/builders/schematics/SchematicHanging.java +++ b/common/buildcraft/builders/schematics/SchematicHanging.java @@ -14,7 +14,6 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicEntity; import buildcraft.api.blueprints.Translation; diff --git a/common/buildcraft/builders/schematics/SchematicLever.java b/common/buildcraft/builders/schematics/SchematicLever.java index 5bf387b7..d291d8e6 100644 --- a/common/buildcraft/builders/schematics/SchematicLever.java +++ b/common/buildcraft/builders/schematics/SchematicLever.java @@ -9,9 +9,9 @@ package buildcraft.builders.schematics; import buildcraft.api.blueprints.IBuilderContext; +import buildcraft.core.builders.schematics.SchematicWallSide; public class SchematicLever extends SchematicWallSide { - @Override public void rotateLeft(IBuilderContext context) { int status = meta & 8; @@ -19,6 +19,5 @@ public class SchematicLever extends SchematicWallSide { meta -= status; super.rotateLeft(context); meta += status; - } } diff --git a/common/buildcraft/builders/schematics/SchematicMinecart.java b/common/buildcraft/builders/schematics/SchematicMinecart.java index c1032dac..50431742 100755 --- a/common/buildcraft/builders/schematics/SchematicMinecart.java +++ b/common/buildcraft/builders/schematics/SchematicMinecart.java @@ -13,7 +13,6 @@ import net.minecraft.entity.item.EntityMinecart; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagList; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicEntity; import buildcraft.api.blueprints.Translation; diff --git a/common/buildcraft/builders/schematics/SchematicPiston.java b/common/buildcraft/builders/schematics/SchematicPiston.java index 66560bef..68a06242 100644 --- a/common/buildcraft/builders/schematics/SchematicPiston.java +++ b/common/buildcraft/builders/schematics/SchematicPiston.java @@ -9,10 +9,9 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; +import buildcraft.core.builders.schematics.SchematicRotateMeta; public class SchematicPiston extends SchematicRotateMeta { diff --git a/common/buildcraft/builders/schematics/SchematicPortal.java b/common/buildcraft/builders/schematics/SchematicPortal.java index 04dbc97d..83090d5e 100755 --- a/common/buildcraft/builders/schematics/SchematicPortal.java +++ b/common/buildcraft/builders/schematics/SchematicPortal.java @@ -9,10 +9,8 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicPumpkin.java b/common/buildcraft/builders/schematics/SchematicPumpkin.java index 18186a3c..8c8eca0a 100644 --- a/common/buildcraft/builders/schematics/SchematicPumpkin.java +++ b/common/buildcraft/builders/schematics/SchematicPumpkin.java @@ -9,9 +9,7 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicRail.java b/common/buildcraft/builders/schematics/SchematicRail.java index ce48e78f..207530f0 100755 --- a/common/buildcraft/builders/schematics/SchematicRail.java +++ b/common/buildcraft/builders/schematics/SchematicRail.java @@ -9,9 +9,7 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicRedstoneDiode.java b/common/buildcraft/builders/schematics/SchematicRedstoneDiode.java index bec6ffe4..88457d66 100644 --- a/common/buildcraft/builders/schematics/SchematicRedstoneDiode.java +++ b/common/buildcraft/builders/schematics/SchematicRedstoneDiode.java @@ -9,10 +9,8 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicRedstoneLamp.java b/common/buildcraft/builders/schematics/SchematicRedstoneLamp.java index 1b01e179..44d42ae2 100755 --- a/common/buildcraft/builders/schematics/SchematicRedstoneLamp.java +++ b/common/buildcraft/builders/schematics/SchematicRedstoneLamp.java @@ -9,11 +9,9 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicRedstoneWire.java b/common/buildcraft/builders/schematics/SchematicRedstoneWire.java index 85eed761..2d3905e6 100755 --- a/common/buildcraft/builders/schematics/SchematicRedstoneWire.java +++ b/common/buildcraft/builders/schematics/SchematicRedstoneWire.java @@ -9,9 +9,7 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicSeeds.java b/common/buildcraft/builders/schematics/SchematicSeeds.java index 18b97e82..d2969152 100755 --- a/common/buildcraft/builders/schematics/SchematicSeeds.java +++ b/common/buildcraft/builders/schematics/SchematicSeeds.java @@ -9,10 +9,8 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicSign.java b/common/buildcraft/builders/schematics/SchematicSign.java index 616828b4..7e2e9be0 100644 --- a/common/buildcraft/builders/schematics/SchematicSign.java +++ b/common/buildcraft/builders/schematics/SchematicSign.java @@ -9,12 +9,9 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; diff --git a/common/buildcraft/builders/schematics/SchematicStairs.java b/common/buildcraft/builders/schematics/SchematicStairs.java index c5b90f8f..efb375cd 100644 --- a/common/buildcraft/builders/schematics/SchematicStairs.java +++ b/common/buildcraft/builders/schematics/SchematicStairs.java @@ -9,9 +9,7 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicStone.java b/common/buildcraft/builders/schematics/SchematicStone.java index 1ec440bc..88ba70b2 100755 --- a/common/buildcraft/builders/schematics/SchematicStone.java +++ b/common/buildcraft/builders/schematics/SchematicStone.java @@ -9,11 +9,9 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicTripWireHook.java b/common/buildcraft/builders/schematics/SchematicTripWireHook.java index 6ed0327f..f1a8a6ca 100755 --- a/common/buildcraft/builders/schematics/SchematicTripWireHook.java +++ b/common/buildcraft/builders/schematics/SchematicTripWireHook.java @@ -9,9 +9,7 @@ package buildcraft.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/statements/ActionFiller.java b/common/buildcraft/builders/statements/ActionFiller.java index a0e6ab3f..99279e57 100644 --- a/common/buildcraft/builders/statements/ActionFiller.java +++ b/common/buildcraft/builders/statements/ActionFiller.java @@ -10,9 +10,7 @@ package buildcraft.builders.statements; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/builders/statements/BuildersActionProvider.java b/common/buildcraft/builders/statements/BuildersActionProvider.java index 11c07bb9..036c3838 100644 --- a/common/buildcraft/builders/statements/BuildersActionProvider.java +++ b/common/buildcraft/builders/statements/BuildersActionProvider.java @@ -11,11 +11,8 @@ package buildcraft.builders.statements; import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; - import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.filler.FillerManager; import buildcraft.api.filler.IFillerPattern; import buildcraft.api.statements.IActionExternal; diff --git a/common/buildcraft/builders/urbanism/AnchoredBox.java b/common/buildcraft/builders/urbanism/AnchoredBox.java index 816a4145..4d1d2865 100755 --- a/common/buildcraft/builders/urbanism/AnchoredBox.java +++ b/common/buildcraft/builders/urbanism/AnchoredBox.java @@ -9,9 +9,7 @@ package buildcraft.builders.urbanism; import io.netty.buffer.ByteBuf; - import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.core.ISerializable; import buildcraft.core.Box; diff --git a/common/buildcraft/builders/urbanism/BlockUrbanist.java b/common/buildcraft/builders/urbanism/BlockUrbanist.java index 915747a4..74e1713d 100755 --- a/common/buildcraft/builders/urbanism/BlockUrbanist.java +++ b/common/buildcraft/builders/urbanism/BlockUrbanist.java @@ -13,15 +13,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import cpw.mods.fml.common.FMLCommonHandler; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftBuilders; import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.GuiIds; +import buildcraft.core.lib.block.BlockBuildCraft; public class BlockUrbanist extends BlockBuildCraft { diff --git a/common/buildcraft/builders/urbanism/ContainerUrbanist.java b/common/buildcraft/builders/urbanism/ContainerUrbanist.java index 804149e5..26a4a7fa 100755 --- a/common/buildcraft/builders/urbanism/ContainerUrbanist.java +++ b/common/buildcraft/builders/urbanism/ContainerUrbanist.java @@ -10,7 +10,6 @@ package buildcraft.builders.urbanism; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; - import buildcraft.core.lib.gui.BuildCraftContainer; public class ContainerUrbanist extends BuildCraftContainer { diff --git a/common/buildcraft/builders/urbanism/EntityUrbanist.java b/common/buildcraft/builders/urbanism/EntityUrbanist.java index 5d40c3c0..810beefe 100755 --- a/common/buildcraft/builders/urbanism/EntityUrbanist.java +++ b/common/buildcraft/builders/urbanism/EntityUrbanist.java @@ -12,9 +12,7 @@ import java.nio.ByteBuffer; import java.nio.DoubleBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; - import org.lwjgl.input.Keyboard; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.entity.EntityLivingBase; @@ -22,7 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; - import buildcraft.BuildCraftCore; public class EntityUrbanist extends EntityLivingBase { diff --git a/common/buildcraft/builders/urbanism/GuiUrbanist.java b/common/buildcraft/builders/urbanism/GuiUrbanist.java index 7b2d0a19..b9448b7e 100755 --- a/common/buildcraft/builders/urbanism/GuiUrbanist.java +++ b/common/buildcraft/builders/urbanism/GuiUrbanist.java @@ -10,15 +10,11 @@ package buildcraft.builders.urbanism; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; - import net.minecraft.inventory.IInventory; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import buildcraft.core.DefaultProps; import buildcraft.core.lib.gui.AdvancedSlot; import buildcraft.core.lib.gui.GuiAdvancedInterface; diff --git a/common/buildcraft/builders/urbanism/TileUrbanist.java b/common/buildcraft/builders/urbanism/TileUrbanist.java index af5a55d7..772ced0d 100755 --- a/common/buildcraft/builders/urbanism/TileUrbanist.java +++ b/common/buildcraft/builders/urbanism/TileUrbanist.java @@ -9,9 +9,7 @@ package buildcraft.builders.urbanism; import java.util.ArrayList; - import io.netty.buffer.ByteBuf; - import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -20,9 +18,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; - import cpw.mods.fml.relauncher.Side; - import buildcraft.BuildCraftCore; import buildcraft.core.Box; import buildcraft.core.Box.Kind; diff --git a/common/buildcraft/builders/urbanism/UrbanistTool.java b/common/buildcraft/builders/urbanism/UrbanistTool.java index e7b05e00..1b85eca0 100755 --- a/common/buildcraft/builders/urbanism/UrbanistTool.java +++ b/common/buildcraft/builders/urbanism/UrbanistTool.java @@ -9,10 +9,8 @@ package buildcraft.builders.urbanism; import java.util.ArrayList; - import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; - import buildcraft.core.lib.gui.AdvancedSlot; class UrbanistTool { diff --git a/common/buildcraft/builders/urbanism/UrbanistToolArea.java b/common/buildcraft/builders/urbanism/UrbanistToolArea.java index 40340dff..49db00a7 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolArea.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolArea.java @@ -9,7 +9,6 @@ package buildcraft.builders.urbanism; import org.lwjgl.input.Mouse; - import net.minecraft.client.Minecraft; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; diff --git a/common/buildcraft/builders/urbanism/UrbanistToolBlock.java b/common/buildcraft/builders/urbanism/UrbanistToolBlock.java index 9e687ab2..62586494 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolBlock.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolBlock.java @@ -12,8 +12,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import buildcraft.core.DefaultProps; - class UrbanistToolBlock extends UrbanistTool { private static final ResourceLocation GUI_TEXTURE = new ResourceLocation("buildcraftbuilders:textures/gui/urbanist_tool_place_block.png"); diff --git a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java index 58ce8e83..d1b37855 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java @@ -10,18 +10,14 @@ package buildcraft.builders.urbanism; import java.util.ArrayList; import java.util.LinkedList; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.filler.IFillerPattern; import buildcraft.core.Box; -import buildcraft.core.DefaultProps; import buildcraft.core.builders.patterns.FillerPattern; import buildcraft.core.lib.gui.AdvancedSlot; import buildcraft.core.lib.gui.GuiAdvancedInterface; diff --git a/common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java b/common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java index 4af25fb8..86917599 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java @@ -10,10 +10,8 @@ package buildcraft.builders.urbanism; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.core.IIconProvider; public final class UrbanistToolsIconProvider implements IIconProvider { diff --git a/common/buildcraft/core/BCCreativeTab.java b/common/buildcraft/core/BCCreativeTab.java index f196daa5..cef11b00 100644 --- a/common/buildcraft/core/BCCreativeTab.java +++ b/common/buildcraft/core/BCCreativeTab.java @@ -10,7 +10,6 @@ package buildcraft.core; import java.util.HashMap; import java.util.Map; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; diff --git a/common/buildcraft/core/BlockBuildCraftLED.java b/common/buildcraft/core/BlockBuildCraftLED.java index 515852d3..7dafa65a 100644 --- a/common/buildcraft/core/BlockBuildCraftLED.java +++ b/common/buildcraft/core/BlockBuildCraftLED.java @@ -5,12 +5,8 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.BuildCraftCore; -import buildcraft.api.transport.IPipeTile; import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.lib.utils.ResourceUtils; -import buildcraft.core.lib.utils.Utils; public abstract class BlockBuildCraftLED extends BlockBuildCraft { private IIcon[] led; diff --git a/common/buildcraft/core/BlockBuildTool.java b/common/buildcraft/core/BlockBuildTool.java index ebb8679c..a5b2438c 100755 --- a/common/buildcraft/core/BlockBuildTool.java +++ b/common/buildcraft/core/BlockBuildTool.java @@ -10,11 +10,7 @@ package buildcraft.core; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import buildcraft.BuildCraftCore; public class BlockBuildTool extends Block { diff --git a/common/buildcraft/core/BlockEngine.java b/common/buildcraft/core/BlockEngine.java index d59c406a..5e0bc797 100644 --- a/common/buildcraft/core/BlockEngine.java +++ b/common/buildcraft/core/BlockEngine.java @@ -36,7 +36,7 @@ public class BlockEngine extends BlockEngineBase { public TileEntity createTileEntity(World world, int metadata) { try { return engineTiles.get(metadata % engineTiles.size()).newInstance(); - } catch(Exception e) { + } catch (Exception e) { e.printStackTrace(); return null; } diff --git a/common/buildcraft/core/BlockSpring.java b/common/buildcraft/core/BlockSpring.java index ee24e9f3..b0f83047 100644 --- a/common/buildcraft/core/BlockSpring.java +++ b/common/buildcraft/core/BlockSpring.java @@ -10,7 +10,6 @@ package buildcraft.core; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,7 +18,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/buildcraft/core/Box.java b/common/buildcraft/core/Box.java index 29a21761..949e6acd 100644 --- a/common/buildcraft/core/Box.java +++ b/common/buildcraft/core/Box.java @@ -11,13 +11,10 @@ package buildcraft.core; import java.util.ArrayList; import java.util.List; import java.util.Random; - import io.netty.buffer.ByteBuf; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; - import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.IBox; diff --git a/common/buildcraft/core/BuildCraftConfiguration.java b/common/buildcraft/core/BuildCraftConfiguration.java index 7d5475af..bab6722c 100644 --- a/common/buildcraft/core/BuildCraftConfiguration.java +++ b/common/buildcraft/core/BuildCraftConfiguration.java @@ -9,7 +9,6 @@ package buildcraft.core; import java.io.File; - import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; diff --git a/common/buildcraft/core/ChunkIndex.java b/common/buildcraft/core/ChunkIndex.java index dfd10a3a..8aebfd5f 100755 --- a/common/buildcraft/core/ChunkIndex.java +++ b/common/buildcraft/core/ChunkIndex.java @@ -9,9 +9,7 @@ package buildcraft.core; import io.netty.buffer.ByteBuf; - import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.core.ISerializable; public class ChunkIndex implements ISerializable { diff --git a/common/buildcraft/core/CommandBuildCraft.java b/common/buildcraft/core/CommandBuildCraft.java index 435fa0a3..9550e41d 100644 --- a/common/buildcraft/core/CommandBuildCraft.java +++ b/common/buildcraft/core/CommandBuildCraft.java @@ -9,7 +9,6 @@ package buildcraft.core; import java.util.List; - import net.minecraft.command.CommandBase; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; diff --git a/common/buildcraft/core/CompatHooks.java b/common/buildcraft/core/CompatHooks.java index bdeb37c3..d2d19e00 100644 --- a/common/buildcraft/core/CompatHooks.java +++ b/common/buildcraft/core/CompatHooks.java @@ -11,9 +11,7 @@ package buildcraft.core; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; - import cpw.mods.fml.common.Loader; - import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.transport.IInjectable; diff --git a/common/buildcraft/core/CoreGuiHandler.java b/common/buildcraft/core/CoreGuiHandler.java index e1f622d9..14c78ef4 100755 --- a/common/buildcraft/core/CoreGuiHandler.java +++ b/common/buildcraft/core/CoreGuiHandler.java @@ -10,9 +10,7 @@ package buildcraft.core; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; - import cpw.mods.fml.common.network.IGuiHandler; - import buildcraft.core.gui.ContainerList; import buildcraft.core.gui.GuiList; diff --git a/common/buildcraft/core/CoreIconProvider.java b/common/buildcraft/core/CoreIconProvider.java index 62b79fab..d18cd1ac 100644 --- a/common/buildcraft/core/CoreIconProvider.java +++ b/common/buildcraft/core/CoreIconProvider.java @@ -10,10 +10,8 @@ package buildcraft.core; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.core.IIconProvider; public class CoreIconProvider implements IIconProvider { diff --git a/common/buildcraft/core/EntityLaser.java b/common/buildcraft/core/EntityLaser.java index bea00869..89910edb 100644 --- a/common/buildcraft/core/EntityLaser.java +++ b/common/buildcraft/core/EntityLaser.java @@ -12,7 +12,6 @@ import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - import buildcraft.api.core.Position; public abstract class EntityLaser extends Entity { diff --git a/common/buildcraft/core/InterModComms.java b/common/buildcraft/core/InterModComms.java index 19ede0a8..aa913009 100644 --- a/common/buildcraft/core/InterModComms.java +++ b/common/buildcraft/core/InterModComms.java @@ -12,16 +12,12 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; - import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; - import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.core.BCLog; import buildcraft.core.recipes.AssemblyRecipeManager; import buildcraft.core.recipes.RefineryRecipeManager; diff --git a/common/buildcraft/core/ItemDebugger.java b/common/buildcraft/core/ItemDebugger.java index 21ee8b4f..2ccd27a6 100644 --- a/common/buildcraft/core/ItemDebugger.java +++ b/common/buildcraft/core/ItemDebugger.java @@ -2,7 +2,6 @@ package buildcraft.core; import java.util.ArrayList; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/common/buildcraft/core/ItemList.java b/common/buildcraft/core/ItemList.java index 07d3b588..518a099a 100644 --- a/common/buildcraft/core/ItemList.java +++ b/common/buildcraft/core/ItemList.java @@ -11,9 +11,7 @@ package buildcraft.core; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; - import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,13 +20,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.world.World; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.oredict.OreDictionary; - import buildcraft.BuildCraftCore; import buildcraft.api.items.IList; import buildcraft.core.lib.inventory.StackHelper; diff --git a/common/buildcraft/core/ItemMapLocation.java b/common/buildcraft/core/ItemMapLocation.java index 63f745c6..49229b84 100755 --- a/common/buildcraft/core/ItemMapLocation.java +++ b/common/buildcraft/core/ItemMapLocation.java @@ -10,7 +10,6 @@ package buildcraft.core; import java.util.ArrayList; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -19,14 +18,10 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.boards.RedstoneBoardRegistry; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.IBox; @@ -119,8 +114,6 @@ public class ItemMapLocation extends ItemBuildCraft implements IMapLocation { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); - // TODO: Move this - RedstoneBoardRegistry.instance.registerIcons(par1IconRegister); } @Override diff --git a/common/buildcraft/core/ItemPaintbrush.java b/common/buildcraft/core/ItemPaintbrush.java index 1fefd0a2..0dcc595e 100644 --- a/common/buildcraft/core/ItemPaintbrush.java +++ b/common/buildcraft/core/ItemPaintbrush.java @@ -25,9 +25,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.blocks.IColorRemovable; import buildcraft.api.core.EnumColor; import buildcraft.core.lib.items.ItemBuildCraft; -import buildcraft.core.lib.utils.ColorUtils; import buildcraft.core.lib.utils.NBTUtils; -import buildcraft.core.lib.utils.StringUtils; public class ItemPaintbrush extends ItemBuildCraft { public ItemPaintbrush() { diff --git a/common/buildcraft/core/ItemSpring.java b/common/buildcraft/core/ItemSpring.java index 2c5da5a7..aee91531 100644 --- a/common/buildcraft/core/ItemSpring.java +++ b/common/buildcraft/core/ItemSpring.java @@ -9,7 +9,6 @@ package buildcraft.core; import java.util.Locale; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import buildcraft.core.lib.items.ItemBlockBuildCraft; diff --git a/common/buildcraft/core/ItemWrench.java b/common/buildcraft/core/ItemWrench.java index c3e9f803..ebbeb251 100644 --- a/common/buildcraft/core/ItemWrench.java +++ b/common/buildcraft/core/ItemWrench.java @@ -10,7 +10,6 @@ package buildcraft.core; import java.util.HashSet; import java.util.Set; - import net.minecraft.block.Block; import net.minecraft.block.BlockButton; import net.minecraft.block.BlockChest; @@ -18,9 +17,7 @@ import net.minecraft.block.BlockLever; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.tools.IToolWrench; import buildcraft.core.lib.items.ItemBuildCraft; diff --git a/common/buildcraft/core/LaserData.java b/common/buildcraft/core/LaserData.java index 06e00803..2e32ccb3 100755 --- a/common/buildcraft/core/LaserData.java +++ b/common/buildcraft/core/LaserData.java @@ -9,9 +9,7 @@ package buildcraft.core; import io.netty.buffer.ByteBuf; - import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.core.ISerializable; import buildcraft.api.core.Position; diff --git a/common/buildcraft/core/SchematicEngine.java b/common/buildcraft/core/SchematicEngine.java index 56fcdf4c..0e9c196a 100644 --- a/common/buildcraft/core/SchematicEngine.java +++ b/common/buildcraft/core/SchematicEngine.java @@ -9,11 +9,8 @@ package buildcraft.core; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; import buildcraft.core.lib.engines.TileEngineBase; diff --git a/common/buildcraft/core/SpringPopulate.java b/common/buildcraft/core/SpringPopulate.java index dc6b1ea0..a67b217d 100644 --- a/common/buildcraft/core/SpringPopulate.java +++ b/common/buildcraft/core/SpringPopulate.java @@ -9,18 +9,14 @@ package buildcraft.core; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; - import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; - import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.TerrainGen; - import buildcraft.BuildCraftCore; public class SpringPopulate { diff --git a/common/buildcraft/core/StackAtPosition.java b/common/buildcraft/core/StackAtPosition.java index 61b3f5eb..3909462e 100755 --- a/common/buildcraft/core/StackAtPosition.java +++ b/common/buildcraft/core/StackAtPosition.java @@ -9,9 +9,7 @@ package buildcraft.core; import io.netty.buffer.ByteBuf; - import net.minecraft.item.ItemStack; - import buildcraft.api.core.ISerializable; import buildcraft.api.core.Position; import buildcraft.core.lib.utils.NetworkUtils; diff --git a/common/buildcraft/core/TickHandlerCore.java b/common/buildcraft/core/TickHandlerCore.java index af4b1008..1a0fbf55 100644 --- a/common/buildcraft/core/TickHandlerCore.java +++ b/common/buildcraft/core/TickHandlerCore.java @@ -10,12 +10,10 @@ package buildcraft.core; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChatComponentTranslation; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.core.proxy.CoreProxy; public class TickHandlerCore { diff --git a/common/buildcraft/core/TileEngine.java b/common/buildcraft/core/TileEngine.java deleted file mode 100644 index 524c7ebd..00000000 --- a/common/buildcraft/core/TileEngine.java +++ /dev/null @@ -1,10 +0,0 @@ -package buildcraft.core; - -import net.minecraft.util.ResourceLocation; -import buildcraft.core.lib.engines.TileEngineBase; - -/** - * Created by asie on 3/6/15. - */ -public abstract class TileEngine extends TileEngineBase { -} diff --git a/common/buildcraft/core/TileEngineWood.java b/common/buildcraft/core/TileEngineWood.java index 25161bc9..5d091aa7 100644 --- a/common/buildcraft/core/TileEngineWood.java +++ b/common/buildcraft/core/TileEngineWood.java @@ -10,15 +10,13 @@ package buildcraft.core; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.power.IRedstoneEngine; import buildcraft.api.power.IRedstoneEngineReceiver; import buildcraft.api.transport.IPipeTile; import buildcraft.core.lib.engines.TileEngineBase; -public class TileEngineWood extends TileEngine implements IRedstoneEngine { +public class TileEngineWood extends TileEngineBase implements IRedstoneEngine { private boolean hasSent = false; diff --git a/common/buildcraft/core/Version.java b/common/buildcraft/core/Version.java index d6fa3824..fb3cac7a 100644 --- a/common/buildcraft/core/Version.java +++ b/common/buildcraft/core/Version.java @@ -13,16 +13,12 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; import java.util.ArrayList; - import net.minecraft.command.ICommandSender; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; - import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInterModComms; - import net.minecraftforge.common.config.Property; - import buildcraft.BuildCraftCore; import buildcraft.api.core.BCLog; import buildcraft.core.proxy.CoreProxy; diff --git a/common/buildcraft/core/ZoneChunk.java b/common/buildcraft/core/ZoneChunk.java index 6b8a49ff..e5d70544 100755 --- a/common/buildcraft/core/ZoneChunk.java +++ b/common/buildcraft/core/ZoneChunk.java @@ -10,11 +10,8 @@ package buildcraft.core; import java.util.BitSet; import java.util.Random; - import io.netty.buffer.ByteBuf; - import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.core.BlockIndex; import buildcraft.api.core.ISerializable; import buildcraft.core.lib.utils.BitSetUtils; diff --git a/common/buildcraft/core/ZonePlan.java b/common/buildcraft/core/ZonePlan.java index b0135279..63768e06 100755 --- a/common/buildcraft/core/ZonePlan.java +++ b/common/buildcraft/core/ZonePlan.java @@ -11,14 +11,10 @@ package buildcraft.core; import java.util.HashMap; import java.util.Map; import java.util.Random; - import io.netty.buffer.ByteBuf; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; - import net.minecraftforge.common.util.Constants; - import buildcraft.api.core.BlockIndex; import buildcraft.api.core.ISerializable; import buildcraft.api.core.IZone; diff --git a/common/buildcraft/core/blueprints/Blueprint.java b/common/buildcraft/core/blueprints/Blueprint.java index 7dd25042..eaa7fa78 100644 --- a/common/buildcraft/core/blueprints/Blueprint.java +++ b/common/buildcraft/core/blueprints/Blueprint.java @@ -9,7 +9,6 @@ package buildcraft.core.blueprints; import java.util.LinkedList; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.item.Item; @@ -17,9 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.Constants; - import buildcraft.api.blueprints.BuildingPermission; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; diff --git a/common/buildcraft/core/blueprints/BlueprintBase.java b/common/buildcraft/core/blueprints/BlueprintBase.java index c8ccd591..e0ba8bc9 100644 --- a/common/buildcraft/core/blueprints/BlueprintBase.java +++ b/common/buildcraft/core/blueprints/BlueprintBase.java @@ -10,7 +10,6 @@ package buildcraft.core.blueprints; import java.io.IOException; import java.util.ArrayList; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; @@ -18,10 +17,8 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.blueprints.BuildingPermission; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingRegistry; diff --git a/common/buildcraft/core/blueprints/BlueprintReadConfiguration.java b/common/buildcraft/core/blueprints/BlueprintReadConfiguration.java index 029da217..76dca763 100755 --- a/common/buildcraft/core/blueprints/BlueprintReadConfiguration.java +++ b/common/buildcraft/core/blueprints/BlueprintReadConfiguration.java @@ -9,9 +9,7 @@ package buildcraft.core.blueprints; import io.netty.buffer.ByteBuf; - import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.core.ISerializable; public class BlueprintReadConfiguration implements ISerializable { diff --git a/common/buildcraft/core/blueprints/BptBuilderBase.java b/common/buildcraft/core/blueprints/BptBuilderBase.java index b633472a..d9d73662 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBase.java +++ b/common/buildcraft/core/blueprints/BptBuilderBase.java @@ -10,9 +10,7 @@ package buildcraft.core.blueprints; import java.util.HashSet; import java.util.LinkedList; - import org.apache.logging.log4j.Level; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; @@ -22,12 +20,10 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraft.world.WorldServer; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.common.util.Constants; import net.minecraftforge.event.world.BlockEvent; - import buildcraft.BuildCraftCore; import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.IBuilderContext; @@ -44,8 +40,8 @@ import buildcraft.core.builders.BuildingSlot; import buildcraft.core.builders.BuildingSlotBlock; import buildcraft.core.builders.IBuildingItemsProvider; import buildcraft.core.builders.TileAbstractBuilder; -import buildcraft.core.proxy.CoreProxy; import buildcraft.core.lib.utils.BlockUtils; +import buildcraft.core.proxy.CoreProxy; public abstract class BptBuilderBase implements IAreaProvider { diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java index 147ee669..851b9242 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -17,7 +17,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.ListIterator; import java.util.Map.Entry; - import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -26,13 +25,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.Schematic; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/core/blueprints/BptBuilderTemplate.java b/common/buildcraft/core/blueprints/BptBuilderTemplate.java index 36e69b42..41458ae8 100644 --- a/common/buildcraft/core/blueprints/BptBuilderTemplate.java +++ b/common/buildcraft/core/blueprints/BptBuilderTemplate.java @@ -9,12 +9,9 @@ package buildcraft.core.blueprints; import java.util.LinkedList; - import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.SchematicBlockBase; import buildcraft.api.core.BlockIndex; diff --git a/common/buildcraft/core/blueprints/BptContext.java b/common/buildcraft/core/blueprints/BptContext.java index 0de1f181..c5b6c906 100644 --- a/common/buildcraft/core/blueprints/BptContext.java +++ b/common/buildcraft/core/blueprints/BptContext.java @@ -9,7 +9,6 @@ package buildcraft.core.blueprints; import net.minecraft.world.World; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingRegistry; import buildcraft.api.core.IBox; diff --git a/common/buildcraft/core/blueprints/LibraryId.java b/common/buildcraft/core/blueprints/LibraryId.java index 50a423b9..7490e6e4 100644 --- a/common/buildcraft/core/blueprints/LibraryId.java +++ b/common/buildcraft/core/blueprints/LibraryId.java @@ -11,13 +11,9 @@ package buildcraft.core.blueprints; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; - import org.apache.commons.lang3.ArrayUtils; - import io.netty.buffer.ByteBuf; - import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.core.ISerializable; import buildcraft.core.lib.utils.NetworkUtils; diff --git a/common/buildcraft/core/blueprints/SchematicRegistry.java b/common/buildcraft/core/blueprints/SchematicRegistry.java index 129968ca..a4909819 100644 --- a/common/buildcraft/core/blueprints/SchematicRegistry.java +++ b/common/buildcraft/core/blueprints/SchematicRegistry.java @@ -12,13 +12,10 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.HashSet; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; - import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; - import buildcraft.api.blueprints.ISchematicRegistry; import buildcraft.api.blueprints.Schematic; import buildcraft.api.blueprints.SchematicBlock; @@ -29,14 +26,13 @@ import buildcraft.api.core.JavaTools; public final class SchematicRegistry implements ISchematicRegistry { public static SchematicRegistry INSTANCE = new SchematicRegistry(); - + private static final HashMap, Constructor> emptyConstructorMap = new HashMap, Constructor>(); + public final HashMap schematicBlocks = new HashMap(); public final HashMap, SchematicConstructor> schematicEntities = new HashMap, SchematicConstructor>(); - private static final HashMap, Constructor> emptyConstructorMap = new HashMap, Constructor>(); - private final HashSet modsForbidden = new HashSet(); private final HashSet blocksForbidden = new HashSet(); diff --git a/common/buildcraft/core/blueprints/Template.java b/common/buildcraft/core/blueprints/Template.java index c76bffd3..f6fe7c5a 100644 --- a/common/buildcraft/core/blueprints/Template.java +++ b/common/buildcraft/core/blueprints/Template.java @@ -12,7 +12,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicMask; import buildcraft.api.core.BuildCraftAPI; diff --git a/common/buildcraft/core/builders/BuildingItem.java b/common/buildcraft/core/builders/BuildingItem.java index 522d74dd..ce82ad99 100755 --- a/common/buildcraft/core/builders/BuildingItem.java +++ b/common/buildcraft/core/builders/BuildingItem.java @@ -10,17 +10,13 @@ package buildcraft.core.builders; import java.util.Date; import java.util.LinkedList; - import io.netty.buffer.ByteBuf; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.MathHelper; - import net.minecraftforge.common.util.Constants; - import buildcraft.BuildCraftCore; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; diff --git a/common/buildcraft/core/builders/BuildingSlot.java b/common/buildcraft/core/builders/BuildingSlot.java index a333c40a..69f82df5 100755 --- a/common/buildcraft/core/builders/BuildingSlot.java +++ b/common/buildcraft/core/builders/BuildingSlot.java @@ -9,10 +9,8 @@ package buildcraft.core.builders; import java.util.LinkedList; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; import buildcraft.api.blueprints.MappingRegistry; diff --git a/common/buildcraft/core/builders/BuildingSlotBlock.java b/common/buildcraft/core/builders/BuildingSlotBlock.java index f868d63e..816f0333 100755 --- a/common/buildcraft/core/builders/BuildingSlotBlock.java +++ b/common/buildcraft/core/builders/BuildingSlotBlock.java @@ -11,14 +11,11 @@ package buildcraft.core.builders; import java.util.Arrays; import java.util.LinkedList; import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.Constants; - import buildcraft.api.blueprints.BuildingPermission; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; diff --git a/common/buildcraft/core/builders/BuildingSlotEntity.java b/common/buildcraft/core/builders/BuildingSlotEntity.java index af39071d..d77f26aa 100755 --- a/common/buildcraft/core/builders/BuildingSlotEntity.java +++ b/common/buildcraft/core/builders/BuildingSlotEntity.java @@ -10,11 +10,9 @@ package buildcraft.core.builders; import java.util.Collections; import java.util.LinkedList; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; import buildcraft.api.blueprints.MappingRegistry; diff --git a/common/buildcraft/core/builders/TileAbstractBuilder.java b/common/buildcraft/core/builders/TileAbstractBuilder.java index cab1a27f..7aa3e621 100755 --- a/common/buildcraft/core/builders/TileAbstractBuilder.java +++ b/common/buildcraft/core/builders/TileAbstractBuilder.java @@ -12,15 +12,11 @@ import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; - import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; - import cpw.mods.fml.relauncher.Side; - import net.minecraftforge.fluids.FluidStack; import buildcraft.BuildCraftCore; import buildcraft.api.blueprints.BuilderAPI; diff --git a/common/buildcraft/core/builders/patterns/FillerPattern.java b/common/buildcraft/core/builders/patterns/FillerPattern.java index 124deb32..165d74b0 100644 --- a/common/buildcraft/core/builders/patterns/FillerPattern.java +++ b/common/buildcraft/core/builders/patterns/FillerPattern.java @@ -10,12 +10,10 @@ package buildcraft.core.builders.patterns; import java.util.Map; import java.util.TreeMap; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; - import cpw.mods.fml.common.Loader; import buildcraft.api.blueprints.SchematicMask; import buildcraft.api.filler.IFillerPattern; diff --git a/common/buildcraft/core/builders/patterns/FillerRegistry.java b/common/buildcraft/core/builders/patterns/FillerRegistry.java index 8b795426..5fcf33e0 100644 --- a/common/buildcraft/core/builders/patterns/FillerRegistry.java +++ b/common/buildcraft/core/builders/patterns/FillerRegistry.java @@ -12,7 +12,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Map.Entry; import java.util.TreeMap; - import buildcraft.api.filler.IFillerPattern; import buildcraft.api.filler.IFillerRegistry; diff --git a/common/buildcraft/core/builders/patterns/PatternBox.java b/common/buildcraft/core/builders/patterns/PatternBox.java index 1c0b6b42..e6087d37 100644 --- a/common/buildcraft/core/builders/patterns/PatternBox.java +++ b/common/buildcraft/core/builders/patterns/PatternBox.java @@ -9,7 +9,6 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; - import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.Template; diff --git a/common/buildcraft/core/builders/patterns/PatternClear.java b/common/buildcraft/core/builders/patterns/PatternClear.java index 96f9714a..7fa51b52 100644 --- a/common/buildcraft/core/builders/patterns/PatternClear.java +++ b/common/buildcraft/core/builders/patterns/PatternClear.java @@ -9,7 +9,6 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; - import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.Template; diff --git a/common/buildcraft/core/builders/patterns/PatternCylinder.java b/common/buildcraft/core/builders/patterns/PatternCylinder.java index e3376ebd..10b6008d 100644 --- a/common/buildcraft/core/builders/patterns/PatternCylinder.java +++ b/common/buildcraft/core/builders/patterns/PatternCylinder.java @@ -9,7 +9,6 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; - import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.Template; diff --git a/common/buildcraft/core/builders/patterns/PatternFill.java b/common/buildcraft/core/builders/patterns/PatternFill.java index 066eabce..0f4d7945 100644 --- a/common/buildcraft/core/builders/patterns/PatternFill.java +++ b/common/buildcraft/core/builders/patterns/PatternFill.java @@ -9,7 +9,6 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; - import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.Template; diff --git a/common/buildcraft/core/builders/patterns/PatternFlatten.java b/common/buildcraft/core/builders/patterns/PatternFlatten.java index 12217caf..de408306 100644 --- a/common/buildcraft/core/builders/patterns/PatternFlatten.java +++ b/common/buildcraft/core/builders/patterns/PatternFlatten.java @@ -9,7 +9,6 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; - import buildcraft.api.blueprints.SchematicMask; import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; diff --git a/common/buildcraft/core/builders/patterns/PatternFrame.java b/common/buildcraft/core/builders/patterns/PatternFrame.java index 07663cf7..a6cc8834 100755 --- a/common/buildcraft/core/builders/patterns/PatternFrame.java +++ b/common/buildcraft/core/builders/patterns/PatternFrame.java @@ -9,7 +9,6 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; - import buildcraft.api.blueprints.SchematicMask; import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; diff --git a/common/buildcraft/core/builders/patterns/PatternHorizon.java b/common/buildcraft/core/builders/patterns/PatternHorizon.java index 9a12dbdf..1e21831c 100644 --- a/common/buildcraft/core/builders/patterns/PatternHorizon.java +++ b/common/buildcraft/core/builders/patterns/PatternHorizon.java @@ -9,7 +9,6 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; - import buildcraft.api.blueprints.SchematicMask; import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; diff --git a/common/buildcraft/core/builders/patterns/PatternPyramid.java b/common/buildcraft/core/builders/patterns/PatternPyramid.java index 608a762f..687721de 100644 --- a/common/buildcraft/core/builders/patterns/PatternPyramid.java +++ b/common/buildcraft/core/builders/patterns/PatternPyramid.java @@ -9,7 +9,6 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; - import buildcraft.api.blueprints.SchematicMask; import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; diff --git a/common/buildcraft/core/builders/patterns/PatternStairs.java b/common/buildcraft/core/builders/patterns/PatternStairs.java index 1039f266..760b79eb 100644 --- a/common/buildcraft/core/builders/patterns/PatternStairs.java +++ b/common/buildcraft/core/builders/patterns/PatternStairs.java @@ -9,7 +9,6 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; - import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.Template; diff --git a/common/buildcraft/builders/schematics/SchematicBlockCreative.java b/common/buildcraft/core/builders/schematics/SchematicBlockCreative.java similarity index 92% rename from common/buildcraft/builders/schematics/SchematicBlockCreative.java rename to common/buildcraft/core/builders/schematics/SchematicBlockCreative.java index 013640b3..aec8b5b9 100755 --- a/common/buildcraft/builders/schematics/SchematicBlockCreative.java +++ b/common/buildcraft/core/builders/schematics/SchematicBlockCreative.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.schematics; +package buildcraft.core.builders.schematics; import buildcraft.api.blueprints.BuildingPermission; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicIgnore.java b/common/buildcraft/core/builders/schematics/SchematicIgnore.java similarity index 96% rename from common/buildcraft/builders/schematics/SchematicIgnore.java rename to common/buildcraft/core/builders/schematics/SchematicIgnore.java index 62dfe7c5..cbfebe75 100644 --- a/common/buildcraft/builders/schematics/SchematicIgnore.java +++ b/common/buildcraft/core/builders/schematics/SchematicIgnore.java @@ -6,12 +6,10 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.schematics; +package buildcraft.core.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicIgnoreMeta.java b/common/buildcraft/core/builders/schematics/SchematicIgnoreMeta.java similarity index 95% rename from common/buildcraft/builders/schematics/SchematicIgnoreMeta.java rename to common/buildcraft/core/builders/schematics/SchematicIgnoreMeta.java index 5c965190..58253199 100644 --- a/common/buildcraft/builders/schematics/SchematicIgnoreMeta.java +++ b/common/buildcraft/core/builders/schematics/SchematicIgnoreMeta.java @@ -6,12 +6,10 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.schematics; +package buildcraft.core.builders.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicRotateMeta.java b/common/buildcraft/core/builders/schematics/SchematicRotateMeta.java similarity index 97% rename from common/buildcraft/builders/schematics/SchematicRotateMeta.java rename to common/buildcraft/core/builders/schematics/SchematicRotateMeta.java index 643f9825..116c2fd1 100644 --- a/common/buildcraft/builders/schematics/SchematicRotateMeta.java +++ b/common/buildcraft/core/builders/schematics/SchematicRotateMeta.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.schematics; +package buildcraft.core.builders.schematics; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; diff --git a/common/buildcraft/builders/schematics/SchematicStandalone.java b/common/buildcraft/core/builders/schematics/SchematicStandalone.java similarity index 91% rename from common/buildcraft/builders/schematics/SchematicStandalone.java rename to common/buildcraft/core/builders/schematics/SchematicStandalone.java index a6ab2e79..ea832a7a 100755 --- a/common/buildcraft/builders/schematics/SchematicStandalone.java +++ b/common/buildcraft/core/builders/schematics/SchematicStandalone.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.schematics; +package buildcraft.core.builders.schematics; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/builders/schematics/SchematicTileCreative.java b/common/buildcraft/core/builders/schematics/SchematicTileCreative.java similarity index 92% rename from common/buildcraft/builders/schematics/SchematicTileCreative.java rename to common/buildcraft/core/builders/schematics/SchematicTileCreative.java index 5be292cf..ab4862c0 100755 --- a/common/buildcraft/builders/schematics/SchematicTileCreative.java +++ b/common/buildcraft/core/builders/schematics/SchematicTileCreative.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.schematics; +package buildcraft.core.builders.schematics; import buildcraft.api.blueprints.BuildingPermission; import buildcraft.api.blueprints.SchematicTile; diff --git a/common/buildcraft/builders/schematics/SchematicWallSide.java b/common/buildcraft/core/builders/schematics/SchematicWallSide.java similarity index 94% rename from common/buildcraft/builders/schematics/SchematicWallSide.java rename to common/buildcraft/core/builders/schematics/SchematicWallSide.java index 18a975fd..78626288 100644 --- a/common/buildcraft/builders/schematics/SchematicWallSide.java +++ b/common/buildcraft/core/builders/schematics/SchematicWallSide.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.builders.schematics; +package buildcraft.core.builders.schematics; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; diff --git a/common/buildcraft/core/gui/ContainerList.java b/common/buildcraft/core/gui/ContainerList.java index 6ff2c95b..4bdc5ea5 100755 --- a/common/buildcraft/core/gui/ContainerList.java +++ b/common/buildcraft/core/gui/ContainerList.java @@ -9,13 +9,10 @@ package buildcraft.core.gui; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; - import cpw.mods.fml.relauncher.Side; - import buildcraft.BuildCraftCore; import buildcraft.core.ItemList; import buildcraft.core.lib.gui.BuildCraftContainer; diff --git a/common/buildcraft/core/gui/GuiList.java b/common/buildcraft/core/gui/GuiList.java index 06ffe546..13c9fc42 100755 --- a/common/buildcraft/core/gui/GuiList.java +++ b/common/buildcraft/core/gui/GuiList.java @@ -12,9 +12,7 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import buildcraft.BuildCraftCore; -import buildcraft.core.DefaultProps; import buildcraft.core.ItemList; import buildcraft.core.lib.gui.AdvancedSlot; import buildcraft.core.lib.gui.GuiAdvancedInterface; diff --git a/common/buildcraft/core/lib/EntityBlock.java b/common/buildcraft/core/lib/EntityBlock.java index 2c766044..e82b5014 100644 --- a/common/buildcraft/core/lib/EntityBlock.java +++ b/common/buildcraft/core/lib/EntityBlock.java @@ -12,7 +12,6 @@ import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/buildcraft/core/lib/ITileBufferHolder.java b/common/buildcraft/core/lib/ITileBufferHolder.java index 84782563..0795e876 100644 --- a/common/buildcraft/core/lib/ITileBufferHolder.java +++ b/common/buildcraft/core/lib/ITileBufferHolder.java @@ -10,7 +10,6 @@ package buildcraft.core.lib; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; public interface ITileBufferHolder { diff --git a/common/buildcraft/core/lib/RFBattery.java b/common/buildcraft/core/lib/RFBattery.java index 6d842e74..8deb1810 100644 --- a/common/buildcraft/core/lib/RFBattery.java +++ b/common/buildcraft/core/lib/RFBattery.java @@ -1,7 +1,6 @@ package buildcraft.core.lib; import net.minecraft.nbt.NBTTagCompound; - import cofh.api.energy.IEnergyStorage; public class RFBattery implements IEnergyStorage { diff --git a/common/buildcraft/core/lib/TileBuffer.java b/common/buildcraft/core/lib/TileBuffer.java index 93b1d8a1..bd6da51b 100644 --- a/common/buildcraft/core/lib/TileBuffer.java +++ b/common/buildcraft/core/lib/TileBuffer.java @@ -11,9 +11,7 @@ package buildcraft.core.lib; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.SafeTimeTracker; import buildcraft.core.lib.utils.BlockUtils; diff --git a/common/buildcraft/core/lib/block/BlockBuildCraft.java b/common/buildcraft/core/lib/block/BlockBuildCraft.java index 121afac5..ba4ff1d7 100644 --- a/common/buildcraft/core/lib/block/BlockBuildCraft.java +++ b/common/buildcraft/core/lib/block/BlockBuildCraft.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.block; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -23,11 +22,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.events.BlockInteractionEvent; @@ -39,21 +36,22 @@ import buildcraft.core.lib.utils.ResourceUtils; import buildcraft.core.lib.utils.Utils; public abstract class BlockBuildCraft extends BlockContainer { - @SideOnly(Side.CLIENT) - public IIcon[][] icons; - protected static boolean keepInventory = false; - protected final Random rand = new Random(); - protected int renderPass; - - protected int maxPasses = 1; - private static final int[][] SIDE_TEXTURING_LOCATIONS = new int[][] { {2, 3, 5, 4}, {3, 2, 4, 5}, {4, 5, 2, 3}, {5, 4, 3, 2} }; + + @SideOnly(Side.CLIENT) + public IIcon[][] icons; + + protected final Random rand = new Random(); + protected int renderPass; + + protected int maxPasses = 1; + private boolean rotatable = false; private boolean alphaPass = false; diff --git a/common/buildcraft/core/lib/block/BlockBuildCraftFluid.java b/common/buildcraft/core/lib/block/BlockBuildCraftFluid.java index 6987bc0f..b44674ea 100644 --- a/common/buildcraft/core/lib/block/BlockBuildCraftFluid.java +++ b/common/buildcraft/core/lib/block/BlockBuildCraftFluid.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.block; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -19,15 +18,12 @@ import net.minecraft.entity.Entity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; - import buildcraft.core.lib.render.EntityDropParticleFX; import buildcraft.core.lib.utils.ResourceUtils; diff --git a/common/buildcraft/core/lib/block/TileBuildCraft.java b/common/buildcraft/core/lib/block/TileBuildCraft.java index 2880a43d..eead16af 100644 --- a/common/buildcraft/core/lib/block/TileBuildCraft.java +++ b/common/buildcraft/core/lib/block/TileBuildCraft.java @@ -9,20 +9,15 @@ package buildcraft.core.lib.block; import java.util.HashSet; - import io.netty.buffer.ByteBuf; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyHandler; - import buildcraft.BuildCraftCore; import buildcraft.api.core.ISerializable; import buildcraft.api.tiles.IControllable; diff --git a/common/buildcraft/core/lib/engines/BlockEngineBase.java b/common/buildcraft/core/lib/engines/BlockEngineBase.java index 55dee992..9dece5e0 100644 --- a/common/buildcraft/core/lib/engines/BlockEngineBase.java +++ b/common/buildcraft/core/lib/engines/BlockEngineBase.java @@ -10,7 +10,6 @@ package buildcraft.core.lib.engines; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -21,16 +20,13 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import cpw.mods.fml.common.FMLCommonHandler; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftCore; import buildcraft.api.events.BlockInteractionEvent; +import buildcraft.core.IItemPipe; import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.lib.render.ICustomHighlight; -import buildcraft.core.IItemPipe; public abstract class BlockEngineBase extends BlockBuildCraft implements ICustomHighlight { private static final AxisAlignedBB[][] boxes = { diff --git a/common/buildcraft/core/lib/engines/ItemEngine.java b/common/buildcraft/core/lib/engines/ItemEngine.java index ebf040ec..eb48abe0 100644 --- a/common/buildcraft/core/lib/engines/ItemEngine.java +++ b/common/buildcraft/core/lib/engines/ItemEngine.java @@ -10,7 +10,6 @@ package buildcraft.core.lib.engines; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; - import buildcraft.core.BCCreativeTab; import buildcraft.core.lib.items.ItemBlockBuildCraft; diff --git a/common/buildcraft/core/lib/engines/RenderEngine.java b/common/buildcraft/core/lib/engines/RenderEngine.java index 37590f2b..87fa9213 100644 --- a/common/buildcraft/core/lib/engines/RenderEngine.java +++ b/common/buildcraft/core/lib/engines/RenderEngine.java @@ -9,16 +9,13 @@ package buildcraft.core.lib.engines; import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore.RenderMode; import buildcraft.core.lib.render.IInventoryRenderer; @@ -170,7 +167,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor bindTexture(chamberTexture); float chamberf = 2F / 16F; - int chamberc = ((int) step + 2) / 2; + int chamberc = ((int) step + 4) / 2; for (int i = 0; i <= step + 2; i += 2) { chamber.render(factor); diff --git a/common/buildcraft/core/lib/engines/TileEngineBase.java b/common/buildcraft/core/lib/engines/TileEngineBase.java index 667bddc1..fb712acf 100644 --- a/common/buildcraft/core/lib/engines/TileEngineBase.java +++ b/common/buildcraft/core/lib/engines/TileEngineBase.java @@ -9,20 +9,16 @@ package buildcraft.core.lib.engines; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyReceiver; - import buildcraft.BuildCraftCore; import buildcraft.api.power.IEngine; import buildcraft.api.tiles.IHeatable; diff --git a/common/buildcraft/core/lib/engines/TileEngineWithInventory.java b/common/buildcraft/core/lib/engines/TileEngineWithInventory.java index a822d64a..0387bda3 100644 --- a/common/buildcraft/core/lib/engines/TileEngineWithInventory.java +++ b/common/buildcraft/core/lib/engines/TileEngineWithInventory.java @@ -13,13 +13,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import buildcraft.core.TileEngine; -import buildcraft.core.lib.engines.TileEngineBase; import buildcraft.core.lib.inventory.SimpleInventory; import buildcraft.core.lib.utils.Utils; -public abstract class TileEngineWithInventory extends TileEngine implements IInventory, ISidedInventory { +public abstract class TileEngineWithInventory extends TileEngineBase implements IInventory, ISidedInventory { private final SimpleInventory inv; private final int[] defaultSlotArray; diff --git a/common/buildcraft/core/lib/fluids/RestrictedTank.java b/common/buildcraft/core/lib/fluids/RestrictedTank.java index c27b97d0..f6f119dc 100644 --- a/common/buildcraft/core/lib/fluids/RestrictedTank.java +++ b/common/buildcraft/core/lib/fluids/RestrictedTank.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.fluids; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/common/buildcraft/core/lib/fluids/SingleUseTank.java b/common/buildcraft/core/lib/fluids/SingleUseTank.java index f00371a2..a98c935c 100644 --- a/common/buildcraft/core/lib/fluids/SingleUseTank.java +++ b/common/buildcraft/core/lib/fluids/SingleUseTank.java @@ -10,7 +10,6 @@ package buildcraft.core.lib.fluids; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/common/buildcraft/core/lib/fluids/Tank.java b/common/buildcraft/core/lib/fluids/Tank.java index 535bf2bf..1c2ba6a3 100644 --- a/common/buildcraft/core/lib/fluids/Tank.java +++ b/common/buildcraft/core/lib/fluids/Tank.java @@ -9,13 +9,10 @@ package buildcraft.core.lib.fluids; import java.util.Locale; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidTank; - import buildcraft.core.lib.gui.tooltips.ToolTip; import buildcraft.core.lib.gui.tooltips.ToolTipLine; diff --git a/common/buildcraft/core/lib/fluids/TankManager.java b/common/buildcraft/core/lib/fluids/TankManager.java index 434b7a5d..21c912aa 100644 --- a/common/buildcraft/core/lib/fluids/TankManager.java +++ b/common/buildcraft/core/lib/fluids/TankManager.java @@ -11,16 +11,11 @@ package buildcraft.core.lib.fluids; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import com.google.common.collect.ForwardingList; - import io.netty.buffer.ByteBuf; - import net.minecraft.nbt.NBTTagCompound; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/common/buildcraft/core/lib/fluids/TankUtils.java b/common/buildcraft/core/lib/fluids/TankUtils.java index 7d7cfd6f..6148999e 100644 --- a/common/buildcraft/core/lib/fluids/TankUtils.java +++ b/common/buildcraft/core/lib/fluids/TankUtils.java @@ -13,7 +13,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -21,7 +20,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; - import buildcraft.core.lib.TileBuffer; import buildcraft.core.lib.inventory.InvUtils; diff --git a/common/buildcraft/core/lib/gui/AdvancedSlot.java b/common/buildcraft/core/lib/gui/AdvancedSlot.java index 3110919b..0289f112 100755 --- a/common/buildcraft/core/lib/gui/AdvancedSlot.java +++ b/common/buildcraft/core/lib/gui/AdvancedSlot.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.gui; import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; @@ -17,8 +16,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import buildcraft.core.DefaultProps; - public abstract class AdvancedSlot { private static final ResourceLocation TEXTURE_SLOT = new ResourceLocation( diff --git a/common/buildcraft/core/lib/gui/BuildCraftContainer.java b/common/buildcraft/core/lib/gui/BuildCraftContainer.java index 1a4e005a..d2732319 100644 --- a/common/buildcraft/core/lib/gui/BuildCraftContainer.java +++ b/common/buildcraft/core/lib/gui/BuildCraftContainer.java @@ -13,17 +13,14 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.List; - import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufInputStream; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; - import buildcraft.BuildCraftCore; import buildcraft.core.lib.gui.slots.IPhantomSlot; import buildcraft.core.lib.gui.slots.SlotBase; diff --git a/common/buildcraft/core/lib/gui/FluidSlot.java b/common/buildcraft/core/lib/gui/FluidSlot.java index 859c9c1e..06bdf00e 100755 --- a/common/buildcraft/core/lib/gui/FluidSlot.java +++ b/common/buildcraft/core/lib/gui/FluidSlot.java @@ -10,9 +10,7 @@ package buildcraft.core.lib.gui; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.fluids.Fluid; - import buildcraft.core.lib.render.FluidRenderer; import buildcraft.core.lib.render.RenderUtils; diff --git a/common/buildcraft/core/lib/gui/GuiAdvancedInterface.java b/common/buildcraft/core/lib/gui/GuiAdvancedInterface.java index ee1a0e89..5c6a7bae 100644 --- a/common/buildcraft/core/lib/gui/GuiAdvancedInterface.java +++ b/common/buildcraft/core/lib/gui/GuiAdvancedInterface.java @@ -9,9 +9,7 @@ package buildcraft.core.lib.gui; import java.util.ArrayList; - import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; diff --git a/common/buildcraft/core/lib/gui/GuiBuildCraft.java b/common/buildcraft/core/lib/gui/GuiBuildCraft.java index a81ba6da..4db40557 100644 --- a/common/buildcraft/core/lib/gui/GuiBuildCraft.java +++ b/common/buildcraft/core/lib/gui/GuiBuildCraft.java @@ -11,9 +11,7 @@ package buildcraft.core.lib.gui; import java.util.ArrayList; import java.util.Collection; import java.util.Date; - import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; @@ -26,10 +24,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.fluids.FluidStack; - -import buildcraft.core.DefaultProps; import buildcraft.core.lib.gui.slots.IPhantomSlot; import buildcraft.core.lib.gui.tooltips.IToolTipProvider; import buildcraft.core.lib.gui.tooltips.ToolTip; diff --git a/common/buildcraft/core/lib/gui/GuiTools.java b/common/buildcraft/core/lib/gui/GuiTools.java index 743101c9..b839bcbf 100644 --- a/common/buildcraft/core/lib/gui/GuiTools.java +++ b/common/buildcraft/core/lib/gui/GuiTools.java @@ -9,9 +9,7 @@ package buildcraft.core.lib.gui; import java.util.List; - import net.minecraft.client.gui.FontRenderer; - import buildcraft.core.lib.gui.buttons.GuiBetterButton; public final class GuiTools { diff --git a/common/buildcraft/core/lib/gui/buttons/GuiBetterButton.java b/common/buildcraft/core/lib/gui/buttons/GuiBetterButton.java index ae957d42..658e63b7 100644 --- a/common/buildcraft/core/lib/gui/buttons/GuiBetterButton.java +++ b/common/buildcraft/core/lib/gui/buttons/GuiBetterButton.java @@ -9,16 +9,12 @@ package buildcraft.core.lib.gui.buttons; 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.util.ResourceLocation; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import buildcraft.core.DefaultProps; import buildcraft.core.lib.gui.tooltips.IToolTipProvider; import buildcraft.core.lib.gui.tooltips.ToolTip; diff --git a/common/buildcraft/core/lib/gui/buttons/GuiImageButton.java b/common/buildcraft/core/lib/gui/buttons/GuiImageButton.java index c025b977..ef157ec4 100644 --- a/common/buildcraft/core/lib/gui/buttons/GuiImageButton.java +++ b/common/buildcraft/core/lib/gui/buttons/GuiImageButton.java @@ -10,18 +10,13 @@ package buildcraft.core.lib.gui.buttons; import java.util.ArrayList; - import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.core.DefaultProps; - @SideOnly(Side.CLIENT) public class GuiImageButton extends GuiButton implements IButtonClickEventTrigger { diff --git a/common/buildcraft/core/lib/gui/buttons/GuiMultiButton.java b/common/buildcraft/core/lib/gui/buttons/GuiMultiButton.java index d57ee1b6..46ed92e7 100644 --- a/common/buildcraft/core/lib/gui/buttons/GuiMultiButton.java +++ b/common/buildcraft/core/lib/gui/buttons/GuiMultiButton.java @@ -9,13 +9,10 @@ package buildcraft.core.lib.gui.buttons; import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.core.lib.gui.tooltips.ToolTip; @SideOnly(Side.CLIENT) diff --git a/common/buildcraft/core/lib/gui/slots/SlotBase.java b/common/buildcraft/core/lib/gui/slots/SlotBase.java index e57a78db..a984bc7a 100644 --- a/common/buildcraft/core/lib/gui/slots/SlotBase.java +++ b/common/buildcraft/core/lib/gui/slots/SlotBase.java @@ -10,7 +10,6 @@ package buildcraft.core.lib.gui.slots; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; - import buildcraft.core.lib.gui.tooltips.IToolTipProvider; import buildcraft.core.lib.gui.tooltips.ToolTip; diff --git a/common/buildcraft/core/lib/gui/slots/SlotUntouchable.java b/common/buildcraft/core/lib/gui/slots/SlotUntouchable.java index 9d4cd5fa..64803aba 100644 --- a/common/buildcraft/core/lib/gui/slots/SlotUntouchable.java +++ b/common/buildcraft/core/lib/gui/slots/SlotUntouchable.java @@ -11,7 +11,6 @@ package buildcraft.core.lib.gui.slots; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/buildcraft/core/lib/gui/tooltips/ToolTip.java b/common/buildcraft/core/lib/gui/tooltips/ToolTip.java index aaa59518..67519775 100644 --- a/common/buildcraft/core/lib/gui/tooltips/ToolTip.java +++ b/common/buildcraft/core/lib/gui/tooltips/ToolTip.java @@ -11,7 +11,6 @@ package buildcraft.core.lib.gui.tooltips; import java.util.ArrayList; import java.util.Collections; import java.util.List; - import com.google.common.collect.ForwardingList; public class ToolTip extends ForwardingList { diff --git a/common/buildcraft/core/lib/gui/widgets/FluidGaugeWidget.java b/common/buildcraft/core/lib/gui/widgets/FluidGaugeWidget.java index c9c14f9f..62716136 100644 --- a/common/buildcraft/core/lib/gui/widgets/FluidGaugeWidget.java +++ b/common/buildcraft/core/lib/gui/widgets/FluidGaugeWidget.java @@ -9,9 +9,7 @@ package buildcraft.core.lib.gui.widgets; import net.minecraft.util.IIcon; - import net.minecraftforge.fluids.FluidStack; - import buildcraft.core.lib.fluids.Tank; import buildcraft.core.lib.gui.GuiBuildCraft; import buildcraft.core.lib.gui.tooltips.ToolTip; diff --git a/common/buildcraft/core/lib/gui/widgets/IndicatorWidget.java b/common/buildcraft/core/lib/gui/widgets/IndicatorWidget.java index 14629cdc..a77110d1 100644 --- a/common/buildcraft/core/lib/gui/widgets/IndicatorWidget.java +++ b/common/buildcraft/core/lib/gui/widgets/IndicatorWidget.java @@ -10,7 +10,6 @@ package buildcraft.core.lib.gui.widgets; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.core.lib.gui.GuiBuildCraft; import buildcraft.core.lib.gui.tooltips.ToolTip; diff --git a/common/buildcraft/core/lib/gui/widgets/Widget.java b/common/buildcraft/core/lib/gui/widgets/Widget.java index 237584ec..5e20c004 100644 --- a/common/buildcraft/core/lib/gui/widgets/Widget.java +++ b/common/buildcraft/core/lib/gui/widgets/Widget.java @@ -10,12 +10,9 @@ package buildcraft.core.lib.gui.widgets; import java.io.DataInputStream; import java.io.IOException; - import net.minecraft.inventory.ICrafting; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.GuiBuildCraft; import buildcraft.core.lib.gui.tooltips.IToolTipProvider; diff --git a/common/buildcraft/core/lib/inventory/CrafterCopy.java b/common/buildcraft/core/lib/inventory/CrafterCopy.java index dc73cf84..3c0dd126 100644 --- a/common/buildcraft/core/lib/inventory/CrafterCopy.java +++ b/common/buildcraft/core/lib/inventory/CrafterCopy.java @@ -9,9 +9,7 @@ package buildcraft.core.lib.inventory; import net.minecraft.item.ItemStack; - import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.recipes.IFlexibleCrafter; public class CrafterCopy implements IFlexibleCrafter { diff --git a/common/buildcraft/core/lib/inventory/ITransactor.java b/common/buildcraft/core/lib/inventory/ITransactor.java index 9f92e5ae..e9ca0a5f 100644 --- a/common/buildcraft/core/lib/inventory/ITransactor.java +++ b/common/buildcraft/core/lib/inventory/ITransactor.java @@ -9,9 +9,7 @@ package buildcraft.core.lib.inventory; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.core.lib.inventory.filters.IStackFilter; public interface ITransactor { diff --git a/common/buildcraft/core/lib/inventory/InvUtils.java b/common/buildcraft/core/lib/inventory/InvUtils.java index 20ea5acd..0d73f305 100644 --- a/common/buildcraft/core/lib/inventory/InvUtils.java +++ b/common/buildcraft/core/lib/inventory/InvUtils.java @@ -17,10 +17,8 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.world.World; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IInvSlot; import buildcraft.core.lib.inventory.filters.IStackFilter; diff --git a/common/buildcraft/core/lib/inventory/InventoryConcatenator.java b/common/buildcraft/core/lib/inventory/InventoryConcatenator.java index 938a5105..ed2ecbd6 100644 --- a/common/buildcraft/core/lib/inventory/InventoryConcatenator.java +++ b/common/buildcraft/core/lib/inventory/InventoryConcatenator.java @@ -10,7 +10,6 @@ package buildcraft.core.lib.inventory; import java.util.ArrayList; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/lib/inventory/InventoryIterator.java b/common/buildcraft/core/lib/inventory/InventoryIterator.java index 976ece08..45772ea3 100644 --- a/common/buildcraft/core/lib/inventory/InventoryIterator.java +++ b/common/buildcraft/core/lib/inventory/InventoryIterator.java @@ -10,9 +10,7 @@ package buildcraft.core.lib.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IInvSlot; public final class InventoryIterator { diff --git a/common/buildcraft/core/lib/inventory/InventoryIteratorSided.java b/common/buildcraft/core/lib/inventory/InventoryIteratorSided.java index 41a3d59e..e3bb0029 100644 --- a/common/buildcraft/core/lib/inventory/InventoryIteratorSided.java +++ b/common/buildcraft/core/lib/inventory/InventoryIteratorSided.java @@ -9,12 +9,9 @@ package buildcraft.core.lib.inventory; import java.util.Iterator; - import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IInvSlot; class InventoryIteratorSided implements Iterable { diff --git a/common/buildcraft/core/lib/inventory/InventoryIteratorSimple.java b/common/buildcraft/core/lib/inventory/InventoryIteratorSimple.java index cf61e9d8..9479bc1e 100644 --- a/common/buildcraft/core/lib/inventory/InventoryIteratorSimple.java +++ b/common/buildcraft/core/lib/inventory/InventoryIteratorSimple.java @@ -9,10 +9,8 @@ package buildcraft.core.lib.inventory; import java.util.Iterator; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - import buildcraft.api.core.IInvSlot; class InventoryIteratorSimple implements Iterable { diff --git a/common/buildcraft/core/lib/inventory/InventoryWrapperSimple.java b/common/buildcraft/core/lib/inventory/InventoryWrapperSimple.java index b15e6b94..644e22a9 100644 --- a/common/buildcraft/core/lib/inventory/InventoryWrapperSimple.java +++ b/common/buildcraft/core/lib/inventory/InventoryWrapperSimple.java @@ -10,7 +10,6 @@ package buildcraft.core.lib.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - import buildcraft.core.lib.utils.Utils; public class InventoryWrapperSimple extends InventoryWrapper { diff --git a/common/buildcraft/core/lib/inventory/SimpleInventory.java b/common/buildcraft/core/lib/inventory/SimpleInventory.java index 0bde6b72..8a8dcda4 100644 --- a/common/buildcraft/core/lib/inventory/SimpleInventory.java +++ b/common/buildcraft/core/lib/inventory/SimpleInventory.java @@ -9,16 +9,13 @@ package buildcraft.core.lib.inventory; import java.util.LinkedList; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.Constants; - import buildcraft.api.core.INBTStoreable; public class SimpleInventory implements IInventory, INBTStoreable { diff --git a/common/buildcraft/core/lib/inventory/StackHelper.java b/common/buildcraft/core/lib/inventory/StackHelper.java index 45b5260a..cae19bc6 100644 --- a/common/buildcraft/core/lib/inventory/StackHelper.java +++ b/common/buildcraft/core/lib/inventory/StackHelper.java @@ -9,9 +9,7 @@ package buildcraft.core.lib.inventory; import net.minecraft.item.ItemStack; - import net.minecraftforge.oredict.OreDictionary; - import buildcraft.api.items.IList; public class StackHelper { diff --git a/common/buildcraft/core/lib/inventory/Transactor.java b/common/buildcraft/core/lib/inventory/Transactor.java index 3a5da9c2..9710412a 100644 --- a/common/buildcraft/core/lib/inventory/Transactor.java +++ b/common/buildcraft/core/lib/inventory/Transactor.java @@ -11,7 +11,6 @@ package buildcraft.core.lib.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; public abstract class Transactor implements ITransactor { diff --git a/common/buildcraft/core/lib/inventory/TransactorRoundRobin.java b/common/buildcraft/core/lib/inventory/TransactorRoundRobin.java index cce8a78d..c76f1c5c 100644 --- a/common/buildcraft/core/lib/inventory/TransactorRoundRobin.java +++ b/common/buildcraft/core/lib/inventory/TransactorRoundRobin.java @@ -10,9 +10,7 @@ package buildcraft.core.lib.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IInvSlot; public class TransactorRoundRobin extends TransactorSimple { diff --git a/common/buildcraft/core/lib/inventory/TransactorSimple.java b/common/buildcraft/core/lib/inventory/TransactorSimple.java index e57aba2e..984cb95b 100644 --- a/common/buildcraft/core/lib/inventory/TransactorSimple.java +++ b/common/buildcraft/core/lib/inventory/TransactorSimple.java @@ -10,12 +10,9 @@ package buildcraft.core.lib.inventory; import java.util.ArrayList; import java.util.List; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IInvSlot; import buildcraft.core.lib.inventory.filters.IStackFilter; diff --git a/common/buildcraft/core/lib/inventory/filters/ArrayFluidFilter.java b/common/buildcraft/core/lib/inventory/filters/ArrayFluidFilter.java index 1fa4d9c3..2867d6bf 100755 --- a/common/buildcraft/core/lib/inventory/filters/ArrayFluidFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/ArrayFluidFilter.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/common/buildcraft/core/lib/inventory/filters/ArrayStackFilter.java b/common/buildcraft/core/lib/inventory/filters/ArrayStackFilter.java index df6d2548..9aa4b56a 100644 --- a/common/buildcraft/core/lib/inventory/filters/ArrayStackFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/ArrayStackFilter.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; - import buildcraft.core.lib.inventory.StackHelper; /** diff --git a/common/buildcraft/core/lib/inventory/filters/ArrayStackOrListFilter.java b/common/buildcraft/core/lib/inventory/filters/ArrayStackOrListFilter.java index 64190a09..4a483193 100755 --- a/common/buildcraft/core/lib/inventory/filters/ArrayStackOrListFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/ArrayStackOrListFilter.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; - import buildcraft.core.lib.inventory.StackHelper; /** diff --git a/common/buildcraft/core/lib/inventory/filters/CraftingFilter.java b/common/buildcraft/core/lib/inventory/filters/CraftingFilter.java index a5c5b750..15de2255 100644 --- a/common/buildcraft/core/lib/inventory/filters/CraftingFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/CraftingFilter.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; - import buildcraft.core.lib.inventory.StackHelper; /** diff --git a/common/buildcraft/core/lib/inventory/filters/OreStackFilter.java b/common/buildcraft/core/lib/inventory/filters/OreStackFilter.java index 7106c7b3..61bfb5b5 100755 --- a/common/buildcraft/core/lib/inventory/filters/OreStackFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/OreStackFilter.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; - import net.minecraftforge.oredict.OreDictionary; /** diff --git a/common/buildcraft/core/lib/inventory/filters/StatementParameterStackFilter.java b/common/buildcraft/core/lib/inventory/filters/StatementParameterStackFilter.java index 6abdf06e..f91239bc 100755 --- a/common/buildcraft/core/lib/inventory/filters/StatementParameterStackFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/StatementParameterStackFilter.java @@ -9,9 +9,7 @@ package buildcraft.core.lib.inventory.filters; import java.util.ArrayList; - import net.minecraft.item.ItemStack; - import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; diff --git a/common/buildcraft/core/lib/items/ItemBuildCraft.java b/common/buildcraft/core/lib/items/ItemBuildCraft.java index 3a4a1b70..90862f20 100644 --- a/common/buildcraft/core/lib/items/ItemBuildCraft.java +++ b/common/buildcraft/core/lib/items/ItemBuildCraft.java @@ -14,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.core.BCCreativeTab; @@ -47,7 +46,11 @@ public class ItemBuildCraft extends Item { if (itemIcon != null) { // NBT lookup workaround? return itemIcon; } - return icons[meta % icons.length]; + if (icons != null && icons.length > 0) { + return icons[meta % icons.length]; + } else { + return null; + } } public String[] getIconNames() { diff --git a/common/buildcraft/core/lib/network/ChannelHandler.java b/common/buildcraft/core/lib/network/ChannelHandler.java index 98798432..e55ba72f 100755 --- a/common/buildcraft/core/lib/network/ChannelHandler.java +++ b/common/buildcraft/core/lib/network/ChannelHandler.java @@ -10,7 +10,6 @@ package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; - import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; import buildcraft.core.lib.network.command.PacketCommand; diff --git a/common/buildcraft/core/lib/network/IGuiReturnHandler.java b/common/buildcraft/core/lib/network/IGuiReturnHandler.java index d68ac522..413c7211 100644 --- a/common/buildcraft/core/lib/network/IGuiReturnHandler.java +++ b/common/buildcraft/core/lib/network/IGuiReturnHandler.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/common/buildcraft/core/lib/network/PacketGuiReturn.java b/common/buildcraft/core/lib/network/PacketGuiReturn.java index d590366b..d0874ecc 100644 --- a/common/buildcraft/core/lib/network/PacketGuiReturn.java +++ b/common/buildcraft/core/lib/network/PacketGuiReturn.java @@ -9,14 +9,11 @@ package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import net.minecraftforge.common.DimensionManager; - import buildcraft.BuildCraftCore; import buildcraft.core.network.PacketIds; diff --git a/common/buildcraft/core/lib/network/PacketGuiWidget.java b/common/buildcraft/core/lib/network/PacketGuiWidget.java index ab78778f..c88ec350 100644 --- a/common/buildcraft/core/lib/network/PacketGuiWidget.java +++ b/common/buildcraft/core/lib/network/PacketGuiWidget.java @@ -9,11 +9,8 @@ package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; - import cpw.mods.fml.client.FMLClientHandler; - import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.network.PacketIds; diff --git a/common/buildcraft/core/lib/network/PacketHandler.java b/common/buildcraft/core/lib/network/PacketHandler.java index 093bae99..821c46fe 100644 --- a/common/buildcraft/core/lib/network/PacketHandler.java +++ b/common/buildcraft/core/lib/network/PacketHandler.java @@ -9,18 +9,14 @@ package buildcraft.core.lib.network; import java.io.IOException; - import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.INetHandler; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import cpw.mods.fml.common.network.NetworkRegistry; - import buildcraft.api.core.ISerializable; import buildcraft.core.lib.network.command.PacketCommand; import buildcraft.core.network.PacketIds; diff --git a/common/buildcraft/core/lib/network/PacketNBT.java b/common/buildcraft/core/lib/network/PacketNBT.java index 787d8319..988d1ba9 100644 --- a/common/buildcraft/core/lib/network/PacketNBT.java +++ b/common/buildcraft/core/lib/network/PacketNBT.java @@ -9,13 +9,10 @@ package buildcraft.core.lib.network; import java.io.IOException; - import io.netty.buffer.ByteBuf; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.core.BCLog; public class PacketNBT extends PacketCoordinates { diff --git a/common/buildcraft/core/lib/network/PacketSlotChange.java b/common/buildcraft/core/lib/network/PacketSlotChange.java index 7c038525..8e8feeae 100644 --- a/common/buildcraft/core/lib/network/PacketSlotChange.java +++ b/common/buildcraft/core/lib/network/PacketSlotChange.java @@ -9,9 +9,7 @@ package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; - import net.minecraft.item.ItemStack; - import buildcraft.core.lib.utils.NetworkUtils; public class PacketSlotChange extends PacketCoordinates { diff --git a/common/buildcraft/core/lib/network/PacketTileState.java b/common/buildcraft/core/lib/network/PacketTileState.java index c531a2f6..24b99d30 100644 --- a/common/buildcraft/core/lib/network/PacketTileState.java +++ b/common/buildcraft/core/lib/network/PacketTileState.java @@ -11,10 +11,8 @@ package buildcraft.core.lib.network; import java.io.IOException; import java.util.LinkedList; import java.util.List; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - import buildcraft.api.core.ISerializable; import buildcraft.core.network.PacketIds; diff --git a/common/buildcraft/core/lib/network/PacketTileUpdate.java b/common/buildcraft/core/lib/network/PacketTileUpdate.java index b2bcb10f..9e3e3364 100644 --- a/common/buildcraft/core/lib/network/PacketTileUpdate.java +++ b/common/buildcraft/core/lib/network/PacketTileUpdate.java @@ -10,7 +10,6 @@ package buildcraft.core.lib.network; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import buildcraft.api.core.ISerializable; import buildcraft.core.network.PacketIds; diff --git a/common/buildcraft/core/lib/network/PacketUpdate.java b/common/buildcraft/core/lib/network/PacketUpdate.java index a68d314f..1466505b 100644 --- a/common/buildcraft/core/lib/network/PacketUpdate.java +++ b/common/buildcraft/core/lib/network/PacketUpdate.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; - import buildcraft.api.core.ISerializable; public class PacketUpdate extends Packet { diff --git a/common/buildcraft/core/lib/network/Serializable.java b/common/buildcraft/core/lib/network/Serializable.java index ec261a89..96f5ad1b 100644 --- a/common/buildcraft/core/lib/network/Serializable.java +++ b/common/buildcraft/core/lib/network/Serializable.java @@ -1,7 +1,6 @@ package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; - import buildcraft.api.core.ISerializable; public class Serializable implements ISerializable { diff --git a/common/buildcraft/core/lib/network/command/CommandTarget.java b/common/buildcraft/core/lib/network/command/CommandTarget.java index 25fa2742..f0d6cab3 100644 --- a/common/buildcraft/core/lib/network/command/CommandTarget.java +++ b/common/buildcraft/core/lib/network/command/CommandTarget.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.network.command; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/common/buildcraft/core/lib/network/command/CommandTargetContainer.java b/common/buildcraft/core/lib/network/command/CommandTargetContainer.java index cfb3dfc1..6f789c47 100644 --- a/common/buildcraft/core/lib/network/command/CommandTargetContainer.java +++ b/common/buildcraft/core/lib/network/command/CommandTargetContainer.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.network.command; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.world.World; diff --git a/common/buildcraft/core/lib/network/command/CommandTargetEntity.java b/common/buildcraft/core/lib/network/command/CommandTargetEntity.java index 6eb000f7..477ae838 100644 --- a/common/buildcraft/core/lib/network/command/CommandTargetEntity.java +++ b/common/buildcraft/core/lib/network/command/CommandTargetEntity.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.network.command; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/common/buildcraft/core/lib/network/command/CommandTargetTile.java b/common/buildcraft/core/lib/network/command/CommandTargetTile.java index 8bfddc5d..c0b378d4 100644 --- a/common/buildcraft/core/lib/network/command/CommandTargetTile.java +++ b/common/buildcraft/core/lib/network/command/CommandTargetTile.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.network.command; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/common/buildcraft/core/lib/network/command/ICommandReceiver.java b/common/buildcraft/core/lib/network/command/ICommandReceiver.java index 1f9c415b..e1d6ed82 100644 --- a/common/buildcraft/core/lib/network/command/ICommandReceiver.java +++ b/common/buildcraft/core/lib/network/command/ICommandReceiver.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.network.command; import io.netty.buffer.ByteBuf; - import cpw.mods.fml.relauncher.Side; public interface ICommandReceiver { diff --git a/common/buildcraft/core/lib/network/command/PacketCommand.java b/common/buildcraft/core/lib/network/command/PacketCommand.java index f4510f78..5afcebac 100644 --- a/common/buildcraft/core/lib/network/command/PacketCommand.java +++ b/common/buildcraft/core/lib/network/command/PacketCommand.java @@ -9,13 +9,9 @@ package buildcraft.core.lib.network.command; import java.util.ArrayList; - import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; - import cpw.mods.fml.common.FMLCommonHandler; - import buildcraft.core.lib.network.Packet; import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.core.network.PacketIds; diff --git a/common/buildcraft/core/lib/render/DynamicTexturePaletted.java b/common/buildcraft/core/lib/render/DynamicTexturePaletted.java index 7552640a..31cf4dfb 100755 --- a/common/buildcraft/core/lib/render/DynamicTexturePaletted.java +++ b/common/buildcraft/core/lib/render/DynamicTexturePaletted.java @@ -10,7 +10,6 @@ package buildcraft.core.lib.render; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.DynamicTexture; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/buildcraft/core/lib/render/EntityDropParticleFX.java b/common/buildcraft/core/lib/render/EntityDropParticleFX.java index 8377c5ca..ea7beefe 100644 --- a/common/buildcraft/core/lib/render/EntityDropParticleFX.java +++ b/common/buildcraft/core/lib/render/EntityDropParticleFX.java @@ -13,10 +13,8 @@ import net.minecraft.block.material.Material; import net.minecraft.client.particle.EntityFX; import net.minecraft.util.MathHelper; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.fluids.IFluidBlock; @SideOnly(Side.CLIENT) diff --git a/common/buildcraft/core/lib/render/FakeBlock.java b/common/buildcraft/core/lib/render/FakeBlock.java index fc4a618e..9c30c7fb 100644 --- a/common/buildcraft/core/lib/render/FakeBlock.java +++ b/common/buildcraft/core/lib/render/FakeBlock.java @@ -12,12 +12,9 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.render.ITextureStates; /* diff --git a/common/buildcraft/core/lib/render/FluidRenderer.java b/common/buildcraft/core/lib/render/FluidRenderer.java index c500c270..d8554774 100644 --- a/common/buildcraft/core/lib/render/FluidRenderer.java +++ b/common/buildcraft/core/lib/render/FluidRenderer.java @@ -10,9 +10,7 @@ package buildcraft.core.lib.render; import java.util.HashMap; import java.util.Map; - import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.texture.TextureMap; @@ -20,10 +18,8 @@ import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; - import buildcraft.core.lib.render.RenderEntityBlock.RenderInfo; public final class FluidRenderer { diff --git a/common/buildcraft/core/lib/render/RenderBlockComplex.java b/common/buildcraft/core/lib/render/RenderBlockComplex.java index ff8ef6b4..30900ec9 100644 --- a/common/buildcraft/core/lib/render/RenderBlockComplex.java +++ b/common/buildcraft/core/lib/render/RenderBlockComplex.java @@ -45,7 +45,7 @@ public class RenderBlockComplex implements ISimpleBlockRenderingHandler { renderer.uvRotateBottom = Y_ROTATE[block.getFrontSide(meta) - 2]; } - double pDouble = ((pass > 0 ? 1 : 0) / 512.0); + double pDouble = (pass > 0 ? 1 : 0) / 512.0; renderer.setRenderBounds(block.getBlockBoundsMinX() - pDouble, block.getBlockBoundsMinY() - pDouble, block.getBlockBoundsMinZ() - pDouble, diff --git a/common/buildcraft/core/lib/render/RenderEntityBlock.java b/common/buildcraft/core/lib/render/RenderEntityBlock.java index 2b1b96ef..9cfe8d0c 100644 --- a/common/buildcraft/core/lib/render/RenderEntityBlock.java +++ b/common/buildcraft/core/lib/render/RenderEntityBlock.java @@ -9,9 +9,7 @@ package buildcraft.core.lib.render; import java.util.Arrays; - import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -22,7 +20,6 @@ import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; - import buildcraft.core.lib.EntityBlock; public final class RenderEntityBlock extends Render { diff --git a/common/buildcraft/core/lib/render/SubIcon.java b/common/buildcraft/core/lib/render/SubIcon.java index 2d611e41..7c9d0cb2 100644 --- a/common/buildcraft/core/lib/render/SubIcon.java +++ b/common/buildcraft/core/lib/render/SubIcon.java @@ -43,8 +43,8 @@ public class SubIcon implements IIcon { } @Override - public float getInterpolatedU(double p_94214_1_) { - return u + (uScale * (float) p_94214_1_ / (float) icon.getIconWidth()); + public float getInterpolatedU(double uu) { + return u + (uScale * (float) uu / (float) icon.getIconWidth()); } @Override @@ -58,8 +58,8 @@ public class SubIcon implements IIcon { } @Override - public float getInterpolatedV(double p_94207_1_) { - return v + (vScale * (float) p_94207_1_ / (float) icon.getIconHeight()); + public float getInterpolatedV(double vv) { + return v + (vScale * (float) vv / (float) icon.getIconHeight()); } @Override diff --git a/common/buildcraft/core/lib/render/TextureStateManager.java b/common/buildcraft/core/lib/render/TextureStateManager.java index 1f7575a1..5f9a127e 100644 --- a/common/buildcraft/core/lib/render/TextureStateManager.java +++ b/common/buildcraft/core/lib/render/TextureStateManager.java @@ -9,10 +9,8 @@ package buildcraft.core.lib.render; import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.core.render.ITextureStateManager; /* diff --git a/common/buildcraft/core/lib/utils/BlockMiner.java b/common/buildcraft/core/lib/utils/BlockMiner.java index c72f4d40..51f3c550 100644 --- a/common/buildcraft/core/lib/utils/BlockMiner.java +++ b/common/buildcraft/core/lib/utils/BlockMiner.java @@ -1,18 +1,15 @@ package buildcraft.core.lib.utils; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.WorldServer; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.world.BlockEvent; - import buildcraft.BuildCraftCore; import buildcraft.core.proxy.CoreProxy; diff --git a/common/buildcraft/core/lib/utils/BlockScanner.java b/common/buildcraft/core/lib/utils/BlockScanner.java index 0ba8eafa..65a193e4 100755 --- a/common/buildcraft/core/lib/utils/BlockScanner.java +++ b/common/buildcraft/core/lib/utils/BlockScanner.java @@ -9,10 +9,8 @@ package buildcraft.core.lib.utils; import java.util.Iterator; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; - import buildcraft.api.core.BlockIndex; import buildcraft.core.Box; diff --git a/common/buildcraft/core/lib/utils/BlockScannerExpanding.java b/common/buildcraft/core/lib/utils/BlockScannerExpanding.java index 9fbfa238..ab1fa97b 100644 --- a/common/buildcraft/core/lib/utils/BlockScannerExpanding.java +++ b/common/buildcraft/core/lib/utils/BlockScannerExpanding.java @@ -1,7 +1,6 @@ package buildcraft.core.lib.utils; import java.util.Iterator; - import buildcraft.api.core.BlockIndex; public class BlockScannerExpanding implements Iterable { diff --git a/common/buildcraft/core/lib/utils/BlockScannerRandom.java b/common/buildcraft/core/lib/utils/BlockScannerRandom.java index a59557e4..032b6600 100644 --- a/common/buildcraft/core/lib/utils/BlockScannerRandom.java +++ b/common/buildcraft/core/lib/utils/BlockScannerRandom.java @@ -2,7 +2,6 @@ package buildcraft.core.lib.utils; import java.util.Iterator; import java.util.Random; - import net.minecraft.util.MathHelper; import buildcraft.api.core.BlockIndex; diff --git a/common/buildcraft/core/lib/utils/BlockScannerZoneRandom.java b/common/buildcraft/core/lib/utils/BlockScannerZoneRandom.java index d1b619a2..1242b67c 100644 --- a/common/buildcraft/core/lib/utils/BlockScannerZoneRandom.java +++ b/common/buildcraft/core/lib/utils/BlockScannerZoneRandom.java @@ -2,7 +2,6 @@ package buildcraft.core.lib.utils; import java.util.Iterator; import java.util.Random; - import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IZone; diff --git a/common/buildcraft/core/lib/utils/BlockUtils.java b/common/buildcraft/core/lib/utils/BlockUtils.java index 759b76ac..1b669b0f 100644 --- a/common/buildcraft/core/lib/utils/BlockUtils.java +++ b/common/buildcraft/core/lib/utils/BlockUtils.java @@ -10,7 +10,6 @@ package buildcraft.core.lib.utils; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockStaticLiquid; import net.minecraft.entity.item.EntityItem; @@ -20,17 +19,12 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.S27PacketExplosion; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.ChunkPosition; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.ChunkProviderServer; - import cpw.mods.fml.common.FMLCommonHandler; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.world.BlockEvent.BreakEvent; @@ -39,12 +33,12 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; - import buildcraft.BuildCraftCore; import buildcraft.api.blueprints.BuilderAPI; import buildcraft.core.proxy.CoreProxy; public final class BlockUtils { + private static Chunk lastChunk; /** * Deactivate constructor @@ -135,7 +129,7 @@ public final class BlockUtils { } // TODO: Make this support all "heavy" liquids, not just oil/lava - if (block instanceof IFluidBlock && ((IFluidBlock) block).getFluid() != null && ((IFluidBlock) block).getFluid().getName().equals("oil")) { + if (block instanceof IFluidBlock && ((IFluidBlock) block).getFluid() != null && "oil".equals(((IFluidBlock) block).getFluid().getName())) { return false; } @@ -229,7 +223,6 @@ public final class BlockUtils { /** * The following functions let you avoid unnecessary chunk loads, which is nice. */ - private static Chunk lastChunk; private static Chunk getChunkUnforced(World world, int x, int z) { Chunk chunk = lastChunk; @@ -259,7 +252,9 @@ public final class BlockUtils { } Chunk chunk = getChunkUnforced(world, x >> 4, z >> 4); return chunk != null ? chunk.getTileEntityUnsafe(x & 15, y, z & 15) : null; - } else return world.getTileEntity(x, y, z); + } else { + return world.getTileEntity(x, y, z); + } } public static Block getBlock(World world, int x, int y, int z) { @@ -273,7 +268,9 @@ public final class BlockUtils { } Chunk chunk = getChunkUnforced(world, x >> 4, z >> 4); return chunk != null ? chunk.getBlock(x & 15, y, z & 15) : Blocks.air; - } else return world.getBlock(x, y, z); + } else { + return world.getBlock(x, y, z); + } } public static int getBlockMetadata(World world, int x, int y, int z) { @@ -287,6 +284,8 @@ public final class BlockUtils { } Chunk chunk = getChunkUnforced(world, x >> 4, z >> 4); return chunk != null ? chunk.getBlockMetadata(x & 15, y, z & 15) : 0; - } else return world.getBlockMetadata(x, y, z); + } else { + return world.getBlockMetadata(x, y, z); + } } } diff --git a/common/buildcraft/core/lib/utils/ColorUtils.java b/common/buildcraft/core/lib/utils/ColorUtils.java index d27f09d5..4291bece 100644 --- a/common/buildcraft/core/lib/utils/ColorUtils.java +++ b/common/buildcraft/core/lib/utils/ColorUtils.java @@ -10,7 +10,6 @@ package buildcraft.core.lib.utils; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; - import net.minecraftforge.oredict.OreDictionary; public final class ColorUtils { diff --git a/common/buildcraft/core/lib/utils/ConfigUtils.java b/common/buildcraft/core/lib/utils/ConfigUtils.java index 39295e58..14862f51 100644 --- a/common/buildcraft/core/lib/utils/ConfigUtils.java +++ b/common/buildcraft/core/lib/utils/ConfigUtils.java @@ -9,10 +9,8 @@ package buildcraft.core.lib.utils; import org.apache.logging.log4j.Level; - import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; - import buildcraft.api.core.BCLog; public class ConfigUtils { diff --git a/common/buildcraft/core/lib/utils/CraftingUtils.java b/common/buildcraft/core/lib/utils/CraftingUtils.java index edef070b..0201d510 100644 --- a/common/buildcraft/core/lib/utils/CraftingUtils.java +++ b/common/buildcraft/core/lib/utils/CraftingUtils.java @@ -10,7 +10,6 @@ package buildcraft.core.lib.utils; import java.util.ArrayList; import java.util.List; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/lib/utils/FluidUtils.java b/common/buildcraft/core/lib/utils/FluidUtils.java index c7465b3c..b1b0deff 100644 --- a/common/buildcraft/core/lib/utils/FluidUtils.java +++ b/common/buildcraft/core/lib/utils/FluidUtils.java @@ -3,7 +3,6 @@ package buildcraft.core.lib.utils; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/common/buildcraft/core/lib/utils/NBTUtils.java b/common/buildcraft/core/lib/utils/NBTUtils.java index fcc09324..ea4e1147 100644 --- a/common/buildcraft/core/lib/utils/NBTUtils.java +++ b/common/buildcraft/core/lib/utils/NBTUtils.java @@ -10,12 +10,10 @@ package buildcraft.core.lib.utils; import java.io.IOException; import java.util.UUID; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; -import buildcraft.core.blueprints.BlueprintBase; public final class NBTUtils { diff --git a/common/buildcraft/core/lib/utils/NetworkUtils.java b/common/buildcraft/core/lib/utils/NetworkUtils.java index 97ffaa21..c2f6c70e 100644 --- a/common/buildcraft/core/lib/utils/NetworkUtils.java +++ b/common/buildcraft/core/lib/utils/NetworkUtils.java @@ -9,7 +9,7 @@ import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; -public class NetworkUtils { +public final class NetworkUtils { private NetworkUtils() { } diff --git a/common/buildcraft/core/lib/utils/PathFinding.java b/common/buildcraft/core/lib/utils/PathFinding.java index f439e4e1..22e0653d 100755 --- a/common/buildcraft/core/lib/utils/PathFinding.java +++ b/common/buildcraft/core/lib/utils/PathFinding.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; - import net.minecraft.world.World; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.BuildCraftAPI; diff --git a/common/buildcraft/core/lib/utils/PathFindingSearch.java b/common/buildcraft/core/lib/utils/PathFindingSearch.java index 2b765526..2c0e3cbb 100644 --- a/common/buildcraft/core/lib/utils/PathFindingSearch.java +++ b/common/buildcraft/core/lib/utils/PathFindingSearch.java @@ -14,9 +14,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; - import net.minecraft.world.World; - import buildcraft.api.core.BlockIndex; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.IZone; diff --git a/common/buildcraft/core/lib/utils/ResourceUtils.java b/common/buildcraft/core/lib/utils/ResourceUtils.java index 544544d8..b61b39c8 100644 --- a/common/buildcraft/core/lib/utils/ResourceUtils.java +++ b/common/buildcraft/core/lib/utils/ResourceUtils.java @@ -8,7 +8,7 @@ import net.minecraft.client.resources.IResource; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -public class ResourceUtils { +public final class ResourceUtils { private ResourceUtils() { } diff --git a/common/buildcraft/core/lib/utils/RevolvingList.java b/common/buildcraft/core/lib/utils/RevolvingList.java index 5a075995..85265610 100644 --- a/common/buildcraft/core/lib/utils/RevolvingList.java +++ b/common/buildcraft/core/lib/utils/RevolvingList.java @@ -11,7 +11,6 @@ package buildcraft.core.lib.utils; import java.util.Collection; import java.util.Deque; import java.util.LinkedList; - import com.google.common.collect.ForwardingCollection; public class RevolvingList extends ForwardingCollection { diff --git a/common/buildcraft/core/lib/utils/StringUtils.java b/common/buildcraft/core/lib/utils/StringUtils.java index 4ece6751..270704e0 100644 --- a/common/buildcraft/core/lib/utils/StringUtils.java +++ b/common/buildcraft/core/lib/utils/StringUtils.java @@ -9,7 +9,6 @@ package buildcraft.core.lib.utils; import com.google.common.base.Splitter; - import net.minecraft.util.StatCollector; public final class StringUtils { diff --git a/common/buildcraft/core/lib/utils/Utils.java b/common/buildcraft/core/lib/utils/Utils.java index e158b9a1..145355d5 100644 --- a/common/buildcraft/core/lib/utils/Utils.java +++ b/common/buildcraft/core/lib/utils/Utils.java @@ -13,10 +13,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Random; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -26,14 +24,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; -import net.minecraft.world.IWorldAccess; import net.minecraft.world.World; - import cpw.mods.fml.common.network.internal.FMLProxyPacket; - import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.Position; import buildcraft.api.power.IEngine; @@ -42,11 +36,11 @@ import buildcraft.api.transport.IInjectable; import buildcraft.api.transport.IPipeTile; import buildcraft.core.CompatHooks; import buildcraft.core.DefaultProps; -import buildcraft.core.lib.EntityBlock; import buildcraft.core.IDropControlInventory; import buildcraft.core.IFramePipeConnection; import buildcraft.core.LaserData; import buildcraft.core.LaserKind; +import buildcraft.core.lib.EntityBlock; import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.lib.inventory.ITransactor; import buildcraft.core.lib.inventory.InvUtils; @@ -82,7 +76,7 @@ public final class Utils { Position pos = new Position(x, y, z, orientation); pos.moveForwards(1.0); - TileEntity tileInventory =BlockUtils.getTileEntity(world, (int) pos.x, (int) pos.y, (int) pos.z); + TileEntity tileInventory = BlockUtils.getTileEntity(world, (int) pos.x, (int) pos.y, (int) pos.z); ITransactor transactor = Transactor.getTransactorFor(tileInventory); if (transactor != null && !(tileInventory instanceof IEngine) && transactor.add(stack, orientation.getOpposite(), false).stackSize > 0) { return transactor.add(stack, orientation.getOpposite(), true).stackSize; diff --git a/common/buildcraft/core/properties/ChunkProperty.java b/common/buildcraft/core/properties/ChunkProperty.java index 6ea6841e..43434e11 100755 --- a/common/buildcraft/core/properties/ChunkProperty.java +++ b/common/buildcraft/core/properties/ChunkProperty.java @@ -9,7 +9,6 @@ package buildcraft.core.properties; import java.util.BitSet; - import net.minecraft.world.IBlockAccess; public class ChunkProperty { diff --git a/common/buildcraft/core/properties/WorldProperty.java b/common/buildcraft/core/properties/WorldProperty.java index d01cfede..188f9acb 100644 --- a/common/buildcraft/core/properties/WorldProperty.java +++ b/common/buildcraft/core/properties/WorldProperty.java @@ -9,11 +9,9 @@ package buildcraft.core.properties; import java.util.HashMap; - import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import buildcraft.api.core.IWorldProperty; public abstract class WorldProperty implements IWorldProperty { diff --git a/common/buildcraft/core/properties/WorldPropertyIsFluidSource.java b/common/buildcraft/core/properties/WorldPropertyIsFluidSource.java index f08990cc..f9f01c16 100755 --- a/common/buildcraft/core/properties/WorldPropertyIsFluidSource.java +++ b/common/buildcraft/core/properties/WorldPropertyIsFluidSource.java @@ -11,7 +11,6 @@ package buildcraft.core.properties; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.world.IBlockAccess; - import net.minecraftforge.fluids.BlockFluidBase; public class WorldPropertyIsFluidSource extends WorldProperty { diff --git a/common/buildcraft/core/properties/WorldPropertyIsLeaf.java b/common/buildcraft/core/properties/WorldPropertyIsLeaf.java index 50327484..19182b3a 100755 --- a/common/buildcraft/core/properties/WorldPropertyIsLeaf.java +++ b/common/buildcraft/core/properties/WorldPropertyIsLeaf.java @@ -11,7 +11,6 @@ package buildcraft.core.properties; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; - import net.minecraftforge.oredict.OreDictionary; public class WorldPropertyIsLeaf extends WorldProperty { diff --git a/common/buildcraft/core/properties/WorldPropertyIsOre.java b/common/buildcraft/core/properties/WorldPropertyIsOre.java index 720c0670..57ead1a9 100755 --- a/common/buildcraft/core/properties/WorldPropertyIsOre.java +++ b/common/buildcraft/core/properties/WorldPropertyIsOre.java @@ -10,13 +10,11 @@ package buildcraft.core.properties; import java.util.ArrayList; import java.util.HashSet; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; - import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; diff --git a/common/buildcraft/core/properties/WorldPropertyIsSoft.java b/common/buildcraft/core/properties/WorldPropertyIsSoft.java index cf778f19..6a0d2586 100755 --- a/common/buildcraft/core/properties/WorldPropertyIsSoft.java +++ b/common/buildcraft/core/properties/WorldPropertyIsSoft.java @@ -10,7 +10,6 @@ package buildcraft.core.properties; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; - import buildcraft.api.core.BuildCraftAPI; public class WorldPropertyIsSoft extends WorldProperty { diff --git a/common/buildcraft/core/properties/WorldPropertyIsWood.java b/common/buildcraft/core/properties/WorldPropertyIsWood.java index f2fc0414..3b07c506 100755 --- a/common/buildcraft/core/properties/WorldPropertyIsWood.java +++ b/common/buildcraft/core/properties/WorldPropertyIsWood.java @@ -11,7 +11,6 @@ package buildcraft.core.properties; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; - import net.minecraftforge.oredict.OreDictionary; public class WorldPropertyIsWood extends WorldProperty { diff --git a/common/buildcraft/core/proxy/CoreProxy.java b/common/buildcraft/core/proxy/CoreProxy.java index b4becc8e..b2980742 100644 --- a/common/buildcraft/core/proxy/CoreProxy.java +++ b/common/buildcraft/core/proxy/CoreProxy.java @@ -10,7 +10,6 @@ package buildcraft.core.proxy; import java.lang.ref.WeakReference; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -23,21 +22,18 @@ import net.minecraft.network.INetHandler; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.world.World; import net.minecraft.world.WorldServer; - import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.registry.GameRegistry; - import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; - import buildcraft.BuildCraftCore; import buildcraft.api.core.ICoreProxy; import buildcraft.core.CompatHooks; +import buildcraft.core.LaserKind; import buildcraft.core.lib.EntityBlock; import buildcraft.core.lib.items.ItemBlockBuildCraft; -import buildcraft.core.LaserKind; public class CoreProxy implements ICoreProxy { diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index dc320169..63d49127 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -9,7 +9,6 @@ package buildcraft.core.proxy; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; @@ -21,14 +20,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.INetHandler; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.world.World; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; - import buildcraft.BuildCraftCore; -import buildcraft.core.lib.EntityBlock; import buildcraft.core.LaserKind; +import buildcraft.core.lib.EntityBlock; import buildcraft.core.lib.engines.RenderEngine; import buildcraft.core.lib.engines.TileEngineBase; import buildcraft.core.lib.render.RenderBlockComplex; diff --git a/common/buildcraft/core/recipes/AssemblyRecipeManager.java b/common/buildcraft/core/recipes/AssemblyRecipeManager.java index 15c992b0..68b29508 100644 --- a/common/buildcraft/core/recipes/AssemblyRecipeManager.java +++ b/common/buildcraft/core/recipes/AssemblyRecipeManager.java @@ -11,10 +11,8 @@ package buildcraft.core.recipes; import java.util.Collection; import java.util.HashMap; import java.util.Map; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - import buildcraft.BuildCraftCore; import buildcraft.api.recipes.IAssemblyRecipeManager; import buildcraft.api.recipes.IFlexibleRecipe; diff --git a/common/buildcraft/core/recipes/FlexibleRecipe.java b/common/buildcraft/core/recipes/FlexibleRecipe.java index cdf2c2ab..2a80979a 100644 --- a/common/buildcraft/core/recipes/FlexibleRecipe.java +++ b/common/buildcraft/core/recipes/FlexibleRecipe.java @@ -11,14 +11,11 @@ package buildcraft.core.recipes; import java.util.ArrayList; import java.util.Collection; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; - import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.IFlexibleCrafter; import buildcraft.api.recipes.IFlexibleRecipe; diff --git a/common/buildcraft/core/recipes/IntegrationRecipeManager.java b/common/buildcraft/core/recipes/IntegrationRecipeManager.java index 49880a20..e52d445d 100644 --- a/common/buildcraft/core/recipes/IntegrationRecipeManager.java +++ b/common/buildcraft/core/recipes/IntegrationRecipeManager.java @@ -10,7 +10,6 @@ package buildcraft.core.recipes; import java.util.LinkedList; import java.util.List; - import buildcraft.api.recipes.IIntegrationRecipe; import buildcraft.api.recipes.IIntegrationRecipeManager; diff --git a/common/buildcraft/core/recipes/RefineryRecipeManager.java b/common/buildcraft/core/recipes/RefineryRecipeManager.java index a48b6846..45d4a0f6 100644 --- a/common/buildcraft/core/recipes/RefineryRecipeManager.java +++ b/common/buildcraft/core/recipes/RefineryRecipeManager.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; - import net.minecraftforge.fluids.FluidStack; import buildcraft.BuildCraftCore; import buildcraft.api.core.BCLog; diff --git a/common/buildcraft/core/render/BlockHighlightHandler.java b/common/buildcraft/core/render/BlockHighlightHandler.java index a8dd5009..123f9a8c 100644 --- a/common/buildcraft/core/render/BlockHighlightHandler.java +++ b/common/buildcraft/core/render/BlockHighlightHandler.java @@ -9,20 +9,16 @@ package buildcraft.core.render; import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.client.event.DrawBlockHighlightEvent; - import buildcraft.core.lib.render.ICustomHighlight; public class BlockHighlightHandler { diff --git a/common/buildcraft/core/render/RenderBox.java b/common/buildcraft/core/render/RenderBox.java index 817df024..bcd4cf77 100755 --- a/common/buildcraft/core/render/RenderBox.java +++ b/common/buildcraft/core/render/RenderBox.java @@ -9,10 +9,8 @@ package buildcraft.core.render; import org.lwjgl.opengl.GL11; - import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; - import buildcraft.core.Box; import buildcraft.core.LaserData; diff --git a/common/buildcraft/core/render/RenderBoxProvider.java b/common/buildcraft/core/render/RenderBoxProvider.java index 1f236b27..c59efd9c 100755 --- a/common/buildcraft/core/render/RenderBoxProvider.java +++ b/common/buildcraft/core/render/RenderBoxProvider.java @@ -9,14 +9,11 @@ package buildcraft.core.render; import org.lwjgl.opengl.GL11; - import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; - import buildcraft.core.Box; -import buildcraft.core.DefaultProps; import buildcraft.core.IBoxProvider; import buildcraft.core.IBoxesProvider; diff --git a/common/buildcraft/core/render/RenderBuilder.java b/common/buildcraft/core/render/RenderBuilder.java index 51463460..ed66d208 100755 --- a/common/buildcraft/core/render/RenderBuilder.java +++ b/common/buildcraft/core/render/RenderBuilder.java @@ -9,10 +9,8 @@ package buildcraft.core.render; import org.lwjgl.opengl.GL11; - import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.tileentity.TileEntity; - import buildcraft.core.EntityLaser; import buildcraft.core.LaserData; import buildcraft.core.builders.TileAbstractBuilder; diff --git a/common/buildcraft/core/render/RenderBuildingItems.java b/common/buildcraft/core/render/RenderBuildingItems.java index 0de3cef9..0f88f0cb 100755 --- a/common/buildcraft/core/render/RenderBuildingItems.java +++ b/common/buildcraft/core/render/RenderBuildingItems.java @@ -9,15 +9,12 @@ package buildcraft.core.render; import org.lwjgl.opengl.GL11; - import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - -import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftCore; import buildcraft.core.StackAtPosition; import buildcraft.core.builders.BuildingItem; diff --git a/common/buildcraft/core/render/RenderLaser.java b/common/buildcraft/core/render/RenderLaser.java index 626258ad..bbbd2763 100644 --- a/common/buildcraft/core/render/RenderLaser.java +++ b/common/buildcraft/core/render/RenderLaser.java @@ -9,7 +9,6 @@ package buildcraft.core.render; import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GLAllocation; @@ -19,7 +18,6 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; - import buildcraft.api.core.Position; import buildcraft.core.EntityLaser; import buildcraft.core.LaserData; @@ -27,7 +25,6 @@ import buildcraft.core.lib.render.RenderEntityBlock; import buildcraft.core.lib.render.RenderEntityBlock.RenderInfo; public class RenderLaser extends Render { - public static final float STEP = 0.04F; protected static ModelBase model = new ModelBase() { @@ -74,8 +71,8 @@ public class RenderLaser extends Render { float range = maxSize - minSize; - float diff = (MathHelper.cos(i / 20F * 2 * (float) Math.PI) - * range / 2F); + float diff = MathHelper.cos(i / 20F * 2 * (float) Math.PI) + * range / 2F; block.minX = 0.0; block.minY = -maxSize / 2F + diff; diff --git a/common/buildcraft/core/render/RenderingEntityBlocks.java b/common/buildcraft/core/render/RenderingEntityBlocks.java index fd7755d3..3dad9945 100644 --- a/common/buildcraft/core/render/RenderingEntityBlocks.java +++ b/common/buildcraft/core/render/RenderingEntityBlocks.java @@ -9,9 +9,7 @@ package buildcraft.core.render; import java.util.HashMap; - import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -19,9 +17,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - import buildcraft.BuildCraftCore; import buildcraft.core.CoreConstants; import buildcraft.core.lib.render.IInventoryRenderer; diff --git a/common/buildcraft/core/render/RenderingMarkers.java b/common/buildcraft/core/render/RenderingMarkers.java index 9c6d54e2..dd2ad07e 100644 --- a/common/buildcraft/core/render/RenderingMarkers.java +++ b/common/buildcraft/core/render/RenderingMarkers.java @@ -13,9 +13,7 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - import buildcraft.BuildCraftCore; public class RenderingMarkers implements ISimpleBlockRenderingHandler { diff --git a/common/buildcraft/core/statements/ActionMachineControl.java b/common/buildcraft/core/statements/ActionMachineControl.java index 220a23e9..9ff65b67 100644 --- a/common/buildcraft/core/statements/ActionMachineControl.java +++ b/common/buildcraft/core/statements/ActionMachineControl.java @@ -9,15 +9,11 @@ package buildcraft.core.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/core/statements/ActionRedstoneOutput.java b/common/buildcraft/core/statements/ActionRedstoneOutput.java index 0fee82e5..aa4ddc51 100644 --- a/common/buildcraft/core/statements/ActionRedstoneOutput.java +++ b/common/buildcraft/core/statements/ActionRedstoneOutput.java @@ -9,10 +9,8 @@ package buildcraft.core.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; diff --git a/common/buildcraft/core/statements/BCStatement.java b/common/buildcraft/core/statements/BCStatement.java index 6ab1f810..52598a7f 100644 --- a/common/buildcraft/core/statements/BCStatement.java +++ b/common/buildcraft/core/statements/BCStatement.java @@ -10,10 +10,8 @@ package buildcraft.core.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementManager; diff --git a/common/buildcraft/core/statements/DefaultActionProvider.java b/common/buildcraft/core/statements/DefaultActionProvider.java index 4ac73d12..563420f7 100644 --- a/common/buildcraft/core/statements/DefaultActionProvider.java +++ b/common/buildcraft/core/statements/DefaultActionProvider.java @@ -10,11 +10,8 @@ package buildcraft.core.statements; import java.util.Collection; import java.util.LinkedList; - import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftCore; import buildcraft.api.core.BCLog; import buildcraft.api.statements.IActionExternal; @@ -23,7 +20,6 @@ import buildcraft.api.statements.IActionProvider; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.containers.IRedstoneStatementContainer; import buildcraft.api.tiles.IControllable; -import buildcraft.api.transport.IPipeTile; public class DefaultActionProvider implements IActionProvider { diff --git a/common/buildcraft/core/statements/DefaultTriggerProvider.java b/common/buildcraft/core/statements/DefaultTriggerProvider.java index e3af025d..5ed0cf48 100644 --- a/common/buildcraft/core/statements/DefaultTriggerProvider.java +++ b/common/buildcraft/core/statements/DefaultTriggerProvider.java @@ -9,15 +9,11 @@ package buildcraft.core.statements; import java.util.LinkedList; - import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.BuildCraftCore; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/core/statements/StatementParameterDirection.java b/common/buildcraft/core/statements/StatementParameterDirection.java index 173500b9..33f37627 100644 --- a/common/buildcraft/core/statements/StatementParameterDirection.java +++ b/common/buildcraft/core/statements/StatementParameterDirection.java @@ -12,9 +12,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java b/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java index da700e5a..77209912 100644 --- a/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java +++ b/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java @@ -4,7 +4,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; - import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/core/statements/TriggerEnergy.java b/common/buildcraft/core/statements/TriggerEnergy.java index 297f22c7..3c02f977 100644 --- a/common/buildcraft/core/statements/TriggerEnergy.java +++ b/common/buildcraft/core/statements/TriggerEnergy.java @@ -8,20 +8,15 @@ */ package buildcraft.core.statements; -import java.util.Locale; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; - import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; @@ -69,7 +64,7 @@ public class TriggerEnergy extends BCStatement implements ITriggerInternal { } if (energyMaxStored > 0) { - float level = (energyStored / energyMaxStored); + float level = energyStored / energyMaxStored; if (high) { return level > 0.95F; } else { diff --git a/common/buildcraft/core/statements/TriggerFluidContainer.java b/common/buildcraft/core/statements/TriggerFluidContainer.java index 070b6c1a..5452478f 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainer.java +++ b/common/buildcraft/core/statements/TriggerFluidContainer.java @@ -9,16 +9,13 @@ package buildcraft.core.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java index 13433f12..3b6b3cc5 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java +++ b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java @@ -9,16 +9,13 @@ package buildcraft.core.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/core/statements/TriggerInventory.java b/common/buildcraft/core/statements/TriggerInventory.java index ba9eb05b..6e1715df 100644 --- a/common/buildcraft/core/statements/TriggerInventory.java +++ b/common/buildcraft/core/statements/TriggerInventory.java @@ -9,14 +9,11 @@ package buildcraft.core.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/core/statements/TriggerInventoryLevel.java b/common/buildcraft/core/statements/TriggerInventoryLevel.java index bf88b844..04eb3d1a 100644 --- a/common/buildcraft/core/statements/TriggerInventoryLevel.java +++ b/common/buildcraft/core/statements/TriggerInventoryLevel.java @@ -9,14 +9,11 @@ package buildcraft.core.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/core/statements/TriggerMachine.java b/common/buildcraft/core/statements/TriggerMachine.java index 6ce79f07..f60e20cb 100644 --- a/common/buildcraft/core/statements/TriggerMachine.java +++ b/common/buildcraft/core/statements/TriggerMachine.java @@ -10,9 +10,7 @@ package buildcraft.core.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/core/statements/TriggerRedstoneInput.java b/common/buildcraft/core/statements/TriggerRedstoneInput.java index f217af04..7d71e533 100644 --- a/common/buildcraft/core/statements/TriggerRedstoneInput.java +++ b/common/buildcraft/core/statements/TriggerRedstoneInput.java @@ -9,7 +9,6 @@ package buildcraft.core.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/energy/BucketHandler.java b/common/buildcraft/energy/BucketHandler.java index 097f540a..f17c23b3 100644 --- a/common/buildcraft/energy/BucketHandler.java +++ b/common/buildcraft/energy/BucketHandler.java @@ -10,16 +10,13 @@ package buildcraft.energy; import java.util.HashMap; import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; - import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; - import net.minecraftforge.event.entity.player.FillBucketEvent; public final class BucketHandler { diff --git a/common/buildcraft/energy/EnergyGuiHandler.java b/common/buildcraft/energy/EnergyGuiHandler.java index 17efc1bb..518e6678 100644 --- a/common/buildcraft/energy/EnergyGuiHandler.java +++ b/common/buildcraft/energy/EnergyGuiHandler.java @@ -11,9 +11,7 @@ package buildcraft.energy; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import cpw.mods.fml.common.network.IGuiHandler; - import buildcraft.core.GuiIds; import buildcraft.core.lib.engines.TileEngineWithInventory; import buildcraft.energy.gui.ContainerEngine; diff --git a/common/buildcraft/energy/ItemBucketBuildcraft.java b/common/buildcraft/energy/ItemBucketBuildcraft.java index 5b087211..2433ec8c 100644 --- a/common/buildcraft/energy/ItemBucketBuildcraft.java +++ b/common/buildcraft/energy/ItemBucketBuildcraft.java @@ -14,10 +14,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBucket; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.core.BCCreativeTab; public class ItemBucketBuildcraft extends ItemBucket { diff --git a/common/buildcraft/energy/TileEngineCreative.java b/common/buildcraft/energy/TileEngineCreative.java index dec06baf..53e992e1 100644 --- a/common/buildcraft/energy/TileEngineCreative.java +++ b/common/buildcraft/energy/TileEngineCreative.java @@ -9,24 +9,19 @@ package buildcraft.energy; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ResourceLocation; - import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftCore; import buildcraft.api.tools.IToolWrench; import buildcraft.core.PowerMode; -import buildcraft.core.TileEngine; import buildcraft.core.lib.engines.TileEngineBase; import buildcraft.core.lib.utils.StringUtils; -public class TileEngineCreative extends TileEngine { +public class TileEngineCreative extends TileEngineBase { private PowerMode powerMode = PowerMode.M2; @Override diff --git a/common/buildcraft/energy/TileEngineIron.java b/common/buildcraft/energy/TileEngineIron.java index 2c2ed508..5327eaa5 100644 --- a/common/buildcraft/energy/TileEngineIron.java +++ b/common/buildcraft/energy/TileEngineIron.java @@ -14,14 +14,12 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.biome.BiomeGenBase; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.BuildCraftEnergy; import buildcraft.api.core.StackKey; import buildcraft.api.fuels.BuildcraftFuelRegistry; diff --git a/common/buildcraft/energy/TileEngineStone.java b/common/buildcraft/energy/TileEngineStone.java index 752eb386..77f30196 100644 --- a/common/buildcraft/energy/TileEngineStone.java +++ b/common/buildcraft/energy/TileEngineStone.java @@ -15,9 +15,7 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftEnergy; import buildcraft.core.GuiIds; import buildcraft.core.lib.engines.TileEngineWithInventory; diff --git a/common/buildcraft/energy/fuels/CoolantManager.java b/common/buildcraft/energy/fuels/CoolantManager.java index 3cd1828d..abafe695 100644 --- a/common/buildcraft/energy/fuels/CoolantManager.java +++ b/common/buildcraft/energy/fuels/CoolantManager.java @@ -11,12 +11,9 @@ package buildcraft.energy.fuels; import java.util.Collection; import java.util.LinkedList; import java.util.List; - import net.minecraft.item.ItemStack; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.core.StackKey; import buildcraft.api.fuels.ICoolant; import buildcraft.api.fuels.ICoolantManager; diff --git a/common/buildcraft/energy/fuels/FuelManager.java b/common/buildcraft/energy/fuels/FuelManager.java index 54d145bc..e2b4158f 100644 --- a/common/buildcraft/energy/fuels/FuelManager.java +++ b/common/buildcraft/energy/fuels/FuelManager.java @@ -11,9 +11,7 @@ package buildcraft.energy.fuels; import java.util.Collection; import java.util.LinkedList; import java.util.List; - import net.minecraftforge.fluids.Fluid; - import buildcraft.api.fuels.IFuel; import buildcraft.api.fuels.IFuelManager; diff --git a/common/buildcraft/energy/gui/ContainerEngine.java b/common/buildcraft/energy/gui/ContainerEngine.java index c938ed27..0ca0ebe5 100644 --- a/common/buildcraft/energy/gui/ContainerEngine.java +++ b/common/buildcraft/energy/gui/ContainerEngine.java @@ -12,10 +12,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; - +import buildcraft.core.lib.engines.TileEngineWithInventory; import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.energy.TileEngineStone; -import buildcraft.core.lib.engines.TileEngineWithInventory; public class ContainerEngine extends BuildCraftContainer { diff --git a/common/buildcraft/energy/gui/GuiCombustionEngine.java b/common/buildcraft/energy/gui/GuiCombustionEngine.java index d958b193..74d9a9d2 100644 --- a/common/buildcraft/energy/gui/GuiCombustionEngine.java +++ b/common/buildcraft/energy/gui/GuiCombustionEngine.java @@ -10,8 +10,6 @@ package buildcraft.energy.gui; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - -import buildcraft.core.DefaultProps; import buildcraft.core.lib.utils.StringUtils; import buildcraft.energy.TileEngineIron; diff --git a/common/buildcraft/energy/gui/GuiEngine.java b/common/buildcraft/energy/gui/GuiEngine.java index c0ad25df..f59f4db7 100644 --- a/common/buildcraft/energy/gui/GuiEngine.java +++ b/common/buildcraft/energy/gui/GuiEngine.java @@ -12,13 +12,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; - import buildcraft.BuildCraftCore; import buildcraft.core.CoreIconProvider; +import buildcraft.core.lib.engines.TileEngineBase; import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.GuiBuildCraft; import buildcraft.core.lib.utils.StringUtils; -import buildcraft.core.lib.engines.TileEngineBase; public abstract class GuiEngine extends GuiBuildCraft { diff --git a/common/buildcraft/energy/gui/GuiStoneEngine.java b/common/buildcraft/energy/gui/GuiStoneEngine.java index 0a07ccd0..cbf96ef2 100644 --- a/common/buildcraft/energy/gui/GuiStoneEngine.java +++ b/common/buildcraft/energy/gui/GuiStoneEngine.java @@ -9,11 +9,8 @@ package buildcraft.energy.gui; import org.lwjgl.opengl.GL11; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - -import buildcraft.core.DefaultProps; import buildcraft.core.lib.utils.StringUtils; import buildcraft.energy.TileEngineStone; diff --git a/common/buildcraft/energy/statements/EnergyStatementProvider.java b/common/buildcraft/energy/statements/EnergyStatementProvider.java index 808e6f37..b0674689 100644 --- a/common/buildcraft/energy/statements/EnergyStatementProvider.java +++ b/common/buildcraft/energy/statements/EnergyStatementProvider.java @@ -10,11 +10,8 @@ package buildcraft.energy.statements; import java.util.Collection; import java.util.LinkedList; - import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftEnergy; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/energy/statements/TriggerEngineHeat.java b/common/buildcraft/energy/statements/TriggerEngineHeat.java index 6bb9db3e..51b40718 100644 --- a/common/buildcraft/energy/statements/TriggerEngineHeat.java +++ b/common/buildcraft/energy/statements/TriggerEngineHeat.java @@ -9,22 +9,18 @@ package buildcraft.energy.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; -import buildcraft.core.statements.BCStatement; -import buildcraft.core.lib.utils.StringUtils; import buildcraft.core.lib.engines.TileEngineBase; import buildcraft.core.lib.engines.TileEngineBase.EnergyStage; +import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; public class TriggerEngineHeat extends BCStatement implements ITriggerExternal { diff --git a/common/buildcraft/energy/worldgen/BiomeGenOilDesert.java b/common/buildcraft/energy/worldgen/BiomeGenOilDesert.java index 8e307307..88a66468 100644 --- a/common/buildcraft/energy/worldgen/BiomeGenOilDesert.java +++ b/common/buildcraft/energy/worldgen/BiomeGenOilDesert.java @@ -10,7 +10,6 @@ package buildcraft.energy.worldgen; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenDesert; - import net.minecraftforge.common.BiomeDictionary; public final class BiomeGenOilDesert extends BiomeGenDesert { diff --git a/common/buildcraft/energy/worldgen/BiomeGenOilOcean.java b/common/buildcraft/energy/worldgen/BiomeGenOilOcean.java index 4bdaf545..65787a0d 100644 --- a/common/buildcraft/energy/worldgen/BiomeGenOilOcean.java +++ b/common/buildcraft/energy/worldgen/BiomeGenOilOcean.java @@ -10,7 +10,6 @@ package buildcraft.energy.worldgen; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenOcean; - import net.minecraftforge.common.BiomeDictionary; public final class BiomeGenOilOcean extends BiomeGenOcean { diff --git a/common/buildcraft/energy/worldgen/BiomeInitializer.java b/common/buildcraft/energy/worldgen/BiomeInitializer.java index 6e2adf26..de73e9ad 100644 --- a/common/buildcraft/energy/worldgen/BiomeInitializer.java +++ b/common/buildcraft/energy/worldgen/BiomeInitializer.java @@ -9,9 +9,7 @@ package buildcraft.energy.worldgen; import cpw.mods.fml.common.eventhandler.SubscribeEvent; - import net.minecraftforge.event.terraingen.WorldTypeEvent; - import buildcraft.BuildCraftEnergy; public class BiomeInitializer { diff --git a/common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java b/common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java index 6570c1c2..17f2315b 100644 --- a/common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java +++ b/common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java @@ -10,7 +10,6 @@ package buildcraft.energy.worldgen; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.GenLayer; - import buildcraft.BuildCraftEnergy; public class GenLayerAddOilDesert extends GenLayerBiomeReplacer { diff --git a/common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java b/common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java index 0bea71a0..b1d57cca 100644 --- a/common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java +++ b/common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java @@ -10,7 +10,6 @@ package buildcraft.energy.worldgen; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.GenLayer; - import buildcraft.BuildCraftEnergy; public class GenLayerAddOilOcean extends GenLayerBiomeReplacer { diff --git a/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java b/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java index 0b0591bb..a7465693 100644 --- a/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java +++ b/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java @@ -9,7 +9,6 @@ package buildcraft.energy.worldgen; import java.util.Random; - import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.IntCache; diff --git a/common/buildcraft/energy/worldgen/OilPopulate.java b/common/buildcraft/energy/worldgen/OilPopulate.java index ffe814b1..bc350a5a 100644 --- a/common/buildcraft/energy/worldgen/OilPopulate.java +++ b/common/buildcraft/energy/worldgen/OilPopulate.java @@ -11,7 +11,6 @@ package buildcraft.energy.worldgen; import java.util.HashSet; import java.util.Random; import java.util.Set; - import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockStaticLiquid; @@ -20,10 +19,8 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; - import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; - import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.terraingen.PopulateChunkEvent; @@ -31,7 +28,6 @@ import net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType import net.minecraftforge.event.terraingen.TerrainGen; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.IFluidBlock; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftEnergy; diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java index b05f3d41..952f6292 100644 --- a/common/buildcraft/factory/BlockAutoWorkbench.java +++ b/common/buildcraft/factory/BlockAutoWorkbench.java @@ -9,21 +9,13 @@ package buildcraft.factory; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.BuildCraftFactory; -import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; +import buildcraft.core.lib.block.BlockBuildCraft; public class BlockAutoWorkbench extends BlockBuildCraft { public BlockAutoWorkbench() { diff --git a/common/buildcraft/factory/BlockFloodGate.java b/common/buildcraft/factory/BlockFloodGate.java index 8a727c22..86ae515d 100644 --- a/common/buildcraft/factory/BlockFloodGate.java +++ b/common/buildcraft/factory/BlockFloodGate.java @@ -17,14 +17,9 @@ 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 cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; import buildcraft.core.lib.block.BlockBuildCraft; -import buildcraft.core.lib.utils.Utils; public class BlockFloodGate extends BlockBuildCraft { private IIcon valve, transparent; diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index 9e32e17c..6e5a08dd 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -11,7 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,12 +23,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftCore; import buildcraft.core.CoreConstants; import buildcraft.core.IFramePipeConnection; diff --git a/common/buildcraft/factory/BlockHopper.java b/common/buildcraft/factory/BlockHopper.java index 4cb9a381..5004a84c 100644 --- a/common/buildcraft/factory/BlockHopper.java +++ b/common/buildcraft/factory/BlockHopper.java @@ -14,17 +14,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; -import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; +import buildcraft.core.lib.block.BlockBuildCraft; public class BlockHopper extends BlockBuildCraft { diff --git a/common/buildcraft/factory/BlockLEDHatchBase.java b/common/buildcraft/factory/BlockLEDHatchBase.java index 8b3738de..fbc677ac 100644 --- a/common/buildcraft/factory/BlockLEDHatchBase.java +++ b/common/buildcraft/factory/BlockLEDHatchBase.java @@ -72,8 +72,7 @@ public abstract class BlockLEDHatchBase extends BlockBuildCraft { } @Override - public boolean renderAsNormalBlock() - { + public boolean renderAsNormalBlock() { return false; } } diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index 41790501..9455251d 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -13,7 +13,6 @@ import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import buildcraft.BuildCraftFactory; public class BlockMiningWell extends BlockLEDHatchBase { diff --git a/common/buildcraft/factory/BlockPlainPipe.java b/common/buildcraft/factory/BlockPlainPipe.java index 62093936..0dfb6416 100644 --- a/common/buildcraft/factory/BlockPlainPipe.java +++ b/common/buildcraft/factory/BlockPlainPipe.java @@ -11,7 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,10 +20,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.core.CoreConstants; import buildcraft.core.IFramePipeConnection; diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java index 5d095cf1..0bcfd35c 100644 --- a/common/buildcraft/factory/BlockPump.java +++ b/common/buildcraft/factory/BlockPump.java @@ -10,25 +10,14 @@ package buildcraft.factory; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; 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 cpw.mods.fml.relauncher.SideOnly; - -import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.BuildCraftCore; import buildcraft.api.tools.IToolWrench; -import buildcraft.api.transport.IPipeTile; import buildcraft.core.BlockBuildCraftLED; -import buildcraft.core.lib.block.BlockBuildCraft; -import buildcraft.core.lib.utils.ResourceUtils; -import buildcraft.core.lib.utils.Utils; public class BlockPump extends BlockBuildCraftLED { private IIcon[] led; diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java index 7ddf3836..8fc0ccb7 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -9,7 +9,6 @@ package buildcraft.factory; import java.util.ArrayList; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -19,9 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftFactory; import buildcraft.api.tools.IToolWrench; diff --git a/common/buildcraft/factory/BlockRefinery.java b/common/buildcraft/factory/BlockRefinery.java index 114020a7..836885b9 100644 --- a/common/buildcraft/factory/BlockRefinery.java +++ b/common/buildcraft/factory/BlockRefinery.java @@ -9,32 +9,21 @@ package buildcraft.factory; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; -import buildcraft.api.events.BlockInteractionEvent; import buildcraft.api.tools.IToolWrench; -import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; import buildcraft.core.GuiIds; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.lib.fluids.TankUtils; -import buildcraft.core.lib.utils.Utils; public class BlockRefinery extends BlockBuildCraft { public BlockRefinery() { diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index 78cc046f..37daa960 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -16,20 +16,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; - import buildcraft.BuildCraftCore; -import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.lib.inventory.InvUtils; public class BlockTank extends BlockBuildCraft { diff --git a/common/buildcraft/factory/EntityMechanicalArm.java b/common/buildcraft/factory/EntityMechanicalArm.java index 3d8e73bc..055d6db2 100644 --- a/common/buildcraft/factory/EntityMechanicalArm.java +++ b/common/buildcraft/factory/EntityMechanicalArm.java @@ -12,7 +12,6 @@ import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import buildcraft.core.lib.EntityBlock; public class EntityMechanicalArm extends Entity { diff --git a/common/buildcraft/factory/FactoryGuiHandler.java b/common/buildcraft/factory/FactoryGuiHandler.java index 5d91e1d2..061e9715 100644 --- a/common/buildcraft/factory/FactoryGuiHandler.java +++ b/common/buildcraft/factory/FactoryGuiHandler.java @@ -11,9 +11,7 @@ package buildcraft.factory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import cpw.mods.fml.common.network.IGuiHandler; - import buildcraft.core.GuiIds; import buildcraft.factory.gui.ContainerAutoWorkbench; import buildcraft.factory.gui.ContainerHopper; diff --git a/common/buildcraft/factory/FactoryProxy.java b/common/buildcraft/factory/FactoryProxy.java index 7df2f3a9..9df687e9 100644 --- a/common/buildcraft/factory/FactoryProxy.java +++ b/common/buildcraft/factory/FactoryProxy.java @@ -9,9 +9,7 @@ package buildcraft.factory; import net.minecraft.world.World; - import cpw.mods.fml.common.SidedProxy; - import buildcraft.core.lib.EntityBlock; public class FactoryProxy { diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index 3bb146bf..bd46d830 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -9,18 +9,15 @@ package buildcraft.factory; import java.lang.reflect.Method; - import net.minecraft.util.IIcon; import net.minecraft.world.World; - import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; - import buildcraft.BuildCraftFactory; import buildcraft.api.core.BCLog; import buildcraft.core.lib.EntityBlock; -import buildcraft.core.render.RenderBuilder; import buildcraft.core.lib.render.RenderVoid; +import buildcraft.core.render.RenderBuilder; import buildcraft.core.render.RenderingEntityBlocks; import buildcraft.core.render.RenderingEntityBlocks.EntityRenderIndex; import buildcraft.factory.gui.GuiAutoCrafting; diff --git a/common/buildcraft/factory/PumpDimensionList.java b/common/buildcraft/factory/PumpDimensionList.java index b903816c..ec6be14c 100644 --- a/common/buildcraft/factory/PumpDimensionList.java +++ b/common/buildcraft/factory/PumpDimensionList.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Locale; - import net.minecraftforge.fluids.Fluid; public class PumpDimensionList { diff --git a/common/buildcraft/factory/TileAutoWorkbench.java b/common/buildcraft/factory/TileAutoWorkbench.java index 9151525f..23e20583 100644 --- a/common/buildcraft/factory/TileAutoWorkbench.java +++ b/common/buildcraft/factory/TileAutoWorkbench.java @@ -9,7 +9,6 @@ package buildcraft.factory; import java.lang.ref.WeakReference; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; @@ -23,7 +22,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IInvSlot; import buildcraft.api.power.IRedstoneEngine; import buildcraft.api.power.IRedstoneEngineReceiver; @@ -35,9 +33,9 @@ import buildcraft.core.lib.inventory.InventoryConcatenator; import buildcraft.core.lib.inventory.InventoryIterator; import buildcraft.core.lib.inventory.SimpleInventory; import buildcraft.core.lib.inventory.StackHelper; -import buildcraft.core.proxy.CoreProxy; import buildcraft.core.lib.utils.CraftingUtils; import buildcraft.core.lib.utils.Utils; +import buildcraft.core.proxy.CoreProxy; public class TileAutoWorkbench extends TileBuildCraft implements ISidedInventory, IHasWork, IRedstoneEngineReceiver { @@ -82,14 +80,15 @@ public class TileAutoWorkbench extends TileBuildCraft implements ISidedInventory @Override public boolean canConnectEnergy(ForgeDirection side) { TileEntity tile = worldObj.getTileEntity(xCoord + side.offsetX, yCoord + side.offsetY, zCoord + side.offsetZ); - return (tile instanceof IRedstoneEngine); + return tile instanceof IRedstoneEngine; } public class LocalInventoryCrafting extends InventoryCrafting { public IRecipe currentRecipe; public boolean useBindings, isJammed; - public LocalInventoryCrafting() {super(new Container() { + public LocalInventoryCrafting() { + super(new Container() { @Override public boolean canInteractWith(EntityPlayer entityplayer) { return false; diff --git a/common/buildcraft/factory/TileFloodGate.java b/common/buildcraft/factory/TileFloodGate.java index 287cf071..cb23d7f2 100644 --- a/common/buildcraft/factory/TileFloodGate.java +++ b/common/buildcraft/factory/TileFloodGate.java @@ -13,11 +13,9 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.Set; import java.util.TreeMap; - import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.Fluid; @@ -26,10 +24,8 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.api.core.BlockIndex; import buildcraft.api.core.BuildCraftAPI; -import buildcraft.core.LaserData; import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.lib.fluids.Tank; import buildcraft.core.lib.fluids.TankUtils; diff --git a/common/buildcraft/factory/TileHopper.java b/common/buildcraft/factory/TileHopper.java index a6e4ecef..272b3e05 100644 --- a/common/buildcraft/factory/TileHopper.java +++ b/common/buildcraft/factory/TileHopper.java @@ -13,9 +13,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyHandler; import buildcraft.api.power.IRedstoneEngineReceiver; import buildcraft.api.transport.IInjectable; diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index 9a183dff..7fde0b79 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -10,9 +10,7 @@ package buildcraft.factory; import io.netty.buffer.ByteBuf; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.api.blueprints.BuilderAPI; diff --git a/common/buildcraft/factory/TilePump.java b/common/buildcraft/factory/TilePump.java index c6b23182..9039988a 100644 --- a/common/buildcraft/factory/TilePump.java +++ b/common/buildcraft/factory/TilePump.java @@ -13,13 +13,10 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.Set; import java.util.TreeMap; - import io.netty.buffer.ByteBuf; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.nbt.NBTTagCompound; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -27,7 +24,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.api.core.BlockIndex; @@ -41,9 +37,9 @@ import buildcraft.core.lib.TileBuffer; import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.lib.fluids.SingleUseTank; import buildcraft.core.lib.fluids.TankUtils; -import buildcraft.core.proxy.CoreProxy; import buildcraft.core.lib.utils.BlockUtils; import buildcraft.core.lib.utils.Utils; +import buildcraft.core.proxy.CoreProxy; public class TilePump extends TileBuildCraft implements IHasWork, IFluidHandler, IRedstoneEngineReceiver { diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index 296b3a4f..1424f434 100644 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -11,30 +11,24 @@ package buildcraft.factory; import java.util.LinkedList; import java.util.List; import java.util.Set; - import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import io.netty.buffer.ByteBuf; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentText; import net.minecraft.util.MathHelper; import net.minecraft.world.ChunkCoordIntPair; - import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.ForgeChunkManager.Type; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.api.blueprints.BuilderAPI; @@ -52,16 +46,16 @@ import buildcraft.core.Box.Kind; import buildcraft.core.CoreConstants; import buildcraft.core.DefaultAreaProvider; import buildcraft.core.IDropControlInventory; -import buildcraft.core.lib.RFBattery; import buildcraft.core.blueprints.Blueprint; import buildcraft.core.blueprints.BptBuilderBase; import buildcraft.core.blueprints.BptBuilderBlueprint; import buildcraft.core.builders.TileAbstractBuilder; import buildcraft.core.builders.patterns.FillerPattern; -import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.lib.RFBattery; import buildcraft.core.lib.utils.BlockMiner; import buildcraft.core.lib.utils.BlockUtils; import buildcraft.core.lib.utils.Utils; +import buildcraft.core.proxy.CoreProxy; public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedInventory, IDropControlInventory, IPipeConnection, IControllable { diff --git a/common/buildcraft/factory/TileRefinery.java b/common/buildcraft/factory/TileRefinery.java index fd5342fd..d514dbe3 100644 --- a/common/buildcraft/factory/TileRefinery.java +++ b/common/buildcraft/factory/TileRefinery.java @@ -34,8 +34,8 @@ import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.lib.fluids.SingleUseTank; import buildcraft.core.lib.fluids.TankManager; import buildcraft.core.lib.network.command.ICommandReceiver; -import buildcraft.core.recipes.RefineryRecipeManager; import buildcraft.core.lib.utils.NetworkUtils; +import buildcraft.core.recipes.RefineryRecipeManager; public class TileRefinery extends TileBuildCraft implements IFluidHandler, IInventory, IHasWork, IFlexibleCrafter, ICommandReceiver { diff --git a/common/buildcraft/factory/TileTank.java b/common/buildcraft/factory/TileTank.java index 48749287..bda1fe9c 100644 --- a/common/buildcraft/factory/TileTank.java +++ b/common/buildcraft/factory/TileTank.java @@ -9,11 +9,9 @@ package buildcraft.factory; import io.netty.buffer.ByteBuf; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.EnumSkyBlock; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -21,7 +19,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.BuildCraftCore; import buildcraft.api.core.SafeTimeTracker; import buildcraft.core.lib.block.TileBuildCraft; diff --git a/common/buildcraft/factory/gui/ContainerAutoWorkbench.java b/common/buildcraft/factory/gui/ContainerAutoWorkbench.java index 90b30f10..ae43fa79 100644 --- a/common/buildcraft/factory/gui/ContainerAutoWorkbench.java +++ b/common/buildcraft/factory/gui/ContainerAutoWorkbench.java @@ -15,14 +15,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.slots.SlotOutput; import buildcraft.core.lib.gui.slots.SlotUntouchable; import buildcraft.core.lib.gui.slots.SlotWorkbench; -import buildcraft.core.lib.inventory.InvUtils; -import buildcraft.core.lib.utils.StringUtils; import buildcraft.factory.TileAutoWorkbench; public class ContainerAutoWorkbench extends BuildCraftContainer { diff --git a/common/buildcraft/factory/gui/ContainerHopper.java b/common/buildcraft/factory/gui/ContainerHopper.java index 272fdf79..27aec8ee 100644 --- a/common/buildcraft/factory/gui/ContainerHopper.java +++ b/common/buildcraft/factory/gui/ContainerHopper.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; - import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.factory.TileHopper; diff --git a/common/buildcraft/factory/gui/ContainerRefinery.java b/common/buildcraft/factory/gui/ContainerRefinery.java index a3291177..85926264 100644 --- a/common/buildcraft/factory/gui/ContainerRefinery.java +++ b/common/buildcraft/factory/gui/ContainerRefinery.java @@ -9,22 +9,15 @@ package buildcraft.factory.gui; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; - import net.minecraftforge.fluids.Fluid; - import buildcraft.BuildCraftFactory; -import buildcraft.api.core.ISerializable; import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.network.command.CommandWriter; import buildcraft.core.lib.network.command.PacketCommand; -import buildcraft.core.network.PacketIds; -import buildcraft.core.lib.network.PacketUpdate; -import buildcraft.core.lib.network.Serializable; import buildcraft.factory.TileRefinery; public class ContainerRefinery extends BuildCraftContainer { diff --git a/common/buildcraft/factory/gui/GuiAutoCrafting.java b/common/buildcraft/factory/gui/GuiAutoCrafting.java index f0af65c6..9501505d 100644 --- a/common/buildcraft/factory/gui/GuiAutoCrafting.java +++ b/common/buildcraft/factory/gui/GuiAutoCrafting.java @@ -9,12 +9,9 @@ package buildcraft.factory.gui; import org.lwjgl.opengl.GL11; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - -import buildcraft.core.DefaultProps; import buildcraft.core.lib.gui.GuiBuildCraft; import buildcraft.core.lib.utils.StringUtils; import buildcraft.factory.TileAutoWorkbench; diff --git a/common/buildcraft/factory/gui/GuiHopper.java b/common/buildcraft/factory/gui/GuiHopper.java index 1a8b3fd3..28a8e796 100644 --- a/common/buildcraft/factory/gui/GuiHopper.java +++ b/common/buildcraft/factory/gui/GuiHopper.java @@ -9,12 +9,9 @@ package buildcraft.factory.gui; import org.lwjgl.opengl.GL11; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - -import buildcraft.core.DefaultProps; import buildcraft.factory.TileHopper; public class GuiHopper extends GuiContainer { diff --git a/common/buildcraft/factory/gui/GuiRefinery.java b/common/buildcraft/factory/gui/GuiRefinery.java index 5a8fb1ae..f60d8ab7 100644 --- a/common/buildcraft/factory/gui/GuiRefinery.java +++ b/common/buildcraft/factory/gui/GuiRefinery.java @@ -9,16 +9,12 @@ package buildcraft.factory.gui; import org.lwjgl.opengl.GL11; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.recipes.CraftingResult; -import buildcraft.core.DefaultProps; import buildcraft.core.lib.gui.FluidSlot; import buildcraft.core.lib.gui.GuiAdvancedInterface; import buildcraft.core.lib.utils.StringUtils; diff --git a/common/buildcraft/factory/render/RenderHopper.java b/common/buildcraft/factory/render/RenderHopper.java index 64124764..2cf297e0 100644 --- a/common/buildcraft/factory/render/RenderHopper.java +++ b/common/buildcraft/factory/render/RenderHopper.java @@ -9,7 +9,6 @@ package buildcraft.factory.render; import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.Tessellator; @@ -17,10 +16,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore.RenderMode; -import buildcraft.core.DefaultProps; import buildcraft.core.lib.render.IInventoryRenderer; import buildcraft.core.lib.render.ModelFrustum; diff --git a/common/buildcraft/factory/render/RenderRefinery.java b/common/buildcraft/factory/render/RenderRefinery.java index 9368c5ab..ff9e6030 100644 --- a/common/buildcraft/factory/render/RenderRefinery.java +++ b/common/buildcraft/factory/render/RenderRefinery.java @@ -9,20 +9,16 @@ package buildcraft.factory.render; import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.fluids.FluidStack; - -import buildcraft.core.DefaultProps; -import buildcraft.core.lib.render.IInventoryRenderer; import buildcraft.core.lib.fluids.Tank; import buildcraft.core.lib.render.FluidRenderer; +import buildcraft.core.lib.render.IInventoryRenderer; import buildcraft.core.lib.render.RenderUtils; import buildcraft.factory.TileRefinery; diff --git a/common/buildcraft/factory/render/RenderTank.java b/common/buildcraft/factory/render/RenderTank.java index e0e28f04..60e4158a 100644 --- a/common/buildcraft/factory/render/RenderTank.java +++ b/common/buildcraft/factory/render/RenderTank.java @@ -9,12 +9,9 @@ package buildcraft.factory.render; import org.lwjgl.opengl.GL11; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.fluids.FluidStack; - import buildcraft.core.lib.render.FluidRenderer; import buildcraft.core.lib.render.RenderUtils; import buildcraft.factory.TileTank; diff --git a/common/buildcraft/factory/schematics/SchematicAutoWorkbench.java b/common/buildcraft/factory/schematics/SchematicAutoWorkbench.java index 88bdc0cb..abe6d60e 100644 --- a/common/buildcraft/factory/schematics/SchematicAutoWorkbench.java +++ b/common/buildcraft/factory/schematics/SchematicAutoWorkbench.java @@ -10,7 +10,6 @@ package buildcraft.factory.schematics; import java.util.ArrayList; import java.util.LinkedList; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/common/buildcraft/factory/schematics/SchematicPump.java b/common/buildcraft/factory/schematics/SchematicPump.java index a8e9a5c3..b92277a8 100755 --- a/common/buildcraft/factory/schematics/SchematicPump.java +++ b/common/buildcraft/factory/schematics/SchematicPump.java @@ -9,9 +9,7 @@ package buildcraft.factory.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.BuildCraftFactory; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; diff --git a/common/buildcraft/factory/schematics/SchematicRefinery.java b/common/buildcraft/factory/schematics/SchematicRefinery.java index 37ef58a5..c1452024 100644 --- a/common/buildcraft/factory/schematics/SchematicRefinery.java +++ b/common/buildcraft/factory/schematics/SchematicRefinery.java @@ -9,11 +9,8 @@ package buildcraft.factory.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftFactory; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; diff --git a/common/buildcraft/factory/schematics/SchematicTileIgnoreState.java b/common/buildcraft/factory/schematics/SchematicTileIgnoreState.java index 6a4c38a9..16e77104 100644 --- a/common/buildcraft/factory/schematics/SchematicTileIgnoreState.java +++ b/common/buildcraft/factory/schematics/SchematicTileIgnoreState.java @@ -9,9 +9,7 @@ package buildcraft.factory.schematics; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; diff --git a/common/buildcraft/robotics/BlockRequester.java b/common/buildcraft/robotics/BlockRequester.java index ec1b9e2e..623db823 100755 --- a/common/buildcraft/robotics/BlockRequester.java +++ b/common/buildcraft/robotics/BlockRequester.java @@ -9,25 +9,12 @@ package buildcraft.robotics; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftRobotics; -import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.GuiIds; -import buildcraft.core.lib.utils.Utils; +import buildcraft.core.lib.block.BlockBuildCraft; public class BlockRequester extends BlockBuildCraft { public BlockRequester() { diff --git a/common/buildcraft/robotics/BlockZonePlan.java b/common/buildcraft/robotics/BlockZonePlan.java index eb08da61..553fe917 100755 --- a/common/buildcraft/robotics/BlockZonePlan.java +++ b/common/buildcraft/robotics/BlockZonePlan.java @@ -9,25 +9,14 @@ package buildcraft.robotics; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftRobotics; -import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.GuiIds; -import buildcraft.core.lib.utils.Utils; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.robotics.map.MapWorld; public class BlockZonePlan extends BlockBuildCraft { @@ -62,8 +51,8 @@ public class BlockZonePlan extends BlockBuildCraft { if (!world.isRemote) { int r = TileZonePlan.RESOLUTION >> 4; - int cox = (x >> 4); - int coz = (z >> 4); + int cox = x >> 4; + int coz = z >> 4; MapWorld w = BuildCraftRobotics.manager.getWorld(world); for (int cx = -r; cx < r; cx++) { diff --git a/common/buildcraft/robotics/DockingStation.java b/common/buildcraft/robotics/DockingStation.java index e01b7264..6a5ea919 100755 --- a/common/buildcraft/robotics/DockingStation.java +++ b/common/buildcraft/robotics/DockingStation.java @@ -11,9 +11,7 @@ package buildcraft.robotics; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IDockingStation; diff --git a/common/buildcraft/robotics/EntityRobot.java b/common/buildcraft/robotics/EntityRobot.java index 9e2df4ee..636b2cbe 100644 --- a/common/buildcraft/robotics/EntityRobot.java +++ b/common/buildcraft/robotics/EntityRobot.java @@ -11,9 +11,7 @@ package buildcraft.robotics; import java.util.Date; import java.util.List; import java.util.WeakHashMap; - import io.netty.buffer.ByteBuf; - import net.minecraft.client.Minecraft; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -30,11 +28,9 @@ import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import net.minecraft.world.World; - import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -42,7 +38,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftRobotics; import buildcraft.api.boards.RedstoneBoardNBT; @@ -55,6 +50,7 @@ import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IDockingStation; import buildcraft.api.robots.RobotManager; +import buildcraft.api.statements.StatementSlot; import buildcraft.api.tiles.IDebuggable; import buildcraft.api.transport.IPipeTile; import buildcraft.core.DefaultProps; @@ -68,10 +64,7 @@ import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.robotics.ai.AIRobotMain; import buildcraft.robotics.ai.AIRobotSleep; import buildcraft.robotics.statements.ActionRobotWorkInArea; -import buildcraft.transport.Pipe; -import buildcraft.transport.PipeTransportPower; import buildcraft.transport.gates.ActionIterator; -import buildcraft.api.statements.StatementSlot; public class EntityRobot extends EntityRobotBase implements IEntityAdditionalSpawnData, IInventory, IFluidHandler, ICommandReceiver, IDebuggable { diff --git a/common/buildcraft/robotics/EntityRobotEnergyParticle.java b/common/buildcraft/robotics/EntityRobotEnergyParticle.java index 52d89063..7377bcd8 100755 --- a/common/buildcraft/robotics/EntityRobotEnergyParticle.java +++ b/common/buildcraft/robotics/EntityRobotEnergyParticle.java @@ -11,7 +11,6 @@ package buildcraft.robotics; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/buildcraft/robotics/ImplRedstoneBoardRegistry.java b/common/buildcraft/robotics/ImplRedstoneBoardRegistry.java index ff61b92c..b3d68e3d 100755 --- a/common/buildcraft/robotics/ImplRedstoneBoardRegistry.java +++ b/common/buildcraft/robotics/ImplRedstoneBoardRegistry.java @@ -11,13 +11,9 @@ package buildcraft.robotics; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Random; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.BuildCraftRobotics; -import buildcraft.BuildCraftSilicon; import buildcraft.api.boards.RedstoneBoardNBT; import buildcraft.api.boards.RedstoneBoardRegistry; diff --git a/common/buildcraft/robotics/ItemRedstoneBoard.java b/common/buildcraft/robotics/ItemRedstoneBoard.java index e67bb378..c72b8fb1 100755 --- a/common/buildcraft/robotics/ItemRedstoneBoard.java +++ b/common/buildcraft/robotics/ItemRedstoneBoard.java @@ -9,18 +9,14 @@ package buildcraft.robotics; 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.nbt.NBTTagCompound; import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.BuildCraftRobotics; import buildcraft.api.boards.RedstoneBoardNBT; import buildcraft.api.boards.RedstoneBoardRegistry; diff --git a/common/buildcraft/robotics/ItemRobot.java b/common/buildcraft/robotics/ItemRobot.java index 97178f7c..74f6b4f3 100755 --- a/common/buildcraft/robotics/ItemRobot.java +++ b/common/buildcraft/robotics/ItemRobot.java @@ -9,7 +9,6 @@ package buildcraft.robotics; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -19,11 +18,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import cofh.api.energy.IEnergyContainerItem; import buildcraft.BuildCraftRobotics; import buildcraft.api.boards.RedstoneBoardNBT; @@ -178,7 +175,7 @@ public class ItemRobot extends ItemBuildCraft implements IEnergyContainerItem { } @Override - public boolean onItemUse(ItemStack currentItem, EntityPlayer player, World world, int x, int y, int z, int side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { + public boolean onItemUse(ItemStack currentItem, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { Block b = world.getBlock(x, y, z); if (!(b instanceof BlockGenericPipe)) { diff --git a/common/buildcraft/robotics/ItemRobotStation.java b/common/buildcraft/robotics/ItemRobotStation.java index 09bd0143..5756009a 100755 --- a/common/buildcraft/robotics/ItemRobotStation.java +++ b/common/buildcraft/robotics/ItemRobotStation.java @@ -12,12 +12,9 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.transport.IPipe; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; diff --git a/common/buildcraft/robotics/RobotIntegrationRecipe.java b/common/buildcraft/robotics/RobotIntegrationRecipe.java index 0a7d525e..fccc6871 100755 --- a/common/buildcraft/robotics/RobotIntegrationRecipe.java +++ b/common/buildcraft/robotics/RobotIntegrationRecipe.java @@ -9,7 +9,6 @@ package buildcraft.robotics; import net.minecraft.item.ItemStack; - import buildcraft.BuildCraftRobotics; import buildcraft.api.recipes.CraftingResult; import buildcraft.silicon.TileIntegrationTable; diff --git a/common/buildcraft/robotics/RobotRegistry.java b/common/buildcraft/robotics/RobotRegistry.java index 48a532e4..cb295be0 100755 --- a/common/buildcraft/robotics/RobotRegistry.java +++ b/common/buildcraft/robotics/RobotRegistry.java @@ -14,23 +14,17 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.world.ChunkEvent; - import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IDockingStation; import buildcraft.api.robots.IRobotRegistry; -import buildcraft.api.robots.IRobotRegistryProvider; import buildcraft.api.robots.ResourceId; public class RobotRegistry extends WorldSavedData implements IRobotRegistry { diff --git a/common/buildcraft/robotics/RobotStationPluggable.java b/common/buildcraft/robotics/RobotStationPluggable.java index 111b928c..364ff2d8 100644 --- a/common/buildcraft/robotics/RobotStationPluggable.java +++ b/common/buildcraft/robotics/RobotStationPluggable.java @@ -2,15 +2,12 @@ package buildcraft.robotics; import java.util.List; import io.netty.buffer.ByteBuf; - import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyReceiver; import buildcraft.BuildCraftRobotics; import buildcraft.BuildCraftTransport; diff --git a/common/buildcraft/robotics/RobotUtils.java b/common/buildcraft/robotics/RobotUtils.java index 09166abc..4fa38ace 100644 --- a/common/buildcraft/robotics/RobotUtils.java +++ b/common/buildcraft/robotics/RobotUtils.java @@ -1,9 +1,7 @@ package buildcraft.robotics; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.transport.IPipeTile; -import buildcraft.robotics.ai.AIRobotSleep; /** * Created by asie on 1/24/15. diff --git a/common/buildcraft/robotics/RoboticsProxyClient.java b/common/buildcraft/robotics/RoboticsProxyClient.java index 0bf86a79..a2ad78ab 100644 --- a/common/buildcraft/robotics/RoboticsProxyClient.java +++ b/common/buildcraft/robotics/RoboticsProxyClient.java @@ -9,18 +9,23 @@ package buildcraft.robotics; import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.Loader; import net.minecraftforge.client.MinecraftForgeClient; import buildcraft.BuildCraftRobotics; import buildcraft.robotics.render.RenderRobot; import buildcraft.robotics.render.RobotStationItemRenderer; public class RoboticsProxyClient extends RoboticsProxy { - public static final RobotStationItemRenderer robotStationItemRenderer = new RobotStationItemRenderer(); - - @Override public void registerRenderers() { RenderingRegistry.registerEntityRenderingHandler(EntityRobot.class, new RenderRobot()); MinecraftForgeClient.registerItemRenderer(BuildCraftRobotics.robotItem, new RenderRobot()); - MinecraftForgeClient.registerItemRenderer(BuildCraftRobotics.robotStationItem, robotStationItemRenderer); + // TODO: Move robot station textures locally + if (Loader.isModLoaded("BuildCraft|Transport")) { + loadBCTransport(); + } + } + + private void loadBCTransport() { + MinecraftForgeClient.registerItemRenderer(BuildCraftRobotics.robotStationItem, new RobotStationItemRenderer()); } } diff --git a/common/buildcraft/robotics/StationIndex.java b/common/buildcraft/robotics/StationIndex.java index 915bd097..0314ea30 100755 --- a/common/buildcraft/robotics/StationIndex.java +++ b/common/buildcraft/robotics/StationIndex.java @@ -9,9 +9,7 @@ package buildcraft.robotics; import net.minecraft.nbt.NBTTagCompound; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.IDockingStation; diff --git a/common/buildcraft/robotics/TileRequester.java b/common/buildcraft/robotics/TileRequester.java index 5f91dc20..6f4895c9 100755 --- a/common/buildcraft/robotics/TileRequester.java +++ b/common/buildcraft/robotics/TileRequester.java @@ -9,17 +9,15 @@ package buildcraft.robotics; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import cpw.mods.fml.relauncher.Side; - import buildcraft.BuildCraftCore; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IRequestProvider; +import buildcraft.api.robots.ResourceIdRequest; import buildcraft.api.robots.RobotManager; import buildcraft.api.robots.StackRequest; import buildcraft.core.lib.block.TileBuildCraft; @@ -29,7 +27,6 @@ import buildcraft.core.lib.network.command.CommandWriter; import buildcraft.core.lib.network.command.ICommandReceiver; import buildcraft.core.lib.network.command.PacketCommand; import buildcraft.core.lib.utils.NetworkUtils; -import buildcraft.api.robots.ResourceIdRequest; public class TileRequester extends TileBuildCraft implements IInventory, IRequestProvider, ICommandReceiver { public static final int NB_ITEMS = 20; diff --git a/common/buildcraft/robotics/TileZonePlan.java b/common/buildcraft/robotics/TileZonePlan.java index f1182c21..1f076ad9 100644 --- a/common/buildcraft/robotics/TileZonePlan.java +++ b/common/buildcraft/robotics/TileZonePlan.java @@ -9,20 +9,14 @@ package buildcraft.robotics; import io.netty.buffer.ByteBuf; - -import net.minecraft.block.material.MapColor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.chunk.Chunk; - -import buildcraft.BuildCraftRobotics; -import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.items.INamedItem; import buildcraft.core.ItemMapLocation; -import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.ZonePlan; +import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.lib.inventory.SimpleInventory; import buildcraft.core.lib.utils.NetworkUtils; @@ -47,8 +41,8 @@ public class TileZonePlan extends TileBuildCraft implements IInventory { public void initialize() { super.initialize(); - int cx = (xCoord >> 4); - int cz = (zCoord >> 4); + int cx = xCoord >> 4; + int cz = zCoord >> 4; chunkStartX = cx - RESOLUTION_CHUNKS / 2; chunkStartZ = cz - RESOLUTION_CHUNKS / 2; diff --git a/common/buildcraft/robotics/ai/AIRobotAttack.java b/common/buildcraft/robotics/ai/AIRobotAttack.java index b95ece55..42f45aff 100755 --- a/common/buildcraft/robotics/ai/AIRobotAttack.java +++ b/common/buildcraft/robotics/ai/AIRobotAttack.java @@ -9,7 +9,6 @@ package buildcraft.robotics.ai; import net.minecraft.entity.Entity; - import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/ai/AIRobotBreak.java b/common/buildcraft/robotics/ai/AIRobotBreak.java index 796ab8ad..cd82983a 100644 --- a/common/buildcraft/robotics/ai/AIRobotBreak.java +++ b/common/buildcraft/robotics/ai/AIRobotBreak.java @@ -13,15 +13,13 @@ import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.WorldServer; - import net.minecraftforge.common.ForgeHooks; - import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.proxy.CoreProxy; import buildcraft.core.lib.utils.BlockUtils; +import buildcraft.core.proxy.CoreProxy; public class AIRobotBreak extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java b/common/buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java index 32ae7e06..2215d6b6 100755 --- a/common/buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java +++ b/common/buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java @@ -9,18 +9,16 @@ package buildcraft.robotics.ai; import java.util.ArrayList; - import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IInvSlot; import buildcraft.api.recipes.CraftingResult; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.api.robots.ResourceIdBlock; import buildcraft.api.robots.RobotManager; import buildcraft.core.lib.inventory.ITransactor; import buildcraft.core.lib.inventory.InvUtils; @@ -32,11 +30,10 @@ import buildcraft.core.lib.inventory.filters.ArrayStackFilter; import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.IStationFilter; -import buildcraft.silicon.ResourceIdAssemblyTable; -import buildcraft.api.robots.ResourceIdBlock; import buildcraft.robotics.statements.ActionRobotFilter; import buildcraft.robotics.statements.ActionStationAllowCraft; import buildcraft.silicon.BlockLaserTable; +import buildcraft.silicon.ResourceIdAssemblyTable; import buildcraft.silicon.TileAssemblyTable; public class AIRobotCraftAssemblyTable extends AIRobotCraftGeneric { diff --git a/common/buildcraft/robotics/ai/AIRobotCraftFurnace.java b/common/buildcraft/robotics/ai/AIRobotCraftFurnace.java index 12e3c931..12b5a46e 100755 --- a/common/buildcraft/robotics/ai/AIRobotCraftFurnace.java +++ b/common/buildcraft/robotics/ai/AIRobotCraftFurnace.java @@ -12,13 +12,12 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockFurnace; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IInvSlot; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.api.robots.ResourceIdBlock; import buildcraft.core.lib.inventory.ITransactor; import buildcraft.core.lib.inventory.InvUtils; import buildcraft.core.lib.inventory.StackHelper; @@ -27,7 +26,6 @@ import buildcraft.core.lib.inventory.filters.ArrayStackFilter; import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.IStationFilter; -import buildcraft.api.robots.ResourceIdBlock; import buildcraft.robotics.statements.ActionRobotFilter; import buildcraft.robotics.statements.ActionStationAllowCraft; diff --git a/common/buildcraft/robotics/ai/AIRobotCraftGeneric.java b/common/buildcraft/robotics/ai/AIRobotCraftGeneric.java index dc1a283f..64b5a4d6 100755 --- a/common/buildcraft/robotics/ai/AIRobotCraftGeneric.java +++ b/common/buildcraft/robotics/ai/AIRobotCraftGeneric.java @@ -9,7 +9,6 @@ package buildcraft.robotics.ai; import java.util.ArrayList; - import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.lib.inventory.filters.ArrayStackFilter; diff --git a/common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java b/common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java index 580deed8..36aec60a 100755 --- a/common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java +++ b/common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java @@ -9,7 +9,6 @@ package buildcraft.robotics.ai; import java.util.ArrayList; - import net.minecraft.block.Block; import net.minecraft.block.BlockWorkbench; import net.minecraft.entity.player.EntityPlayer; @@ -20,11 +19,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; - import buildcraft.api.core.IInvSlot; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/ai/AIRobotDeliverRequested.java b/common/buildcraft/robotics/ai/AIRobotDeliverRequested.java index d1b2b8d7..086f9e60 100755 --- a/common/buildcraft/robotics/ai/AIRobotDeliverRequested.java +++ b/common/buildcraft/robotics/ai/AIRobotDeliverRequested.java @@ -9,13 +9,13 @@ package buildcraft.robotics.ai; import net.minecraft.item.ItemStack; - import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IInvSlot; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IRequestProvider; import buildcraft.api.robots.StackRequest; +import buildcraft.api.statements.StatementSlot; import buildcraft.api.transport.IPipe; import buildcraft.core.lib.inventory.InvUtils; import buildcraft.core.lib.inventory.filters.ArrayStackOrListFilter; @@ -23,7 +23,6 @@ import buildcraft.robotics.DockingStation; import buildcraft.robotics.IStationFilter; import buildcraft.robotics.statements.ActionStationRequestItemsMachine; import buildcraft.transport.gates.ActionIterator; -import buildcraft.api.statements.StatementSlot; public class AIRobotDeliverRequested extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotDisposeItems.java b/common/buildcraft/robotics/ai/AIRobotDisposeItems.java index 87ebae97..c3655f36 100755 --- a/common/buildcraft/robotics/ai/AIRobotDisposeItems.java +++ b/common/buildcraft/robotics/ai/AIRobotDisposeItems.java @@ -9,7 +9,6 @@ package buildcraft.robotics.ai; import net.minecraft.entity.item.EntityItem; - import buildcraft.api.core.IInvSlot; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java b/common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java index 14e6bf02..530b30fd 100755 --- a/common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java +++ b/common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java @@ -11,9 +11,7 @@ package buildcraft.robotics.ai; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.lib.inventory.ITransactor; diff --git a/common/buildcraft/robotics/ai/AIRobotFetchItem.java b/common/buildcraft/robotics/ai/AIRobotFetchItem.java index 7091e242..719cea36 100755 --- a/common/buildcraft/robotics/ai/AIRobotFetchItem.java +++ b/common/buildcraft/robotics/ai/AIRobotFetchItem.java @@ -10,9 +10,7 @@ package buildcraft.robotics.ai; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoBlock.java b/common/buildcraft/robotics/ai/AIRobotGotoBlock.java index b94dd2cb..617e03fb 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoBlock.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoBlock.java @@ -9,12 +9,9 @@ package buildcraft.robotics.ai; import java.util.LinkedList; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; - import net.minecraftforge.common.util.Constants; - import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.lib.utils.IterableAlgorithmRunner; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStation.java b/common/buildcraft/robotics/ai/AIRobotGotoStation.java index c29261bb..4ded36b3 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStation.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStation.java @@ -9,9 +9,7 @@ package buildcraft.robotics.ai; import net.minecraft.nbt.NBTTagCompound; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java b/common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java index d1944e37..2d89d549 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java @@ -10,9 +10,7 @@ package buildcraft.robotics.ai; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java b/common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java index 5a61db79..6390691c 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java @@ -9,11 +9,9 @@ package buildcraft.robotics.ai; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java b/common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java index 81702258..84108041 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java @@ -9,11 +9,11 @@ package buildcraft.robotics.ai; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IInvSlot; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.api.statements.StatementSlot; import buildcraft.api.transport.IPipe; import buildcraft.core.lib.inventory.InventoryIterator; import buildcraft.robotics.DockingStation; @@ -21,7 +21,6 @@ import buildcraft.robotics.EntityRobot; import buildcraft.robotics.IStationFilter; import buildcraft.robotics.statements.ActionStationInputItems; import buildcraft.transport.gates.ActionIterator; -import buildcraft.api.statements.StatementSlot; public class AIRobotGotoStationToUnload extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java b/common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java index 11e04a5f..34cebc04 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java @@ -8,12 +8,8 @@ */ package buildcraft.robotics.ai; -import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; @@ -24,7 +20,6 @@ import buildcraft.robotics.statements.ActionRobotFilter; import buildcraft.robotics.statements.ActionStationAcceptFluids; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportFluids; -import buildcraft.transport.PipeTransportItems; public class AIRobotGotoStationToUnloadFluids extends AIRobot { @@ -71,7 +66,7 @@ public class AIRobotGotoStationToUnloadFluids extends AIRobot { } if (((Pipe) station.getPipe().getPipe()).transport instanceof PipeTransportFluids) { - PipeTransportFluids transport = ((PipeTransportFluids) ((Pipe) station.getPipe().getPipe()).transport); + PipeTransportFluids transport = (PipeTransportFluids) ((Pipe) station.getPipe().getPipe()).transport; FluidStack drainable = robot.drain(ForgeDirection.UNKNOWN, 1, false); int filledAmount = transport.fill(station.side, drainable, false); diff --git a/common/buildcraft/robotics/ai/AIRobotLoad.java b/common/buildcraft/robotics/ai/AIRobotLoad.java index 11c206ca..db16bf4e 100755 --- a/common/buildcraft/robotics/ai/AIRobotLoad.java +++ b/common/buildcraft/robotics/ai/AIRobotLoad.java @@ -11,9 +11,7 @@ package buildcraft.robotics.ai; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IInvSlot; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/ai/AIRobotLoadFluids.java b/common/buildcraft/robotics/ai/AIRobotLoadFluids.java index f1fda4ba..7047b071 100755 --- a/common/buildcraft/robotics/ai/AIRobotLoadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotLoadFluids.java @@ -9,12 +9,10 @@ package buildcraft.robotics.ai; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.lib.inventory.filters.IFluidFilter; diff --git a/common/buildcraft/robotics/ai/AIRobotPumpBlock.java b/common/buildcraft/robotics/ai/AIRobotPumpBlock.java index 20c092c4..7acbb2b9 100644 --- a/common/buildcraft/robotics/ai/AIRobotPumpBlock.java +++ b/common/buildcraft/robotics/ai/AIRobotPumpBlock.java @@ -13,7 +13,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/ai/AIRobotRecharge.java b/common/buildcraft/robotics/ai/AIRobotRecharge.java index cd96becd..c734dd39 100755 --- a/common/buildcraft/robotics/ai/AIRobotRecharge.java +++ b/common/buildcraft/robotics/ai/AIRobotRecharge.java @@ -13,7 +13,6 @@ import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.transport.IPipeTile; import buildcraft.robotics.DockingStation; import buildcraft.robotics.IStationFilter; -import buildcraft.transport.PipeTransportPower; public class AIRobotRecharge extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotSearchBlockBase.java b/common/buildcraft/robotics/ai/AIRobotSearchBlockBase.java index de0c9546..6d76c500 100644 --- a/common/buildcraft/robotics/ai/AIRobotSearchBlockBase.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchBlockBase.java @@ -2,16 +2,14 @@ package buildcraft.robotics.ai; import java.util.Iterator; import java.util.LinkedList; - import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.api.robots.ResourceIdBlock; import buildcraft.core.lib.utils.IBlockFilter; import buildcraft.core.lib.utils.IterableAlgorithmRunner; import buildcraft.core.lib.utils.PathFindingSearch; -import buildcraft.api.robots.ResourceIdBlock; public class AIRobotSearchBlockBase extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotSearchEntity.java b/common/buildcraft/robotics/ai/AIRobotSearchEntity.java index e3ba3342..d2cebe13 100755 --- a/common/buildcraft/robotics/ai/AIRobotSearchEntity.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchEntity.java @@ -9,7 +9,6 @@ package buildcraft.robotics.ai; import net.minecraft.entity.Entity; - import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/ai/AIRobotSearchRandomBlock.java b/common/buildcraft/robotics/ai/AIRobotSearchRandomBlock.java index e239fe96..5b220070 100755 --- a/common/buildcraft/robotics/ai/AIRobotSearchRandomBlock.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchRandomBlock.java @@ -9,7 +9,6 @@ package buildcraft.robotics.ai; import java.util.Iterator; - import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IZone; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java b/common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java index 710ac27a..5c653727 100755 --- a/common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java @@ -9,18 +9,16 @@ package buildcraft.robotics.ai; import java.util.Collection; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IRequestProvider; import buildcraft.api.robots.StackRequest; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; +import buildcraft.api.statements.StatementSlot; import buildcraft.api.transport.IPipe; import buildcraft.core.lib.inventory.StackHelper; import buildcraft.core.lib.inventory.filters.IStackFilter; @@ -30,7 +28,6 @@ import buildcraft.robotics.statements.ActionRobotFilter; import buildcraft.robotics.statements.ActionStationRequestItems; import buildcraft.robotics.statements.ActionStationRequestItemsMachine; import buildcraft.transport.gates.ActionIterator; -import buildcraft.api.statements.StatementSlot; public class AIRobotSearchStackRequest extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotSleep.java b/common/buildcraft/robotics/ai/AIRobotSleep.java index 25bb2f0a..b1a25d4f 100755 --- a/common/buildcraft/robotics/ai/AIRobotSleep.java +++ b/common/buildcraft/robotics/ai/AIRobotSleep.java @@ -10,10 +10,10 @@ package buildcraft.robotics.ai; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.api.statements.StatementSlot; import buildcraft.robotics.DockingStation; import buildcraft.robotics.statements.ActionRobotWakeUp; import buildcraft.transport.gates.ActionIterator; -import buildcraft.api.statements.StatementSlot; public class AIRobotSleep extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotStripesHandler.java b/common/buildcraft/robotics/ai/AIRobotStripesHandler.java index 5aaa2f5c..4012130e 100644 --- a/common/buildcraft/robotics/ai/AIRobotStripesHandler.java +++ b/common/buildcraft/robotics/ai/AIRobotStripesHandler.java @@ -11,9 +11,7 @@ package buildcraft.robotics.ai; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.WorldServer; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.BlockIndex; import buildcraft.api.core.Position; import buildcraft.api.robots.AIRobot; diff --git a/common/buildcraft/robotics/ai/AIRobotUnload.java b/common/buildcraft/robotics/ai/AIRobotUnload.java index 9baba3d6..79ed9fdf 100755 --- a/common/buildcraft/robotics/ai/AIRobotUnload.java +++ b/common/buildcraft/robotics/ai/AIRobotUnload.java @@ -9,17 +9,16 @@ package buildcraft.robotics.ai; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IInvSlot; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.api.statements.StatementSlot; import buildcraft.api.transport.IPipe; import buildcraft.core.lib.inventory.InventoryIterator; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; import buildcraft.robotics.statements.ActionStationInputItems; import buildcraft.transport.gates.ActionIterator; -import buildcraft.api.statements.StatementSlot; public class AIRobotUnload extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotUnloadFluids.java b/common/buildcraft/robotics/ai/AIRobotUnloadFluids.java index 23f6b265..d4acbfc8 100755 --- a/common/buildcraft/robotics/ai/AIRobotUnloadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotUnloadFluids.java @@ -11,7 +11,6 @@ package buildcraft.robotics.ai; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.lib.inventory.filters.SimpleFluidFilter; @@ -50,7 +49,7 @@ public class AIRobotUnloadFluids extends AIRobot { } if (((Pipe) station.getPipe().getPipe()).transport instanceof PipeTransportFluids) { - PipeTransportFluids transport = ((PipeTransportFluids) ((Pipe) station.getPipe().getPipe()).transport); + PipeTransportFluids transport = (PipeTransportFluids) ((Pipe) station.getPipe().getPipe()).transport; FluidStack drainable = robot.drain(ForgeDirection.UNKNOWN, FluidContainerRegistry.BUCKET_VOLUME, false); diff --git a/common/buildcraft/robotics/ai/AIRobotUseToolOnBlock.java b/common/buildcraft/robotics/ai/AIRobotUseToolOnBlock.java index 1762a65b..2f4a0128 100755 --- a/common/buildcraft/robotics/ai/AIRobotUseToolOnBlock.java +++ b/common/buildcraft/robotics/ai/AIRobotUseToolOnBlock.java @@ -10,9 +10,7 @@ package buildcraft.robotics.ai; import net.minecraft.item.ItemStack; import net.minecraft.world.WorldServer; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotBomber.java b/common/buildcraft/robotics/boards/BoardRobotBomber.java index c5943f67..bd129af5 100755 --- a/common/buildcraft/robotics/boards/BoardRobotBomber.java +++ b/common/buildcraft/robotics/boards/BoardRobotBomber.java @@ -12,9 +12,7 @@ import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BlockIndex; diff --git a/common/buildcraft/robotics/boards/BoardRobotBomberNBT.java b/common/buildcraft/robotics/boards/BoardRobotBomberNBT.java index 3e1dc7f9..9a505000 100755 --- a/common/buildcraft/robotics/boards/BoardRobotBomberNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotBomberNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotBuilder.java b/common/buildcraft/robotics/boards/BoardRobotBuilder.java index f14c8006..e18ad3d6 100644 --- a/common/buildcraft/robotics/boards/BoardRobotBuilder.java +++ b/common/buildcraft/robotics/boards/BoardRobotBuilder.java @@ -9,10 +9,8 @@ package buildcraft.robotics.boards; import java.util.LinkedList; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; diff --git a/common/buildcraft/robotics/boards/BoardRobotBuilderNBT.java b/common/buildcraft/robotics/boards/BoardRobotBuilderNBT.java index 6e8efc53..070e461b 100755 --- a/common/buildcraft/robotics/boards/BoardRobotBuilderNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotBuilderNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotButcher.java b/common/buildcraft/robotics/boards/BoardRobotButcher.java index be03518f..5b45322d 100755 --- a/common/buildcraft/robotics/boards/BoardRobotButcher.java +++ b/common/buildcraft/robotics/boards/BoardRobotButcher.java @@ -12,7 +12,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; diff --git a/common/buildcraft/robotics/boards/BoardRobotButcherNBT.java b/common/buildcraft/robotics/boards/BoardRobotButcherNBT.java index e865c308..872d8cdb 100755 --- a/common/buildcraft/robotics/boards/BoardRobotButcherNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotButcherNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotCarrierNBT.java b/common/buildcraft/robotics/boards/BoardRobotCarrierNBT.java index 2da0078d..de450a09 100755 --- a/common/buildcraft/robotics/boards/BoardRobotCarrierNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotCarrierNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotCrafter.java b/common/buildcraft/robotics/boards/BoardRobotCrafter.java index 492ea10f..26893372 100755 --- a/common/buildcraft/robotics/boards/BoardRobotCrafter.java +++ b/common/buildcraft/robotics/boards/BoardRobotCrafter.java @@ -11,17 +11,14 @@ package buildcraft.robotics.boards; import java.util.ArrayList; import java.util.HashSet; import java.util.Map; - import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; - import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.recipes.CraftingResult; diff --git a/common/buildcraft/robotics/boards/BoardRobotCrafterNBT.java b/common/buildcraft/robotics/boards/BoardRobotCrafterNBT.java index b9587b97..e9992eac 100755 --- a/common/buildcraft/robotics/boards/BoardRobotCrafterNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotCrafterNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotDelivery.java b/common/buildcraft/robotics/boards/BoardRobotDelivery.java index 07c793a1..a0980f0a 100755 --- a/common/buildcraft/robotics/boards/BoardRobotDelivery.java +++ b/common/buildcraft/robotics/boards/BoardRobotDelivery.java @@ -9,9 +9,7 @@ package buildcraft.robotics.boards; import java.util.ArrayList; - import net.minecraft.item.ItemStack; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; diff --git a/common/buildcraft/robotics/boards/BoardRobotDeliveryNBT.java b/common/buildcraft/robotics/boards/BoardRobotDeliveryNBT.java index e4aaa939..8c3b6165 100755 --- a/common/buildcraft/robotics/boards/BoardRobotDeliveryNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotDeliveryNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotFarmer.java b/common/buildcraft/robotics/boards/BoardRobotFarmer.java index d9ed34b2..fca1556b 100644 --- a/common/buildcraft/robotics/boards/BoardRobotFarmer.java +++ b/common/buildcraft/robotics/boards/BoardRobotFarmer.java @@ -12,7 +12,6 @@ import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BlockIndex; @@ -20,9 +19,9 @@ import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.IWorldProperty; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.api.robots.ResourceIdBlock; import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.core.lib.utils.IBlockFilter; -import buildcraft.api.robots.ResourceIdBlock; import buildcraft.robotics.ai.AIRobotFetchAndEquipItemStack; import buildcraft.robotics.ai.AIRobotGotoBlock; import buildcraft.robotics.ai.AIRobotGotoSleep; diff --git a/common/buildcraft/robotics/boards/BoardRobotFarmerNBT.java b/common/buildcraft/robotics/boards/BoardRobotFarmerNBT.java index dae3466b..8575e607 100755 --- a/common/buildcraft/robotics/boards/BoardRobotFarmerNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotFarmerNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotFluidCarrierNBT.java b/common/buildcraft/robotics/boards/BoardRobotFluidCarrierNBT.java index 67def54f..59f27108 100755 --- a/common/buildcraft/robotics/boards/BoardRobotFluidCarrierNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotFluidCarrierNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotGenericBreakBlock.java b/common/buildcraft/robotics/boards/BoardRobotGenericBreakBlock.java index 37ffdb3f..801d995b 100644 --- a/common/buildcraft/robotics/boards/BoardRobotGenericBreakBlock.java +++ b/common/buildcraft/robotics/boards/BoardRobotGenericBreakBlock.java @@ -9,23 +9,22 @@ package buildcraft.robotics.boards; import java.util.ArrayList; - import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.api.robots.ResourceIdBlock; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; +import buildcraft.api.statements.StatementSlot; import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.core.lib.utils.IBlockFilter; import buildcraft.robotics.DockingStation; -import buildcraft.api.robots.ResourceIdBlock; import buildcraft.robotics.ai.AIRobotBreak; import buildcraft.robotics.ai.AIRobotFetchAndEquipItemStack; import buildcraft.robotics.ai.AIRobotGotoBlock; @@ -33,7 +32,6 @@ import buildcraft.robotics.ai.AIRobotGotoSleep; import buildcraft.robotics.ai.AIRobotSearchBlock; import buildcraft.robotics.statements.ActionRobotFilter; import buildcraft.transport.gates.ActionIterator; -import buildcraft.api.statements.StatementSlot; public abstract class BoardRobotGenericBreakBlock extends RedstoneBoardRobot { diff --git a/common/buildcraft/robotics/boards/BoardRobotHarvester.java b/common/buildcraft/robotics/boards/BoardRobotHarvester.java index 0c0e0934..621e8452 100755 --- a/common/buildcraft/robotics/boards/BoardRobotHarvester.java +++ b/common/buildcraft/robotics/boards/BoardRobotHarvester.java @@ -11,7 +11,6 @@ package buildcraft.robotics.boards; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; - import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotHarvesterNBT.java b/common/buildcraft/robotics/boards/BoardRobotHarvesterNBT.java index 23232218..3c95b710 100755 --- a/common/buildcraft/robotics/boards/BoardRobotHarvesterNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotHarvesterNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotKnight.java b/common/buildcraft/robotics/boards/BoardRobotKnight.java index f917445a..d1ecb81c 100755 --- a/common/buildcraft/robotics/boards/BoardRobotKnight.java +++ b/common/buildcraft/robotics/boards/BoardRobotKnight.java @@ -13,7 +13,6 @@ import net.minecraft.entity.monster.IMob; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; diff --git a/common/buildcraft/robotics/boards/BoardRobotKnightNBT.java b/common/buildcraft/robotics/boards/BoardRobotKnightNBT.java index 502f2624..54d521b3 100755 --- a/common/buildcraft/robotics/boards/BoardRobotKnightNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotKnightNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotLeaveCutter.java b/common/buildcraft/robotics/boards/BoardRobotLeaveCutter.java index 20b68c54..084efc6a 100755 --- a/common/buildcraft/robotics/boards/BoardRobotLeaveCutter.java +++ b/common/buildcraft/robotics/boards/BoardRobotLeaveCutter.java @@ -11,7 +11,6 @@ package buildcraft.robotics.boards; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotLeaveCutterNBT.java b/common/buildcraft/robotics/boards/BoardRobotLeaveCutterNBT.java index 7a172c48..02c82f45 100755 --- a/common/buildcraft/robotics/boards/BoardRobotLeaveCutterNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotLeaveCutterNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotLumberjack.java b/common/buildcraft/robotics/boards/BoardRobotLumberjack.java index 36c9d322..11496a09 100755 --- a/common/buildcraft/robotics/boards/BoardRobotLumberjack.java +++ b/common/buildcraft/robotics/boards/BoardRobotLumberjack.java @@ -8,11 +8,9 @@ */ package buildcraft.robotics.boards; -import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; - import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotLumberjackNBT.java b/common/buildcraft/robotics/boards/BoardRobotLumberjackNBT.java index 7bddba5c..9b39f8e6 100755 --- a/common/buildcraft/robotics/boards/BoardRobotLumberjackNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotLumberjackNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotMiner.java b/common/buildcraft/robotics/boards/BoardRobotMiner.java index 77850705..78031d46 100755 --- a/common/buildcraft/robotics/boards/BoardRobotMiner.java +++ b/common/buildcraft/robotics/boards/BoardRobotMiner.java @@ -11,7 +11,6 @@ package buildcraft.robotics.boards; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.robots.AIRobot; diff --git a/common/buildcraft/robotics/boards/BoardRobotMinerNBT.java b/common/buildcraft/robotics/boards/BoardRobotMinerNBT.java index b40d1fc8..8faf3597 100755 --- a/common/buildcraft/robotics/boards/BoardRobotMinerNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotMinerNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotPicker.java b/common/buildcraft/robotics/boards/BoardRobotPicker.java index 45a4f61b..536a413b 100755 --- a/common/buildcraft/robotics/boards/BoardRobotPicker.java +++ b/common/buildcraft/robotics/boards/BoardRobotPicker.java @@ -10,9 +10,7 @@ package buildcraft.robotics.boards; import java.util.HashSet; import java.util.Set; - import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; diff --git a/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java b/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java index 6d02a039..8a658c2d 100755 --- a/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java @@ -9,20 +9,17 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; import buildcraft.core.lib.utils.StringUtils; -import buildcraft.robotics.EntityRobot; public final class BoardRobotPickerNBT extends RedstoneBoardRobotNBT { public static BoardRobotPickerNBT instance = new BoardRobotPickerNBT(); diff --git a/common/buildcraft/robotics/boards/BoardRobotPlanter.java b/common/buildcraft/robotics/boards/BoardRobotPlanter.java index c267bc42..445dd54a 100644 --- a/common/buildcraft/robotics/boards/BoardRobotPlanter.java +++ b/common/buildcraft/robotics/boards/BoardRobotPlanter.java @@ -10,7 +10,6 @@ package buildcraft.robotics.boards; import java.util.ArrayList; import java.util.Collection; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; @@ -18,21 +17,19 @@ import net.minecraft.item.ItemReed; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; - import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.api.robots.ResourceIdBlock; import buildcraft.core.lib.inventory.filters.ArrayStackFilter; import buildcraft.core.lib.inventory.filters.ArrayStackOrListFilter; import buildcraft.core.lib.inventory.filters.CompositeFilter; import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.core.lib.utils.IBlockFilter; -import buildcraft.api.robots.ResourceIdBlock; import buildcraft.robotics.ai.AIRobotFetchAndEquipItemStack; import buildcraft.robotics.ai.AIRobotGotoBlock; import buildcraft.robotics.ai.AIRobotGotoSleep; @@ -127,7 +124,7 @@ public class BoardRobotPlanter extends RedstoneBoardRobot { AIRobotSearchRandomBlock searchAI = (AIRobotSearchRandomBlock) ai; if (searchAI.takeResource()) { blockFound = searchAI.blockFound; - if (searchAI.path.size() > 1){ + if (searchAI.path.size() > 1) { searchAI.path.removeLast(); } startDelegateAI(new AIRobotGotoBlock(robot, searchAI.path)); diff --git a/common/buildcraft/robotics/boards/BoardRobotPlanterNBT.java b/common/buildcraft/robotics/boards/BoardRobotPlanterNBT.java index 6043ceca..32995223 100755 --- a/common/buildcraft/robotics/boards/BoardRobotPlanterNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotPlanterNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotPump.java b/common/buildcraft/robotics/boards/BoardRobotPump.java index 585f6f87..3f05cf3c 100644 --- a/common/buildcraft/robotics/boards/BoardRobotPump.java +++ b/common/buildcraft/robotics/boards/BoardRobotPump.java @@ -9,17 +9,14 @@ package buildcraft.robotics.boards; import java.util.ArrayList; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BlockIndex; @@ -27,11 +24,12 @@ import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.IWorldProperty; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.api.robots.ResourceIdBlock; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; +import buildcraft.api.statements.StatementSlot; import buildcraft.core.lib.utils.IBlockFilter; import buildcraft.robotics.DockingStation; -import buildcraft.api.robots.ResourceIdBlock; import buildcraft.robotics.ai.AIRobotGotoBlock; import buildcraft.robotics.ai.AIRobotGotoSleep; import buildcraft.robotics.ai.AIRobotGotoStationAndUnloadFluids; @@ -39,7 +37,6 @@ import buildcraft.robotics.ai.AIRobotPumpBlock; import buildcraft.robotics.ai.AIRobotSearchBlock; import buildcraft.robotics.statements.ActionRobotFilter; import buildcraft.transport.gates.ActionIterator; -import buildcraft.api.statements.StatementSlot; public class BoardRobotPump extends RedstoneBoardRobot { diff --git a/common/buildcraft/robotics/boards/BoardRobotPumpNBT.java b/common/buildcraft/robotics/boards/BoardRobotPumpNBT.java index 453ce574..0f83eca7 100755 --- a/common/buildcraft/robotics/boards/BoardRobotPumpNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotPumpNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotShovelman.java b/common/buildcraft/robotics/boards/BoardRobotShovelman.java index 715d7310..90737911 100755 --- a/common/buildcraft/robotics/boards/BoardRobotShovelman.java +++ b/common/buildcraft/robotics/boards/BoardRobotShovelman.java @@ -8,10 +8,8 @@ */ package buildcraft.robotics.boards; -import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotShovelmanNBT.java b/common/buildcraft/robotics/boards/BoardRobotShovelmanNBT.java index fa65c482..33757cd3 100755 --- a/common/buildcraft/robotics/boards/BoardRobotShovelmanNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotShovelmanNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/boards/BoardRobotStripes.java b/common/buildcraft/robotics/boards/BoardRobotStripes.java index cd78956b..f25b21e3 100644 --- a/common/buildcraft/robotics/boards/BoardRobotStripes.java +++ b/common/buildcraft/robotics/boards/BoardRobotStripes.java @@ -11,15 +11,14 @@ package buildcraft.robotics.boards; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.api.robots.ResourceIdBlock; import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.core.lib.utils.IBlockFilter; -import buildcraft.api.robots.ResourceIdBlock; import buildcraft.robotics.ai.AIRobotFetchAndEquipItemStack; import buildcraft.robotics.ai.AIRobotGotoBlock; import buildcraft.robotics.ai.AIRobotGotoSleep; diff --git a/common/buildcraft/robotics/boards/BoardRobotStripesNBT.java b/common/buildcraft/robotics/boards/BoardRobotStripesNBT.java index c2c88fbb..33da066f 100644 --- a/common/buildcraft/robotics/boards/BoardRobotStripesNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotStripesNBT.java @@ -9,14 +9,12 @@ package buildcraft.robotics.boards; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/robotics/gui/ContainerRequester.java b/common/buildcraft/robotics/gui/ContainerRequester.java index 8462341e..4c191bcd 100755 --- a/common/buildcraft/robotics/gui/ContainerRequester.java +++ b/common/buildcraft/robotics/gui/ContainerRequester.java @@ -9,14 +9,11 @@ package buildcraft.robotics.gui; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; - import cpw.mods.fml.relauncher.Side; - import buildcraft.BuildCraftCore; import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.network.command.CommandWriter; diff --git a/common/buildcraft/robotics/gui/ContainerZonePlan.java b/common/buildcraft/robotics/gui/ContainerZonePlan.java index adad2380..ddabc09c 100755 --- a/common/buildcraft/robotics/gui/ContainerZonePlan.java +++ b/common/buildcraft/robotics/gui/ContainerZonePlan.java @@ -9,23 +9,20 @@ package buildcraft.robotics.gui; import io.netty.buffer.ByteBuf; - import net.minecraft.block.material.MapColor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; - import cpw.mods.fml.relauncher.Side; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftRobotics; -import buildcraft.core.lib.render.DynamicTexturePaletted; import buildcraft.core.ZonePlan; import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.slots.SlotOutput; import buildcraft.core.lib.network.command.CommandWriter; import buildcraft.core.lib.network.command.ICommandReceiver; import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.render.DynamicTexturePaletted; import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.robotics.TileZonePlan; @@ -72,7 +69,8 @@ public class ContainerZonePlan extends BuildCraftContainer implements ICommandRe public void saveArea(final int index) { BuildCraftCore.instance.sendToServer(new PacketCommand(this, "saveArea", new CommandWriter() { - public void write(ByteBuf data) {data.writeByte(index); + public void write(ByteBuf data) { + data.writeByte(index); currentAreaSelection.writeData(data); } })); diff --git a/common/buildcraft/robotics/gui/GuiRequester.java b/common/buildcraft/robotics/gui/GuiRequester.java index 1e74c195..b700c81d 100755 --- a/common/buildcraft/robotics/gui/GuiRequester.java +++ b/common/buildcraft/robotics/gui/GuiRequester.java @@ -11,8 +11,6 @@ package buildcraft.robotics.gui; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - -import buildcraft.core.DefaultProps; import buildcraft.core.lib.gui.AdvancedSlot; import buildcraft.core.lib.gui.GuiAdvancedInterface; import buildcraft.robotics.TileRequester; diff --git a/common/buildcraft/robotics/gui/GuiZonePlan.java b/common/buildcraft/robotics/gui/GuiZonePlan.java index befda143..633a57af 100755 --- a/common/buildcraft/robotics/gui/GuiZonePlan.java +++ b/common/buildcraft/robotics/gui/GuiZonePlan.java @@ -10,22 +10,17 @@ package buildcraft.robotics.gui; import java.util.LinkedList; import java.util.List; - import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; - import io.netty.buffer.ByteBuf; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.inventory.IInventory; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import buildcraft.BuildCraftCore; import buildcraft.api.core.EnumColor; -import buildcraft.core.lib.render.DynamicTexturePaletted; import buildcraft.core.DefaultProps; import buildcraft.core.ZonePlan; import buildcraft.core.lib.gui.AdvancedSlot; @@ -35,6 +30,7 @@ import buildcraft.core.lib.gui.tooltips.ToolTip; import buildcraft.core.lib.gui.tooltips.ToolTipLine; import buildcraft.core.lib.network.command.CommandWriter; import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.render.DynamicTexturePaletted; import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.TileZonePlan; diff --git a/common/buildcraft/robotics/map/MapChunk.java b/common/buildcraft/robotics/map/MapChunk.java index 3156e535..10d41f95 100644 --- a/common/buildcraft/robotics/map/MapChunk.java +++ b/common/buildcraft/robotics/map/MapChunk.java @@ -11,7 +11,7 @@ public class MapChunk { private int x, z; private byte[] data; - public MapChunk(int x, int y) { + public MapChunk(int x, int z) { this.x = x; this.z = z; data = new byte[256]; @@ -34,19 +34,19 @@ public class MapChunk { } public void update(Chunk chunk) { - for (int z = 0; z < 16; z++) { - for (int x = 0; x < 16; x++) { - int y = chunk.getHeightValue(x, z); + for (int bz = 0; bz < 16; bz++) { + for (int bx = 0; bx < 16; bx++) { + int y = chunk.getHeightValue(bx, bz); int color; - while ((color = chunk.getBlock(x, y, z).getMapColor(0).colorIndex) == MapColor.airColor.colorIndex) { + while ((color = chunk.getBlock(bx, y, bz).getMapColor(0).colorIndex) == MapColor.airColor.colorIndex) { y--; if (y < 0) { break; } } - data[(z << 4) | x] = (byte) color; + data[(bz << 4) | bx] = (byte) color; } } } diff --git a/common/buildcraft/robotics/map/MapRegion.java b/common/buildcraft/robotics/map/MapRegion.java index 66dc6ea6..3eb0c3ab 100644 --- a/common/buildcraft/robotics/map/MapRegion.java +++ b/common/buildcraft/robotics/map/MapRegion.java @@ -1,9 +1,8 @@ package buildcraft.robotics.map; -import gnu.trove.map.hash.TIntObjectHashMap; - import net.minecraft.nbt.NBTTagCompound; import buildcraft.api.core.INBTStoreable; +import gnu.trove.map.hash.TIntObjectHashMap; public class MapRegion implements INBTStoreable { private final TIntObjectHashMap chunks = new TIntObjectHashMap(); diff --git a/common/buildcraft/robotics/map/MapWorld.java b/common/buildcraft/robotics/map/MapWorld.java index e35f437c..f49413be 100644 --- a/common/buildcraft/robotics/map/MapWorld.java +++ b/common/buildcraft/robotics/map/MapWorld.java @@ -1,9 +1,5 @@ package buildcraft.robotics.map; -import gnu.trove.iterator.TLongIterator; -import gnu.trove.map.hash.TLongObjectHashMap; -import gnu.trove.set.hash.TLongHashSet; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -19,6 +15,7 @@ import java.util.Set; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import buildcraft.core.lib.utils.NBTUtils; +import gnu.trove.map.hash.TLongObjectHashMap; public class MapWorld { private final World world; diff --git a/common/buildcraft/robotics/render/RenderRobot.java b/common/buildcraft/robotics/render/RenderRobot.java index e7ac8878..6b59e7bc 100644 --- a/common/buildcraft/robotics/render/RenderRobot.java +++ b/common/buildcraft/robotics/render/RenderRobot.java @@ -9,9 +9,7 @@ package buildcraft.robotics.render; import java.util.Date; - import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.OpenGlHelper; @@ -23,17 +21,14 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.client.IItemRenderer; - import buildcraft.BuildCraftRobotics; import buildcraft.core.DefaultProps; import buildcraft.core.EntityLaser; -import buildcraft.core.render.RenderLaser; import buildcraft.core.lib.render.RenderUtils; +import buildcraft.core.render.RenderLaser; import buildcraft.robotics.EntityRobot; import buildcraft.robotics.ItemRobot; -import buildcraft.robotics.RobotUtils; public class RenderRobot extends Render implements IItemRenderer { private static final ResourceLocation overlay_red = new ResourceLocation( diff --git a/common/buildcraft/robotics/render/RobotStationItemRenderer.java b/common/buildcraft/robotics/render/RobotStationItemRenderer.java index 4c5e117e..3847b119 100755 --- a/common/buildcraft/robotics/render/RobotStationItemRenderer.java +++ b/common/buildcraft/robotics/render/RobotStationItemRenderer.java @@ -9,15 +9,12 @@ package buildcraft.robotics.render; import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - import net.minecraftforge.client.IItemRenderer; - import buildcraft.BuildCraftTransport; import buildcraft.transport.PipeIconProvider; diff --git a/common/buildcraft/robotics/statements/ActionRobotFilter.java b/common/buildcraft/robotics/statements/ActionRobotFilter.java index e73adc4b..3709641d 100755 --- a/common/buildcraft/robotics/statements/ActionRobotFilter.java +++ b/common/buildcraft/robotics/statements/ActionRobotFilter.java @@ -10,18 +10,16 @@ package buildcraft.robotics.statements; import java.util.ArrayList; import java.util.Collection; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; - import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.robots.IDockingStation; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; +import buildcraft.api.statements.StatementSlot; import buildcraft.api.transport.IPipe; import buildcraft.core.lib.inventory.filters.ArrayFluidFilter; import buildcraft.core.lib.inventory.filters.ArrayStackOrListFilter; @@ -30,11 +28,10 @@ import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.core.lib.inventory.filters.PassThroughFluidFilter; import buildcraft.core.lib.inventory.filters.PassThroughStackFilter; import buildcraft.core.lib.inventory.filters.StatementParameterStackFilter; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; import buildcraft.robotics.DockingStation; import buildcraft.transport.gates.ActionIterator; -import buildcraft.api.statements.StatementSlot; public class ActionRobotFilter extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionRobotFilterTool.java b/common/buildcraft/robotics/statements/ActionRobotFilterTool.java index 36080dea..e784e1db 100644 --- a/common/buildcraft/robotics/statements/ActionRobotFilterTool.java +++ b/common/buildcraft/robotics/statements/ActionRobotFilterTool.java @@ -10,23 +10,21 @@ package buildcraft.robotics.statements; import java.util.ArrayList; import java.util.Collection; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; - import buildcraft.api.robots.IDockingStation; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; +import buildcraft.api.statements.StatementSlot; import buildcraft.core.lib.inventory.filters.ArrayStackOrListFilter; import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.core.lib.inventory.filters.PassThroughStackFilter; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; import buildcraft.robotics.DockingStation; import buildcraft.transport.gates.ActionIterator; -import buildcraft.api.statements.StatementSlot; public class ActionRobotFilterTool extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionRobotGotoStation.java b/common/buildcraft/robotics/statements/ActionRobotGotoStation.java index 53da56e4..dc3489e8 100644 --- a/common/buildcraft/robotics/statements/ActionRobotGotoStation.java +++ b/common/buildcraft/robotics/statements/ActionRobotGotoStation.java @@ -10,9 +10,7 @@ package buildcraft.robotics.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.BlockIndex; import buildcraft.api.items.IMapLocation; import buildcraft.api.robots.AIRobot; @@ -22,8 +20,8 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.api.transport.IPipeTile; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; import buildcraft.robotics.RobotRegistry; diff --git a/common/buildcraft/robotics/statements/ActionRobotWakeUp.java b/common/buildcraft/robotics/statements/ActionRobotWakeUp.java index b0fe0223..caf78348 100755 --- a/common/buildcraft/robotics/statements/ActionRobotWakeUp.java +++ b/common/buildcraft/robotics/statements/ActionRobotWakeUp.java @@ -9,12 +9,11 @@ package buildcraft.robotics.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; public class ActionRobotWakeUp extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionRobotWorkInArea.java b/common/buildcraft/robotics/statements/ActionRobotWorkInArea.java index 037f417e..2a14e778 100755 --- a/common/buildcraft/robotics/statements/ActionRobotWorkInArea.java +++ b/common/buildcraft/robotics/statements/ActionRobotWorkInArea.java @@ -10,16 +10,15 @@ package buildcraft.robotics.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; - import buildcraft.api.core.IZone; import buildcraft.api.items.IMapLocation; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.statements.BCStatement; -import buildcraft.core.lib.utils.StringUtils; import buildcraft.api.statements.StatementSlot; +import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; public class ActionRobotWorkInArea extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionStationAcceptFluids.java b/common/buildcraft/robotics/statements/ActionStationAcceptFluids.java index 9d00410b..a0eb99f0 100755 --- a/common/buildcraft/robotics/statements/ActionStationAcceptFluids.java +++ b/common/buildcraft/robotics/statements/ActionStationAcceptFluids.java @@ -9,13 +9,12 @@ package buildcraft.robotics.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; public class ActionStationAcceptFluids extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionStationAcceptItems.java b/common/buildcraft/robotics/statements/ActionStationAcceptItems.java index 9fb06be9..32504ec3 100755 --- a/common/buildcraft/robotics/statements/ActionStationAcceptItems.java +++ b/common/buildcraft/robotics/statements/ActionStationAcceptItems.java @@ -9,18 +9,17 @@ package buildcraft.robotics.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementManager; import buildcraft.api.statements.StatementParameterItemStack; +import buildcraft.api.statements.StatementSlot; import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TravelingItem; -import buildcraft.api.statements.StatementSlot; public class ActionStationAcceptItems extends ActionStationInputItems { diff --git a/common/buildcraft/robotics/statements/ActionStationAllowCraft.java b/common/buildcraft/robotics/statements/ActionStationAllowCraft.java index 81707997..759067e6 100755 --- a/common/buildcraft/robotics/statements/ActionStationAllowCraft.java +++ b/common/buildcraft/robotics/statements/ActionStationAllowCraft.java @@ -9,13 +9,12 @@ package buildcraft.robotics.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; public class ActionStationAllowCraft extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionStationForbidRobot.java b/common/buildcraft/robotics/statements/ActionStationForbidRobot.java index 59f31d33..3401e954 100755 --- a/common/buildcraft/robotics/statements/ActionStationForbidRobot.java +++ b/common/buildcraft/robotics/statements/ActionStationForbidRobot.java @@ -10,18 +10,17 @@ package buildcraft.robotics.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; - import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.statements.BCStatement; +import buildcraft.api.statements.StatementSlot; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; import buildcraft.robotics.DockingStation; import buildcraft.robotics.ItemRobot; import buildcraft.transport.gates.ActionIterator; -import buildcraft.api.statements.StatementSlot; public class ActionStationForbidRobot extends BCStatement implements IActionInternal { private final boolean invert; diff --git a/common/buildcraft/robotics/statements/ActionStationInputItems.java b/common/buildcraft/robotics/statements/ActionStationInputItems.java index 8a4dd03e..df4ae89b 100755 --- a/common/buildcraft/robotics/statements/ActionStationInputItems.java +++ b/common/buildcraft/robotics/statements/ActionStationInputItems.java @@ -12,11 +12,11 @@ import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; +import buildcraft.api.statements.StatementSlot; import buildcraft.core.lib.inventory.filters.StatementParameterStackFilter; import buildcraft.core.statements.BCStatement; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; -import buildcraft.api.statements.StatementSlot; public abstract class ActionStationInputItems extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionStationProvideFluids.java b/common/buildcraft/robotics/statements/ActionStationProvideFluids.java index e34518c0..70f95a46 100755 --- a/common/buildcraft/robotics/statements/ActionStationProvideFluids.java +++ b/common/buildcraft/robotics/statements/ActionStationProvideFluids.java @@ -9,13 +9,12 @@ package buildcraft.robotics.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; public class ActionStationProvideFluids extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionStationProvideItems.java b/common/buildcraft/robotics/statements/ActionStationProvideItems.java index 27d2bd7a..e1d79e81 100755 --- a/common/buildcraft/robotics/statements/ActionStationProvideItems.java +++ b/common/buildcraft/robotics/statements/ActionStationProvideItems.java @@ -9,13 +9,12 @@ package buildcraft.robotics.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; public class ActionStationProvideItems extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionStationRequestItems.java b/common/buildcraft/robotics/statements/ActionStationRequestItems.java index 47ef35cd..7013f988 100755 --- a/common/buildcraft/robotics/statements/ActionStationRequestItems.java +++ b/common/buildcraft/robotics/statements/ActionStationRequestItems.java @@ -9,17 +9,16 @@ package buildcraft.robotics.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; +import buildcraft.api.statements.StatementSlot; import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TravelingItem; -import buildcraft.api.statements.StatementSlot; public class ActionStationRequestItems extends ActionStationInputItems { diff --git a/common/buildcraft/robotics/statements/ActionStationRequestItemsMachine.java b/common/buildcraft/robotics/statements/ActionStationRequestItemsMachine.java index e3ecc82a..08b01124 100755 --- a/common/buildcraft/robotics/statements/ActionStationRequestItemsMachine.java +++ b/common/buildcraft/robotics/statements/ActionStationRequestItemsMachine.java @@ -9,12 +9,11 @@ package buildcraft.robotics.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; public class ActionStationRequestItemsMachine extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/RobotsActionProvider.java b/common/buildcraft/robotics/statements/RobotsActionProvider.java index d78d9a83..c51ac878 100755 --- a/common/buildcraft/robotics/statements/RobotsActionProvider.java +++ b/common/buildcraft/robotics/statements/RobotsActionProvider.java @@ -11,16 +11,13 @@ package buildcraft.robotics.statements; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; - import net.minecraft.block.Block; import net.minecraft.block.BlockWorkbench; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.BuildCraftRobotics; import buildcraft.api.robots.IRequestProvider; import buildcraft.api.statements.IActionExternal; diff --git a/common/buildcraft/robotics/statements/RobotsTriggerProvider.java b/common/buildcraft/robotics/statements/RobotsTriggerProvider.java index 8ed60a44..42404e65 100755 --- a/common/buildcraft/robotics/statements/RobotsTriggerProvider.java +++ b/common/buildcraft/robotics/statements/RobotsTriggerProvider.java @@ -10,11 +10,8 @@ package buildcraft.robotics.statements; import java.util.Collection; import java.util.LinkedList; - import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftRobotics; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; diff --git a/common/buildcraft/robotics/statements/StateStationProvideItems.java b/common/buildcraft/robotics/statements/StateStationProvideItems.java index 941ce027..23e97f68 100755 --- a/common/buildcraft/robotics/statements/StateStationProvideItems.java +++ b/common/buildcraft/robotics/statements/StateStationProvideItems.java @@ -9,9 +9,7 @@ package buildcraft.robotics.statements; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.statements.ActionState; import buildcraft.core.lib.inventory.filters.IStackFilter; diff --git a/common/buildcraft/robotics/statements/StateStationRequestItems.java b/common/buildcraft/robotics/statements/StateStationRequestItems.java index eb9248b6..1995adbe 100755 --- a/common/buildcraft/robotics/statements/StateStationRequestItems.java +++ b/common/buildcraft/robotics/statements/StateStationRequestItems.java @@ -9,9 +9,7 @@ package buildcraft.robotics.statements; import java.util.LinkedList; - import net.minecraft.item.ItemStack; - import buildcraft.api.statements.ActionState; import buildcraft.core.lib.inventory.filters.IStackFilter; diff --git a/common/buildcraft/robotics/statements/TriggerRobotInStation.java b/common/buildcraft/robotics/statements/TriggerRobotInStation.java index bfe93d0d..ea169a9f 100755 --- a/common/buildcraft/robotics/statements/TriggerRobotInStation.java +++ b/common/buildcraft/robotics/statements/TriggerRobotInStation.java @@ -16,7 +16,6 @@ import buildcraft.core.lib.utils.StringUtils; import buildcraft.core.statements.BCStatement; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; -import buildcraft.robotics.ai.AIRobotSleep; public class TriggerRobotInStation extends BCStatement implements ITriggerInternal { diff --git a/common/buildcraft/robotics/statements/TriggerRobotLinked.java b/common/buildcraft/robotics/statements/TriggerRobotLinked.java index 2c4a12ce..243f17d3 100755 --- a/common/buildcraft/robotics/statements/TriggerRobotLinked.java +++ b/common/buildcraft/robotics/statements/TriggerRobotLinked.java @@ -15,7 +15,6 @@ import buildcraft.api.statements.ITriggerInternal; import buildcraft.core.lib.utils.StringUtils; import buildcraft.core.statements.BCStatement; import buildcraft.robotics.DockingStation; -import buildcraft.robotics.EntityRobot; public class TriggerRobotLinked extends BCStatement implements ITriggerInternal { private final boolean reserved; diff --git a/common/buildcraft/robotics/statements/TriggerRobotSleep.java b/common/buildcraft/robotics/statements/TriggerRobotSleep.java index 5ab40298..1347621b 100755 --- a/common/buildcraft/robotics/statements/TriggerRobotSleep.java +++ b/common/buildcraft/robotics/statements/TriggerRobotSleep.java @@ -9,19 +9,13 @@ package buildcraft.robotics.statements; import net.minecraft.client.renderer.texture.IIconRegister; - -import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; -import buildcraft.api.transport.IPipeTile; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; -import buildcraft.robotics.RobotUtils; -import buildcraft.robotics.ai.AIRobotSleep; public class TriggerRobotSleep extends BCStatement implements ITriggerInternal { diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java index d7212eca..83761fe2 100644 --- a/common/buildcraft/silicon/BlockLaser.java +++ b/common/buildcraft/silicon/BlockLaser.java @@ -9,9 +9,7 @@ package buildcraft.silicon; import java.util.List; - import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -21,14 +19,11 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.lib.render.ICustomHighlight; public class BlockLaser extends BlockBuildCraft implements ICustomHighlight { diff --git a/common/buildcraft/silicon/BlockLaserTable.java b/common/buildcraft/silicon/BlockLaserTable.java index 8688e5f5..c15e337e 100644 --- a/common/buildcraft/silicon/BlockLaserTable.java +++ b/common/buildcraft/silicon/BlockLaserTable.java @@ -9,28 +9,21 @@ package buildcraft.silicon; import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.material.Material; -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.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.BuildCraftSilicon; import buildcraft.api.events.BlockInteractionEvent; import buildcraft.api.power.ILaserTargetBlock; -import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; -import buildcraft.core.lib.utils.Utils; +import buildcraft.core.lib.block.BlockBuildCraft; public class BlockLaserTable extends BlockBuildCraft implements ILaserTargetBlock { protected static final int TABLE_MAX = 5; diff --git a/common/buildcraft/silicon/ItemLaserTable.java b/common/buildcraft/silicon/ItemLaserTable.java index 36170856..e1dac326 100644 --- a/common/buildcraft/silicon/ItemLaserTable.java +++ b/common/buildcraft/silicon/ItemLaserTable.java @@ -10,7 +10,6 @@ package buildcraft.silicon; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; - import buildcraft.core.lib.items.ItemBlockBuildCraft; public class ItemLaserTable extends ItemBlockBuildCraft { diff --git a/common/buildcraft/silicon/ItemRedstoneChipset.java b/common/buildcraft/silicon/ItemRedstoneChipset.java index f5c0ad22..6d62c4de 100644 --- a/common/buildcraft/silicon/ItemRedstoneChipset.java +++ b/common/buildcraft/silicon/ItemRedstoneChipset.java @@ -10,17 +10,14 @@ package buildcraft.silicon; import java.util.List; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.BuildCraftSilicon; import buildcraft.core.lib.items.ItemBuildCraft; diff --git a/common/buildcraft/silicon/ResourceIdAssemblyTable.java b/common/buildcraft/silicon/ResourceIdAssemblyTable.java index 83bcba8d..9dd5e729 100755 --- a/common/buildcraft/silicon/ResourceIdAssemblyTable.java +++ b/common/buildcraft/silicon/ResourceIdAssemblyTable.java @@ -10,7 +10,6 @@ package buildcraft.silicon; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.ResourceId; -import buildcraft.silicon.TileAssemblyTable; public class ResourceIdAssemblyTable extends ResourceId { diff --git a/common/buildcraft/silicon/SiliconGuiHandler.java b/common/buildcraft/silicon/SiliconGuiHandler.java index f570d4e2..86e2414a 100644 --- a/common/buildcraft/silicon/SiliconGuiHandler.java +++ b/common/buildcraft/silicon/SiliconGuiHandler.java @@ -11,9 +11,7 @@ package buildcraft.silicon; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import cpw.mods.fml.common.network.IGuiHandler; - import buildcraft.silicon.gui.ContainerAdvancedCraftingTable; import buildcraft.silicon.gui.ContainerAssemblyTable; import buildcraft.silicon.gui.ContainerChargingTable; diff --git a/common/buildcraft/silicon/TileAdvancedCraftingTable.java b/common/buildcraft/silicon/TileAdvancedCraftingTable.java index 692c9270..25706c6c 100644 --- a/common/buildcraft/silicon/TileAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/TileAdvancedCraftingTable.java @@ -12,9 +12,7 @@ import java.lang.ref.WeakReference; import java.util.Arrays; import java.util.EnumSet; import java.util.List; - import com.google.common.collect.Lists; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; @@ -27,10 +25,8 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.WorldServer; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; - import buildcraft.BuildCraftSilicon; import buildcraft.api.core.IInvSlot; import buildcraft.api.power.ILaserTarget; @@ -43,12 +39,12 @@ import buildcraft.core.lib.inventory.StackHelper; import buildcraft.core.lib.inventory.Transactor; import buildcraft.core.lib.inventory.filters.CraftingFilter; import buildcraft.core.lib.inventory.filters.IStackFilter; -import buildcraft.core.network.PacketIds; import buildcraft.core.lib.network.PacketSlotChange; -import buildcraft.core.proxy.CoreProxy; import buildcraft.core.lib.utils.CraftingUtils; import buildcraft.core.lib.utils.StringUtils; import buildcraft.core.lib.utils.Utils; +import buildcraft.core.network.PacketIds; +import buildcraft.core.proxy.CoreProxy; public class TileAdvancedCraftingTable extends TileLaserTableBase implements IInventory, ILaserTarget, ISidedInventory { diff --git a/common/buildcraft/silicon/TileAssemblyTable.java b/common/buildcraft/silicon/TileAssemblyTable.java index 12bf7acd..f756439f 100644 --- a/common/buildcraft/silicon/TileAssemblyTable.java +++ b/common/buildcraft/silicon/TileAssemblyTable.java @@ -11,23 +11,18 @@ package buildcraft.silicon; import java.util.HashSet; import java.util.LinkedList; import java.util.List; - import io.netty.buffer.ByteBuf; - import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; - import buildcraft.BuildCraftCore; import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.IFlexibleCrafter; @@ -37,10 +32,10 @@ import buildcraft.api.robots.RobotManager; import buildcraft.core.lib.network.command.CommandWriter; import buildcraft.core.lib.network.command.ICommandReceiver; import buildcraft.core.lib.network.command.PacketCommand; -import buildcraft.core.recipes.AssemblyRecipeManager; import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.core.lib.utils.StringUtils; import buildcraft.core.lib.utils.Utils; +import buildcraft.core.recipes.AssemblyRecipeManager; public class TileAssemblyTable extends TileLaserTableBase implements IInventory, IFlexibleCrafter, ICommandReceiver { public String currentRecipeId = ""; diff --git a/common/buildcraft/silicon/TileChargingTable.java b/common/buildcraft/silicon/TileChargingTable.java index 84f06097..11cbf722 100644 --- a/common/buildcraft/silicon/TileChargingTable.java +++ b/common/buildcraft/silicon/TileChargingTable.java @@ -1,11 +1,8 @@ package buildcraft.silicon; import net.minecraft.item.ItemStack; - import cpw.mods.fml.common.FMLCommonHandler; - import cofh.api.energy.IEnergyContainerItem; - import buildcraft.api.tiles.IHasWork; import buildcraft.core.lib.utils.StringUtils; diff --git a/common/buildcraft/silicon/TileIntegrationTable.java b/common/buildcraft/silicon/TileIntegrationTable.java index 23723210..2b8c3ab0 100644 --- a/common/buildcraft/silicon/TileIntegrationTable.java +++ b/common/buildcraft/silicon/TileIntegrationTable.java @@ -10,10 +10,8 @@ package buildcraft.silicon; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.recipes.BuildcraftRecipeRegistry; import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.IFlexibleCrafter; diff --git a/common/buildcraft/silicon/TileLaser.java b/common/buildcraft/silicon/TileLaser.java index 52002590..91f954f5 100644 --- a/common/buildcraft/silicon/TileLaser.java +++ b/common/buildcraft/silicon/TileLaser.java @@ -10,16 +10,12 @@ package buildcraft.silicon; import java.util.LinkedList; import java.util.List; - import io.netty.buffer.ByteBuf; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.Position; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.power.ILaserTarget; diff --git a/common/buildcraft/silicon/TileLaserTableBase.java b/common/buildcraft/silicon/TileLaserTableBase.java index 61b947ec..513abcf6 100644 --- a/common/buildcraft/silicon/TileLaserTableBase.java +++ b/common/buildcraft/silicon/TileLaserTableBase.java @@ -14,7 +14,6 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.api.power.ILaserTarget; import buildcraft.api.tiles.IHasWork; import buildcraft.core.lib.block.TileBuildCraft; diff --git a/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java b/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java index d400ddb9..e5f655cd 100644 --- a/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; - import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.slots.SlotOutput; import buildcraft.core.lib.gui.slots.SlotPhantom; diff --git a/common/buildcraft/silicon/gui/ContainerAssemblyTable.java b/common/buildcraft/silicon/gui/ContainerAssemblyTable.java index e63ebffb..a683bade 100644 --- a/common/buildcraft/silicon/gui/ContainerAssemblyTable.java +++ b/common/buildcraft/silicon/gui/ContainerAssemblyTable.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; - import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.silicon.TileAssemblyTable; diff --git a/common/buildcraft/silicon/gui/ContainerChargingTable.java b/common/buildcraft/silicon/gui/ContainerChargingTable.java index 19c7b095..ef8c64c5 100644 --- a/common/buildcraft/silicon/gui/ContainerChargingTable.java +++ b/common/buildcraft/silicon/gui/ContainerChargingTable.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; - import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.slots.SlotValidated; import buildcraft.silicon.TileChargingTable; diff --git a/common/buildcraft/silicon/gui/ContainerIntegrationTable.java b/common/buildcraft/silicon/gui/ContainerIntegrationTable.java index 40fac240..33d47a42 100644 --- a/common/buildcraft/silicon/gui/ContainerIntegrationTable.java +++ b/common/buildcraft/silicon/gui/ContainerIntegrationTable.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; - import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.slots.SlotOutput; import buildcraft.core.lib.gui.slots.SlotUntouchable; diff --git a/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java b/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java index 323e3287..d299fb50 100644 --- a/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java @@ -9,11 +9,8 @@ package buildcraft.silicon.gui; import org.lwjgl.opengl.GL11; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - -import buildcraft.core.DefaultProps; import buildcraft.silicon.TileAdvancedCraftingTable; public class GuiAdvancedCraftingTable extends GuiLaserTable { diff --git a/common/buildcraft/silicon/gui/GuiAssemblyTable.java b/common/buildcraft/silicon/gui/GuiAssemblyTable.java index 2ca30836..a20c52f9 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyTable.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyTable.java @@ -10,19 +10,15 @@ package buildcraft.silicon.gui; import java.util.Iterator; import java.util.List; - import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import buildcraft.BuildCraftCore; import buildcraft.api.recipes.CraftingResult; import buildcraft.core.CoreIconProvider; -import buildcraft.core.DefaultProps; import buildcraft.core.lib.gui.AdvancedSlot; import buildcraft.core.lib.gui.GuiAdvancedInterface; import buildcraft.core.lib.utils.StringUtils; diff --git a/common/buildcraft/silicon/gui/GuiChargingTable.java b/common/buildcraft/silicon/gui/GuiChargingTable.java index cfbe45af..870dc43f 100644 --- a/common/buildcraft/silicon/gui/GuiChargingTable.java +++ b/common/buildcraft/silicon/gui/GuiChargingTable.java @@ -10,8 +10,6 @@ package buildcraft.silicon.gui; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - -import buildcraft.core.DefaultProps; import buildcraft.silicon.TileChargingTable; public class GuiChargingTable extends GuiLaserTable { diff --git a/common/buildcraft/silicon/gui/GuiIntegrationTable.java b/common/buildcraft/silicon/gui/GuiIntegrationTable.java index caf4e44c..7f7766ac 100644 --- a/common/buildcraft/silicon/gui/GuiIntegrationTable.java +++ b/common/buildcraft/silicon/gui/GuiIntegrationTable.java @@ -9,11 +9,8 @@ package buildcraft.silicon.gui; import org.lwjgl.opengl.GL11; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - -import buildcraft.core.DefaultProps; import buildcraft.silicon.TileIntegrationTable; public class GuiIntegrationTable extends GuiLaserTable { diff --git a/common/buildcraft/silicon/gui/GuiLaserTable.java b/common/buildcraft/silicon/gui/GuiLaserTable.java index 8ce26ec6..492dfe75 100644 --- a/common/buildcraft/silicon/gui/GuiLaserTable.java +++ b/common/buildcraft/silicon/gui/GuiLaserTable.java @@ -13,7 +13,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; - import buildcraft.BuildCraftCore; import buildcraft.core.CoreIconProvider; import buildcraft.core.lib.gui.BuildCraftContainer; diff --git a/common/buildcraft/silicon/gui/GuiProgrammingTable.java b/common/buildcraft/silicon/gui/GuiProgrammingTable.java index 2596f9da..bf17bfc0 100644 --- a/common/buildcraft/silicon/gui/GuiProgrammingTable.java +++ b/common/buildcraft/silicon/gui/GuiProgrammingTable.java @@ -17,7 +17,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import buildcraft.BuildCraftCore; import buildcraft.core.CoreIconProvider; -import buildcraft.core.DefaultProps; import buildcraft.core.lib.gui.AdvancedSlot; import buildcraft.core.lib.gui.GuiAdvancedInterface; import buildcraft.core.lib.utils.StringUtils; diff --git a/common/buildcraft/silicon/network/PacketHandlerSilicon.java b/common/buildcraft/silicon/network/PacketHandlerSilicon.java index f8972431..2ce9ae6a 100644 --- a/common/buildcraft/silicon/network/PacketHandlerSilicon.java +++ b/common/buildcraft/silicon/network/PacketHandlerSilicon.java @@ -11,17 +11,14 @@ package buildcraft.silicon.network; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.INetHandler; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import cpw.mods.fml.common.network.NetworkRegistry; - import buildcraft.core.lib.network.Packet; -import buildcraft.core.network.PacketIds; import buildcraft.core.lib.network.PacketSlotChange; +import buildcraft.core.network.PacketIds; import buildcraft.core.proxy.CoreProxy; import buildcraft.silicon.TileAdvancedCraftingTable; import buildcraft.silicon.TileAssemblyTable; diff --git a/common/buildcraft/silicon/recipes/IntegrationTableRecipe.java b/common/buildcraft/silicon/recipes/IntegrationTableRecipe.java index 5dc1426b..e27a1e4e 100755 --- a/common/buildcraft/silicon/recipes/IntegrationTableRecipe.java +++ b/common/buildcraft/silicon/recipes/IntegrationTableRecipe.java @@ -9,7 +9,6 @@ package buildcraft.silicon.recipes; import net.minecraft.item.ItemStack; - import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.IFlexibleCrafter; import buildcraft.api.recipes.IIntegrationRecipe; diff --git a/common/buildcraft/silicon/render/RenderLaserBlock.java b/common/buildcraft/silicon/render/RenderLaserBlock.java index 3006f9e2..349ec83b 100644 --- a/common/buildcraft/silicon/render/RenderLaserBlock.java +++ b/common/buildcraft/silicon/render/RenderLaserBlock.java @@ -9,16 +9,12 @@ package buildcraft.silicon.render; import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.core.CoreConstants; import buildcraft.silicon.SiliconProxy; diff --git a/common/buildcraft/silicon/render/RenderLaserTable.java b/common/buildcraft/silicon/render/RenderLaserTable.java index acc8571b..57cc816f 100644 --- a/common/buildcraft/silicon/render/RenderLaserTable.java +++ b/common/buildcraft/silicon/render/RenderLaserTable.java @@ -7,15 +7,22 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import buildcraft.core.lib.block.BlockBuildCraft; +import buildcraft.core.lib.render.FakeBlock; import buildcraft.core.lib.render.RenderUtils; import buildcraft.core.lib.render.SubIcon; import buildcraft.silicon.SiliconProxy; -import buildcraft.core.lib.render.FakeBlock; /** * Created by asie on 3/15/15. */ public class RenderLaserTable implements ISimpleBlockRenderingHandler { + private void workaround17(int x, int y, int z) { + Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); + Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); + Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); + Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); + } + @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { BlockBuildCraft bcBlock = (BlockBuildCraft) block; @@ -86,6 +93,7 @@ public class RenderLaserTable implements ISimpleBlockRenderingHandler { private void renderAssemblyTable(RenderBlocks renderer, boolean isInv, int x, int y, int z, BlockBuildCraft block) { if (!isInv && block.getCurrentRenderPass() != 0) { + workaround17(x, y, z); return; } IIcon base = block.getIcon(0, 0); @@ -96,6 +104,7 @@ public class RenderLaserTable implements ISimpleBlockRenderingHandler { private void renderChargingTable(RenderBlocks renderer, boolean isInv, int x, int y, int z, BlockBuildCraft block) { if (!isInv && block.getCurrentRenderPass() != 0) { + workaround17(x, y, z); return; } IIcon base = block.getIcon(0, 3); @@ -136,6 +145,7 @@ public class RenderLaserTable implements ISimpleBlockRenderingHandler { private void renderIntegrationTable(RenderBlocks renderer, boolean isInv, int x, int y, int z, BlockBuildCraft block) { IIcon base = block.getIcon(0, 2); if (!isInv && block.getCurrentRenderPass() != 0) { + workaround17(x, y, z); return; } renderCube(renderer, isInv, x, y, z, 0, 0, 0, 16, 1, 16, 16, 21, base, 0x3f); // black bottom @@ -156,6 +166,7 @@ public class RenderLaserTable implements ISimpleBlockRenderingHandler { private void renderAdvancedCraftingTable(RenderBlocks renderer, boolean isInv, int x, int y, int z, BlockBuildCraft block) { if (!isInv && block.getCurrentRenderPass() != 0) { + workaround17(x, y, z); return; } IIcon base = block.getIcon(0, 1); diff --git a/common/buildcraft/silicon/render/RenderLaserTile.java b/common/buildcraft/silicon/render/RenderLaserTile.java index 5cb773ff..81e63e1c 100755 --- a/common/buildcraft/silicon/render/RenderLaserTile.java +++ b/common/buildcraft/silicon/render/RenderLaserTile.java @@ -9,11 +9,9 @@ package buildcraft.silicon.render; import org.lwjgl.opengl.GL11; - import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - import buildcraft.core.render.RenderLaser; import buildcraft.silicon.TileLaser; diff --git a/common/buildcraft/transport/BlockFilteredBuffer.java b/common/buildcraft/transport/BlockFilteredBuffer.java index 7e49c9ef..277321bf 100644 --- a/common/buildcraft/transport/BlockFilteredBuffer.java +++ b/common/buildcraft/transport/BlockFilteredBuffer.java @@ -9,21 +9,13 @@ package buildcraft.transport; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.BuildCraftTransport; -import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; +import buildcraft.core.lib.block.BlockBuildCraft; public class BlockFilteredBuffer extends BlockBuildCraft { public BlockFilteredBuffer() { diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index e8412de6..bfdcb7c1 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockRedstoneWire; import net.minecraft.block.material.Material; @@ -38,19 +37,15 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.blocks.IColorRemovable; import buildcraft.api.core.BCLog; import buildcraft.api.core.BlockIndex; -import buildcraft.api.events.BlockInteractionEvent; import buildcraft.api.events.PipePlacedEvent; import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.IGateExpansion; @@ -61,10 +56,10 @@ import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeWire; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.lib.block.BlockBuildCraft; -import buildcraft.core.CoreConstants; import buildcraft.core.BCCreativeTab; +import buildcraft.core.CoreConstants; import buildcraft.core.lib.TileBuffer; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.lib.utils.MatrixTranformations; import buildcraft.core.lib.utils.Utils; import buildcraft.transport.gates.GateDefinition; diff --git a/common/buildcraft/transport/FacadePluggable.java b/common/buildcraft/transport/FacadePluggable.java index 5c807d52..dbfa03f7 100644 --- a/common/buildcraft/transport/FacadePluggable.java +++ b/common/buildcraft/transport/FacadePluggable.java @@ -1,15 +1,12 @@ package buildcraft.transport; import io.netty.buffer.ByteBuf; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IFacadePluggable; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java index 76df3993..5c762f5e 100644 --- a/common/buildcraft/transport/Gate.java +++ b/common/buildcraft/transport/Gate.java @@ -8,25 +8,19 @@ */ package buildcraft.transport; -import scala.actors.threadpool.Arrays; - import java.util.ArrayList; +import java.util.Arrays; import java.util.BitSet; -import java.util.Collections; import java.util.List; - import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.HashMultiset; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.IGate; @@ -34,22 +28,22 @@ import buildcraft.api.gates.IGateExpansion; import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IActionReceptor; -import buildcraft.api.statements.ITriggerExternalOverride; -import buildcraft.api.statements.containers.IRedstoneStatementContainer; -import buildcraft.api.statements.containers.ISidedStatementContainer; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; +import buildcraft.api.statements.ITriggerExternalOverride; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.StatementManager; import buildcraft.api.statements.StatementParameterItemStack; +import buildcraft.api.statements.StatementSlot; +import buildcraft.api.statements.containers.IRedstoneStatementContainer; +import buildcraft.api.statements.containers.ISidedStatementContainer; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.PipeWire; import buildcraft.core.GuiIds; import buildcraft.transport.gates.GateDefinition.GateLogic; import buildcraft.transport.gates.GateDefinition.GateMaterial; import buildcraft.transport.gates.ItemGate; -import buildcraft.api.statements.StatementSlot; import buildcraft.transport.gui.ContainerGateInterface; import buildcraft.transport.statements.ActionValve; diff --git a/common/buildcraft/transport/IDiamondPipe.java b/common/buildcraft/transport/IDiamondPipe.java index d7f5b236..e9ec2164 100644 --- a/common/buildcraft/transport/IDiamondPipe.java +++ b/common/buildcraft/transport/IDiamondPipe.java @@ -9,7 +9,6 @@ package buildcraft.transport; import net.minecraft.inventory.IInventory; - import buildcraft.api.core.ISerializable; public interface IDiamondPipe extends ISerializable { diff --git a/common/buildcraft/transport/IFilteredPipe.java b/common/buildcraft/transport/IFilteredPipe.java index 34961a78..ab19dde4 100644 --- a/common/buildcraft/transport/IFilteredPipe.java +++ b/common/buildcraft/transport/IFilteredPipe.java @@ -9,7 +9,6 @@ package buildcraft.transport; import net.minecraft.inventory.IInventory; - import buildcraft.api.core.ISerializable; public interface IFilteredPipe extends ISerializable { diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 792eb9dd..de39b155 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -10,9 +10,7 @@ package buildcraft.transport; import java.util.ArrayList; import java.util.List; - import com.google.common.base.Strings; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -24,14 +22,11 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.JavaTools; import buildcraft.api.facades.FacadeType; @@ -41,11 +36,11 @@ import buildcraft.api.transport.IPipe; import buildcraft.api.transport.PipeWire; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.BlockSpring; import buildcraft.core.BCCreativeTab; +import buildcraft.core.BlockSpring; import buildcraft.core.lib.items.ItemBuildCraft; -import buildcraft.core.proxy.CoreProxy; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.proxy.CoreProxy; public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePluggableItem { public static class FacadeState { diff --git a/common/buildcraft/transport/ItemGateCopier.java b/common/buildcraft/transport/ItemGateCopier.java index c56fe6ab..4d3be3cd 100644 --- a/common/buildcraft/transport/ItemGateCopier.java +++ b/common/buildcraft/transport/ItemGateCopier.java @@ -1,7 +1,6 @@ package buildcraft.transport; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -9,10 +8,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IIcon; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.lib.items.ItemBuildCraft; import buildcraft.core.lib.utils.NBTUtils; diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index 02e70ffe..42a11283 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -9,9 +9,7 @@ package buildcraft.transport; import java.util.List; - import org.apache.logging.log4j.Level; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -21,10 +19,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.BCLog; import buildcraft.api.core.IIconProvider; diff --git a/common/buildcraft/transport/ItemPipeWire.java b/common/buildcraft/transport/ItemPipeWire.java index ac7f2b09..d2271c3b 100644 --- a/common/buildcraft/transport/ItemPipeWire.java +++ b/common/buildcraft/transport/ItemPipeWire.java @@ -9,17 +9,14 @@ package buildcraft.transport; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.transport.PipeWire; import buildcraft.core.lib.items.ItemBuildCraft; diff --git a/common/buildcraft/transport/LensFilterHandler.java b/common/buildcraft/transport/LensFilterHandler.java index f403d066..26546129 100644 --- a/common/buildcraft/transport/LensFilterHandler.java +++ b/common/buildcraft/transport/LensFilterHandler.java @@ -1,9 +1,7 @@ package buildcraft.transport; import java.util.LinkedList; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.PipePluggable; diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 0369f05b..55d6a935 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -13,7 +13,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Random; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -22,17 +21,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.IGate; import buildcraft.api.statements.ActionState; import buildcraft.api.statements.IActionInternal; +import buildcraft.api.statements.StatementSlot; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeWire; @@ -40,7 +37,6 @@ import buildcraft.core.IDropControlInventory; import buildcraft.core.lib.inventory.InvUtils; import buildcraft.core.lib.utils.Utils; import buildcraft.transport.gates.GateFactory; -import buildcraft.api.statements.StatementSlot; import buildcraft.transport.statements.ActionValve.ValveState; public abstract class Pipe implements IDropControlInventory, IPipe { diff --git a/common/buildcraft/transport/PipeActionProvider.java b/common/buildcraft/transport/PipeActionProvider.java index bc70472b..1540ce2d 100644 --- a/common/buildcraft/transport/PipeActionProvider.java +++ b/common/buildcraft/transport/PipeActionProvider.java @@ -2,11 +2,8 @@ package buildcraft.transport; import java.util.Collection; import java.util.LinkedList; - import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.gates.IGate; import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; diff --git a/common/buildcraft/transport/PipeColoringRecipe.java b/common/buildcraft/transport/PipeColoringRecipe.java index 76c1452e..362b2bb9 100644 --- a/common/buildcraft/transport/PipeColoringRecipe.java +++ b/common/buildcraft/transport/PipeColoringRecipe.java @@ -5,7 +5,6 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; - import buildcraft.core.lib.utils.ColorUtils; public class PipeColoringRecipe implements IRecipe { diff --git a/common/buildcraft/transport/PipeConnectionBans.java b/common/buildcraft/transport/PipeConnectionBans.java index 8bb51605..59317f68 100644 --- a/common/buildcraft/transport/PipeConnectionBans.java +++ b/common/buildcraft/transport/PipeConnectionBans.java @@ -10,7 +10,6 @@ package buildcraft.transport; import com.google.common.collect.HashMultimap; import com.google.common.collect.SetMultimap; - import buildcraft.transport.pipes.PipeFluidsCobblestone; import buildcraft.transport.pipes.PipeFluidsEmerald; import buildcraft.transport.pipes.PipeFluidsStone; diff --git a/common/buildcraft/transport/PipeEventBus.java b/common/buildcraft/transport/PipeEventBus.java index a715b939..df4e52df 100644 --- a/common/buildcraft/transport/PipeEventBus.java +++ b/common/buildcraft/transport/PipeEventBus.java @@ -7,7 +7,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; - import buildcraft.transport.pipes.events.PipeEvent; import buildcraft.transport.pipes.events.PipeEventPriority; diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java index 533166ab..1e2333bf 100644 --- a/common/buildcraft/transport/PipeIconProvider.java +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -10,10 +10,8 @@ package buildcraft.transport; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.BuildCraftCore; import buildcraft.api.core.IIconProvider; diff --git a/common/buildcraft/transport/PipePluggableState.java b/common/buildcraft/transport/PipePluggableState.java index e0b7bff7..680a2c67 100644 --- a/common/buildcraft/transport/PipePluggableState.java +++ b/common/buildcraft/transport/PipePluggableState.java @@ -1,9 +1,7 @@ package buildcraft.transport; import io.netty.buffer.ByteBuf; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.ISerializable; import buildcraft.api.transport.PipeManager; import buildcraft.api.transport.pluggable.PipePluggable; diff --git a/common/buildcraft/transport/PipeRenderState.java b/common/buildcraft/transport/PipeRenderState.java index d6af3f24..e0deeb8a 100644 --- a/common/buildcraft/transport/PipeRenderState.java +++ b/common/buildcraft/transport/PipeRenderState.java @@ -9,7 +9,6 @@ package buildcraft.transport; import io.netty.buffer.ByteBuf; - import buildcraft.api.core.ISerializable; import buildcraft.transport.utils.ConnectionMatrix; import buildcraft.transport.utils.TextureMatrix; diff --git a/common/buildcraft/transport/PipeToolTipManager.java b/common/buildcraft/transport/PipeToolTipManager.java index a4ea98c5..6de68bc7 100644 --- a/common/buildcraft/transport/PipeToolTipManager.java +++ b/common/buildcraft/transport/PipeToolTipManager.java @@ -12,9 +12,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import net.minecraft.client.gui.GuiScreen; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.BuildCraftCore; diff --git a/common/buildcraft/transport/PipeTransport.java b/common/buildcraft/transport/PipeTransport.java index 0711e594..c99f733d 100644 --- a/common/buildcraft/transport/PipeTransport.java +++ b/common/buildcraft/transport/PipeTransport.java @@ -11,14 +11,11 @@ package buildcraft.transport; import java.util.ArrayList; import java.util.BitSet; import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.transport.IPipeTile; import buildcraft.core.lib.utils.BitSetUtils; diff --git a/common/buildcraft/transport/PipeTransportFluids.java b/common/buildcraft/transport/PipeTransportFluids.java index b26611c4..a7afc5f5 100644 --- a/common/buildcraft/transport/PipeTransportFluids.java +++ b/common/buildcraft/transport/PipeTransportFluids.java @@ -12,10 +12,8 @@ import java.util.ArrayList; import java.util.BitSet; import java.util.HashMap; import java.util.Map; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -23,7 +21,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.core.SafeTimeTracker; diff --git a/common/buildcraft/transport/PipeTransportItems.java b/common/buildcraft/transport/PipeTransportItems.java index be9f994b..cbd295d6 100644 --- a/common/buildcraft/transport/PipeTransportItems.java +++ b/common/buildcraft/transport/PipeTransportItems.java @@ -13,9 +13,7 @@ import java.util.Collections; import java.util.EnumSet; import java.util.LinkedList; import java.util.List; - import org.apache.logging.log4j.Level; - import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -24,10 +22,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.BCLog; import buildcraft.api.core.Position; diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index cd5faeca..538c08c5 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -12,18 +12,14 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyReceiver; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.core.SafeTimeTracker; @@ -357,7 +353,8 @@ public class PipeTransportPower extends PipeTransport implements IDebuggable { * All power input MUST go through designated input pipes, such as Wooden * Power Pipes or a subclass thereof. */ - public int receiveEnergy(ForgeDirection from, int val) { + public int receiveEnergy(ForgeDirection from, int iVal) { + int val = iVal; int side = from.ordinal(); step(); diff --git a/common/buildcraft/transport/PipeTransportStructure.java b/common/buildcraft/transport/PipeTransportStructure.java index 8ace8bd5..5317b57f 100644 --- a/common/buildcraft/transport/PipeTransportStructure.java +++ b/common/buildcraft/transport/PipeTransportStructure.java @@ -9,9 +9,7 @@ package buildcraft.transport; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.transport.IPipeTile; public class PipeTransportStructure extends PipeTransport { diff --git a/common/buildcraft/transport/PipeTriggerProvider.java b/common/buildcraft/transport/PipeTriggerProvider.java index 4a4a18b1..97dc2c30 100644 --- a/common/buildcraft/transport/PipeTriggerProvider.java +++ b/common/buildcraft/transport/PipeTriggerProvider.java @@ -9,12 +9,8 @@ package buildcraft.transport; import java.util.LinkedList; - import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.BuildCraftCore; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; diff --git a/common/buildcraft/transport/TileFilteredBuffer.java b/common/buildcraft/transport/TileFilteredBuffer.java index 4606a784..3cf9d082 100644 --- a/common/buildcraft/transport/TileFilteredBuffer.java +++ b/common/buildcraft/transport/TileFilteredBuffer.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.lib.inventory.SimpleInventory; diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 2e8ef218..871336f0 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -10,9 +10,7 @@ package buildcraft.transport; import java.util.List; import org.apache.logging.log4j.Level; - import io.netty.buffer.ByteBuf; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -22,19 +20,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.WorldServer; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import cofh.api.energy.IEnergyHandler; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.core.BCLog; @@ -56,9 +50,9 @@ import buildcraft.core.DefaultProps; import buildcraft.core.IDropControlInventory; import buildcraft.core.lib.ITileBufferHolder; import buildcraft.core.lib.TileBuffer; -import buildcraft.core.lib.network.Packet; import buildcraft.core.lib.network.IGuiReturnHandler; import buildcraft.core.lib.network.ISyncedTile; +import buildcraft.core.lib.network.Packet; import buildcraft.core.lib.network.PacketTileState; import buildcraft.core.lib.utils.Utils; import buildcraft.transport.ItemFacade.FacadeState; @@ -806,9 +800,12 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { TileBuffer t = cache[side.ordinal()]; - t.refresh(); + // For blocks which are not loaded, keep the old connection value. + if (t.exists()) { + t.refresh(); - pipeConnectionsBuffer[side.ordinal()] = canPipeConnect(t.getTile(), side); + pipeConnectionsBuffer[side.ordinal()] = canPipeConnect(t.getTile(), side); + } } } diff --git a/common/buildcraft/transport/TransportGuiHandler.java b/common/buildcraft/transport/TransportGuiHandler.java index 3988282a..45c49c32 100644 --- a/common/buildcraft/transport/TransportGuiHandler.java +++ b/common/buildcraft/transport/TransportGuiHandler.java @@ -9,13 +9,10 @@ package buildcraft.transport; import org.apache.logging.log4j.Level; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import cpw.mods.fml.common.network.IGuiHandler; - import buildcraft.api.core.BCLog; import buildcraft.core.GuiIds; import buildcraft.transport.gui.ContainerDiamondPipe; diff --git a/common/buildcraft/transport/TransportProxy.java b/common/buildcraft/transport/TransportProxy.java index 999aa1d4..7e9161bc 100644 --- a/common/buildcraft/transport/TransportProxy.java +++ b/common/buildcraft/transport/TransportProxy.java @@ -13,7 +13,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.registry.GameRegistry; - import buildcraft.BuildCraftTransport; import buildcraft.core.CompatHooks; diff --git a/common/buildcraft/transport/TransportProxyClient.java b/common/buildcraft/transport/TransportProxyClient.java index 743f8e99..87c0ef6b 100644 --- a/common/buildcraft/transport/TransportProxyClient.java +++ b/common/buildcraft/transport/TransportProxyClient.java @@ -14,9 +14,7 @@ import net.minecraft.world.World; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; - import net.minecraftforge.client.MinecraftForgeClient; - import buildcraft.BuildCraftTransport; import buildcraft.transport.render.FacadeItemRenderer; import buildcraft.transport.render.GateItemRenderer; diff --git a/common/buildcraft/transport/TravelerSet.java b/common/buildcraft/transport/TravelerSet.java index 501125a1..76687c30 100644 --- a/common/buildcraft/transport/TravelerSet.java +++ b/common/buildcraft/transport/TravelerSet.java @@ -12,10 +12,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.Set; - -import com.google.common.collect.BiMap; import com.google.common.collect.ForwardingSet; -import com.google.common.collect.HashBiMap; public class TravelerSet extends ForwardingSet { diff --git a/common/buildcraft/transport/TravelingItem.java b/common/buildcraft/transport/TravelingItem.java index 845cc123..91770598 100644 --- a/common/buildcraft/transport/TravelingItem.java +++ b/common/buildcraft/transport/TravelingItem.java @@ -10,21 +10,16 @@ package buildcraft.transport; import java.util.EnumSet; import java.util.Map; - import com.google.common.collect.MapMaker; - import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftCore; import buildcraft.api.core.EnumColor; import buildcraft.api.core.Position; diff --git a/common/buildcraft/transport/WireIconProvider.java b/common/buildcraft/transport/WireIconProvider.java index 73a0d458..746e6f59 100644 --- a/common/buildcraft/transport/WireIconProvider.java +++ b/common/buildcraft/transport/WireIconProvider.java @@ -10,10 +10,8 @@ package buildcraft.transport; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.core.IIconProvider; public class WireIconProvider implements IIconProvider { diff --git a/common/buildcraft/transport/gates/ActionIterator.java b/common/buildcraft/transport/gates/ActionIterator.java index be8e56b0..417b7f2c 100755 --- a/common/buildcraft/transport/gates/ActionIterator.java +++ b/common/buildcraft/transport/gates/ActionIterator.java @@ -9,13 +9,10 @@ package buildcraft.transport.gates; import java.util.Iterator; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.statements.StatementSlot; import buildcraft.api.transport.IPipe; import buildcraft.transport.Gate; -import buildcraft.transport.Pipe; public class ActionIterator implements Iterable { private IPipe pipe; diff --git a/common/buildcraft/transport/gates/GateDefinition.java b/common/buildcraft/transport/gates/GateDefinition.java index 9e1106fe..07a1277b 100644 --- a/common/buildcraft/transport/gates/GateDefinition.java +++ b/common/buildcraft/transport/gates/GateDefinition.java @@ -9,15 +9,11 @@ package buildcraft.transport.gates; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import buildcraft.core.DefaultProps; import buildcraft.core.lib.utils.StringUtils; public final class GateDefinition { diff --git a/common/buildcraft/transport/gates/GateExpansionBuildcraft.java b/common/buildcraft/transport/gates/GateExpansionBuildcraft.java index 76dab4c6..c5817ad8 100644 --- a/common/buildcraft/transport/gates/GateExpansionBuildcraft.java +++ b/common/buildcraft/transport/gates/GateExpansionBuildcraft.java @@ -10,7 +10,6 @@ package buildcraft.transport.gates; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - import buildcraft.api.gates.IGateExpansion; import buildcraft.core.lib.utils.StringUtils; diff --git a/common/buildcraft/transport/gates/GateExpansionLightSensor.java b/common/buildcraft/transport/gates/GateExpansionLightSensor.java index 03d28a91..db3a9408 100644 --- a/common/buildcraft/transport/gates/GateExpansionLightSensor.java +++ b/common/buildcraft/transport/gates/GateExpansionLightSensor.java @@ -8,13 +8,11 @@ */ package buildcraft.transport.gates; -import java.util.Arrays; import java.util.List; import net.minecraft.tileentity.TileEntity; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.IGateExpansion; -import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.ITriggerInternal; public final class GateExpansionLightSensor extends GateExpansionBuildcraft implements IGateExpansion { diff --git a/common/buildcraft/transport/gates/GateExpansionPulsar.java b/common/buildcraft/transport/gates/GateExpansionPulsar.java index ab95e598..f701fba9 100644 --- a/common/buildcraft/transport/gates/GateExpansionPulsar.java +++ b/common/buildcraft/transport/gates/GateExpansionPulsar.java @@ -9,14 +9,10 @@ package buildcraft.transport.gates; import java.util.List; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyHandler; - import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.IGate; diff --git a/common/buildcraft/transport/gates/GateExpansionRedstoneFader.java b/common/buildcraft/transport/gates/GateExpansionRedstoneFader.java index 3a6f53f8..c0ae4c54 100644 --- a/common/buildcraft/transport/gates/GateExpansionRedstoneFader.java +++ b/common/buildcraft/transport/gates/GateExpansionRedstoneFader.java @@ -10,9 +10,7 @@ package buildcraft.transport.gates; import java.util.Arrays; import java.util.List; - import net.minecraft.tileentity.TileEntity; - import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.IGateExpansion; diff --git a/common/buildcraft/transport/gates/GateExpansionTimer.java b/common/buildcraft/transport/gates/GateExpansionTimer.java index 1397c0e0..03557cad 100644 --- a/common/buildcraft/transport/gates/GateExpansionTimer.java +++ b/common/buildcraft/transport/gates/GateExpansionTimer.java @@ -9,9 +9,7 @@ package buildcraft.transport.gates; import java.util.List; - import net.minecraft.tileentity.TileEntity; - import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.IGate; diff --git a/common/buildcraft/transport/gates/GateFactory.java b/common/buildcraft/transport/gates/GateFactory.java index 3687c617..dbfcb9ee 100644 --- a/common/buildcraft/transport/gates/GateFactory.java +++ b/common/buildcraft/transport/gates/GateFactory.java @@ -11,10 +11,8 @@ package buildcraft.transport.gates; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.gates.GateExpansionController; import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.IGateExpansion; diff --git a/common/buildcraft/transport/gates/GatePluggable.java b/common/buildcraft/transport/gates/GatePluggable.java index c29465fa..7ebcdba5 100644 --- a/common/buildcraft/transport/gates/GatePluggable.java +++ b/common/buildcraft/transport/gates/GatePluggable.java @@ -1,18 +1,14 @@ package buildcraft.transport.gates; import java.util.Set; - import io.netty.buffer.ByteBuf; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.AxisAlignedBB; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.IGateExpansion; import buildcraft.api.transport.IPipeTile; diff --git a/common/buildcraft/transport/gates/ItemGate.java b/common/buildcraft/transport/gates/ItemGate.java index f468ee53..205f6254 100755 --- a/common/buildcraft/transport/gates/ItemGate.java +++ b/common/buildcraft/transport/gates/ItemGate.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -23,13 +22,10 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.IGateExpansion; @@ -38,8 +34,8 @@ import buildcraft.api.transport.IPipe; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.BCCreativeTab; -import buildcraft.core.lib.items.ItemBuildCraft; import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.items.ItemBuildCraft; import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.Gate; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/gui/ContainerDiamondPipe.java b/common/buildcraft/transport/gui/ContainerDiamondPipe.java index b8ccf783..22dad3a4 100644 --- a/common/buildcraft/transport/gui/ContainerDiamondPipe.java +++ b/common/buildcraft/transport/gui/ContainerDiamondPipe.java @@ -11,7 +11,6 @@ package buildcraft.transport.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; - import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.slots.SlotPhantom; import buildcraft.transport.IDiamondPipe; diff --git a/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java b/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java index 9adc7360..c2c37e7d 100644 --- a/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java +++ b/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java @@ -11,7 +11,6 @@ package buildcraft.transport.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; - import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.slots.SlotPhantom; import buildcraft.transport.pipes.PipeFluidsEmerald; diff --git a/common/buildcraft/transport/gui/ContainerEmeraldPipe.java b/common/buildcraft/transport/gui/ContainerEmeraldPipe.java index b6795350..83178e2f 100644 --- a/common/buildcraft/transport/gui/ContainerEmeraldPipe.java +++ b/common/buildcraft/transport/gui/ContainerEmeraldPipe.java @@ -11,7 +11,6 @@ package buildcraft.transport.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; - import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.slots.SlotPhantom; import buildcraft.transport.pipes.PipeItemsEmerald; diff --git a/common/buildcraft/transport/gui/ContainerEmzuliPipe.java b/common/buildcraft/transport/gui/ContainerEmzuliPipe.java index b171f3de..3017b8a3 100644 --- a/common/buildcraft/transport/gui/ContainerEmzuliPipe.java +++ b/common/buildcraft/transport/gui/ContainerEmzuliPipe.java @@ -12,16 +12,13 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.Arrays; - import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.EnumColor; import buildcraft.core.lib.gui.BuildCraftContainer; diff --git a/common/buildcraft/transport/gui/ContainerFilteredBuffer.java b/common/buildcraft/transport/gui/ContainerFilteredBuffer.java index 3a9a00d8..bbac75ce 100644 --- a/common/buildcraft/transport/gui/ContainerFilteredBuffer.java +++ b/common/buildcraft/transport/gui/ContainerFilteredBuffer.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; - import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.gui.slots.SlotPhantom; import buildcraft.core.lib.gui.slots.SlotValidated; diff --git a/common/buildcraft/transport/gui/ContainerGateInterface.java b/common/buildcraft/transport/gui/ContainerGateInterface.java index 2f66b768..7ae60edf 100644 --- a/common/buildcraft/transport/gui/ContainerGateInterface.java +++ b/common/buildcraft/transport/gui/ContainerGateInterface.java @@ -13,18 +13,14 @@ import java.util.Comparator; import java.util.Iterator; import java.util.NavigableSet; import java.util.TreeSet; - import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; - import cpw.mods.fml.relauncher.Side; - import buildcraft.BuildCraftCore; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/gui/GuiDiamondPipe.java b/common/buildcraft/transport/gui/GuiDiamondPipe.java index 37d0b565..118a12e8 100644 --- a/common/buildcraft/transport/gui/GuiDiamondPipe.java +++ b/common/buildcraft/transport/gui/GuiDiamondPipe.java @@ -9,12 +9,9 @@ package buildcraft.transport.gui; import org.lwjgl.opengl.GL11; - import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; - import buildcraft.BuildCraftCore; -import buildcraft.core.DefaultProps; import buildcraft.core.lib.gui.GuiBuildCraft; import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.IDiamondPipe; diff --git a/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java b/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java index de492d51..4e3e3422 100644 --- a/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java +++ b/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java @@ -9,11 +9,8 @@ package buildcraft.transport.gui; import org.lwjgl.opengl.GL11; - import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; - -import buildcraft.core.DefaultProps; import buildcraft.core.lib.gui.GuiBuildCraft; import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.pipes.PipeFluidsEmerald; diff --git a/common/buildcraft/transport/gui/GuiEmeraldPipe.java b/common/buildcraft/transport/gui/GuiEmeraldPipe.java index 0d239eee..c69cd680 100644 --- a/common/buildcraft/transport/gui/GuiEmeraldPipe.java +++ b/common/buildcraft/transport/gui/GuiEmeraldPipe.java @@ -9,11 +9,8 @@ package buildcraft.transport.gui; import org.lwjgl.opengl.GL11; - import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; - -import buildcraft.core.DefaultProps; import buildcraft.core.lib.gui.GuiBuildCraft; import buildcraft.core.lib.gui.buttons.GuiImageButton; import buildcraft.core.lib.gui.buttons.IButtonClickEventListener; diff --git a/common/buildcraft/transport/gui/GuiEmzuliPipe.java b/common/buildcraft/transport/gui/GuiEmzuliPipe.java index bd6cb955..ec5e4810 100644 --- a/common/buildcraft/transport/gui/GuiEmzuliPipe.java +++ b/common/buildcraft/transport/gui/GuiEmzuliPipe.java @@ -10,8 +10,6 @@ package buildcraft.transport.gui; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; - -import buildcraft.core.DefaultProps; import buildcraft.core.lib.gui.GuiBuildCraft; import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.pipes.PipeItemsEmzuli; diff --git a/common/buildcraft/transport/gui/GuiFilteredBuffer.java b/common/buildcraft/transport/gui/GuiFilteredBuffer.java index 990a4132..6afdb2c4 100644 --- a/common/buildcraft/transport/gui/GuiFilteredBuffer.java +++ b/common/buildcraft/transport/gui/GuiFilteredBuffer.java @@ -9,13 +9,10 @@ package buildcraft.transport.gui; import org.lwjgl.opengl.GL11; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; - -import buildcraft.core.DefaultProps; import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.TileFilteredBuffer; diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java index 29f9db9b..a8d737aa 100644 --- a/common/buildcraft/transport/gui/GuiGateInterface.java +++ b/common/buildcraft/transport/gui/GuiGateInterface.java @@ -9,13 +9,10 @@ package buildcraft.transport.gui; import java.util.Iterator; - import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; - import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; - import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementMouseClick; diff --git a/common/buildcraft/transport/network/PacketFluidUpdate.java b/common/buildcraft/transport/network/PacketFluidUpdate.java index 8a814988..8b71c949 100644 --- a/common/buildcraft/transport/network/PacketFluidUpdate.java +++ b/common/buildcraft/transport/network/PacketFluidUpdate.java @@ -9,19 +9,15 @@ package buildcraft.transport.network; import java.util.BitSet; - import io.netty.buffer.ByteBuf; - import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; - import buildcraft.core.lib.network.PacketCoordinates; +import buildcraft.core.lib.utils.BitSetUtils; import buildcraft.core.network.PacketIds; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.lib.utils.BitSetUtils; import buildcraft.transport.PipeTransportFluids; import buildcraft.transport.TileGenericPipe; diff --git a/common/buildcraft/transport/network/PacketHandlerTransport.java b/common/buildcraft/transport/network/PacketHandlerTransport.java index 2e12972d..8bec2714 100644 --- a/common/buildcraft/transport/network/PacketHandlerTransport.java +++ b/common/buildcraft/transport/network/PacketHandlerTransport.java @@ -11,17 +11,14 @@ package buildcraft.transport.network; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.INetHandler; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import cpw.mods.fml.common.network.NetworkRegistry; - import buildcraft.core.lib.network.Packet; -import buildcraft.core.network.PacketIds; import buildcraft.core.lib.network.PacketSlotChange; +import buildcraft.core.network.PacketIds; import buildcraft.core.proxy.CoreProxy; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.PipeTransportPower; diff --git a/common/buildcraft/transport/network/PacketPipeTransportItemStack.java b/common/buildcraft/transport/network/PacketPipeTransportItemStack.java index 4027aef1..2c205d86 100644 --- a/common/buildcraft/transport/network/PacketPipeTransportItemStack.java +++ b/common/buildcraft/transport/network/PacketPipeTransportItemStack.java @@ -9,12 +9,10 @@ package buildcraft.transport.network; import io.netty.buffer.ByteBuf; - import net.minecraft.item.ItemStack; - import buildcraft.core.lib.network.Packet; -import buildcraft.core.network.PacketIds; import buildcraft.core.lib.utils.NetworkUtils; +import buildcraft.core.network.PacketIds; import buildcraft.transport.TravelingItem; public class PacketPipeTransportItemStack extends Packet { diff --git a/common/buildcraft/transport/network/PacketPipeTransportItemStackRequest.java b/common/buildcraft/transport/network/PacketPipeTransportItemStackRequest.java index c1c9a104..36f58162 100644 --- a/common/buildcraft/transport/network/PacketPipeTransportItemStackRequest.java +++ b/common/buildcraft/transport/network/PacketPipeTransportItemStackRequest.java @@ -9,9 +9,7 @@ package buildcraft.transport.network; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; - import buildcraft.BuildCraftTransport; import buildcraft.core.lib.network.Packet; import buildcraft.core.network.PacketIds; diff --git a/common/buildcraft/transport/network/PacketPipeTransportTraveler.java b/common/buildcraft/transport/network/PacketPipeTransportTraveler.java index 6c338f61..4b4abc09 100644 --- a/common/buildcraft/transport/network/PacketPipeTransportTraveler.java +++ b/common/buildcraft/transport/network/PacketPipeTransportTraveler.java @@ -9,11 +9,8 @@ package buildcraft.transport.network; import io.netty.buffer.ByteBuf; - import net.minecraft.util.MathHelper; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.EnumColor; import buildcraft.core.lib.network.Packet; import buildcraft.core.network.PacketIds; diff --git a/common/buildcraft/transport/network/PacketPowerUpdate.java b/common/buildcraft/transport/network/PacketPowerUpdate.java index 85eb22b1..acb4f5b9 100644 --- a/common/buildcraft/transport/network/PacketPowerUpdate.java +++ b/common/buildcraft/transport/network/PacketPowerUpdate.java @@ -9,7 +9,6 @@ package buildcraft.transport.network; import io.netty.buffer.ByteBuf; - import buildcraft.core.lib.network.PacketCoordinates; import buildcraft.core.network.PacketIds; import buildcraft.transport.render.PipeRendererTESR; diff --git a/common/buildcraft/transport/pipes/PipeFluidsCobblestone.java b/common/buildcraft/transport/pipes/PipeFluidsCobblestone.java index dc0f4b5a..a1a7ffea 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeFluidsCobblestone.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeFluidsDiamond.java b/common/buildcraft/transport/pipes/PipeFluidsDiamond.java index e9113482..48aafc6d 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsDiamond.java +++ b/common/buildcraft/transport/pipes/PipeFluidsDiamond.java @@ -10,22 +10,17 @@ package buildcraft.transport.pipes; import java.util.ArrayList; import java.util.List; - import io.netty.buffer.ByteBuf; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.core.GuiIds; diff --git a/common/buildcraft/transport/pipes/PipeFluidsEmerald.java b/common/buildcraft/transport/pipes/PipeFluidsEmerald.java index 65803382..53c3d6a5 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeFluidsEmerald.java @@ -9,18 +9,15 @@ package buildcraft.transport.pipes; import io.netty.buffer.ByteBuf; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.ISerializable; import buildcraft.core.GuiIds; diff --git a/common/buildcraft/transport/pipes/PipeFluidsGold.java b/common/buildcraft/transport/pipes/PipeFluidsGold.java index 3ba64d08..988b077f 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsGold.java +++ b/common/buildcraft/transport/pipes/PipeFluidsGold.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeFluidsIron.java b/common/buildcraft/transport/pipes/PipeFluidsIron.java index 56046832..b742316b 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsIron.java +++ b/common/buildcraft/transport/pipes/PipeFluidsIron.java @@ -10,25 +10,21 @@ package buildcraft.transport.pipes; import java.util.Collection; import java.util.LinkedList; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.statements.IActionInternal; +import buildcraft.api.statements.StatementSlot; import buildcraft.api.transport.IPipeTile; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportFluids; -import buildcraft.api.statements.StatementSlot; import buildcraft.transport.statements.ActionPipeDirection; public class PipeFluidsIron extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeFluidsQuartz.java b/common/buildcraft/transport/pipes/PipeFluidsQuartz.java index a029c5b2..e5e40e70 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsQuartz.java +++ b/common/buildcraft/transport/pipes/PipeFluidsQuartz.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeFluidsSandstone.java b/common/buildcraft/transport/pipes/PipeFluidsSandstone.java index 71f220c2..a582ca4e 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeFluidsSandstone.java @@ -10,13 +10,10 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.transport.IPipeTile; diff --git a/common/buildcraft/transport/pipes/PipeFluidsStone.java b/common/buildcraft/transport/pipes/PipeFluidsStone.java index 7e126743..72b2e3a1 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsStone.java +++ b/common/buildcraft/transport/pipes/PipeFluidsStone.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeFluidsVoid.java b/common/buildcraft/transport/pipes/PipeFluidsVoid.java index 527880d7..ecf61159 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsVoid.java +++ b/common/buildcraft/transport/pipes/PipeFluidsVoid.java @@ -9,13 +9,10 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.IPipeTransportFluidsHook; diff --git a/common/buildcraft/transport/pipes/PipeFluidsWood.java b/common/buildcraft/transport/pipes/PipeFluidsWood.java index 8e327e95..1f958630 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsWood.java +++ b/common/buildcraft/transport/pipes/PipeFluidsWood.java @@ -9,21 +9,16 @@ package buildcraft.transport.pipes; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; - import cofh.api.energy.IEnergyHandler; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.ISerializable; diff --git a/common/buildcraft/transport/pipes/PipeItemsClay.java b/common/buildcraft/transport/pipes/PipeItemsClay.java index 67080326..9a731158 100644 --- a/common/buildcraft/transport/pipes/PipeItemsClay.java +++ b/common/buildcraft/transport/pipes/PipeItemsClay.java @@ -9,15 +9,11 @@ package buildcraft.transport.pipes; import java.util.LinkedList; - import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.transport.IPipeTile; diff --git a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java index 91dc999c..3e961e3e 100644 --- a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsDaizuli.java b/common/buildcraft/transport/pipes/PipeItemsDaizuli.java index b3d50fdc..cba4fad6 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDaizuli.java +++ b/common/buildcraft/transport/pipes/PipeItemsDaizuli.java @@ -11,25 +11,21 @@ package buildcraft.transport.pipes; import java.util.Arrays; import java.util.Collection; import java.util.LinkedList; - import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.EnumColor; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.ISerializable; import buildcraft.api.statements.IActionInternal; +import buildcraft.api.statements.StatementSlot; import buildcraft.api.tools.IToolWrench; import buildcraft.api.transport.IPipeTile; import buildcraft.core.lib.utils.ColorUtils; @@ -38,7 +34,6 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TransportConstants; import buildcraft.transport.TravelingItem; -import buildcraft.api.statements.StatementSlot; import buildcraft.transport.pipes.events.PipeEventItem; import buildcraft.transport.statements.ActionPipeColor; import buildcraft.transport.statements.ActionPipeDirection; diff --git a/common/buildcraft/transport/pipes/PipeItemsDiamond.java b/common/buildcraft/transport/pipes/PipeItemsDiamond.java index 64b01a8b..12cc0a07 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDiamond.java +++ b/common/buildcraft/transport/pipes/PipeItemsDiamond.java @@ -9,28 +9,21 @@ package buildcraft.transport.pipes; import java.util.Iterator; -import java.util.LinkedList; - import io.netty.buffer.ByteBuf; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.core.GuiIds; import buildcraft.core.lib.inventory.SimpleInventory; import buildcraft.core.lib.inventory.StackHelper; -import buildcraft.core.lib.utils.FluidUtils; import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.IDiamondPipe; @@ -134,7 +127,7 @@ public class PipeItemsDiamond extends Pipe implements IDiamo ItemStack filter = getFilters().getStackInSlot(v); if (StackHelper.isMatchingItemOrList(filter, event.item.getItemStack())) { - usedFilters |= (1 << v); + usedFilters |= 1 << v; event.destinations.clear(); event.destinations.add(dir); event.shuffle = false; diff --git a/common/buildcraft/transport/pipes/PipeItemsEmerald.java b/common/buildcraft/transport/pipes/PipeItemsEmerald.java index da0f96ac..9bbd1243 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmerald.java @@ -9,7 +9,6 @@ package buildcraft.transport.pipes; import io.netty.buffer.ByteBuf; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -17,9 +16,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.ISerializable; import buildcraft.core.GuiIds; diff --git a/common/buildcraft/transport/pipes/PipeItemsEmzuli.java b/common/buildcraft/transport/pipes/PipeItemsEmzuli.java index 0033d677..5729a718 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmzuli.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmzuli.java @@ -11,21 +11,18 @@ package buildcraft.transport.pipes; import java.util.BitSet; import java.util.Collection; import java.util.LinkedList; - import io.netty.buffer.ByteBuf; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.EnumColor; import buildcraft.api.statements.IActionInternal; +import buildcraft.api.statements.StatementSlot; import buildcraft.core.GuiIds; import buildcraft.core.lib.inventory.InvUtils; import buildcraft.core.lib.inventory.SimpleInventory; @@ -33,7 +30,6 @@ import buildcraft.core.lib.network.IGuiReturnHandler; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.TravelingItem; -import buildcraft.api.statements.StatementSlot; import buildcraft.transport.statements.ActionExtractionPreset; public class PipeItemsEmzuli extends PipeItemsWood implements IGuiReturnHandler { diff --git a/common/buildcraft/transport/pipes/PipeItemsGold.java b/common/buildcraft/transport/pipes/PipeItemsGold.java index 550fb1bb..d528c03a 100644 --- a/common/buildcraft/transport/pipes/PipeItemsGold.java +++ b/common/buildcraft/transport/pipes/PipeItemsGold.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.core.lib.utils.MathUtils; diff --git a/common/buildcraft/transport/pipes/PipeItemsIron.java b/common/buildcraft/transport/pipes/PipeItemsIron.java index 65bc157b..a8491254 100644 --- a/common/buildcraft/transport/pipes/PipeItemsIron.java +++ b/common/buildcraft/transport/pipes/PipeItemsIron.java @@ -10,25 +10,21 @@ package buildcraft.transport.pipes; import java.util.Collection; import java.util.LinkedList; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.statements.IActionInternal; +import buildcraft.api.statements.StatementSlot; import buildcraft.api.transport.IPipeTile; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; -import buildcraft.api.statements.StatementSlot; import buildcraft.transport.statements.ActionPipeDirection; public class PipeItemsIron extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipeItemsLapis.java b/common/buildcraft/transport/pipes/PipeItemsLapis.java index bbe4f8c9..31d61734 100644 --- a/common/buildcraft/transport/pipes/PipeItemsLapis.java +++ b/common/buildcraft/transport/pipes/PipeItemsLapis.java @@ -11,19 +11,16 @@ package buildcraft.transport.pipes; import java.util.Arrays; import java.util.Collection; import java.util.LinkedList; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.EnumColor; import buildcraft.api.core.IIconProvider; import buildcraft.api.statements.IActionInternal; +import buildcraft.api.statements.StatementSlot; import buildcraft.api.tools.IToolWrench; import buildcraft.core.lib.utils.ColorUtils; import buildcraft.transport.Pipe; @@ -31,7 +28,6 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TransportConstants; import buildcraft.transport.TravelingItem; -import buildcraft.api.statements.StatementSlot; import buildcraft.transport.pipes.events.PipeEventItem; import buildcraft.transport.statements.ActionPipeColor; diff --git a/common/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/buildcraft/transport/pipes/PipeItemsObsidian.java index f849476e..07042f94 100644 --- a/common/buildcraft/transport/pipes/PipeItemsObsidian.java +++ b/common/buildcraft/transport/pipes/PipeItemsObsidian.java @@ -10,7 +10,6 @@ package buildcraft.transport.pipes; import java.util.Arrays; import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityMinecartChest; @@ -19,14 +18,10 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyHandler; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; diff --git a/common/buildcraft/transport/pipes/PipeItemsQuartz.java b/common/buildcraft/transport/pipes/PipeItemsQuartz.java index b147f2b1..5c7a0b7f 100644 --- a/common/buildcraft/transport/pipes/PipeItemsQuartz.java +++ b/common/buildcraft/transport/pipes/PipeItemsQuartz.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsSandstone.java b/common/buildcraft/transport/pipes/PipeItemsSandstone.java index c10082d0..6f6f276d 100644 --- a/common/buildcraft/transport/pipes/PipeItemsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeItemsSandstone.java @@ -10,12 +10,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.transport.IPipeTile; diff --git a/common/buildcraft/transport/pipes/PipeItemsStone.java b/common/buildcraft/transport/pipes/PipeItemsStone.java index e8ea75e7..ae332969 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStone.java +++ b/common/buildcraft/transport/pipes/PipeItemsStone.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index d0478df7..c467c4bd 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -11,35 +11,31 @@ package buildcraft.transport.pipes; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.WorldServer; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyHandler; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; import buildcraft.api.statements.IActionInternal; +import buildcraft.api.statements.StatementSlot; import buildcraft.api.transport.IStripesHandler; import buildcraft.api.transport.IStripesHandler.StripesHandlerType; import buildcraft.api.transport.IStripesPipe; import buildcraft.api.transport.PipeManager; import buildcraft.core.lib.inventory.InvUtils; -import buildcraft.core.proxy.CoreProxy; import buildcraft.core.lib.utils.BlockUtils; +import buildcraft.core.proxy.CoreProxy; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TileGenericPipe; import buildcraft.transport.TravelingItem; -import buildcraft.api.statements.StatementSlot; import buildcraft.transport.pipes.events.PipeEventItem; import buildcraft.transport.statements.ActionPipeDirection; import buildcraft.transport.utils.TransportUtils; diff --git a/common/buildcraft/transport/pipes/PipeItemsVoid.java b/common/buildcraft/transport/pipes/PipeItemsVoid.java index dceb13ca..01ac85ad 100644 --- a/common/buildcraft/transport/pipes/PipeItemsVoid.java +++ b/common/buildcraft/transport/pipes/PipeItemsVoid.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index e1234133..a7794474 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -14,14 +14,10 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyHandler; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; diff --git a/common/buildcraft/transport/pipes/PipeLogicIron.java b/common/buildcraft/transport/pipes/PipeLogicIron.java index a91042e2..b3f5af98 100644 --- a/common/buildcraft/transport/pipes/PipeLogicIron.java +++ b/common/buildcraft/transport/pipes/PipeLogicIron.java @@ -12,9 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.tools.IToolWrench; import buildcraft.core.lib.TileBuffer; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeLogicWood.java b/common/buildcraft/transport/pipes/PipeLogicWood.java index c02c04ea..b061a036 100644 --- a/common/buildcraft/transport/pipes/PipeLogicWood.java +++ b/common/buildcraft/transport/pipes/PipeLogicWood.java @@ -11,9 +11,7 @@ package buildcraft.transport.pipes; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.tools.IToolWrench; import buildcraft.core.lib.TileBuffer; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipePowerCobblestone.java b/common/buildcraft/transport/pipes/PipePowerCobblestone.java index a494683c..4a612443 100644 --- a/common/buildcraft/transport/pipes/PipePowerCobblestone.java +++ b/common/buildcraft/transport/pipes/PipePowerCobblestone.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipePowerDiamond.java b/common/buildcraft/transport/pipes/PipePowerDiamond.java index 5b80133a..f14f15c1 100644 --- a/common/buildcraft/transport/pipes/PipePowerDiamond.java +++ b/common/buildcraft/transport/pipes/PipePowerDiamond.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipePowerEmerald.java b/common/buildcraft/transport/pipes/PipePowerEmerald.java index f6a2373c..b2748e85 100644 --- a/common/buildcraft/transport/pipes/PipePowerEmerald.java +++ b/common/buildcraft/transport/pipes/PipePowerEmerald.java @@ -1,12 +1,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.core.lib.RFBattery; diff --git a/common/buildcraft/transport/pipes/PipePowerGold.java b/common/buildcraft/transport/pipes/PipePowerGold.java index 4547c96e..e28be3a8 100644 --- a/common/buildcraft/transport/pipes/PipePowerGold.java +++ b/common/buildcraft/transport/pipes/PipePowerGold.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipePowerIron.java b/common/buildcraft/transport/pipes/PipePowerIron.java index 43a4228e..ce0ddf8e 100644 --- a/common/buildcraft/transport/pipes/PipePowerIron.java +++ b/common/buildcraft/transport/pipes/PipePowerIron.java @@ -10,28 +10,24 @@ package buildcraft.transport.pipes; import java.util.Collection; import java.util.LinkedList; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.util.ChatComponentText; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.statements.IActionInternal; +import buildcraft.api.statements.StatementSlot; import buildcraft.api.tools.IToolWrench; import buildcraft.core.PowerMode; import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; -import buildcraft.api.statements.StatementSlot; import buildcraft.transport.statements.ActionPowerLimiter; public class PipePowerIron extends Pipe { diff --git a/common/buildcraft/transport/pipes/PipePowerQuartz.java b/common/buildcraft/transport/pipes/PipePowerQuartz.java index 70005dca..f42cb3cd 100644 --- a/common/buildcraft/transport/pipes/PipePowerQuartz.java +++ b/common/buildcraft/transport/pipes/PipePowerQuartz.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipePowerSandstone.java b/common/buildcraft/transport/pipes/PipePowerSandstone.java index b0fc52ff..35567b6a 100644 --- a/common/buildcraft/transport/pipes/PipePowerSandstone.java +++ b/common/buildcraft/transport/pipes/PipePowerSandstone.java @@ -10,12 +10,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.transport.IPipeTile; diff --git a/common/buildcraft/transport/pipes/PipePowerStone.java b/common/buildcraft/transport/pipes/PipePowerStone.java index 13ed5452..72df972f 100644 --- a/common/buildcraft/transport/pipes/PipePowerStone.java +++ b/common/buildcraft/transport/pipes/PipePowerStone.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index 40c77ea7..37b3ac71 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -14,15 +14,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.power.IRedstoneEngine; diff --git a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java index aa49087b..ea69f908 100644 --- a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes; import net.minecraft.item.Item; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/events/PipeEventFluid.java b/common/buildcraft/transport/pipes/events/PipeEventFluid.java index 0fafacb3..056c3f27 100644 --- a/common/buildcraft/transport/pipes/events/PipeEventFluid.java +++ b/common/buildcraft/transport/pipes/events/PipeEventFluid.java @@ -1,7 +1,6 @@ package buildcraft.transport.pipes.events; import java.util.List; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/events/PipeEventItem.java b/common/buildcraft/transport/pipes/events/PipeEventItem.java index 4478296b..298c70e4 100644 --- a/common/buildcraft/transport/pipes/events/PipeEventItem.java +++ b/common/buildcraft/transport/pipes/events/PipeEventItem.java @@ -9,12 +9,9 @@ package buildcraft.transport.pipes.events; import java.util.List; - import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.transport.Pipe; import buildcraft.transport.TravelingItem; diff --git a/common/buildcraft/transport/pluggable/ItemLens.java b/common/buildcraft/transport/pluggable/ItemLens.java index 11a7adad..e79b270c 100755 --- a/common/buildcraft/transport/pluggable/ItemLens.java +++ b/common/buildcraft/transport/pluggable/ItemLens.java @@ -9,21 +9,15 @@ package buildcraft.transport.pluggable; 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.IIcon; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.core.EnumColor; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableItem; diff --git a/common/buildcraft/transport/pluggable/ItemPlug.java b/common/buildcraft/transport/pluggable/ItemPlug.java index 352d1387..9bf719f9 100755 --- a/common/buildcraft/transport/pluggable/ItemPlug.java +++ b/common/buildcraft/transport/pluggable/ItemPlug.java @@ -12,12 +12,9 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.transport.IPipe; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; diff --git a/common/buildcraft/transport/pluggable/ItemPowerAdapter.java b/common/buildcraft/transport/pluggable/ItemPowerAdapter.java index edbc4e96..9e3aafcc 100755 --- a/common/buildcraft/transport/pluggable/ItemPowerAdapter.java +++ b/common/buildcraft/transport/pluggable/ItemPowerAdapter.java @@ -12,14 +12,10 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyHandler; - import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableItem; diff --git a/common/buildcraft/transport/pluggable/LensPluggable.java b/common/buildcraft/transport/pluggable/LensPluggable.java index c186e8d4..f335086e 100644 --- a/common/buildcraft/transport/pluggable/LensPluggable.java +++ b/common/buildcraft/transport/pluggable/LensPluggable.java @@ -1,14 +1,11 @@ package buildcraft.transport.pluggable; import io.netty.buffer.ByteBuf; - import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.EnumColor; import buildcraft.api.core.render.ITextureStates; @@ -16,12 +13,12 @@ import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; import buildcraft.api.transport.pluggable.PipePluggable; +import buildcraft.core.lib.render.FakeBlock; import buildcraft.core.lib.utils.ColorUtils; import buildcraft.core.lib.utils.MatrixTranformations; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.TravelingItem; import buildcraft.transport.pipes.events.PipeEventItem; -import buildcraft.core.lib.render.FakeBlock; public class LensPluggable extends PipePluggable { public int color; diff --git a/common/buildcraft/transport/pluggable/PlugPluggable.java b/common/buildcraft/transport/pluggable/PlugPluggable.java index ad36c38c..8bcc90a5 100644 --- a/common/buildcraft/transport/pluggable/PlugPluggable.java +++ b/common/buildcraft/transport/pluggable/PlugPluggable.java @@ -1,14 +1,11 @@ package buildcraft.transport.pluggable; import io.netty.buffer.ByteBuf; - import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.render.ITextureStates; import buildcraft.api.transport.IPipe; diff --git a/common/buildcraft/transport/pluggable/PowerAdapterPluggable.java b/common/buildcraft/transport/pluggable/PowerAdapterPluggable.java index fc03a554..b8609462 100644 --- a/common/buildcraft/transport/pluggable/PowerAdapterPluggable.java +++ b/common/buildcraft/transport/pluggable/PowerAdapterPluggable.java @@ -1,16 +1,12 @@ package buildcraft.transport.pluggable; import io.netty.buffer.ByteBuf; - import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyHandler; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.render.ITextureStates; import buildcraft.api.transport.IPipe; diff --git a/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java b/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java index f7fa596a..7d3b06d2 100644 --- a/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java +++ b/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java @@ -11,9 +11,7 @@ package buildcraft.transport.recipes; import java.util.ArrayList; import java.util.Collection; import net.minecraft.item.ItemStack; - import net.minecraftforge.oredict.OreDictionary; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.JavaTools; import buildcraft.api.facades.FacadeType; @@ -26,7 +24,6 @@ import buildcraft.silicon.recipes.IntegrationTableRecipe; import buildcraft.transport.ItemFacade; import buildcraft.transport.ItemFacade.FacadeState; import buildcraft.transport.ItemPipeWire; -import buildcraft.transport.gates.ItemGate; public class AdvancedFacadeRecipe extends IntegrationTableRecipe { diff --git a/common/buildcraft/transport/recipes/GateExpansionRecipe.java b/common/buildcraft/transport/recipes/GateExpansionRecipe.java index c999bd72..92d16e93 100644 --- a/common/buildcraft/transport/recipes/GateExpansionRecipe.java +++ b/common/buildcraft/transport/recipes/GateExpansionRecipe.java @@ -11,7 +11,6 @@ package buildcraft.transport.recipes; import java.util.ArrayList; import java.util.Collection; import net.minecraft.item.ItemStack; - import buildcraft.BuildCraftTransport; import buildcraft.api.gates.IGateExpansion; import buildcraft.api.recipes.CraftingResult; diff --git a/common/buildcraft/transport/recipes/GateLogicSwapRecipe.java b/common/buildcraft/transport/recipes/GateLogicSwapRecipe.java index 5388e3a0..14979580 100644 --- a/common/buildcraft/transport/recipes/GateLogicSwapRecipe.java +++ b/common/buildcraft/transport/recipes/GateLogicSwapRecipe.java @@ -11,7 +11,6 @@ package buildcraft.transport.recipes; import java.util.ArrayList; import java.util.Collection; import net.minecraft.item.ItemStack; - import buildcraft.BuildCraftTransport; import buildcraft.api.recipes.CraftingResult; import buildcraft.core.lib.inventory.StackHelper; diff --git a/common/buildcraft/transport/render/FacadeBlockAccess.java b/common/buildcraft/transport/render/FacadeBlockAccess.java index 355b005a..c44452c7 100644 --- a/common/buildcraft/transport/render/FacadeBlockAccess.java +++ b/common/buildcraft/transport/render/FacadeBlockAccess.java @@ -10,7 +10,6 @@ import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IFacadePluggable; import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.CompatHooks; -import buildcraft.transport.BlockGenericPipe; public class FacadeBlockAccess implements IBlockAccess { private final IBlockAccess world; diff --git a/common/buildcraft/transport/render/FacadeItemRenderer.java b/common/buildcraft/transport/render/FacadeItemRenderer.java index 9aad21e0..c938d0de 100644 --- a/common/buildcraft/transport/render/FacadeItemRenderer.java +++ b/common/buildcraft/transport/render/FacadeItemRenderer.java @@ -9,16 +9,13 @@ package buildcraft.transport.render; import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - import net.minecraftforge.client.IItemRenderer; - import buildcraft.BuildCraftTransport; import buildcraft.api.facades.FacadeType; import buildcraft.api.facades.IFacadeItem; diff --git a/common/buildcraft/transport/render/FacadeRenderHelper.java b/common/buildcraft/transport/render/FacadeRenderHelper.java index 016ca2e9..861d889b 100644 --- a/common/buildcraft/transport/render/FacadeRenderHelper.java +++ b/common/buildcraft/transport/render/FacadeRenderHelper.java @@ -12,9 +12,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.render.ITextureStates; import buildcraft.api.transport.pluggable.IFacadePluggable; @@ -23,7 +21,6 @@ import buildcraft.core.CoreConstants; import buildcraft.core.lib.render.FakeBlock; import buildcraft.core.lib.render.TextureStateManager; import buildcraft.core.lib.utils.MatrixTranformations; -import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeRenderState; import buildcraft.transport.TileGenericPipe; diff --git a/common/buildcraft/transport/render/GateItemRenderer.java b/common/buildcraft/transport/render/GateItemRenderer.java index d83287f0..8a93fe5d 100644 --- a/common/buildcraft/transport/render/GateItemRenderer.java +++ b/common/buildcraft/transport/render/GateItemRenderer.java @@ -9,9 +9,7 @@ package buildcraft.transport.render; import java.util.Random; - import org.lwjgl.opengl.GL11; - import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; @@ -19,9 +17,7 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - import net.minecraftforge.client.IItemRenderer; - import buildcraft.api.gates.IGateExpansion; import buildcraft.transport.gates.ItemGate; diff --git a/common/buildcraft/transport/render/PipeItemRenderer.java b/common/buildcraft/transport/render/PipeItemRenderer.java index 9448f346..d3a3b739 100644 --- a/common/buildcraft/transport/render/PipeItemRenderer.java +++ b/common/buildcraft/transport/render/PipeItemRenderer.java @@ -9,7 +9,6 @@ package buildcraft.transport.render; import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -17,9 +16,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - import net.minecraftforge.client.IItemRenderer; - import buildcraft.BuildCraftTransport; import buildcraft.core.CoreConstants; import buildcraft.core.lib.render.FakeBlock; diff --git a/common/buildcraft/transport/render/PipeRendererTESR.java b/common/buildcraft/transport/render/PipeRendererTESR.java index 5168a4d1..58fd78d8 100644 --- a/common/buildcraft/transport/render/PipeRendererTESR.java +++ b/common/buildcraft/transport/render/PipeRendererTESR.java @@ -9,11 +9,8 @@ package buildcraft.transport.render; import java.util.HashMap; - import com.google.common.collect.Maps; - import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.OpenGlHelper; @@ -26,14 +23,11 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore.RenderMode; import buildcraft.BuildCraftTransport; @@ -43,7 +37,6 @@ import buildcraft.api.gates.IGateExpansion; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeWire; import buildcraft.core.CoreConstants; -import buildcraft.core.DefaultProps; import buildcraft.core.lib.render.RenderEntityBlock; import buildcraft.core.lib.render.RenderEntityBlock.RenderInfo; import buildcraft.core.lib.render.RenderUtils; diff --git a/common/buildcraft/transport/render/PipeRendererWorld.java b/common/buildcraft/transport/render/PipeRendererWorld.java index 9042dc59..26620a45 100644 --- a/common/buildcraft/transport/render/PipeRendererWorld.java +++ b/common/buildcraft/transport/render/PipeRendererWorld.java @@ -9,17 +9,15 @@ package buildcraft.transport.render; 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.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.IIconProvider; import buildcraft.api.core.render.ITextureStates; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; @@ -88,7 +86,7 @@ public class PipeRendererWorld implements ISimpleBlockRenderingHandler { dim[dir / 2 + 3] = dir % 2 == 0 ? CoreConstants.PIPE_MIN_POS : 1; // the mask points to all faces perpendicular to dir, i.e. dirs 0+1 -> mask 111100, 1+2 -> 110011, 3+5 -> 001111 - int renderMask = (3 << (dir / 2 * 2)) ^ 0x3f; + int renderMask = (3 << (dir & 0x6)) ^ 0x3f; fixForRenderPass(dim); @@ -100,6 +98,39 @@ public class PipeRendererWorld implements ISimpleBlockRenderingHandler { } renderTwoWayBlock(renderblocks, fakeBlock, x, y, z, dim, renderMask); + + // Render connecting block + if (Minecraft.getMinecraft().gameSettings.fancyGraphics) { + ForgeDirection side = ForgeDirection.getOrientation(dir); + Block block = iblockaccess.getBlock(x + side.offsetX, + y + side.offsetY, + z + side.offsetZ); + + double[] blockBB = new double[]{ + block.getBlockBoundsMinX(), + block.getBlockBoundsMinY(), + block.getBlockBoundsMinZ(), + block.getBlockBoundsMaxX(), + block.getBlockBoundsMaxY(), + block.getBlockBoundsMaxZ() + }; + + resetToCenterDimensions(dim); + + if (dir % 2 == 1) { + dim[dir / 2] = 0; + dim[dir / 2 + 3] = (float) blockBB[dir / 2]; + } else { + dim[dir / 2] = (float) blockBB[dir / 2 + 3]; + dim[dir / 2 + 3] = 1; + } + + fixForRenderPass(dim); + + renderTwoWayBlock(renderblocks, fakeBlock, x + side.offsetX, + y + side.offsetY, + z + side.offsetZ, dim, renderMask); + } } fakeBlock.setColor(0xFFFFFF); diff --git a/common/buildcraft/transport/render/PlugItemRenderer.java b/common/buildcraft/transport/render/PlugItemRenderer.java index 75b67ff2..0fc0bf19 100644 --- a/common/buildcraft/transport/render/PlugItemRenderer.java +++ b/common/buildcraft/transport/render/PlugItemRenderer.java @@ -9,15 +9,12 @@ package buildcraft.transport.render; import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - import net.minecraftforge.client.IItemRenderer; - import buildcraft.BuildCraftTransport; import buildcraft.transport.PipeIconProvider; diff --git a/common/buildcraft/transport/render/TileEntityPickupFX.java b/common/buildcraft/transport/render/TileEntityPickupFX.java index c022588a..7d248edf 100644 --- a/common/buildcraft/transport/render/TileEntityPickupFX.java +++ b/common/buildcraft/transport/render/TileEntityPickupFX.java @@ -12,7 +12,6 @@ package buildcraft.transport.render; import org.lwjgl.opengl.GL11; - import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; @@ -21,10 +20,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.transport.utils.TransportUtils; @SideOnly(Side.CLIENT) diff --git a/common/buildcraft/transport/schematics/BptItemPipeFilters.java b/common/buildcraft/transport/schematics/BptItemPipeFilters.java index 491c388e..b2f307cb 100644 --- a/common/buildcraft/transport/schematics/BptItemPipeFilters.java +++ b/common/buildcraft/transport/schematics/BptItemPipeFilters.java @@ -9,9 +9,7 @@ package buildcraft.transport.schematics; import net.minecraft.item.Item; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; import buildcraft.core.lib.inventory.SimpleInventory; diff --git a/common/buildcraft/transport/schematics/BptPipeExtension.java b/common/buildcraft/transport/schematics/BptPipeExtension.java index 09addd7f..9c257ca5 100755 --- a/common/buildcraft/transport/schematics/BptPipeExtension.java +++ b/common/buildcraft/transport/schematics/BptPipeExtension.java @@ -9,9 +9,7 @@ package buildcraft.transport.schematics; import java.util.HashMap; - import net.minecraft.item.Item; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; diff --git a/common/buildcraft/transport/schematics/BptPipeIron.java b/common/buildcraft/transport/schematics/BptPipeIron.java index a32a0aac..63fca094 100644 --- a/common/buildcraft/transport/schematics/BptPipeIron.java +++ b/common/buildcraft/transport/schematics/BptPipeIron.java @@ -9,9 +9,7 @@ package buildcraft.transport.schematics; import net.minecraft.item.Item; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; diff --git a/common/buildcraft/transport/schematics/BptPipeWooden.java b/common/buildcraft/transport/schematics/BptPipeWooden.java index 242a62a0..cfa41002 100644 --- a/common/buildcraft/transport/schematics/BptPipeWooden.java +++ b/common/buildcraft/transport/schematics/BptPipeWooden.java @@ -9,9 +9,7 @@ package buildcraft.transport.schematics; import net.minecraft.item.Item; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; diff --git a/common/buildcraft/transport/schematics/SchematicPipe.java b/common/buildcraft/transport/schematics/SchematicPipe.java index 40ce1722..aaede876 100644 --- a/common/buildcraft/transport/schematics/SchematicPipe.java +++ b/common/buildcraft/transport/schematics/SchematicPipe.java @@ -10,14 +10,11 @@ package buildcraft.transport.schematics; import java.util.ArrayList; import java.util.LinkedList; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.blueprints.BuildingPermission; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; diff --git a/common/buildcraft/transport/statements/ActionEnergyPulsar.java b/common/buildcraft/transport/statements/ActionEnergyPulsar.java index 422bf0ed..cac1c0b0 100644 --- a/common/buildcraft/transport/statements/ActionEnergyPulsar.java +++ b/common/buildcraft/transport/statements/ActionEnergyPulsar.java @@ -9,12 +9,11 @@ package buildcraft.transport.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; public class ActionEnergyPulsar extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/transport/statements/ActionExtractionPreset.java b/common/buildcraft/transport/statements/ActionExtractionPreset.java index 4215328f..371088d4 100644 --- a/common/buildcraft/transport/statements/ActionExtractionPreset.java +++ b/common/buildcraft/transport/statements/ActionExtractionPreset.java @@ -9,15 +9,13 @@ package buildcraft.transport.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.core.EnumColor; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; public class ActionExtractionPreset extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/transport/statements/ActionParameterSignal.java b/common/buildcraft/transport/statements/ActionParameterSignal.java index 213018dc..c3f5771e 100644 --- a/common/buildcraft/transport/statements/ActionParameterSignal.java +++ b/common/buildcraft/transport/statements/ActionParameterSignal.java @@ -9,12 +9,10 @@ package buildcraft.transport.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; - import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/statements/ActionPipeColor.java b/common/buildcraft/transport/statements/ActionPipeColor.java index cafeb000..b28fabc2 100644 --- a/common/buildcraft/transport/statements/ActionPipeColor.java +++ b/common/buildcraft/transport/statements/ActionPipeColor.java @@ -9,15 +9,13 @@ package buildcraft.transport.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.core.EnumColor; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; public class ActionPipeColor extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/transport/statements/ActionPipeDirection.java b/common/buildcraft/transport/statements/ActionPipeDirection.java index b73ecbf1..44d8078a 100644 --- a/common/buildcraft/transport/statements/ActionPipeDirection.java +++ b/common/buildcraft/transport/statements/ActionPipeDirection.java @@ -9,11 +9,8 @@ package buildcraft.transport.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatement; diff --git a/common/buildcraft/transport/statements/ActionPowerLimiter.java b/common/buildcraft/transport/statements/ActionPowerLimiter.java index 2837f2d7..90ac9464 100644 --- a/common/buildcraft/transport/statements/ActionPowerLimiter.java +++ b/common/buildcraft/transport/statements/ActionPowerLimiter.java @@ -9,9 +9,7 @@ package buildcraft.transport.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java index 9b376b32..c92c68c7 100644 --- a/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java +++ b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java @@ -10,13 +10,11 @@ package buildcraft.transport.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.statements.IActionInternal; -import buildcraft.core.statements.ActionRedstoneOutput; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.ActionRedstoneOutput; public class ActionRedstoneFaderOutput extends ActionRedstoneOutput implements IActionInternal { diff --git a/common/buildcraft/transport/statements/ActionSignalOutput.java b/common/buildcraft/transport/statements/ActionSignalOutput.java index 675634cf..2b4eeb94 100644 --- a/common/buildcraft/transport/statements/ActionSignalOutput.java +++ b/common/buildcraft/transport/statements/ActionSignalOutput.java @@ -9,15 +9,13 @@ package buildcraft.transport.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.transport.PipeWire; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; import buildcraft.transport.Gate; public class ActionSignalOutput extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java b/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java index 7af768ae..a720aa02 100644 --- a/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java +++ b/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java @@ -9,12 +9,11 @@ package buildcraft.transport.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; public class ActionSingleEnergyPulse extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/transport/statements/ActionValve.java b/common/buildcraft/transport/statements/ActionValve.java index 76c26318..373f7c2b 100644 --- a/common/buildcraft/transport/statements/ActionValve.java +++ b/common/buildcraft/transport/statements/ActionValve.java @@ -9,18 +9,15 @@ package buildcraft.transport.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.transport.IPipe; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.core.statements.BCStatement; import buildcraft.core.statements.StatementParameterDirection; -import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.Gate; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransport; diff --git a/common/buildcraft/transport/statements/TriggerClockTimer.java b/common/buildcraft/transport/statements/TriggerClockTimer.java index d4482d3f..fd6a23c2 100644 --- a/common/buildcraft/transport/statements/TriggerClockTimer.java +++ b/common/buildcraft/transport/statements/TriggerClockTimer.java @@ -9,14 +9,12 @@ package buildcraft.transport.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; public class TriggerClockTimer extends BCStatement implements ITriggerInternal { diff --git a/common/buildcraft/transport/statements/TriggerLightSensor.java b/common/buildcraft/transport/statements/TriggerLightSensor.java index 6dd27b58..688bba58 100644 --- a/common/buildcraft/transport/statements/TriggerLightSensor.java +++ b/common/buildcraft/transport/statements/TriggerLightSensor.java @@ -5,10 +5,10 @@ import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.core.Position; -import buildcraft.api.statements.containers.ISidedStatementContainer; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; +import buildcraft.api.statements.containers.ISidedStatementContainer; import buildcraft.core.lib.utils.StringUtils; import buildcraft.core.statements.BCStatement; diff --git a/common/buildcraft/transport/statements/TriggerParameterSignal.java b/common/buildcraft/transport/statements/TriggerParameterSignal.java index 29aeb532..21f1fb01 100644 --- a/common/buildcraft/transport/statements/TriggerParameterSignal.java +++ b/common/buildcraft/transport/statements/TriggerParameterSignal.java @@ -9,12 +9,10 @@ package buildcraft.transport.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; - import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; diff --git a/common/buildcraft/transport/statements/TriggerPipeContents.java b/common/buildcraft/transport/statements/TriggerPipeContents.java index e324ed07..6e056f39 100644 --- a/common/buildcraft/transport/statements/TriggerPipeContents.java +++ b/common/buildcraft/transport/statements/TriggerPipeContents.java @@ -9,25 +9,21 @@ package buildcraft.transport.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; - import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.lib.inventory.StackHelper; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportFluids; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/transport/statements/TriggerPipeSignal.java b/common/buildcraft/transport/statements/TriggerPipeSignal.java index 24490ecb..b2ffc621 100644 --- a/common/buildcraft/transport/statements/TriggerPipeSignal.java +++ b/common/buildcraft/transport/statements/TriggerPipeSignal.java @@ -9,16 +9,14 @@ package buildcraft.transport.statements; import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; - import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.transport.PipeWire; -import buildcraft.core.statements.BCStatement; import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; import buildcraft.transport.Pipe; public class TriggerPipeSignal extends BCStatement implements ITriggerInternal { diff --git a/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java index aea9139a..82500a98 100644 --- a/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java +++ b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java @@ -9,17 +9,15 @@ package buildcraft.transport.statements; import net.minecraft.client.renderer.texture.IIconRegister; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.core.statements.BCStatement; import buildcraft.core.statements.StatementParameterRedstoneGateSideOnly; -import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.TileGenericPipe; public class TriggerRedstoneFaderInput extends BCStatement implements ITriggerInternal { diff --git a/common/buildcraft/transport/stripes/PipeExtensionListener.java b/common/buildcraft/transport/stripes/PipeExtensionListener.java index cb12b508..9b9f6eb1 100644 --- a/common/buildcraft/transport/stripes/PipeExtensionListener.java +++ b/common/buildcraft/transport/stripes/PipeExtensionListener.java @@ -4,9 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.Set; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -18,10 +16,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; import buildcraft.api.transport.IStripesActivator; -import buildcraft.api.transport.IStripesHandler; import buildcraft.core.proxy.CoreProxy; -import buildcraft.transport.BlockGenericPipe; -import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TileGenericPipe; import buildcraft.transport.TravelingItem; diff --git a/common/buildcraft/transport/stripes/StripesHandlerArrow.java b/common/buildcraft/transport/stripes/StripesHandlerArrow.java index 7f5a248f..bb00bf39 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerArrow.java +++ b/common/buildcraft/transport/stripes/StripesHandlerArrow.java @@ -5,9 +5,7 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; diff --git a/common/buildcraft/transport/stripes/StripesHandlerBucket.java b/common/buildcraft/transport/stripes/StripesHandlerBucket.java index 2fbd5fea..dff6c1cb 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerBucket.java +++ b/common/buildcraft/transport/stripes/StripesHandlerBucket.java @@ -7,13 +7,11 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; - import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; diff --git a/common/buildcraft/transport/stripes/StripesHandlerDispenser.java b/common/buildcraft/transport/stripes/StripesHandlerDispenser.java index f1c7dd97..061886ad 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerDispenser.java +++ b/common/buildcraft/transport/stripes/StripesHandlerDispenser.java @@ -1,7 +1,5 @@ package buildcraft.transport.stripes; -import scala.actors.threadpool.Arrays; - import java.util.ArrayList; import java.util.List; import net.minecraft.block.BlockDispenser; diff --git a/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java b/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java index 420b4eb8..1509b8bf 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java +++ b/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java @@ -11,15 +11,12 @@ package buildcraft.transport.stripes; import java.util.Collections; import java.util.LinkedList; import java.util.List; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; diff --git a/common/buildcraft/transport/stripes/StripesHandlerMinecartDestroy.java b/common/buildcraft/transport/stripes/StripesHandlerMinecartDestroy.java index 340f2058..eb43881a 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerMinecartDestroy.java +++ b/common/buildcraft/transport/stripes/StripesHandlerMinecartDestroy.java @@ -11,14 +11,11 @@ package buildcraft.transport.stripes; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.item.EntityMinecartContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.transport.IStripesActivator; diff --git a/common/buildcraft/transport/stripes/StripesHandlerPipeWires.java b/common/buildcraft/transport/stripes/StripesHandlerPipeWires.java index 68170ed9..42d86595 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerPipeWires.java +++ b/common/buildcraft/transport/stripes/StripesHandlerPipeWires.java @@ -19,7 +19,7 @@ public class StripesHandlerPipeWires implements IStripesHandler { @Override public boolean shouldHandle(ItemStack stack) { - return (stack.getItem() instanceof ItemPipeWire); + return stack.getItem() instanceof ItemPipeWire; } @Override diff --git a/common/buildcraft/transport/stripes/StripesHandlerPipes.java b/common/buildcraft/transport/stripes/StripesHandlerPipes.java index 91352249..92a2c736 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerPipes.java +++ b/common/buildcraft/transport/stripes/StripesHandlerPipes.java @@ -9,13 +9,10 @@ package buildcraft.transport.stripes; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; import buildcraft.api.transport.IStripesActivator; diff --git a/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java b/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java index 31e88e3d..932efcf4 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java +++ b/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java @@ -12,9 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.core.Position; import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; diff --git a/common/buildcraft/transport/stripes/StripesHandlerRightClick.java b/common/buildcraft/transport/stripes/StripesHandlerRightClick.java index 868017b6..2f26b8e8 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerRightClick.java +++ b/common/buildcraft/transport/stripes/StripesHandlerRightClick.java @@ -8,9 +8,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemPotion; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; diff --git a/common/buildcraft/transport/stripes/StripesHandlerShears.java b/common/buildcraft/transport/stripes/StripesHandlerShears.java index abfb245c..9af2e698 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerShears.java +++ b/common/buildcraft/transport/stripes/StripesHandlerShears.java @@ -1,7 +1,6 @@ package buildcraft.transport.stripes; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -9,10 +8,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - import net.minecraftforge.common.IShearable; import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; diff --git a/common/buildcraft/transport/utils/ConnectionMatrix.java b/common/buildcraft/transport/utils/ConnectionMatrix.java index a17770bd..4b001b70 100644 --- a/common/buildcraft/transport/utils/ConnectionMatrix.java +++ b/common/buildcraft/transport/utils/ConnectionMatrix.java @@ -9,7 +9,6 @@ package buildcraft.transport.utils; import io.netty.buffer.ByteBuf; - import net.minecraftforge.common.util.ForgeDirection; public class ConnectionMatrix { diff --git a/common/buildcraft/transport/utils/TextureMatrix.java b/common/buildcraft/transport/utils/TextureMatrix.java index c298d136..c720a9fa 100644 --- a/common/buildcraft/transport/utils/TextureMatrix.java +++ b/common/buildcraft/transport/utils/TextureMatrix.java @@ -9,7 +9,6 @@ package buildcraft.transport.utils; import io.netty.buffer.ByteBuf; - import net.minecraftforge.common.util.ForgeDirection; public class TextureMatrix { diff --git a/common/buildcraft/transport/utils/TransportUtils.java b/common/buildcraft/transport/utils/TransportUtils.java index 345d61ab..80b681aa 100644 --- a/common/buildcraft/transport/utils/TransportUtils.java +++ b/common/buildcraft/transport/utils/TransportUtils.java @@ -9,7 +9,6 @@ package buildcraft.transport.utils; import net.minecraft.item.ItemStack; - import buildcraft.core.CoreConstants; public final class TransportUtils { diff --git a/common/buildcraft/transport/utils/WireMatrix.java b/common/buildcraft/transport/utils/WireMatrix.java index 5006379e..58e662be 100644 --- a/common/buildcraft/transport/utils/WireMatrix.java +++ b/common/buildcraft/transport/utils/WireMatrix.java @@ -9,11 +9,8 @@ package buildcraft.transport.utils; import java.util.BitSet; - import io.netty.buffer.ByteBuf; - import net.minecraftforge.common.util.ForgeDirection; - import buildcraft.api.transport.PipeWire; public class WireMatrix {