From 5292bc6f1943791a512e056225f5866773fea4ed Mon Sep 17 00:00:00 2001 From: Raul Tambre Date: Sun, 15 Jun 2014 22:05:06 +0300 Subject: [PATCH] Even more parameterization and cleanup --- .../api/blueprints/MappingNotFoundException.java | 2 ++ .../api/blueprints/SchematicFactory.java | 4 ++-- .../api/boards/RedstoneBoardRegistry.java | 2 +- common/buildcraft/BuildCraftEnergy.java | 2 ++ common/buildcraft/builders/TileFiller.java | 1 - common/buildcraft/builders/gui/GuiArchitect.java | 3 --- .../builders/gui/GuiBlueprintLibrary.java | 6 ------ .../core/gui/buttons/MultiButtonController.java | 2 +- common/buildcraft/core/network/RPCHandler.java | 16 ++++++++-------- .../core/network/serializers/ClassMapping.java | 4 ++-- common/buildcraft/core/render/RenderLaser.java | 11 ----------- .../core/robots/RobotIntegrationRecipe.java | 2 +- common/buildcraft/core/utils/PathFinding.java | 2 +- common/buildcraft/factory/gui/GuiRefinery.java | 7 ------- .../boards/ImplRedstoneBoardRegistry.java | 4 ++-- .../silicon/recipes/GateExpansionRecipe.java | 2 +- .../silicon/recipes/GateLogicSwapRecipe.java | 2 +- .../silicon/recipes/IntegrationTableRecipe.java | 4 ++-- .../statements/ActionRobotGoToStation.java | 2 +- .../buildcraft/transport/BlockGenericPipe.java | 2 +- common/buildcraft/transport/Pipe.java | 2 +- .../buildcraft/transport/PipeToolTipManager.java | 6 +++--- .../buildcraft/transport/PipeTransportPower.java | 2 +- .../transport/pipes/PipePowerWood.java | 2 -- .../transport/render/PipeRendererWorld.java | 3 +-- 25 files changed, 34 insertions(+), 61 deletions(-) diff --git a/api/buildcraft/api/blueprints/MappingNotFoundException.java b/api/buildcraft/api/blueprints/MappingNotFoundException.java index e3e13739..4403a075 100755 --- a/api/buildcraft/api/blueprints/MappingNotFoundException.java +++ b/api/buildcraft/api/blueprints/MappingNotFoundException.java @@ -9,6 +9,8 @@ package buildcraft.api.blueprints; public class MappingNotFoundException extends Exception { + private static final long serialVersionUID = 1L; + public MappingNotFoundException(String msg) { super(msg); } diff --git a/api/buildcraft/api/blueprints/SchematicFactory.java b/api/buildcraft/api/blueprints/SchematicFactory.java index 5d5fbc2c..b8f35024 100755 --- a/api/buildcraft/api/blueprints/SchematicFactory.java +++ b/api/buildcraft/api/blueprints/SchematicFactory.java @@ -14,9 +14,9 @@ import net.minecraft.nbt.NBTTagCompound; public abstract class SchematicFactory { - private static final HashMap factories = new HashMap(); + private static final HashMap> factories = new HashMap>(); - private static final HashMap, SchematicFactory> schematicToFactory = new HashMap, SchematicFactory>(); + private static final HashMap, SchematicFactory> schematicToFactory = new HashMap, SchematicFactory>(); protected abstract S loadSchematicFromWorldNBT(NBTTagCompound nbt, MappingRegistry registry) throws MappingNotFoundException; diff --git a/api/buildcraft/api/boards/RedstoneBoardRegistry.java b/api/buildcraft/api/boards/RedstoneBoardRegistry.java index 72e1899b..a7c404b3 100755 --- a/api/buildcraft/api/boards/RedstoneBoardRegistry.java +++ b/api/buildcraft/api/boards/RedstoneBoardRegistry.java @@ -33,5 +33,5 @@ public abstract class RedstoneBoardRegistry { public abstract String getKindForParam(IBoardParameter param); - public abstract Collection getAllBoardNBTs(); + public abstract Collection> getAllBoardNBTs(); } diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 2648ee5d..aca10924 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -388,6 +388,8 @@ public class BuildCraftEnergy extends BuildCraftMod { } // failed to find any free biome IDs class BiomeIdLimitException extends RuntimeException { + private static final long serialVersionUID = 1L; + public BiomeIdLimitException(String biome) { super(String.format("You have run out of free Biome ID spaces for %s", biome)); } diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index cf85a108..b76f1ce4 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -273,7 +273,6 @@ public class TileFiller extends TileAbstractBuilder implements IMachine, IAction } public void handlePacketPayload(ByteBuf data) { - boolean initialized = box.isInitialized(); box.readFromStream(data); done = data.readBoolean(); setPattern((FillerPattern) FillerManager.registry.getPattern(Utils.readUTF(data))); diff --git a/common/buildcraft/builders/gui/GuiArchitect.java b/common/buildcraft/builders/gui/GuiArchitect.java index a7c93f07..e418ff6e 100644 --- a/common/buildcraft/builders/gui/GuiArchitect.java +++ b/common/buildcraft/builders/gui/GuiArchitect.java @@ -14,7 +14,6 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; import buildcraft.BuildCraftBuilders; @@ -35,7 +34,6 @@ public class GuiArchitect extends GuiBuildCraft { private static final ResourceLocation TEXTURE = new ResourceLocation( "buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/architect_gui.png"); - private IInventory playerInventory; private TileArchitect architect; private GuiButton optionRotate; @@ -48,7 +46,6 @@ public class GuiArchitect extends GuiBuildCraft { public GuiArchitect(EntityPlayer player, TileArchitect architect) { super(new ContainerArchitect(player, architect), architect, TEXTURE); - this.playerInventory = player.inventory; this.architect = architect; xSize = 256; ySize = 166; diff --git a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java index d39d0e34..fb0e05bd 100644 --- a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java @@ -27,21 +27,15 @@ public class GuiBlueprintLibrary extends GuiBuildCraft { private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/library_rw.png"); private GuiButton nextPageButton; private GuiButton prevPageButton; - private GuiButton lockButton; private GuiButton deleteButton; - private EntityPlayer player; private TileBlueprintLibrary library; - private ContainerBlueprintLibrary container; - private boolean computeInput; public GuiBlueprintLibrary(EntityPlayer player, TileBlueprintLibrary library) { super(new ContainerBlueprintLibrary(player, library), library, TEXTURE); - this.player = player; xSize = 234; ySize = 225; this.library = library; - container = (ContainerBlueprintLibrary) inventorySlots; } @SuppressWarnings("unchecked") diff --git a/common/buildcraft/core/gui/buttons/MultiButtonController.java b/common/buildcraft/core/gui/buttons/MultiButtonController.java index b3ee6632..fd9d936d 100644 --- a/common/buildcraft/core/gui/buttons/MultiButtonController.java +++ b/common/buildcraft/core/gui/buttons/MultiButtonController.java @@ -30,7 +30,7 @@ public final class MultiButtonController { } public MultiButtonController copy() { - return new MultiButtonController(currentState, validStates.clone()); + return new MultiButtonController(currentState, validStates.clone()); } public T[] getValidStates() { diff --git a/common/buildcraft/core/network/RPCHandler.java b/common/buildcraft/core/network/RPCHandler.java index 1a8e2251..3d3262b4 100755 --- a/common/buildcraft/core/network/RPCHandler.java +++ b/common/buildcraft/core/network/RPCHandler.java @@ -54,16 +54,16 @@ public final class RPCHandler { class MethodMapping { Method method; - Class[] parameters; - ClassSerializer [] mappings; + Class[] parameters; + ClassSerializer[] mappings; boolean hasInfo = false; } - private MethodMapping [] methods; + private MethodMapping[] methods; private RPCHandler(Class c) { handledClass = c; - Method [] sortedMethods = JavaTools.getAllMethods (c).toArray(new Method [0]); + Method[] sortedMethods = JavaTools.getAllMethods(c).toArray(new Method[0]); LinkedList mappings = new LinkedList(); @@ -77,7 +77,7 @@ public final class RPCHandler { LinkedList rpcMethods = new LinkedList(); for (Method sortedMethod : sortedMethods) { - if (sortedMethod.getAnnotation (RPC.class) != null) { + if (sortedMethod.getAnnotation(RPC.class) != null) { sortedMethod.setAccessible(true); methodsMap.put(sortedMethod.getName(), rpcMethods.size()); rpcMethods.add(sortedMethod); @@ -85,7 +85,7 @@ public final class RPCHandler { MethodMapping mapping = new MethodMapping(); mapping.method = sortedMethod; mapping.parameters = sortedMethod.getParameterTypes(); - mapping.mappings = new ClassSerializer [mapping.parameters.length]; + mapping.mappings = new ClassSerializer[mapping.parameters.length]; for (int j = 0; j < mapping.parameters.length; ++j) { if (int.class.equals(mapping.parameters[j])) { @@ -279,7 +279,7 @@ public final class RPCHandler { int methodIndex = methodsMap.get(method); MethodMapping m = methods[methodIndex]; - Class[] formals = m.parameters; + Class[] formals = m.parameters; int expectedParameters = m.hasInfo ? formals.length - 1 : formals.length; @@ -335,7 +335,7 @@ public final class RPCHandler { short methodIndex = data.readShort(); MethodMapping m = methods [methodIndex]; - Class[] formals = m.parameters; + Class[] formals = m.parameters; Object[] actuals = new Object [formals.length]; diff --git a/common/buildcraft/core/network/serializers/ClassMapping.java b/common/buildcraft/core/network/serializers/ClassMapping.java index 6c72ec15..9b7cf39b 100644 --- a/common/buildcraft/core/network/serializers/ClassMapping.java +++ b/common/buildcraft/core/network/serializers/ClassMapping.java @@ -447,7 +447,7 @@ public class ClassMapping extends ClassSerializer { break; } case Enum: { - Enum[] arr = (Enum[]) obj; + Enum[] arr = (Enum[]) obj; data.writeInt (arr.length); for (Enum element : arr) { @@ -583,7 +583,7 @@ public class ClassMapping extends ClassSerializer { break; } case Enum: { - Enum[] arr; + Enum[] arr; if (obj == null) { arr = new Enum[size]; diff --git a/common/buildcraft/core/render/RenderLaser.java b/common/buildcraft/core/render/RenderLaser.java index a822e177..7d5fc7f1 100644 --- a/common/buildcraft/core/render/RenderLaser.java +++ b/common/buildcraft/core/render/RenderLaser.java @@ -8,8 +8,6 @@ */ package buildcraft.core.render; -import java.util.Date; - import org.lwjgl.opengl.GL11; import net.minecraft.client.model.ModelBase; @@ -132,13 +130,10 @@ public class RenderLaser extends Render { textureManager.bindTexture(texture); - float factor = (float) (1.0 / 16.0); - int indexList = 0; initScaledBoxes(); - double x0 = 0; double x1 = laser.wavePosition; double x2 = x1 + scaledBoxes [0].length * STEP; double x3 = laser.renderSize; @@ -175,12 +170,6 @@ public class RenderLaser extends Render { textureManager.bindTexture(texture); - float factor = (float) (1.0 / 16.0); - - float lasti = 0; - - int indexList = (int) ((new Date ().getTime() / 100) % 20); - initScaledBoxes(); doRenderLaserLine (laser.renderSize, laser.laserTexAnimation); diff --git a/common/buildcraft/core/robots/RobotIntegrationRecipe.java b/common/buildcraft/core/robots/RobotIntegrationRecipe.java index 0a077ece..36aa973d 100755 --- a/common/buildcraft/core/robots/RobotIntegrationRecipe.java +++ b/common/buildcraft/core/robots/RobotIntegrationRecipe.java @@ -35,7 +35,7 @@ public class RobotIntegrationRecipe extends IntegrationTableRecipe { } @Override - public CraftingResult craft(TileIntegrationTable crafter, boolean preview, ItemStack inputA, + public CraftingResult craft(TileIntegrationTable crafter, boolean preview, ItemStack inputA, ItemStack inputB) { CraftingResult result = super.craft(crafter, preview, inputA, inputB); diff --git a/common/buildcraft/core/utils/PathFinding.java b/common/buildcraft/core/utils/PathFinding.java index 9b7d457b..6495c83a 100755 --- a/common/buildcraft/core/utils/PathFinding.java +++ b/common/buildcraft/core/utils/PathFinding.java @@ -112,7 +112,7 @@ public class PathFinding { openList.remove(from.index); closedList.put(from.index, from); - ArrayList nodes = new ArrayList(); + ArrayList nodes = new ArrayList(); byte[][][] resultMoves = movements(from); for (int dx = -1; dx <= +1; ++dx) { diff --git a/common/buildcraft/factory/gui/GuiRefinery.java b/common/buildcraft/factory/gui/GuiRefinery.java index 5d8168e3..9725a617 100644 --- a/common/buildcraft/factory/gui/GuiRefinery.java +++ b/common/buildcraft/factory/gui/GuiRefinery.java @@ -113,13 +113,6 @@ public class GuiRefinery extends GuiAdvancedInterface { ((FluidSlot) slots[1]).fluid = filter1; ((FluidSlot) slots[1]).colorRenderCache = container.refinery.tanks[1].colorRenderCache; - if (filter0 != null) { - FluidStack liquid0 = new FluidStack(filter0, FluidContainerRegistry.BUCKET_VOLUME); - } - if (filter1 != null) { - FluidStack liquid1 = new FluidStack(filter1, FluidContainerRegistry.BUCKET_VOLUME); - } - CraftingResult crafting = container.refinery.craftingResult; if (crafting != null) { diff --git a/common/buildcraft/silicon/boards/ImplRedstoneBoardRegistry.java b/common/buildcraft/silicon/boards/ImplRedstoneBoardRegistry.java index 5e94ca4a..022bfe8d 100755 --- a/common/buildcraft/silicon/boards/ImplRedstoneBoardRegistry.java +++ b/common/buildcraft/silicon/boards/ImplRedstoneBoardRegistry.java @@ -108,8 +108,8 @@ public class ImplRedstoneBoardRegistry extends RedstoneBoardRegistry { } @Override - public Collection getAllBoardNBTs() { - ArrayList result = new ArrayList(); + public Collection> getAllBoardNBTs() { + ArrayList> result = new ArrayList>(); for (BoardFactory f : boards.values()) { result.add(f.boardNBT); diff --git a/common/buildcraft/silicon/recipes/GateExpansionRecipe.java b/common/buildcraft/silicon/recipes/GateExpansionRecipe.java index 8e93b00a..3e5c5075 100644 --- a/common/buildcraft/silicon/recipes/GateExpansionRecipe.java +++ b/common/buildcraft/silicon/recipes/GateExpansionRecipe.java @@ -46,7 +46,7 @@ public class GateExpansionRecipe extends IntegrationTableRecipe { } @Override - public CraftingResult craft(TileIntegrationTable crafter, boolean preview, ItemStack inputA, + public CraftingResult craft(TileIntegrationTable crafter, boolean preview, ItemStack inputA, ItemStack inputB) { if (inputA == null) { diff --git a/common/buildcraft/silicon/recipes/GateLogicSwapRecipe.java b/common/buildcraft/silicon/recipes/GateLogicSwapRecipe.java index e8e1575a..cff707d6 100644 --- a/common/buildcraft/silicon/recipes/GateLogicSwapRecipe.java +++ b/common/buildcraft/silicon/recipes/GateLogicSwapRecipe.java @@ -36,7 +36,7 @@ public class GateLogicSwapRecipe extends IntegrationTableRecipe { } @Override - public CraftingResult craft(TileIntegrationTable crafter, boolean preview, ItemStack inputA, + public CraftingResult craft(TileIntegrationTable crafter, boolean preview, ItemStack inputA, ItemStack inputB) { CraftingResult result = super.craft(crafter, preview, inputA, inputB); diff --git a/common/buildcraft/silicon/recipes/IntegrationTableRecipe.java b/common/buildcraft/silicon/recipes/IntegrationTableRecipe.java index f0756c76..eb739c0f 100755 --- a/common/buildcraft/silicon/recipes/IntegrationTableRecipe.java +++ b/common/buildcraft/silicon/recipes/IntegrationTableRecipe.java @@ -19,7 +19,7 @@ import buildcraft.silicon.TileIntegrationTable; public abstract class IntegrationTableRecipe extends FlexibleRecipe implements IIntegrationRecipe { @Override - public final CraftingResult craft(IFlexibleCrafter crafter, boolean preview) { + public final CraftingResult craft(IFlexibleCrafter crafter, boolean preview) { TileIntegrationTable table = (TileIntegrationTable) crafter; ItemStack inputA; @@ -44,7 +44,7 @@ public abstract class IntegrationTableRecipe extends FlexibleRecipe i return craft(table, preview, inputA, inputB); } - public CraftingResult craft(TileIntegrationTable crafter, boolean preview, ItemStack inputA, + public CraftingResult craft(TileIntegrationTable crafter, boolean preview, ItemStack inputA, ItemStack inputB) { return super.craft(crafter, preview); } diff --git a/common/buildcraft/silicon/statements/ActionRobotGoToStation.java b/common/buildcraft/silicon/statements/ActionRobotGoToStation.java index 17b3e842..2d46c5cf 100755 --- a/common/buildcraft/silicon/statements/ActionRobotGoToStation.java +++ b/common/buildcraft/silicon/statements/ActionRobotGoToStation.java @@ -60,7 +60,7 @@ public class ActionRobotGoToStation extends BCAction { @Override public void actionActivate(IGate gate, IActionParameter[] parameters) { - Pipe pipe = (Pipe) gate.getPipe(); + Pipe pipe = (Pipe) gate.getPipe(); TileGenericPipe tile = pipe.container; for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index ac4c31e4..69878b36 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -70,7 +70,7 @@ public class BlockGenericPipe extends BlockBuildCraft { public static int facadeRenderColor = -1; public static Map> pipes = new HashMap>(); - public static Map pipeRemoved = new HashMap(); + public static Map> pipeRemoved = new HashMap>(); private static long lastRemovedDate = -1; diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 901de823..44b41e92 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -154,7 +154,7 @@ public abstract class Pipe implements IDropControlInven } public boolean canPipeConnect(TileEntity tile, ForgeDirection side) { - Pipe otherPipe; + Pipe otherPipe; if (tile instanceof TileGenericPipe) { otherPipe = ((TileGenericPipe) tile).pipe; diff --git a/common/buildcraft/transport/PipeToolTipManager.java b/common/buildcraft/transport/PipeToolTipManager.java index 0672fe91..12799f38 100644 --- a/common/buildcraft/transport/PipeToolTipManager.java +++ b/common/buildcraft/transport/PipeToolTipManager.java @@ -21,10 +21,10 @@ import buildcraft.core.utils.StringUtils; @SideOnly(Side.CLIENT) public final class PipeToolTipManager { - private static final Map, String> toolTips = new HashMap, String>(); + private static final Map>, String> toolTips = new HashMap>, String>(); static { - for (Map.Entry, Integer> pipe : PipeTransportPower.powerCapacities.entrySet()) { + for (Map.Entry>, Integer> pipe : PipeTransportPower.powerCapacities.entrySet()) { PipeToolTipManager.addToolTip(pipe.getKey(), String.format("%d MJ/t", pipe.getValue())); } } @@ -35,7 +35,7 @@ public final class PipeToolTipManager { private PipeToolTipManager() { } - public static void addToolTip(Class pipe, String toolTip) { + public static void addToolTip(Class> pipe, String toolTip) { toolTips.put(pipe, toolTip); } diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index 00e19853..18036210 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -40,7 +40,7 @@ import buildcraft.transport.pipes.PipePowerWood; public class PipeTransportPower extends PipeTransport { - public static final Map, Integer> powerCapacities = new HashMap, Integer>(); + public static final Map>, Integer> powerCapacities = new HashMap>, Integer>(); private static final short MAX_DISPLAY = 100; private static final int DISPLAY_SMOOTHING = 10; diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index d449f749..deb54d22 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -19,7 +19,6 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; -import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.mj.IBatteryObject; import buildcraft.api.mj.IOMode; import buildcraft.api.mj.MjAPI; @@ -44,7 +43,6 @@ public class PipePowerWood extends Pipe implements IPowerRec @MjBattery(mode = IOMode.ReceiveActive, maxCapacity = 1500, maxReceivedPerCycle = 500, minimumConsumption = 0) private double mjStored = 0; - private final SafeTimeTracker sourcesTracker = new SafeTimeTracker(1); private boolean full; private PowerHandler powerHandler; diff --git a/common/buildcraft/transport/render/PipeRendererWorld.java b/common/buildcraft/transport/render/PipeRendererWorld.java index 28a38fb1..2cf3a2aa 100644 --- a/common/buildcraft/transport/render/PipeRendererWorld.java +++ b/common/buildcraft/transport/render/PipeRendererWorld.java @@ -220,8 +220,7 @@ public class PipeRendererWorld implements ISimpleBlockRenderingHandler { } private void pipeRobotStationRenderer(RenderBlocks renderblocks, Block block, PipeRenderState state, int x, int y, int z) { - - float width = 0.075F; + //float width = 0.075F; pipeRobotStationPartRender (renderblocks, block, state, x, y, z, 0.45F, 0.55F,