diff --git a/api/buildcraft/api/filler/IFillerPattern.java b/api/buildcraft/api/filler/IFillerPattern.java index da463747..c18e5c2a 100644 --- a/api/buildcraft/api/filler/IFillerPattern.java +++ b/api/buildcraft/api/filler/IFillerPattern.java @@ -8,10 +8,6 @@ */ package buildcraft.api.filler; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.statements.IStatement; public interface IFillerPattern extends IStatement { diff --git a/api/buildcraft/api/robots/RobotManager.java b/api/buildcraft/api/robots/RobotManager.java index 011d0676..0191b80d 100644 --- a/api/buildcraft/api/robots/RobotManager.java +++ b/api/buildcraft/api/robots/RobotManager.java @@ -37,7 +37,7 @@ public abstract class RobotManager { aiRobots.add(aiRobot); aiRobotsByNames.put(name, aiRobot); aiRobotsNames.put(aiRobot, name); - if(legacyClassName != null) { + if (legacyClassName != null) { aiRobotsByLegacyClassNames.put(legacyClassName, aiRobot); } } @@ -61,7 +61,7 @@ public abstract class RobotManager { public static void registerResourceId(Class resourceId, String name, String legacyClassName) { resourceIdByNames.put(name, resourceId); resourceIdNames.put(resourceId, name); - if(legacyClassName != null) { + if (legacyClassName != null) { resourceIdLegacyClassNames.put(legacyClassName, resourceId); } } diff --git a/api/buildcraft/api/transport/pluggable/IFacadePluggable.java b/api/buildcraft/api/transport/pluggable/IFacadePluggable.java index 08ae33f7..6289714a 100644 --- a/api/buildcraft/api/transport/pluggable/IFacadePluggable.java +++ b/api/buildcraft/api/transport/pluggable/IFacadePluggable.java @@ -3,8 +3,11 @@ package buildcraft.api.transport.pluggable; import net.minecraft.block.Block; public interface IFacadePluggable { - public Block getCurrentBlock(); - public int getCurrentMetadata(); - public boolean isTransparent(); - public boolean isHollow(); + Block getCurrentBlock(); + + int getCurrentMetadata(); + + boolean isTransparent(); + + boolean isHollow(); } diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index abc1ecae..cea3d6a9 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -42,10 +42,10 @@ import buildcraft.compat.CompatHooks; import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; import buildcraft.core.ItemBuildCraft; -import buildcraft.robots.ItemRobot; import buildcraft.core.Version; import buildcraft.core.network.BuildCraftChannelHandler; import buildcraft.core.proxy.CoreProxy; +import buildcraft.robots.ItemRobot; import buildcraft.robots.RobotIntegrationRecipe; import buildcraft.robots.boards.BoardRobotBomberNBT; import buildcraft.robots.boards.BoardRobotBuilderNBT; @@ -64,22 +64,6 @@ import buildcraft.robots.boards.BoardRobotPickerNBT; import buildcraft.robots.boards.BoardRobotPlanterNBT; import buildcraft.robots.boards.BoardRobotPumpNBT; import buildcraft.robots.boards.BoardRobotShovelmanNBT; -import buildcraft.silicon.BlockLaser; -import buildcraft.silicon.BlockLaserTable; -import buildcraft.silicon.GuiHandler; -import buildcraft.silicon.ItemLaserTable; -import buildcraft.silicon.ItemRedstoneBoard; -import buildcraft.silicon.ItemRedstoneChipset; -import buildcraft.silicon.ItemRedstoneChipset.Chipset; -import buildcraft.silicon.SiliconProxy; -import buildcraft.silicon.TileAdvancedCraftingTable; -import buildcraft.silicon.TileAssemblyTable; -import buildcraft.silicon.TileChargingTable; -import buildcraft.silicon.TileIntegrationTable; -import buildcraft.silicon.TileLaser; -import buildcraft.silicon.boards.BoardRecipe; -import buildcraft.silicon.boards.ImplRedstoneBoardRegistry; -import buildcraft.silicon.network.PacketHandlerSilicon; import buildcraft.robots.statements.ActionRobotFilter; import buildcraft.robots.statements.ActionRobotGotoStation; import buildcraft.robots.statements.ActionRobotWakeUp; @@ -96,6 +80,22 @@ import buildcraft.robots.statements.ActionStationRequestItemsMachine; import buildcraft.robots.statements.RobotsActionProvider; import buildcraft.robots.statements.RobotsTriggerProvider; import buildcraft.robots.statements.TriggerRobotSleep; +import buildcraft.silicon.BlockLaser; +import buildcraft.silicon.BlockLaserTable; +import buildcraft.silicon.GuiHandler; +import buildcraft.silicon.ItemLaserTable; +import buildcraft.silicon.ItemRedstoneBoard; +import buildcraft.silicon.ItemRedstoneChipset; +import buildcraft.silicon.ItemRedstoneChipset.Chipset; +import buildcraft.silicon.SiliconProxy; +import buildcraft.silicon.TileAdvancedCraftingTable; +import buildcraft.silicon.TileAssemblyTable; +import buildcraft.silicon.TileChargingTable; +import buildcraft.silicon.TileIntegrationTable; +import buildcraft.silicon.TileLaser; +import buildcraft.silicon.boards.BoardRecipe; +import buildcraft.silicon.boards.ImplRedstoneBoardRegistry; +import buildcraft.silicon.network.PacketHandlerSilicon; @Mod(name = "BuildCraft Silicon", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Silicon", dependencies = DefaultProps.DEPENDENCY_TRANSPORT) public class BuildCraftSilicon extends BuildCraftMod { diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 374ad4c5..eafd99c9 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -56,6 +56,8 @@ import buildcraft.core.Version; import buildcraft.core.network.BuildCraftChannelHandler; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.ColorUtils; +import buildcraft.robots.ItemRobotStation; +import buildcraft.robots.RobotStationPluggable; import buildcraft.silicon.ItemRedstoneChipset.Chipset; import buildcraft.transport.BlockFilteredBuffer; import buildcraft.transport.BlockGenericPipe; @@ -120,10 +122,8 @@ import buildcraft.transport.pipes.PipePowerWood; import buildcraft.transport.pipes.PipeStructureCobblestone; import buildcraft.transport.pluggable.ItemLens; import buildcraft.transport.pluggable.ItemPlug; -import buildcraft.robots.ItemRobotStation; import buildcraft.transport.pluggable.LensPluggable; import buildcraft.transport.pluggable.PlugPluggable; -import buildcraft.robots.RobotStationPluggable; import buildcraft.transport.recipes.AdvancedFacadeRecipe; import buildcraft.transport.recipes.GateExpansionRecipe; import buildcraft.transport.recipes.GateLogicSwapRecipe; @@ -500,8 +500,9 @@ public class BuildCraftTransport extends BuildCraftMod { public void loadRecipes() { // Add base recipe for pipe waterproof. GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.dye, 1, 2)); - if(additionalWaterproofingRecipe) - GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.slime_ball, 1, 2)); + if (additionalWaterproofingRecipe) { + GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.slime_ball, 1, 2)); + } // Add pipe recipes for (PipeRecipe pipe : pipeRecipes) { diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index 7afe5183..c6533f9b 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -64,9 +64,9 @@ import buildcraft.core.inventory.Transactor; import buildcraft.core.network.BuildCraftPacket; import buildcraft.core.network.CommandWriter; import buildcraft.core.network.PacketCommand; +import buildcraft.core.utils.Utils; import buildcraft.robots.ResourceIdRequest; import buildcraft.robots.RobotRegistry; -import buildcraft.core.utils.Utils; public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluidHandler, IRequestProvider, IControllable { diff --git a/common/buildcraft/builders/gui/GuiFiller.java b/common/buildcraft/builders/gui/GuiFiller.java index 99629a16..7b6f660a 100644 --- a/common/buildcraft/builders/gui/GuiFiller.java +++ b/common/buildcraft/builders/gui/GuiFiller.java @@ -9,9 +9,7 @@ package buildcraft.builders.gui; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.inventory.IInventory; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import buildcraft.api.filler.FillerManager; @@ -23,14 +21,12 @@ import buildcraft.core.DefaultProps; import buildcraft.core.builders.patterns.FillerPattern; import buildcraft.core.gui.AdvancedSlot; import buildcraft.core.gui.GuiAdvancedInterface; -import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.gui.GuiTools; import buildcraft.core.gui.StatementParameterSlot; import buildcraft.core.gui.StatementSlot; import buildcraft.core.gui.buttons.GuiBetterButton; import buildcraft.core.gui.buttons.StandardButtonTextureSets; import buildcraft.core.utils.StringUtils; -import buildcraft.transport.Pipe; public class GuiFiller extends GuiAdvancedInterface { class FillerParameterSlot extends StatementParameterSlot { diff --git a/common/buildcraft/commander/TileRequester.java b/common/buildcraft/commander/TileRequester.java index 5d1c0384..72021e8d 100755 --- a/common/buildcraft/commander/TileRequester.java +++ b/common/buildcraft/commander/TileRequester.java @@ -27,9 +27,9 @@ import buildcraft.core.inventory.StackHelper; import buildcraft.core.network.CommandWriter; import buildcraft.core.network.ICommandReceiver; import buildcraft.core.network.PacketCommand; +import buildcraft.core.utils.Utils; import buildcraft.robots.ResourceIdRequest; import buildcraft.robots.RobotRegistry; -import buildcraft.core.utils.Utils; public class TileRequester extends TileBuildCraft implements IInventory, IRequestProvider, ICommandReceiver { public static final int NB_ITEMS = 20; diff --git a/common/buildcraft/core/InterModComms.java b/common/buildcraft/core/InterModComms.java index b7bc10f7..637f6d27 100644 --- a/common/buildcraft/core/InterModComms.java +++ b/common/buildcraft/core/InterModComms.java @@ -11,8 +11,6 @@ package buildcraft.core; import java.util.ArrayList; import java.util.List; -import buildcraft.api.fuels.ICoolant; -import buildcraft.energy.fuels.CoolantManager; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.Iterables; @@ -33,11 +31,13 @@ import net.minecraftforge.fluids.FluidStack; import buildcraft.BuildCraftTransport; import buildcraft.api.core.BCLog; +import buildcraft.api.fuels.ICoolant; import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.IGateExpansion; import buildcraft.core.recipes.AssemblyRecipeManager; import buildcraft.core.recipes.IntegrationRecipeManager; import buildcraft.core.recipes.RefineryRecipeManager; +import buildcraft.energy.fuels.CoolantManager; import buildcraft.energy.worldgen.OilPopulate; import buildcraft.transport.ItemFacade; import buildcraft.transport.recipes.GateExpansionRecipe; @@ -258,7 +258,7 @@ public final class InterModComms { public static void processCoolantAddIMC(IMCEvent event, IMCMessage m) { boolean failed = false; - if (!m.isNBTMessage()){ + if (!m.isNBTMessage()) { failed = true; } else { NBTTagCompound tag = m.getNBTValue(); diff --git a/common/buildcraft/core/gui/StatementParameterSlot.java b/common/buildcraft/core/gui/StatementParameterSlot.java index 00bd1830..719c3584 100644 --- a/common/buildcraft/core/gui/StatementParameterSlot.java +++ b/common/buildcraft/core/gui/StatementParameterSlot.java @@ -3,8 +3,6 @@ package buildcraft.core.gui; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import buildcraft.api.statements.IStatementParameter; -import buildcraft.transport.Pipe; -import buildcraft.transport.gui.GuiGateInterface; /** * Created by asie on 1/24/15. diff --git a/common/buildcraft/core/gui/StatementSlot.java b/common/buildcraft/core/gui/StatementSlot.java index 0e9ef022..37616ade 100644 --- a/common/buildcraft/core/gui/StatementSlot.java +++ b/common/buildcraft/core/gui/StatementSlot.java @@ -5,8 +5,6 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.statements.IStatement; -import buildcraft.transport.Pipe; -import buildcraft.transport.gui.GuiGateInterface; /** * Created by asie on 1/24/15. diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index 32884cd4..606bc954 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -34,10 +34,10 @@ import buildcraft.BuildCraftSilicon; import buildcraft.core.EntityBlock; import buildcraft.core.LaserKind; import buildcraft.core.render.RenderEntityBlock; -import buildcraft.robots.render.RenderRobot; import buildcraft.core.render.RenderingEntityBlocks; import buildcraft.core.render.RenderingMarkers; import buildcraft.robots.EntityRobot; +import buildcraft.robots.render.RenderRobot; import buildcraft.transport.render.TileEntityPickupFX; public class CoreProxyClient extends CoreProxy { diff --git a/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java b/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java index 4bfe6427..82b0272e 100644 --- a/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java +++ b/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java @@ -10,8 +10,8 @@ package buildcraft.core.utils.concurrency; public interface IIterableAlgorithm { - abstract void iterate(); + void iterate(); - abstract boolean isDone(); + boolean isDone(); } \ No newline at end of file diff --git a/common/buildcraft/robots/ItemRobot.java b/common/buildcraft/robots/ItemRobot.java index acd6fcb0..5b9fd035 100755 --- a/common/buildcraft/robots/ItemRobot.java +++ b/common/buildcraft/robots/ItemRobot.java @@ -30,7 +30,6 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.ItemBuildCraft; -import buildcraft.robots.EntityRobot; import buildcraft.core.utils.NBTUtils; public class ItemRobot extends ItemBuildCraft implements IEnergyContainerItem { diff --git a/common/buildcraft/robots/RobotIntegrationRecipe.java b/common/buildcraft/robots/RobotIntegrationRecipe.java index 821617ff..147229fa 100755 --- a/common/buildcraft/robots/RobotIntegrationRecipe.java +++ b/common/buildcraft/robots/RobotIntegrationRecipe.java @@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack; import buildcraft.BuildCraftSilicon; import buildcraft.api.recipes.CraftingResult; -import buildcraft.robots.ItemRobot; import buildcraft.silicon.ItemRedstoneBoard; import buildcraft.silicon.TileIntegrationTable; import buildcraft.transport.recipes.IntegrationTableRecipe; diff --git a/common/buildcraft/robots/RobotUtils.java b/common/buildcraft/robots/RobotUtils.java index 1acdd83c..5631d944 100644 --- a/common/buildcraft/robots/RobotUtils.java +++ b/common/buildcraft/robots/RobotUtils.java @@ -2,12 +2,11 @@ package buildcraft.robots; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.transport.IPipeTile; -import buildcraft.transport.TileGenericPipe; /** * Created by asie on 1/24/15. */ -public class RobotUtils { +public final class RobotUtils { private RobotUtils() { } diff --git a/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java b/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java index 56c8745c..81d954dd 100755 --- a/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java +++ b/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java @@ -34,10 +34,10 @@ import buildcraft.robots.IStationFilter; import buildcraft.robots.ResourceIdAssemblyTable; import buildcraft.robots.ResourceIdBlock; import buildcraft.robots.RobotRegistry; -import buildcraft.silicon.BlockLaserTable; -import buildcraft.silicon.TileAssemblyTable; import buildcraft.robots.statements.ActionRobotFilter; import buildcraft.robots.statements.ActionStationAllowCraft; +import buildcraft.silicon.BlockLaserTable; +import buildcraft.silicon.TileAssemblyTable; public class AIRobotCraftAssemblyTable extends AIRobotCraftGeneric { diff --git a/common/buildcraft/robots/boards/BoardRobotBomber.java b/common/buildcraft/robots/boards/BoardRobotBomber.java index 436d4571..edfb1bdd 100755 --- a/common/buildcraft/robots/boards/BoardRobotBomber.java +++ b/common/buildcraft/robots/boards/BoardRobotBomber.java @@ -24,11 +24,11 @@ import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; import buildcraft.core.inventory.filters.ArrayStackFilter; import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.utils.IBlockFilter; import buildcraft.robots.ai.AIRobotGotoBlock; import buildcraft.robots.ai.AIRobotGotoStationToLoad; import buildcraft.robots.ai.AIRobotLoad; import buildcraft.robots.ai.AIRobotSearchRandomGroundBlock; -import buildcraft.core.utils.IBlockFilter; public class BoardRobotBomber extends RedstoneBoardRobot { diff --git a/common/buildcraft/robots/boards/BoardRobotButcher.java b/common/buildcraft/robots/boards/BoardRobotButcher.java index 61baec29..39f1fbc0 100755 --- a/common/buildcraft/robots/boards/BoardRobotButcher.java +++ b/common/buildcraft/robots/boards/BoardRobotButcher.java @@ -18,11 +18,11 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.utils.IEntityFilter; import buildcraft.robots.ai.AIRobotAttack; import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack; import buildcraft.robots.ai.AIRobotGotoSleep; import buildcraft.robots.ai.AIRobotSearchEntity; -import buildcraft.core.utils.IEntityFilter; public class BoardRobotButcher extends RedstoneBoardRobot { diff --git a/common/buildcraft/robots/boards/BoardRobotFarmer.java b/common/buildcraft/robots/boards/BoardRobotFarmer.java index 1afbbb56..63c0480b 100644 --- a/common/buildcraft/robots/boards/BoardRobotFarmer.java +++ b/common/buildcraft/robots/boards/BoardRobotFarmer.java @@ -22,12 +22,12 @@ import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.filters.IStackFilter; import buildcraft.core.utils.IBlockFilter; import buildcraft.robots.ResourceIdBlock; +import buildcraft.robots.RobotRegistry; import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack; import buildcraft.robots.ai.AIRobotGotoBlock; import buildcraft.robots.ai.AIRobotGotoSleep; import buildcraft.robots.ai.AIRobotSearchBlock; import buildcraft.robots.ai.AIRobotUseToolOnBlock; -import buildcraft.robots.RobotRegistry; public class BoardRobotFarmer extends RedstoneBoardRobot { diff --git a/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java b/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java index 6228c6c5..55fc50f7 100644 --- a/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java +++ b/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java @@ -24,13 +24,13 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.inventory.filters.IStackFilter; import buildcraft.core.utils.IBlockFilter; +import buildcraft.robots.DockingStation; +import buildcraft.robots.ResourceIdBlock; import buildcraft.robots.ai.AIRobotBreak; import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack; import buildcraft.robots.ai.AIRobotGotoBlock; import buildcraft.robots.ai.AIRobotGotoSleep; import buildcraft.robots.ai.AIRobotSearchBlock; -import buildcraft.robots.DockingStation; -import buildcraft.robots.ResourceIdBlock; import buildcraft.robots.statements.ActionRobotFilter; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/robots/boards/BoardRobotKnight.java b/common/buildcraft/robots/boards/BoardRobotKnight.java index bdb07bc7..fad0f148 100755 --- a/common/buildcraft/robots/boards/BoardRobotKnight.java +++ b/common/buildcraft/robots/boards/BoardRobotKnight.java @@ -18,11 +18,11 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.utils.IEntityFilter; import buildcraft.robots.ai.AIRobotAttack; import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack; import buildcraft.robots.ai.AIRobotGotoSleep; import buildcraft.robots.ai.AIRobotSearchEntity; -import buildcraft.core.utils.IEntityFilter; public class BoardRobotKnight extends RedstoneBoardRobot { diff --git a/common/buildcraft/robots/boards/BoardRobotPickerNBT.java b/common/buildcraft/robots/boards/BoardRobotPickerNBT.java index 39684395..6703c6de 100755 --- a/common/buildcraft/robots/boards/BoardRobotPickerNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotPickerNBT.java @@ -20,8 +20,8 @@ import net.minecraft.util.ResourceLocation; import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.robots.EntityRobot; import buildcraft.core.utils.StringUtils; +import buildcraft.robots.EntityRobot; public final class BoardRobotPickerNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robots/render/RenderRobot.java b/common/buildcraft/robots/render/RenderRobot.java index 2124a2aa..ef5a42f4 100644 --- a/common/buildcraft/robots/render/RenderRobot.java +++ b/common/buildcraft/robots/render/RenderRobot.java @@ -31,8 +31,8 @@ import buildcraft.core.DefaultProps; import buildcraft.core.EntityLaser; import buildcraft.core.render.RenderLaser; import buildcraft.core.render.RenderUtils; -import buildcraft.robots.ItemRobot; import buildcraft.robots.EntityRobot; +import buildcraft.robots.ItemRobot; public class RenderRobot extends Render implements IItemRenderer { diff --git a/common/buildcraft/robots/statements/ActionRobotFilter.java b/common/buildcraft/robots/statements/ActionRobotFilter.java index b8c4c428..b45ba39e 100755 --- a/common/buildcraft/robots/statements/ActionRobotFilter.java +++ b/common/buildcraft/robots/statements/ActionRobotFilter.java @@ -29,9 +29,9 @@ import buildcraft.core.inventory.filters.IStackFilter; import buildcraft.core.inventory.filters.PassThroughFluidFilter; import buildcraft.core.inventory.filters.PassThroughStackFilter; import buildcraft.core.inventory.filters.StatementParameterStackFilter; -import buildcraft.robots.DockingStation; import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; +import buildcraft.robots.DockingStation; import buildcraft.transport.Pipe; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/robots/statements/ActionRobotGotoStation.java b/common/buildcraft/robots/statements/ActionRobotGotoStation.java index 82c63bf0..2e43c076 100644 --- a/common/buildcraft/robots/statements/ActionRobotGotoStation.java +++ b/common/buildcraft/robots/statements/ActionRobotGotoStation.java @@ -21,15 +21,13 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.api.transport.IPipeTile; import buildcraft.core.ItemMapLocation; -import buildcraft.robots.RobotUtils; -import buildcraft.robots.ai.AIRobotGoAndLinkToDock; +import buildcraft.core.statements.BCStatement; +import buildcraft.core.utils.StringUtils; import buildcraft.robots.DockingStation; import buildcraft.robots.EntityRobot; import buildcraft.robots.RobotRegistry; -import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; -import buildcraft.transport.Gate; -import buildcraft.transport.Pipe; +import buildcraft.robots.RobotUtils; +import buildcraft.robots.ai.AIRobotGoAndLinkToDock; public class ActionRobotGotoStation extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java b/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java index 7b44b077..3007e9a8 100755 --- a/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java +++ b/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java @@ -20,9 +20,9 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; +import buildcraft.core.utils.StringUtils; import buildcraft.robots.DockingStation; import buildcraft.robots.EntityRobot; -import buildcraft.core.utils.StringUtils; import buildcraft.transport.gates.StatementSlot; public class ActionStationAcceptItemsInv extends ActionStationInputItems { diff --git a/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java b/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java index 7b983fd8..1863c0ad 100755 --- a/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java +++ b/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java @@ -13,9 +13,9 @@ import net.minecraft.client.renderer.texture.IIconRegister; import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; +import buildcraft.core.utils.StringUtils; import buildcraft.robots.DockingStation; import buildcraft.robots.EntityRobot; -import buildcraft.core.utils.StringUtils; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TravelingItem; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/robots/statements/ActionStationForbidRobot.java b/common/buildcraft/robots/statements/ActionStationForbidRobot.java index b8c989d4..42f0203b 100755 --- a/common/buildcraft/robots/statements/ActionStationForbidRobot.java +++ b/common/buildcraft/robots/statements/ActionStationForbidRobot.java @@ -16,10 +16,10 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.robots.ItemRobot; -import buildcraft.robots.DockingStation; import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; +import buildcraft.robots.DockingStation; +import buildcraft.robots.ItemRobot; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/robots/statements/ActionStationInputItems.java b/common/buildcraft/robots/statements/ActionStationInputItems.java index 4db624f2..353d7e7e 100755 --- a/common/buildcraft/robots/statements/ActionStationInputItems.java +++ b/common/buildcraft/robots/statements/ActionStationInputItems.java @@ -13,9 +13,9 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.core.inventory.filters.StatementParameterStackFilter; +import buildcraft.core.statements.BCStatement; import buildcraft.robots.DockingStation; import buildcraft.robots.EntityRobot; -import buildcraft.core.statements.BCStatement; import buildcraft.transport.gates.StatementSlot; public abstract class ActionStationInputItems extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robots/statements/ActionStationRequestItems.java b/common/buildcraft/robots/statements/ActionStationRequestItems.java index 2f84d5d5..668a3935 100755 --- a/common/buildcraft/robots/statements/ActionStationRequestItems.java +++ b/common/buildcraft/robots/statements/ActionStationRequestItems.java @@ -20,9 +20,9 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; +import buildcraft.core.utils.StringUtils; import buildcraft.robots.DockingStation; import buildcraft.robots.EntityRobot; -import buildcraft.core.utils.StringUtils; import buildcraft.transport.gates.StatementSlot; public class ActionStationRequestItems extends ActionStationInputItems { diff --git a/common/buildcraft/robots/statements/RobotsActionProvider.java b/common/buildcraft/robots/statements/RobotsActionProvider.java index f62567b2..c3a23ebf 100755 --- a/common/buildcraft/robots/statements/RobotsActionProvider.java +++ b/common/buildcraft/robots/statements/RobotsActionProvider.java @@ -27,7 +27,6 @@ import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IActionProvider; import buildcraft.api.statements.IStatementContainer; -import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.robots.DockingStation; import buildcraft.robots.RobotUtils; diff --git a/common/buildcraft/robots/statements/RobotsTriggerProvider.java b/common/buildcraft/robots/statements/RobotsTriggerProvider.java index 6e11a72b..4d5e2014 100755 --- a/common/buildcraft/robots/statements/RobotsTriggerProvider.java +++ b/common/buildcraft/robots/statements/RobotsTriggerProvider.java @@ -17,7 +17,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftSilicon; -import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; @@ -25,7 +24,6 @@ import buildcraft.api.statements.ITriggerProvider; import buildcraft.api.transport.IPipeTile; import buildcraft.robots.DockingStation; import buildcraft.robots.RobotUtils; -import buildcraft.transport.TileGenericPipe; public class RobotsTriggerProvider implements ITriggerProvider { diff --git a/common/buildcraft/robots/statements/TriggerRobotSleep.java b/common/buildcraft/robots/statements/TriggerRobotSleep.java index 8f23f68e..33880ac9 100755 --- a/common/buildcraft/robots/statements/TriggerRobotSleep.java +++ b/common/buildcraft/robots/statements/TriggerRobotSleep.java @@ -12,19 +12,16 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.transport.IPipeTile; -import buildcraft.robots.RobotUtils; -import buildcraft.robots.ai.AIRobotSleep; -import buildcraft.robots.DockingStation; -import buildcraft.robots.EntityRobot; import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; -import buildcraft.transport.Pipe; -import buildcraft.transport.TileGenericPipe; +import buildcraft.robots.DockingStation; +import buildcraft.robots.EntityRobot; +import buildcraft.robots.RobotUtils; +import buildcraft.robots.ai.AIRobotSleep; public class TriggerRobotSleep extends BCStatement implements ITriggerInternal { diff --git a/common/buildcraft/silicon/TileAssemblyTable.java b/common/buildcraft/silicon/TileAssemblyTable.java index 8a4accaf..e242e0ac 100644 --- a/common/buildcraft/silicon/TileAssemblyTable.java +++ b/common/buildcraft/silicon/TileAssemblyTable.java @@ -36,11 +36,11 @@ import buildcraft.core.network.CommandWriter; import buildcraft.core.network.ICommandReceiver; import buildcraft.core.network.PacketCommand; import buildcraft.core.recipes.AssemblyRecipeManager; +import buildcraft.core.utils.StringUtils; +import buildcraft.core.utils.Utils; import buildcraft.robots.EntityRobot; import buildcraft.robots.ResourceIdAssemblyTable; import buildcraft.robots.RobotRegistry; -import buildcraft.core.utils.StringUtils; -import buildcraft.core.utils.Utils; public class TileAssemblyTable extends TileLaserTableBase implements IInventory, IFlexibleCrafter, ICommandReceiver { public String currentRecipeId = ""; diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index e7fefd30..9f8b51c1 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -66,15 +66,15 @@ import buildcraft.core.BlockBuildCraft; import buildcraft.core.CoreConstants; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.ItemMapLocation; -import buildcraft.robots.ItemRobot; import buildcraft.core.TileBuffer; -import buildcraft.robots.DockingStation; -import buildcraft.robots.EntityRobot; import buildcraft.core.utils.MatrixTranformations; import buildcraft.core.utils.Utils; +import buildcraft.robots.DockingStation; +import buildcraft.robots.EntityRobot; +import buildcraft.robots.ItemRobot; +import buildcraft.robots.RobotStationPluggable; import buildcraft.transport.gates.GateDefinition; import buildcraft.transport.gates.GatePluggable; -import buildcraft.robots.RobotStationPluggable; import buildcraft.transport.render.PipeRendererWorld; public class BlockGenericPipe extends BlockBuildCraft { diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 37cc3441..da5702cd 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -426,8 +426,9 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePlug if (block == null) { return; } - if (!block.getMaterial().blocksMovement()) + if (!block.getMaterial().blocksMovement()) { return; + } String recipeId = "buildcraft:facade{" + Block.blockRegistry.getNameForObject(block) + "#" + itemStack.getItemDamage() + "}"; diff --git a/common/buildcraft/transport/render/FacadeBlockAccess.java b/common/buildcraft/transport/render/FacadeBlockAccess.java index f82aa0d6..9d205911 100644 --- a/common/buildcraft/transport/render/FacadeBlockAccess.java +++ b/common/buildcraft/transport/render/FacadeBlockAccess.java @@ -9,7 +9,6 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.transport.pluggable.IFacadePluggable; import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.transport.BlockGenericPipe; -import buildcraft.transport.FacadePluggable; import buildcraft.transport.TileGenericPipe; public class FacadeBlockAccess implements IBlockAccess { diff --git a/common/buildcraft/transport/render/FacadeRenderHelper.java b/common/buildcraft/transport/render/FacadeRenderHelper.java index 253a5291..bacfd249 100644 --- a/common/buildcraft/transport/render/FacadeRenderHelper.java +++ b/common/buildcraft/transport/render/FacadeRenderHelper.java @@ -22,7 +22,6 @@ import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.CoreConstants; import buildcraft.core.utils.MatrixTranformations; import buildcraft.transport.BlockGenericPipe; -import buildcraft.transport.FacadePluggable; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeRenderState; import buildcraft.transport.TileGenericPipe;