From 4d1c1285b2aaae151e14e7e123df9c30a82d319f Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 10 Nov 2014 21:51:37 +0000 Subject: [PATCH 1/5] Update lots of APIs, most notably BC and an actual 1.7 version of CC --- build.properties | 8 +- src/api/java/buildcraft/api/core/BCLog.java | 16 +- .../java/buildcraft/api/core/BlockIndex.java | 13 +- .../buildcraft/api/core/BuildCraftAPI.java | 4 +- .../java/buildcraft/api/core/EnumColor.java | 207 +++++++ src/api/java/buildcraft/api/core/IBox.java | 4 +- src/api/java/buildcraft/api/core/IZone.java | 21 + .../java/buildcraft/api/core/Position.java | 8 +- .../java/buildcraft/api/core/StackKey.java | 128 ++++- .../buildcraft/api/core/WorldBlockIndex.java | 108 ++++ .../BuildcraftFuelRegistry.java} | 12 +- .../ICoolant.java} | 12 +- .../buildcraft/api/fuels/ICoolantManager.java | 33 ++ .../package-info.java => fuels/IFuel.java} | 14 +- .../buildcraft/api/fuels/IFuelManager.java | 23 + .../buildcraft/api/fuels/ISolidCoolant.java | 16 + .../api/fuels/IronEngineCoolant.java | 92 ---- .../buildcraft/api/fuels/IronEngineFuel.java | 52 -- .../buildcraft/api/fuels/package-info.java | 2 +- .../IGate.java} | 13 +- .../java/buildcraft/api/mj/BatteryObject.java | 199 ------- .../buildcraft/api/mj/IBatteryIOObject.java | 27 - .../buildcraft/api/mj/IBatteryObject.java | 77 --- src/api/java/buildcraft/api/mj/IOMode.java | 30 - src/api/java/buildcraft/api/mj/MjAPI.java | 439 --------------- .../java/buildcraft/api/mj/MjAPILegacy.java | 60 -- src/api/java/buildcraft/api/mj/MjBattery.java | 86 --- .../buildcraft/api/mj/MjReconfigurator.java | 183 ------- .../buildcraft/api/power/ILaserTarget.java | 41 -- .../buildcraft/api/power/IPowerEmitter.java | 21 - .../buildcraft/api/power/IPowerReceptor.java | 45 -- .../buildcraft/api/power/PowerHandler.java | 516 ------------------ .../api/recipes/CraftingResult.java | 4 +- .../api/recipes/IAssemblyRecipeManager.java | 8 +- .../api/recipes/IFlexibleRecipe.java | 4 + .../api/recipes/IFlexibleRecipeViewable.java | 27 + .../api/recipes/IRefineryRecipeManager.java | 4 + .../java/buildcraft/api/transport/IPipe.java | 11 +- .../buildcraft/api/transport/IPipeTile.java | 21 +- .../api/transport/IStripesHandler.java | 20 + .../api/transport/IStripesPipe.java | 9 + .../buildcraft/api/transport/PipeManager.java | 5 + .../api/transport/package-info.java | 2 +- src/api/java/cofh/api/CoFHAPIProps.java | 11 + .../java/cofh/api/energy/EnergyStorage.java | 158 ++++++ .../cofh/api/energy/IEnergyConnection.java | 2 +- .../cofh/api/energy/IEnergyContainerItem.java | 2 +- .../java/cofh/api/energy/IEnergyHandler.java | 23 +- .../java/cofh/api/energy/IEnergyProvider.java | 38 ++ .../java/cofh/api/energy/IEnergyReceiver.java | 38 ++ .../java/cofh/api/energy/IEnergyStorage.java | 46 ++ .../cofh/api/energy/ItemEnergyContainer.java | 110 ++++ .../cofh/api/energy/TileEnergyHandler.java | 65 +++ .../java/cofh/api/energy/package-info.java | 3 +- src/api/java/cofh/api/package-info.java | 9 - .../computercraft/api/ComputerCraftAPI.java | 8 +- .../api/filesystem/package-info.java | 10 + .../computercraft/api/lua/ILuaContext.java | 3 +- .../computercraft/api/lua/ILuaObject.java | 2 +- .../computercraft/api/lua/LuaException.java | 31 ++ .../computercraft/api/lua/package-info.java | 10 + .../computercraft/api/media/package-info.java | 10 + .../computercraft/api/package-info.java | 10 + .../api/peripheral/IComputerAccess.java | 14 +- .../api/peripheral/IPeripheral.java | 3 +- .../api/peripheral/package-info.java | 10 + .../api/redstone/package-info.java | 10 + .../api/turtle/ITurtleAccess.java | 3 +- .../api/turtle/ITurtleCommand.java | 4 +- .../api/turtle/ITurtleUpgrade.java | 14 +- .../api/turtle/TurtleCommandResult.java | 33 +- .../api/turtle/package-info.java | 4 + .../java/ic2/api/energy/tile/IHeatSource.java | 23 + .../ic2/api/energy/tile/IKineticSource.java | 22 + .../ic2/api/energy/tile/IMetaDelegate.java | 36 ++ .../api/entity/IEntityBreathable.java | 10 +- .../galacticraft/api/world/ISolarLevel.java | 8 +- .../java/mekanism/common/CommonProxy.java | 9 +- .../java/mekanism/common/EnergyNetwork.java | 46 +- .../java/mekanism/common/FuelHandler.java | 14 +- .../common/IAdvancedBoundingBlock.java | 7 +- src/main/java/mekanism/common/Mekanism.java | 16 +- .../common/multipart/MultipartMekanism.java | 2 +- .../multipart/PartLogisticalTransporter.java | 87 ++- .../common/multipart/PartUniversalCable.java | 94 +--- .../common/network/PacketConfigSync.java | 15 +- .../tile/TileEntityAdvancedBoundingBlock.java | 53 +- .../TileEntityAdvancedElectricMachine.java | 10 +- .../common/tile/TileEntityChanceMachine.java | 4 +- .../common/tile/TileEntityDigitalMiner.java | 9 +- .../common/tile/TileEntityElectricBlock.java | 99 +--- .../tile/TileEntityElectricMachine.java | 6 +- .../tile/TileEntityElectrolyticSeparator.java | 9 +- .../common/tile/TileEntityEnergyCube.java | 9 +- .../common/tile/TileEntityFactory.java | 11 +- .../tile/TileEntityMetallurgicInfuser.java | 9 +- .../mekanism/common/tile/TileEntityPRC.java | 9 +- .../common/tile/TileEntityTeleporter.java | 9 +- .../java/mekanism/common/util/CableUtils.java | 45 +- .../mekanism/common/util/MekanismUtils.java | 3 +- .../common/util/TransporterUtils.java | 13 +- .../generators/common/MekanismGenerators.java | 20 +- .../common/tile/TileEntityBioGenerator.java | 9 +- .../common/tile/TileEntityGasGenerator.java | 11 +- .../common/tile/TileEntityGenerator.java | 18 +- .../common/tile/TileEntityHeatGenerator.java | 9 +- .../common/tile/TileEntitySolarGenerator.java | 11 +- .../common/tile/TileEntityWindTurbine.java | 5 +- 108 files changed, 1676 insertions(+), 2403 deletions(-) create mode 100644 src/api/java/buildcraft/api/core/EnumColor.java create mode 100755 src/api/java/buildcraft/api/core/IZone.java create mode 100755 src/api/java/buildcraft/api/core/WorldBlockIndex.java rename src/api/java/buildcraft/api/{power/package-info.java => fuels/BuildcraftFuelRegistry.java} (61%) rename src/api/java/buildcraft/api/{mj/IBatteryProvider.java => fuels/ICoolant.java} (64%) create mode 100644 src/api/java/buildcraft/api/fuels/ICoolantManager.java rename src/api/java/buildcraft/api/{mj/package-info.java => fuels/IFuel.java} (63%) create mode 100644 src/api/java/buildcraft/api/fuels/IFuelManager.java create mode 100644 src/api/java/buildcraft/api/fuels/ISolidCoolant.java delete mode 100644 src/api/java/buildcraft/api/fuels/IronEngineCoolant.java delete mode 100644 src/api/java/buildcraft/api/fuels/IronEngineFuel.java rename src/api/java/buildcraft/api/{mj/ISidedBatteryProvider.java => gates/IGate.java} (65%) delete mode 100755 src/api/java/buildcraft/api/mj/BatteryObject.java delete mode 100644 src/api/java/buildcraft/api/mj/IBatteryIOObject.java delete mode 100644 src/api/java/buildcraft/api/mj/IBatteryObject.java delete mode 100644 src/api/java/buildcraft/api/mj/IOMode.java delete mode 100755 src/api/java/buildcraft/api/mj/MjAPI.java delete mode 100644 src/api/java/buildcraft/api/mj/MjAPILegacy.java delete mode 100755 src/api/java/buildcraft/api/mj/MjBattery.java delete mode 100644 src/api/java/buildcraft/api/mj/MjReconfigurator.java delete mode 100644 src/api/java/buildcraft/api/power/ILaserTarget.java delete mode 100644 src/api/java/buildcraft/api/power/IPowerEmitter.java delete mode 100644 src/api/java/buildcraft/api/power/IPowerReceptor.java delete mode 100644 src/api/java/buildcraft/api/power/PowerHandler.java create mode 100644 src/api/java/buildcraft/api/recipes/IFlexibleRecipeViewable.java create mode 100644 src/api/java/buildcraft/api/transport/IStripesHandler.java create mode 100644 src/api/java/buildcraft/api/transport/IStripesPipe.java create mode 100644 src/api/java/cofh/api/CoFHAPIProps.java create mode 100644 src/api/java/cofh/api/energy/EnergyStorage.java create mode 100644 src/api/java/cofh/api/energy/IEnergyProvider.java create mode 100644 src/api/java/cofh/api/energy/IEnergyReceiver.java create mode 100644 src/api/java/cofh/api/energy/IEnergyStorage.java create mode 100644 src/api/java/cofh/api/energy/ItemEnergyContainer.java create mode 100644 src/api/java/cofh/api/energy/TileEnergyHandler.java delete mode 100644 src/api/java/cofh/api/package-info.java create mode 100644 src/api/java/dan200/computercraft/api/filesystem/package-info.java create mode 100644 src/api/java/dan200/computercraft/api/lua/LuaException.java create mode 100644 src/api/java/dan200/computercraft/api/lua/package-info.java create mode 100644 src/api/java/dan200/computercraft/api/media/package-info.java create mode 100644 src/api/java/dan200/computercraft/api/package-info.java create mode 100644 src/api/java/dan200/computercraft/api/peripheral/package-info.java create mode 100644 src/api/java/dan200/computercraft/api/redstone/package-info.java create mode 100644 src/api/java/dan200/computercraft/api/turtle/package-info.java create mode 100644 src/api/java/ic2/api/energy/tile/IHeatSource.java create mode 100644 src/api/java/ic2/api/energy/tile/IKineticSource.java create mode 100644 src/api/java/ic2/api/energy/tile/IMetaDelegate.java diff --git a/build.properties b/build.properties index 994066f1a..2b9ff3ab7 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.7.10 -forge_version=10.13.0.1180 -FMP_version=1.1.0.297 -CCLIB_version=1.1.1.93 -NEI_version=1.0.2.15 +forge_version=10.13.0.1208 +FMP_version=1.1.0.314 +CCLIB_version=1.1.1.106 +NEI_version=1.0.3.67 mod_version=7.1.1 diff --git a/src/api/java/buildcraft/api/core/BCLog.java b/src/api/java/buildcraft/api/core/BCLog.java index 3ccdac2e4..4e5eada55 100644 --- a/src/api/java/buildcraft/api/core/BCLog.java +++ b/src/api/java/buildcraft/api/core/BCLog.java @@ -9,12 +9,14 @@ package buildcraft.api.core; import java.lang.reflect.Method; -import java.util.logging.Level; -import java.util.logging.Logger; + +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public final class BCLog { - public static final Logger logger = Logger.getLogger("Buildcraft"); + public static final Logger logger = LogManager.getLogger("BuildCraft"); /** * Deactivate constructor @@ -23,11 +25,9 @@ public final class BCLog { } public static void initLog() { - // TODO: check if the code below is still useful and remove otherwise. - //logger.setParent(FMLLog.getLogger()); logger.info("Starting BuildCraft " + getVersion()); - logger.info("Copyright (c) SpaceToad, 2011"); + logger.info("Copyright (c) SpaceToad, 2011-2014"); logger.info("http://www.mod-buildcraft.com"); } @@ -39,12 +39,12 @@ public final class BCLog { msg.append(", ").append(stackTrace[0]); } - logger.log(Level.SEVERE, msg.toString()); + logger.log(Level.ERROR, msg.toString()); if (classFile != null) { msg = new StringBuilder(mod); msg.append(" API error: ").append(classFile.getSimpleName()).append(" is loaded from ").append(classFile.getProtectionDomain().getCodeSource().getLocation()); - logger.log(Level.SEVERE, msg.toString()); + logger.log(Level.ERROR, msg.toString()); } } diff --git a/src/api/java/buildcraft/api/core/BlockIndex.java b/src/api/java/buildcraft/api/core/BlockIndex.java index 6024155da..87599bfa4 100644 --- a/src/api/java/buildcraft/api/core/BlockIndex.java +++ b/src/api/java/buildcraft/api/core/BlockIndex.java @@ -11,6 +11,7 @@ package buildcraft.api.core; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; /** @@ -23,7 +24,7 @@ public class BlockIndex implements Comparable { public int z; public BlockIndex() { - + } /** @@ -48,6 +49,10 @@ public class BlockIndex implements Comparable { z = (int) Math.floor(entity.posZ); } + public BlockIndex(TileEntity entity) { + this(entity.xCoord, entity.yCoord, entity.zCoord); + } + /** * Provides a deterministic and complete ordering of block positions. */ @@ -101,4 +106,10 @@ public class BlockIndex implements Comparable { public int hashCode() { return (x * 37 + y) * 37 + z; } + + public boolean nextTo(BlockIndex blockIndex) { + return (Math.abs(blockIndex.x - x) <= 1 && blockIndex.y == y && blockIndex.z == z) + || (blockIndex.x == x && Math.abs(blockIndex.y - y) <= 1 && blockIndex.z == z) + || (blockIndex.x == x && blockIndex.y == y && Math.abs(blockIndex.z - z) <= 1); + } } diff --git a/src/api/java/buildcraft/api/core/BuildCraftAPI.java b/src/api/java/buildcraft/api/core/BuildCraftAPI.java index 5b788a6e8..ce99d7ce6 100644 --- a/src/api/java/buildcraft/api/core/BuildCraftAPI.java +++ b/src/api/java/buildcraft/api/core/BuildCraftAPI.java @@ -23,12 +23,12 @@ public final class BuildCraftAPI { public static IWorldProperty isSoftProperty; public static IWorldProperty isWoodProperty; public static IWorldProperty isLeavesProperty; - public static IWorldProperty isBasicOreProperty; - public static IWorldProperty isExtendedOreProperty; + public static IWorldProperty[] isOreProperty; public static IWorldProperty isHarvestableProperty; public static IWorldProperty isFarmlandProperty; public static IWorldProperty isDirtProperty; public static IWorldProperty isShoveled; + public static IWorldProperty isFluidSource; /** * Deactivate constructor diff --git a/src/api/java/buildcraft/api/core/EnumColor.java b/src/api/java/buildcraft/api/core/EnumColor.java new file mode 100644 index 000000000..1db68c6b0 --- /dev/null +++ b/src/api/java/buildcraft/api/core/EnumColor.java @@ -0,0 +1,207 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.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; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public enum EnumColor { + + BLACK, + RED, + GREEN, + BROWN, + BLUE, + PURPLE, + CYAN, + LIGHT_GRAY, + GRAY, + PINK, + LIME, + YELLOW, + LIGHT_BLUE, + MAGENTA, + ORANGE, + WHITE; + public static final EnumColor[] VALUES = values(); + public static final String[] DYES = { + "dyeBlack", + "dyeRed", + "dyeGreen", + "dyeBrown", + "dyeBlue", + "dyePurple", + "dyeCyan", + "dyeLightGray", + "dyeGray", + "dyePink", + "dyeLime", + "dyeYellow", + "dyeLightBlue", + "dyeMagenta", + "dyeOrange", + "dyeWhite"}; + public static final String[] NAMES = { + "Black", + "Red", + "Green", + "Brown", + "Blue", + "Purple", + "Cyan", + "LightGray", + "Gray", + "Pink", + "Lime", + "Yellow", + "LightBlue", + "Magenta", + "Orange", + "White"}; + public static final int[] DARK_HEX = { + 0x2D2D2D, + 0xA33835, + 0x394C1E, + 0x5C3A24, + 0x3441A2, + 0x843FBF, + 0x36809E, + 0x888888, + 0x444444, + 0xE585A0, + 0x3FAA36, + 0xCFC231, + 0x7F9AD1, + 0xFF64FF, + 0xFF6A00, + 0xFFFFFF}; + public static final int[] LIGHT_HEX = { + 0x181414, + 0xBE2B27, + 0x007F0E, + 0x89502D, + 0x253193, + 0x7e34bf, + 0x299799, + 0xa0a7a7, + 0x7A7A7A, + 0xD97199, + 0x39D52E, + 0xFFD91C, + 0x66AAFF, + 0xD943C6, + 0xEA7835, + 0xe4e4e4}; + + @SideOnly(Side.CLIENT) + private static IIcon[] brushIcons; + + public int getDarkHex() { + return DARK_HEX[ordinal()]; + } + + public int getLightHex() { + return LIGHT_HEX[ordinal()]; + } + + public static EnumColor fromId(int id) { + if (id < 0 || id >= VALUES.length) { + return WHITE; + } + return VALUES[id]; + } + + public static EnumColor fromDye(String dyeTag) { + for (int id = 0; id < DYES.length; id++) { + if (DYES[id].equals(dyeTag)) { + return VALUES[id]; + } + } + return null; + } + + public static EnumColor fromName(String name) { + for (int id = 0; id < NAMES.length; id++) { + if (NAMES[id].equals(name)) { + return VALUES[id]; + } + } + return null; + } + + public static EnumColor getRand() { + return VALUES[new Random().nextInt(VALUES.length)]; + } + + public EnumColor getNext() { + EnumColor next = VALUES[(ordinal() + 1) % VALUES.length]; + return next; + } + + public EnumColor getPrevious() { + EnumColor previous = VALUES[(ordinal() + VALUES.length - 1) % VALUES.length]; + return previous; + } + + public EnumColor inverse() { + return EnumColor.VALUES[15 - ordinal()]; + } + + public String getTag() { + return "color." + name().replace("_", ".").toLowerCase(Locale.ENGLISH); + } + + public String getBasicTag() { + return name().replace("_", ".").toLowerCase(Locale.ENGLISH); + } + + public String getName() { + return NAMES[ordinal()]; + } + + public String getLocalizedName() { + return StatCollector.translateToLocal(getTag()); + } + + public String getDye() { + return DYES[ordinal()]; + } + + @Override + public String toString() { + String s = name().replace("_", " "); + String[] words = s.split(" "); + StringBuilder b = new StringBuilder(); + for (String word : words) { + b.append(word.charAt(0)).append(word.substring(1).toLowerCase(Locale.ENGLISH)).append(" "); + } + return b.toString().trim(); + } + + @SideOnly(Side.CLIENT) + public static void registerIcons(IIconRegister iconRegister) { + brushIcons = new IIcon[16]; + for (EnumColor c : values()) { + brushIcons[c.ordinal()] = iconRegister.registerIcon("buildcraft:triggers/color_" + + c.name().toLowerCase(Locale.ENGLISH)); + } + } + + @SideOnly(Side.CLIENT) + public IIcon getIcon() { + return brushIcons [ordinal()]; + } +} diff --git a/src/api/java/buildcraft/api/core/IBox.java b/src/api/java/buildcraft/api/core/IBox.java index a79c0a7d6..9b2798787 100644 --- a/src/api/java/buildcraft/api/core/IBox.java +++ b/src/api/java/buildcraft/api/core/IBox.java @@ -8,14 +8,12 @@ */ package buildcraft.api.core; -public interface IBox { +public interface IBox extends IZone { IBox expand(int amount); IBox contract(int amount); - boolean contains(double x, double y, double z); - Position pMin(); Position pMax(); diff --git a/src/api/java/buildcraft/api/core/IZone.java b/src/api/java/buildcraft/api/core/IZone.java new file mode 100755 index 000000000..a34bfd129 --- /dev/null +++ b/src/api/java/buildcraft/api/core/IZone.java @@ -0,0 +1,21 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.api.core; + +import java.util.Random; + +public interface IZone { + + double distanceTo(BlockIndex index); + + boolean contains(double x, double y, double z); + + BlockIndex getRandomBlockIndex(Random rand); + +} diff --git a/src/api/java/buildcraft/api/core/Position.java b/src/api/java/buildcraft/api/core/Position.java index 84e58e2b4..4d9a7ea90 100644 --- a/src/api/java/buildcraft/api/core/Position.java +++ b/src/api/java/buildcraft/api/core/Position.java @@ -64,6 +64,13 @@ public class Position { orientation = ForgeDirection.UNKNOWN; } + public Position(BlockIndex index) { + x = index.x; + y = index.y; + z = index.z; + orientation = ForgeDirection.UNKNOWN; + } + public void moveRight(double step) { switch (orientation) { case SOUTH: @@ -171,5 +178,4 @@ public class Position { return !(sqrDis > f * f); } - } diff --git a/src/api/java/buildcraft/api/core/StackKey.java b/src/api/java/buildcraft/api/core/StackKey.java index c3cf4fd62..092c173f0 100644 --- a/src/api/java/buildcraft/api/core/StackKey.java +++ b/src/api/java/buildcraft/api/core/StackKey.java @@ -8,49 +8,127 @@ */ package buildcraft.api.core; +import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; /** * This class is used whenever stacks needs to be stored as keys. */ -public class StackKey { - +public final class StackKey { public final ItemStack stack; + public final FluidStack fluidStack; + + public StackKey(FluidStack fluidStack) { + this(null, fluidStack); + } public StackKey(ItemStack stack) { + this(stack, null); + } + + public StackKey(ItemStack stack, FluidStack fluidStack) { this.stack = stack; + this.fluidStack = fluidStack; + } + + public static StackKey stack(Item item, int amount, int damage) { + return new StackKey(new ItemStack(item, amount, damage)); + } + + public static StackKey stack(Block block, int amount, int damage) { + return new StackKey(new ItemStack(block, amount, damage)); + } + + public static StackKey stack(Item item) { + return new StackKey(new ItemStack(item, 1, 0)); + } + + public static StackKey stack(Block block) { + return new StackKey(new ItemStack(block, 1, 0)); + } + + public static StackKey stack(ItemStack itemStack) { + return new StackKey(itemStack); + } + + public static StackKey fluid(Fluid fluid, int amount) { + return new StackKey(new FluidStack(fluid, amount)); + } + + public static StackKey fluid(Fluid fluid) { + return new StackKey(new FluidStack(fluid, FluidContainerRegistry.BUCKET_VOLUME)); + } + + public static StackKey fluid(FluidStack fluidStack) { + return new StackKey(fluidStack); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || o.getClass() != StackKey.class) { + return false; + } + StackKey k = (StackKey) o; + if ((stack == null ^ k.stack == null) || (fluidStack == null ^ k.fluidStack == null)) { + return false; + } + if (stack != null) { + if (stack.getItem() != k.stack.getItem() || + stack.getHasSubtypes() && stack.getItemDamage() != k.stack.getItemDamage() || + !objectsEqual(stack.getTagCompound(), k.stack.getTagCompound())) { + return false; + } + } + if (fluidStack != null) { + if (fluidStack.fluidID != k.fluidStack.fluidID || + fluidStack.amount != k.fluidStack.amount || + !objectsEqual(fluidStack.tag, k.fluidStack.tag)) { + return false; + } + } + return true; } @Override public int hashCode() { - int hash = 5; - - hash = 67 * hash + stack.getItem().hashCode(); - hash = 67 * hash + stack.getItemDamage(); - - if (stack.stackTagCompound != null) { - hash = 67 * hash + stack.stackTagCompound.hashCode(); + int result = 7; + if (stack != null) { + result = 31 * result + stack.getItem().hashCode(); + result = 31 * result + stack.getItemDamage(); + result = 31 * result + objectHashCode(stack.getTagCompound()); } - - return hash; + result = 31 * result + 7; + if (fluidStack != null) { + result = 31 * result + fluidStack.fluidID; + result = 31 * result + fluidStack.amount; + result = 31 * result + objectHashCode(fluidStack.tag); + } + return result; } - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } else if (getClass() != obj.getClass()) { - return false; - } - - final StackKey other = (StackKey) obj; - - if (stack.getItem() != other.stack.getItem()) { - return false; - } else if (stack.getHasSubtypes() && stack.getItemDamage() != other.stack.getItemDamage()) { + private boolean objectsEqual(Object o1, Object o2) { + if (o1 == null && o2 == null) { + return true; + } else if (o1 == null || o2 == null) { return false; } else { - return !(stack.stackTagCompound != null && !stack.stackTagCompound.equals(other.stack.stackTagCompound)); + return o1.equals(o2); } } + + private int objectHashCode(Object o) { + return o != null ? o.hashCode() : 0; + } + + public StackKey copy() { + return new StackKey(stack != null ? stack.copy() : null, + fluidStack != null ? fluidStack.copy() : null); + } } diff --git a/src/api/java/buildcraft/api/core/WorldBlockIndex.java b/src/api/java/buildcraft/api/core/WorldBlockIndex.java new file mode 100755 index 000000000..aedbeaf58 --- /dev/null +++ b/src/api/java/buildcraft/api/core/WorldBlockIndex.java @@ -0,0 +1,108 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.api.core; + +import net.minecraft.entity.Entity; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +/** + * This class is a comparable container for block positions. TODO: should this be merged with position? + */ +public class WorldBlockIndex implements Comparable { + + public int x; + public int y; + public int z; + public int dimension; + + public WorldBlockIndex() { + + } + + /** + * Creates an index for a block located on x, y. z + */ + public WorldBlockIndex(World world, int x, int y, int z) { + + dimension = world.provider.dimensionId; + this.x = x; + this.y = y; + this.z = z; + } + + public WorldBlockIndex(NBTTagCompound c) { + dimension = c.getInteger("dimension"); + x = c.getInteger("x"); + y = c.getInteger("y"); + z = c.getInteger("z"); + } + + public WorldBlockIndex(Entity entity) { + dimension = entity.worldObj.provider.dimensionId; + x = (int) Math.floor(entity.posX); + y = (int) Math.floor(entity.posY); + z = (int) Math.floor(entity.posZ); + } + + /** + * Provides a deterministic and complete ordering of block positions. + */ + @Override + public int compareTo(WorldBlockIndex o) { + + if (o.dimension < dimension) { + return 1; + } else if (o.dimension > dimension) { + return -1; + } else if (o.x < x) { + return 1; + } else if (o.x > x) { + return -1; + } else if (o.z < z) { + return 1; + } else if (o.z > z) { + return -1; + } else if (o.y < y) { + return 1; + } else if (o.y > y) { + return -1; + } else { + return 0; + } + } + + public void writeTo(NBTTagCompound c) { + c.setInteger("dimension", dimension); + c.setInteger("x", x); + c.setInteger("y", y); + c.setInteger("z", z); + } + + @Override + public String toString() { + return "{" + dimension + ":" + x + ", " + y + ", " + z + "}"; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof WorldBlockIndex) { + WorldBlockIndex b = (WorldBlockIndex) obj; + + return b.dimension == dimension && b.x == x && b.y == y && b.z == z; + } + + return super.equals(obj); + } + + @Override + public int hashCode() { + return (dimension * 37 + (x * 37 + y)) * 37 + z; + } +} diff --git a/src/api/java/buildcraft/api/power/package-info.java b/src/api/java/buildcraft/api/fuels/BuildcraftFuelRegistry.java similarity index 61% rename from src/api/java/buildcraft/api/power/package-info.java rename to src/api/java/buildcraft/api/fuels/BuildcraftFuelRegistry.java index 03c457a8d..eda676ebc 100644 --- a/src/api/java/buildcraft/api/power/package-info.java +++ b/src/api/java/buildcraft/api/fuels/BuildcraftFuelRegistry.java @@ -6,6 +6,12 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -@API(apiVersion = "1.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|power") -package buildcraft.api.power; -import cpw.mods.fml.common.API; +package buildcraft.api.fuels; + +public final class BuildcraftFuelRegistry { + public static IFuelManager fuel; + public static ICoolantManager coolant; + + private BuildcraftFuelRegistry() { + } +} diff --git a/src/api/java/buildcraft/api/mj/IBatteryProvider.java b/src/api/java/buildcraft/api/fuels/ICoolant.java similarity index 64% rename from src/api/java/buildcraft/api/mj/IBatteryProvider.java rename to src/api/java/buildcraft/api/fuels/ICoolant.java index 95236d84b..fd0e6d4df 100644 --- a/src/api/java/buildcraft/api/mj/IBatteryProvider.java +++ b/src/api/java/buildcraft/api/fuels/ICoolant.java @@ -6,8 +6,12 @@ * 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.api.mj; +package buildcraft.api.fuels; -public interface IBatteryProvider { - IBatteryObject getMjBattery(String kind); -} \ No newline at end of file +import net.minecraftforge.fluids.Fluid; + +public interface ICoolant { + Fluid getFluid(); + + float getDegreesCoolingPerMB(float heat); +} diff --git a/src/api/java/buildcraft/api/fuels/ICoolantManager.java b/src/api/java/buildcraft/api/fuels/ICoolantManager.java new file mode 100644 index 000000000..6e29c15c5 --- /dev/null +++ b/src/api/java/buildcraft/api/fuels/ICoolantManager.java @@ -0,0 +1,33 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.api.fuels; + +import java.util.Collection; + +import net.minecraftforge.fluids.Fluid; + +import buildcraft.api.core.StackKey; + +public interface ICoolantManager { + ICoolant addCoolant(ICoolant coolant); + + ICoolant addCoolant(Fluid fluid, float degreesCoolingPerMB); + + ISolidCoolant addSolidCoolant(ISolidCoolant solidCoolant); + + ISolidCoolant addSolidCoolant(StackKey solid, StackKey liquid, float multiplier); + + Collection getCoolants(); + + Collection getSolidCoolants(); + + ICoolant getCoolant(Fluid fluid); + + ISolidCoolant getSolidCoolant(StackKey solid); +} diff --git a/src/api/java/buildcraft/api/mj/package-info.java b/src/api/java/buildcraft/api/fuels/IFuel.java similarity index 63% rename from src/api/java/buildcraft/api/mj/package-info.java rename to src/api/java/buildcraft/api/fuels/IFuel.java index 7ca45ce87..c3e292802 100644 --- a/src/api/java/buildcraft/api/mj/package-info.java +++ b/src/api/java/buildcraft/api/fuels/IFuel.java @@ -6,6 +6,14 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -@API(apiVersion = "1.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|mj") -package buildcraft.api.mj; -import cpw.mods.fml.common.API; +package buildcraft.api.fuels; + +import net.minecraftforge.fluids.Fluid; + +public interface IFuel { + Fluid getFluid(); + + int getTotalBurningTime(); + + int getPowerPerCycle(); +} diff --git a/src/api/java/buildcraft/api/fuels/IFuelManager.java b/src/api/java/buildcraft/api/fuels/IFuelManager.java new file mode 100644 index 000000000..50ac93419 --- /dev/null +++ b/src/api/java/buildcraft/api/fuels/IFuelManager.java @@ -0,0 +1,23 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.api.fuels; + +import java.util.Collection; + +import net.minecraftforge.fluids.Fluid; + +public interface IFuelManager { + IFuel addFuel(IFuel fuel); + + IFuel addFuel(Fluid fluid, int powerPerCycle, int totalBurningTime); + + Collection getFuels(); + + IFuel getFuel(Fluid fluid); +} diff --git a/src/api/java/buildcraft/api/fuels/ISolidCoolant.java b/src/api/java/buildcraft/api/fuels/ISolidCoolant.java new file mode 100644 index 000000000..69e4871ed --- /dev/null +++ b/src/api/java/buildcraft/api/fuels/ISolidCoolant.java @@ -0,0 +1,16 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.api.fuels; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public interface ISolidCoolant { + FluidStack getFluidFromSolidCoolant(ItemStack stack); +} diff --git a/src/api/java/buildcraft/api/fuels/IronEngineCoolant.java b/src/api/java/buildcraft/api/fuels/IronEngineCoolant.java deleted file mode 100644 index 78cf315b1..000000000 --- a/src/api/java/buildcraft/api/fuels/IronEngineCoolant.java +++ /dev/null @@ -1,92 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.fuels; - -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.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -import buildcraft.api.core.StackKey; - -public final class IronEngineCoolant { - - public static Map liquidCoolants = new HashMap(); - public static Map solidCoolants = new HashMap(); - - private IronEngineCoolant() { - } - - public static FluidStack getFluidCoolant(ItemStack stack) { - return solidCoolants.get(new StackKey(stack)); - } - - public static Coolant getCoolant(ItemStack stack) { - return getCoolant(getFluidCoolant(stack)); - } - - public static Coolant getCoolant(FluidStack fluidStack) { - return fluidStack != null && fluidStack.getFluid() != null ? liquidCoolants.get(fluidStack.getFluid().getName()) : null; - } - - public interface Coolant { - - float getDegreesCoolingPerMB(float currentHeat); - } - - public static void addCoolant(final Fluid fluid, final float degreesCoolingPerMB) { - if (fluid != null) { - liquidCoolants.put(fluid.getName(), new Coolant() { - @Override - public float getDegreesCoolingPerMB(float currentHeat) { - return degreesCoolingPerMB; - } - }); - } - } - - /** - * Adds a solid coolant like Ice Blocks. The FluidStack must contain a registered - * Coolant Fluid or nothing will happen. You do not need to call this for - * Fluid Containers. - * - * @param stack - * @param coolant - */ - public static void addCoolant(final ItemStack stack, final FluidStack coolant) { - if (stack != null && stack.getItem() != null && coolant != null) { - solidCoolants.put(new StackKey(stack), coolant); - } - } - - /** - * Adds a solid coolant like Ice Blocks. The FluidStack must contain a - * registered Coolant Fluid or nothing will happen. You do not need to call - * this for Fluid Containers. - * - * @param item - * @param coolant - */ - public static void addCoolant(final Item item, final int metadata, final FluidStack coolant) { - addCoolant(new ItemStack(item, 1, metadata), coolant); - } - - public static void addCoolant(final Block block, final int metadata, final FluidStack coolant) { - addCoolant(new ItemStack(block, 1, metadata), coolant); - } - - public static boolean isCoolant(Fluid fluid) { - return liquidCoolants.containsKey(fluid.getName()); - } -} diff --git a/src/api/java/buildcraft/api/fuels/IronEngineFuel.java b/src/api/java/buildcraft/api/fuels/IronEngineFuel.java deleted file mode 100644 index 68b6653cc..000000000 --- a/src/api/java/buildcraft/api/fuels/IronEngineFuel.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.fuels; - -import java.util.HashMap; -import java.util.Map; - -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; - -public final class IronEngineFuel { - - public static Map fuels = new HashMap(); - - private IronEngineFuel() { - } - - public static Fuel getFuelForFluid(Fluid liquid) { - return liquid == null ? null : fuels.get(liquid.getName()); - } - - public static final class Fuel { - - public final Fluid liquid; - public final float powerPerCycle; - public final int totalBurningTime; - - private Fuel(String fluidName, float powerPerCycle, int totalBurningTime) { - this(FluidRegistry.getFluid(fluidName), powerPerCycle, totalBurningTime); - } - - private Fuel(Fluid liquid, float powerPerCycle, int totalBurningTime) { - this.liquid = liquid; - this.powerPerCycle = powerPerCycle; - this.totalBurningTime = totalBurningTime; - } - } - - public static void addFuel(Fluid fluid, float powerPerCycle, int totalBurningTime) { - fuels.put(fluid.getName(), new Fuel(fluid, powerPerCycle, totalBurningTime)); - } - - public static void addFuel(String fluidName, float powerPerCycle, int totalBurningTime) { - fuels.put(fluidName, new Fuel(fluidName, powerPerCycle, totalBurningTime)); - } -} diff --git a/src/api/java/buildcraft/api/fuels/package-info.java b/src/api/java/buildcraft/api/fuels/package-info.java index 67ca22bc6..fe46ec34e 100644 --- a/src/api/java/buildcraft/api/fuels/package-info.java +++ b/src/api/java/buildcraft/api/fuels/package-info.java @@ -6,6 +6,6 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -@API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|fuels") +@API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|fuels") package buildcraft.api.fuels; import cpw.mods.fml.common.API; diff --git a/src/api/java/buildcraft/api/mj/ISidedBatteryProvider.java b/src/api/java/buildcraft/api/gates/IGate.java similarity index 65% rename from src/api/java/buildcraft/api/mj/ISidedBatteryProvider.java rename to src/api/java/buildcraft/api/gates/IGate.java index 46adb69d9..2018cb441 100644 --- a/src/api/java/buildcraft/api/mj/ISidedBatteryProvider.java +++ b/src/api/java/buildcraft/api/gates/IGate.java @@ -6,10 +6,17 @@ * 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.api.mj; +package buildcraft.api.gates; import net.minecraftforge.common.util.ForgeDirection; -public interface ISidedBatteryProvider { - IBatteryObject getMjBattery(String kind, ForgeDirection direction); +import buildcraft.api.transport.IPipe; + +public interface IGate { + @Deprecated + void setPulsing(boolean pulse); + + ForgeDirection getSide(); + + IPipe getPipe(); } diff --git a/src/api/java/buildcraft/api/mj/BatteryObject.java b/src/api/java/buildcraft/api/mj/BatteryObject.java deleted file mode 100755 index f0dd5680d..000000000 --- a/src/api/java/buildcraft/api/mj/BatteryObject.java +++ /dev/null @@ -1,199 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.mj; - -import java.lang.reflect.Field; -import java.util.logging.Level; - -import buildcraft.api.core.BCLog; -import buildcraft.api.core.JavaTools; - -/** - * A battery object is a wrapper around a battery field in an object. This - * battery field is of type double, and is the only piece of data specific to - * this object. Others are class-wide. - */ -public class BatteryObject implements IBatteryIOObject, MjReconfigurator.IConfigurableBatteryObject { - protected Field energyStored; - protected Object obj; - protected MjBattery batteryData; - - /** - * {@inheritDoc} - */ - @Override - public double getEnergyRequested() { - if (!batteryData.mode().canReceive) { - return 0; - } - try { - return JavaTools.bounds(batteryData.maxCapacity() - energyStored.getDouble(obj), - batteryData.minimumConsumption(), batteryData.maxReceivedPerCycle()); - } catch (IllegalAccessException e) { - BCLog.logger.log(Level.WARNING, "can't get energy requested", e); - } - return 0; - } - - /** - * {@inheritDoc} - */ - @Override - public double addEnergy(double mj) { - return addEnergy(mj, false); - } - - /** - * {@inheritDoc} - */ - @Override - public double addEnergy(double mj, boolean ignoreCycleLimit) { - try { - double contained = energyStored.getDouble(obj); - double maxAccepted = batteryData.maxCapacity() - contained + batteryData.minimumConsumption(); - if (!ignoreCycleLimit && maxAccepted > batteryData.maxReceivedPerCycle()) { - maxAccepted = batteryData.maxReceivedPerCycle(); - } - double used = Math.min(maxAccepted, mj); - if (used > 0) { - energyStored.setDouble(obj, Math.min(contained + used, batteryData.maxCapacity())); - return used; - } - } catch (IllegalAccessException e) { - BCLog.logger.log(Level.WARNING, "can't add energy", e); - } - return 0; - } - - @Override - public double extractEnergy(double mj) { - return extractEnergy(mj, false); - } - - @Override - public double extractEnergy(double mj, boolean ignoreCycleLimit) { - try { - double contained = energyStored.getDouble(obj); - double maxExtracted = contained; - if (!ignoreCycleLimit && maxExtracted > batteryData.maxSendedPerCycle()) { - maxExtracted = batteryData.maxSendedPerCycle(); - } - double used = Math.min(maxExtracted, mj); - if (used > 0) { - energyStored.setDouble(obj, Math.max(contained - used, 0)); - return used; - } - } catch (IllegalAccessException e) { - BCLog.logger.log(Level.WARNING, "can't extract energy", e); - } - return 0; - } - - /** - * {@inheritDoc} - */ - @Override - public double getEnergyStored() { - try { - return energyStored.getDouble(obj); - } catch (IllegalAccessException e) { - BCLog.logger.log(Level.WARNING, "can't get return energy stored", e); - return 0; - } - } - - /** - * {@inheritDoc} - */ - @Override - public void setEnergyStored(double mj) { - try { - energyStored.setDouble(obj, mj); - } catch (IllegalAccessException e) { - BCLog.logger.log(Level.WARNING, "can't set energy stored", e); - throw new RuntimeException(e); - } - } - - /** - * {@inheritDoc} - */ - @Override - public double maxCapacity() { - return batteryData.maxCapacity(); - } - - /** - * {@inheritDoc} - */ - @Override - public double minimumConsumption() { - return batteryData.minimumConsumption(); - } - - /** - * {@inheritDoc} - */ - @Override - public double maxReceivedPerCycle() { - return batteryData.maxReceivedPerCycle(); - } - - @Override - public String kind() { - return batteryData.kind(); - } - - @Override - public void init(Object object, Field storedField, MjBattery battery) { - this.obj = object; - this.energyStored = storedField; - this.batteryData = battery; - } - - @Override - public double maxSendedPerCycle() { - return batteryData.maxSendedPerCycle(); - } - - @Override - public IOMode mode() { - return batteryData.mode(); - } - - @Override - public boolean canSend() { - return batteryData.mode().canSend; - } - - @Override - public boolean canReceive() { - return batteryData.mode().canReceive; - } - - @Override - public boolean isActive() { - return batteryData.mode().active; - } - - @Override - public boolean isCacheable() { - return batteryData.cacheable(); - } - - @Override - public MjBattery getMjBattery() { - return batteryData; - } - - @Override - public void setMjBattery(MjBattery battery) { - batteryData = battery; - } -} \ No newline at end of file diff --git a/src/api/java/buildcraft/api/mj/IBatteryIOObject.java b/src/api/java/buildcraft/api/mj/IBatteryIOObject.java deleted file mode 100644 index a2cfb768a..000000000 --- a/src/api/java/buildcraft/api/mj/IBatteryIOObject.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.mj; - -public interface IBatteryIOObject extends IBatteryObject { - double maxSendedPerCycle(); - - double extractEnergy(double mj); - - double extractEnergy(double mj, boolean ignoreCycleLimit); - - IOMode mode(); - - boolean canSend(); - - boolean canReceive(); - - boolean isActive(); - - boolean isCacheable(); -} diff --git a/src/api/java/buildcraft/api/mj/IBatteryObject.java b/src/api/java/buildcraft/api/mj/IBatteryObject.java deleted file mode 100644 index 6bbd222d2..000000000 --- a/src/api/java/buildcraft/api/mj/IBatteryObject.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.mj; - -import java.lang.reflect.Field; - -public interface IBatteryObject { - /** - * @return Current energy requirement for keeping machine state - */ - double getEnergyRequested(); - - /** - * Add energy to this battery - * - * @param mj Energy amount - * @return Used energy - */ - double addEnergy(double mj); - - /** - * Add energy to this battery - * - * @param mj Energy amount - * @param ignoreCycleLimit Force add all energy even if "maxReceivedPerCycle" limit is reached - * @return Used energy - */ - double addEnergy(double mj, boolean ignoreCycleLimit); - - /** - * @return Current stored energy amount in this battery - */ - double getEnergyStored(); - - /** - * Set current stored energy amount. - * Doesn't use it for your machines! Decrease your battery field directly. - * - * @param mj New energy amount - */ - void setEnergyStored(double mj); - - /** - * @return Maximal energy amount for this battery. - */ - double maxCapacity(); - - /** - * @return Minimal energy amount for keep your machine in active state - */ - double minimumConsumption(); - - /** - * @return Maximal energy received per one tick - */ - double maxReceivedPerCycle(); - - /** - * @return kind of this energy battery - */ - String kind(); - - /** - * Basic initialization method - * - * @param object Basic object which hold a battery field - * @param storedField Field for energy storing - * @param battery Battery data - */ - void init(Object object, Field storedField, MjBattery battery); -} diff --git a/src/api/java/buildcraft/api/mj/IOMode.java b/src/api/java/buildcraft/api/mj/IOMode.java deleted file mode 100644 index 8f15e840f..000000000 --- a/src/api/java/buildcraft/api/mj/IOMode.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.mj; - -public enum IOMode { - Both(true, true, false), - BothActive(true, true, true), - - Receive(true, false, false), - ReceiveActive(true, false, true), - - Send(false, true, false), - SendActive(false, true, true), - - None(false, false, false); - - public final boolean canReceive, canSend, active; - - IOMode(boolean canReceive, boolean canSend, boolean active) { - this.canReceive = canReceive; - this.canSend = canSend; - this.active = active; - } -} diff --git a/src/api/java/buildcraft/api/mj/MjAPI.java b/src/api/java/buildcraft/api/mj/MjAPI.java deleted file mode 100755 index d8333e3a1..000000000 --- a/src/api/java/buildcraft/api/mj/MjAPI.java +++ /dev/null @@ -1,439 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.mj; - -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; -import java.util.WeakHashMap; -import java.util.logging.Level; - -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.core.BCLog; -import buildcraft.api.core.JavaTools; -import buildcraft.api.power.IPowerReceptor; -import buildcraft.api.power.PowerHandler; - -import gnu.trove.map.TIntObjectMap; -import gnu.trove.map.hash.TIntObjectHashMap; - -/** - * The class MjAPI provides services to the Minecraft Joules power framework. - * BuildCraft implements a default power model on top of this, the "kinesis" - * power model. Third party mods may provide they own version of Minecraft - * Joules batteries and provide different models. - */ -public final class MjAPI { - - public static final String DEFAULT_POWER_FRAMEWORK = "buildcraft.kinesis"; - private static Map mjBatteryFields = new HashMap(); - private static Map> mjBatteryKinds = new HashMap>(); - private static final BatteryField invalidBatteryField = new BatteryField(); - private static final MjReconfigurator reconfigurator = new MjReconfigurator(); - private static final Map mjBatteryCache = new WeakHashMap(); - - /** - * Deactivate constructor - */ - private MjAPI() { - } - - /** - * @see #getMjBattery(Object, String, ForgeDirection) - */ - public static IBatteryObject getMjBattery(Object o) { - return getMjBattery(o, null, null); - } - - /** - * @see #getMjBattery(Object, String, ForgeDirection) - */ - public static IBatteryObject getMjBattery(Object o, String kind) { - return getMjBattery(o, kind, null); - } - - /** - * @see #getMjBattery(Object, String, ForgeDirection) - */ - public static IBatteryObject getMjBattery(Object o, ForgeDirection side) { - return getMjBattery(o, null, side); - } - - /** - * Returns the battery related to the object given in parameter. - */ - public static IBatteryObject getMjBattery(Object o, String kindRaw, ForgeDirection sideRaw) { - if (o == null) { - return null; - } - String kind = kindRaw == null ? DEFAULT_POWER_FRAMEWORK : kindRaw; - ForgeDirection side = sideRaw == null ? ForgeDirection.UNKNOWN : sideRaw; - - IBatteryObject battery; - BatteryCache cache = mjBatteryCache.get(o); - if (cache == null) { - cache = new BatteryCache(); - mjBatteryCache.put(o, cache); - } else { - battery = cache.get(kind, side); - if (isCacheable(battery)) { - return battery; - } - } - if (o instanceof ISidedBatteryProvider) { - battery = ((ISidedBatteryProvider) o).getMjBattery(kind, side); - if (battery == null && side != ForgeDirection.UNKNOWN) { - battery = ((ISidedBatteryProvider) o).getMjBattery(kind, ForgeDirection.UNKNOWN); - } - } else if (o instanceof IBatteryProvider) { - battery = ((IBatteryProvider) o).getMjBattery(kind); - } else { - battery = createBattery(o, kind, side); - } - if (battery == null && o instanceof IPowerReceptor) { - PowerHandler.PowerReceiver receiver = ((IPowerReceptor) o).getPowerReceiver(side); - if (receiver == null && side != ForgeDirection.UNKNOWN) { - receiver = ((IPowerReceptor) o).getPowerReceiver(ForgeDirection.UNKNOWN); - } - if (receiver != null) { - battery = receiver.getMjBattery(); - } - } - cache.put(kind, side, battery); - return battery; - } - - /** - * Create new battery instance. - * This method ignore all providers/caches and only create battery for given kind/side. - * - * @param o Object which contains {@link MjBattery} - * @param kind Kind of power - * @param side Side of block - * @return New {@link IBatteryObject} implementation registered for given kind of power - */ - public static IBatteryObject createBattery(Object o, String kind, ForgeDirection side) { - if (o == null) { - return null; - } - BatteryField f = getMjBatteryField(o.getClass(), kind, side); - if (f == null && side != ForgeDirection.UNKNOWN) { - f = getMjBatteryField(o.getClass(), kind, ForgeDirection.UNKNOWN); - } - if (f == null) { - return null; - } else if (!mjBatteryKinds.containsKey(kind)) { - return null; - } else if (f.kind == BatteryKind.Value) { - try { - IBatteryObject obj = mjBatteryKinds.get(kind).newInstance(); - obj.init(o, f.field, f.battery); - return obj; - } catch (InstantiationException e) { - BCLog.logger.log(Level.WARNING, "can't instantiate class for energy kind \"" + kind + "\""); - return null; - } catch (IllegalAccessException e) { - BCLog.logger.log(Level.WARNING, "can't instantiate class for energy kind \"" + kind + "\""); - return null; - } - } else { - try { - return createBattery(f.field.get(o), kind, side); - } catch (IllegalAccessException e) { - e.printStackTrace(); - return null; - } - } - } - - /** - * @return All non-sided batteries for passed object - */ - public static IBatteryObject[] getAllMjBatteries(Object o) { - return getAllMjBatteries(o, ForgeDirection.UNKNOWN); - } - - /** - * @param direction Side of block - * @return All sided batteries for passed object - */ - public static IBatteryObject[] getAllMjBatteries(Object o, ForgeDirection direction) { - IBatteryObject[] result = new IBatteryObject[mjBatteryFields.size()]; - - int id = 0; - - for (String kind : mjBatteryKinds.keySet()) { - result[id] = getMjBattery(o, kind, direction); - if (result[id] != null) { - id++; - } - } - - return Arrays.copyOfRange(result, 0, id); - } - - /** - * Register new battery kind implementation. - * Allowing to have a custom power types alongside default "kinesis" kind - * @param kind Kind name - * @param clazz Battery implementation class - */ - public static void registerMJBatteryKind(String kind, Class clazz) { - if (!mjBatteryKinds.containsKey(kind)) { - mjBatteryKinds.put(kind, clazz); - } else { - BCLog.logger.log(Level.WARNING, - "energy kind \"" + kind + "\" already registered with " + clazz.getCanonicalName()); - } - } - - /** - * @see IOMode#canReceive - */ - public static boolean canReceive(IBatteryObject battery) { - return battery != null && (!(battery instanceof IBatteryIOObject) || ((IBatteryIOObject) battery).canReceive()); - } - - /** - * @see IOMode#canSend - */ - public static boolean canSend(IBatteryObject battery) { - return battery != null && battery instanceof IBatteryIOObject && ((IBatteryIOObject) battery).canSend(); - } - - /** - * @see IOMode#active - */ - public static boolean isActive(IBatteryObject battery) { - return battery != null && battery instanceof IBatteryIOObject && ((IBatteryIOObject) battery).isActive(); - } - - /** - * @see MjBattery#cacheable() - */ - public static boolean isCacheable(IBatteryObject battery) { - return battery != null && battery instanceof IBatteryIOObject && ((IBatteryIOObject) battery).isCacheable(); - } - - /** - * @see MjBattery#maxReceivedPerCycle() - * @see MjBattery#maxSendedPerCycle() - * @return Actual IO limit for passed mode (only send/receive supported) - */ - public static double getIOLimit(IBatteryObject batteryObject, IOMode mode) { - if (mode == IOMode.Receive && canReceive(batteryObject)) { - return batteryObject.maxReceivedPerCycle(); - } else if (mode == IOMode.Send && canSend(batteryObject)) { - return ((IBatteryIOObject) batteryObject).maxSendedPerCycle(); - } - return 0; - } - - /** - * Obtain battery parameters reconfigurator. - * Usage:
- * - * MjAPI.reconfigure().maxCapacity(battery, 15000); - * - * @return Reconfigurator instance - */ - public static MjReconfigurator reconfigure() { - return reconfigurator; - } - - /** - * Transfer mj energy amount from battery "fromBattery" to "toBattery" - * @param fromBattery Source battery - * @param toBattery Target battery - * @param mj Amount of energy - * @return Transferred amount - */ - public static double transferEnergy(IBatteryObject fromBattery, IBatteryObject toBattery, double mj) { - if (!canSend(fromBattery) || !canReceive(toBattery)) { - return 0; - } - IBatteryIOObject from = (IBatteryIOObject) fromBattery; - double attemptToTransfer = Math.min(getIOLimit(from, IOMode.Send), mj); - attemptToTransfer = Math.min(attemptToTransfer, getIOLimit(toBattery, IOMode.Receive)); - double extracted = from.extractEnergy(attemptToTransfer); - double received = toBattery.addEnergy(extracted); - if (extracted > received) { - from.addEnergy(extracted - received); - } - return received; - } - - /** - * Transfer maximal energy amount from battery "fromBattery" to "toBattery" - * @param fromBattery Source battery - * @param toBattery Target battery - * @return Transferred amount - */ - public static double transferEnergy(IBatteryObject fromBattery, IBatteryObject toBattery) { - return transferEnergy(fromBattery, toBattery, Math.min( - getIOLimit(fromBattery, IOMode.Send), - getIOLimit(toBattery, IOMode.Receive))); - } - - /** - * Helper method which you should invoke in every game tick for supporting Active IO modes - * @param tile Tile which contains active battery - */ - public static void updateEntity(TileEntity tile) { - for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { - IBatteryObject batteryObject = getMjBattery(tile, direction); - TileEntity anotherTile = tile.getWorldObj().getTileEntity(tile.xCoord + direction.offsetX, tile.yCoord + direction.offsetY, tile.zCoord + direction.offsetZ); - IBatteryObject anotherBattery = getMjBattery(anotherTile, direction.getOpposite()); - if (batteryObject == null || anotherBattery == null) { - continue; - } - if (canSend(batteryObject) && canReceive(anotherBattery) && isActive(batteryObject)) { - transferEnergy(batteryObject, anotherBattery); - } - if (canReceive(batteryObject) && canSend(anotherBattery) && isActive(anotherBattery) && !isActive(batteryObject)) { - transferEnergy(anotherBattery, batteryObject); - } - } - } - - /** - * Reset all caches for passed tile - */ - public static void resetBatteriesCache(TileEntity tile) { - mjBatteryCache.remove(tile); - } - - /** - * Remove cached instance of passed battery - */ - public static void resetBatteriesCache(IBatteryObject battery) { - for (BatteryCache cache : mjBatteryCache.values()) { - cache.reset(battery); - } - } - - private enum BatteryKind { - Value, Container - } - - private static final class BatteryCache { - TIntObjectMap cache = new TIntObjectHashMap(); - - IBatteryObject get(String kind, ForgeDirection side) { - return cache.get(hash(kind, side)); - } - - void put(String kind, ForgeDirection side, IBatteryObject battery) { - cache.put(hash(kind, side), battery); - } - - void reset(IBatteryObject battery) { - for (int key : cache.keys()) { - if (cache.get(key) == battery) { - cache.remove(key); - } - } - } - - private int hash(String kind, ForgeDirection side) { - return kind.hashCode() * 31 + side.hashCode(); - } - } - - private static final class BatteryHolder { - private String kind; - private ForgeDirection side; - private Class clazz; - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - BatteryHolder that = (BatteryHolder) o; - - return kind.equals(that.kind) && clazz.equals(that.clazz) && side.equals(that.side); - } - - @Override - public int hashCode() { - int result = kind.hashCode(); - result = 31 * result + clazz.hashCode(); - result = 31 * result + side.hashCode(); - return result; - } - } - - private static class BatteryField { - public Field field; - public MjBattery battery; - public BatteryKind kind; - } - - private static BatteryField getMjBatteryField(Class c, String kind, ForgeDirection side) { - BatteryHolder holder = new BatteryHolder(); - holder.clazz = c; - holder.kind = kind; - holder.side = side; - - BatteryField bField = mjBatteryFields.get(holder); - - if (bField == null) { - for (Field f : JavaTools.getAllFields(c)) { - MjBattery battery = f.getAnnotation(MjBattery.class); - - if (battery != null && kind.equals(battery.kind())) { - if (!contains(battery.sides(), side) && !contains(battery.sides(), ForgeDirection.UNKNOWN)) { - continue; - } - f.setAccessible(true); - bField = new BatteryField(); - bField.field = f; - bField.battery = battery; - - if (double.class.equals(f.getType())) { - bField.kind = BatteryKind.Value; - } else if (f.getType().isPrimitive()) { - throw new RuntimeException( - "MJ battery needs to be object or double type"); - } else { - bField.kind = BatteryKind.Container; - } - - mjBatteryFields.put(holder, bField); - - return bField; - } - } - mjBatteryFields.put(holder, invalidBatteryField); - } - - return bField == invalidBatteryField ? null : bField; - } - - private static boolean contains(T[] array, T value) { - for (T t : array) { - if (t == value) { - return true; - } - } - return false; - } - - static { - registerMJBatteryKind(DEFAULT_POWER_FRAMEWORK, BatteryObject.class); - } -} diff --git a/src/api/java/buildcraft/api/mj/MjAPILegacy.java b/src/api/java/buildcraft/api/mj/MjAPILegacy.java deleted file mode 100644 index 55cf56a5b..000000000 --- a/src/api/java/buildcraft/api/mj/MjAPILegacy.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.mj; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.power.IPowerReceptor; -import buildcraft.api.power.PowerHandler; - -public class MjAPILegacy implements IPowerReceptor { - private final PowerHandler powerHandler; - private final World world; - - protected MjAPILegacy(World world, IBatteryObject battery, PowerHandler.Type type) { - if (battery == null) { - throw new NullPointerException(); - } - this.world = world; - this.powerHandler = new PowerHandler(this, type, battery); - } - - public static MjAPILegacy from(World world, IBatteryObject battery, PowerHandler.Type type) { - if (battery == null) { - return null; - } - return new MjAPILegacy(world, battery, type); - } - - public static MjAPILegacy from(World world, Object object, PowerHandler.Type type) { - return from(world, MjAPI.getMjBattery(object), type); - } - - public static MjAPILegacy from(TileEntity tileEntity, PowerHandler.Type type) { - return from(tileEntity.getWorldObj(), MjAPI.getMjBattery(tileEntity), type); - } - - @Override - public PowerHandler.PowerReceiver getPowerReceiver(ForgeDirection side) { - return powerHandler.getPowerReceiver(); - } - - @Override - public void doWork(PowerHandler workProvider) { - - } - - @Override - public World getWorld() { - return world; - } -} diff --git a/src/api/java/buildcraft/api/mj/MjBattery.java b/src/api/java/buildcraft/api/mj/MjBattery.java deleted file mode 100755 index 20ed8c715..000000000 --- a/src/api/java/buildcraft/api/mj/MjBattery.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.mj; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import net.minecraftforge.common.util.ForgeDirection; - -/** - * This annotation is used for tiles that need to interface with BuildCraft - * energy framework, a.k.a MinecraftJoule or MJ. In order to receive power, - * tiles, need to declare a double field, with the annotation MjBattery. MJ - * provider machines able to provide power will then connect to these tiles, and - * feed energy up to max capacity. It's the responsibility of the implementer to - * manually decrease the value of the energy, as he simulates energy - * consumption. On each cycle, per power input, machines can receive up to - * "maxReceivedPerCycle" units of energy. As an optional behavior, the system - * can have a minimum amount of energy consumed even if the system is at max - * capacity, modelized by the "minimumConsumption" value. - * - * If the field designated by MjBattery is an object, then it will be considered - * as a nested battery, and will look for the field in the designated object. - * - * All the properties defined in this annotation are class wide. If you need to - * change them on a tile by tile basis, you will need to use interfaces, either - * {@link IBatteryProvider} or {@link ISidedBatteryProvider} - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.FIELD) -@Inherited -public @interface MjBattery { - /** - * @return Max energy capacity of battery - */ - double maxCapacity() default 100.0; - - /** - * @return Max energy received per one tick - */ - double maxReceivedPerCycle() default 10.0; - - /** - * @return Max energy received per one tick - */ - double maxSendedPerCycle() default 10.0; - - /** - * @return Minimal energy for keep machine is active - */ - double minimumConsumption() default 0.1; - - /** - * @return The kind of battery stored. Specific power systems can be created - * through this system, as several battery of different kind can - * coexist in the same tile. - */ - String kind() default MjAPI.DEFAULT_POWER_FRAMEWORK; - - /** - * @return Sides on which this battery should works. - */ - ForgeDirection[] sides() default {ForgeDirection.UNKNOWN}; - - /** - * @return Current battery input/output mode - */ - IOMode mode() default IOMode.Receive; - - /** - * @return Ability to cache this battery instance for performance reasons. Usual - * not required to modify it for every battery, you can dynamicaly reconfigure - * your batteries with {@link MjAPI#reconfigure()} and reset cache - * for tile with {@link MjAPI#resetBatteriesCache(IBatteryObject)} - */ - boolean cacheable() default true; -} \ No newline at end of file diff --git a/src/api/java/buildcraft/api/mj/MjReconfigurator.java b/src/api/java/buildcraft/api/mj/MjReconfigurator.java deleted file mode 100644 index e5e81dcc6..000000000 --- a/src/api/java/buildcraft/api/mj/MjReconfigurator.java +++ /dev/null @@ -1,183 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.mj; - -import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.core.BCLog; - -/** - * Reconfiguration helper. - * Allow to change battery parameters in runtime. - */ -public class MjReconfigurator { - private static final class ConfigurableMjBattery implements MjBattery { - double maxCapacity, maxReceivedPerCycle, maxSendedPerCycle, minimumConsumption; - String kind; - ForgeDirection[] sides; - IOMode mode; - boolean cacheable; - - @Override - public double maxCapacity() { - return maxCapacity; - } - - @Override - public double maxReceivedPerCycle() { - return maxReceivedPerCycle; - } - - @Override - public double minimumConsumption() { - return minimumConsumption; - } - - @Override - public double maxSendedPerCycle() { - return maxSendedPerCycle; - } - - @Override - public String kind() { - return kind; - } - - @Override - public ForgeDirection[] sides() { - return sides; - } - - @Override - public IOMode mode() { - return mode; - } - - @Override - public boolean cacheable() { - return cacheable; - } - - @Override - public Class annotationType() { - return MjBattery.class; - } - } - - /** - * Helper interface which should implement all configurable batteries. - */ - public interface IConfigurableBatteryObject extends IBatteryObject { - MjBattery getMjBattery(); - - void setMjBattery(MjBattery battery); - } - - private ConfigurableMjBattery obtainConfigurableBattery(IBatteryObject battery) { - if (!(battery instanceof IConfigurableBatteryObject)) { - BCLog.logger.warning("Attempt to reconfigure unsupported battery: " + battery); - return null; - } - IConfigurableBatteryObject configurableBattery = (IConfigurableBatteryObject) battery; - MjBattery mjBattery = configurableBattery.getMjBattery(); - if (mjBattery instanceof ConfigurableMjBattery) { - return (ConfigurableMjBattery) mjBattery; - } - ConfigurableMjBattery configurableMjBattery = new ConfigurableMjBattery(); - configurableMjBattery.maxCapacity = mjBattery.maxCapacity(); - configurableMjBattery.maxReceivedPerCycle = mjBattery.maxReceivedPerCycle(); - configurableMjBattery.maxSendedPerCycle = mjBattery.maxSendedPerCycle(); - configurableMjBattery.minimumConsumption = mjBattery.minimumConsumption(); - configurableMjBattery.kind = mjBattery.kind(); - configurableMjBattery.sides = mjBattery.sides(); - configurableMjBattery.mode = mjBattery.mode(); - configurableMjBattery.cacheable = mjBattery.cacheable(); - configurableBattery.setMjBattery(configurableMjBattery); - return configurableMjBattery; - } - - public void maxCapacity(IBatteryObject batteryObject, double maxCapacity) { - ConfigurableMjBattery battery = obtainConfigurableBattery(batteryObject); - if (battery != null) { - battery.maxCapacity = maxCapacity; - } - } - - public void maxReceivedPerCycle(IBatteryObject batteryObject, double maxReceivedPerCycle) { - ConfigurableMjBattery battery = obtainConfigurableBattery(batteryObject); - if (battery != null) { - battery.maxReceivedPerCycle = maxReceivedPerCycle; - } - } - - public void maxSendedPerCycle(IBatteryObject batteryObject, double maxSendedPerCycle) { - ConfigurableMjBattery battery = obtainConfigurableBattery(batteryObject); - if (battery != null) { - battery.maxSendedPerCycle = maxSendedPerCycle; - } - } - - public void minimumConsumption(IBatteryObject batteryObject, double minimumConsumption) { - ConfigurableMjBattery battery = obtainConfigurableBattery(batteryObject); - if (battery != null) { - battery.minimumConsumption = minimumConsumption; - } - } - - public void kind(IBatteryObject batteryObject, String kind) { - ConfigurableMjBattery battery = obtainConfigurableBattery(batteryObject); - if (battery != null) { - battery.kind = kind; - MjAPI.resetBatteriesCache(batteryObject); - } - } - - /** - * Reconfigure passed battery instance for working with passed sides only - * @param sides Enabled sides - */ - public void sides(IBatteryObject batteryObject, ForgeDirection... sides) { - ConfigurableMjBattery battery = obtainConfigurableBattery(batteryObject); - if (battery != null) { - battery.sides = sides; - MjAPI.resetBatteriesCache(batteryObject); - } - } - - /** - * Reconfigure passed battery instance for working with all sides exclude passed - * @param sides Disabled sides - */ - public void sidesExclude(IBatteryObject batteryObject, ForgeDirection... sides) { - List newSides = new ArrayList(Arrays.asList(ForgeDirection.VALID_DIRECTIONS)); - for (ForgeDirection side : sides) { - newSides.remove(side); - } - sides(batteryObject, newSides.toArray(new ForgeDirection[newSides.size()])); - } - - public void mode(IBatteryObject batteryObject, IOMode mode) { - ConfigurableMjBattery battery = obtainConfigurableBattery(batteryObject); - if (battery != null) { - battery.mode = mode; - } - } - - public void cacheable(IBatteryObject batteryObject, boolean cacheable) { - ConfigurableMjBattery battery = obtainConfigurableBattery(batteryObject); - if (battery != null) { - battery.cacheable = cacheable; - } - } -} diff --git a/src/api/java/buildcraft/api/power/ILaserTarget.java b/src/api/java/buildcraft/api/power/ILaserTarget.java deleted file mode 100644 index 8f859158c..000000000 --- a/src/api/java/buildcraft/api/power/ILaserTarget.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.power; - -public interface ILaserTarget { - - /** - * Returns true if the target currently needs power. For example, if the Advanced - * Crafting Table has work to do. - * - * @return true if needs power - */ - boolean requiresLaserEnergy(); - - /** - * Transfers energy from the laser to the target. - * - * @param energy - */ - void receiveLaserEnergy(double energy); - - /** - * Return true if the Tile Entity object is no longer a valid target. For - * example, if its been invalidated. - * - * @return true if no longer a valid target object - */ - boolean isInvalidTarget(); - - int getXCoord(); - - int getYCoord(); - - int getZCoord(); -} diff --git a/src/api/java/buildcraft/api/power/IPowerEmitter.java b/src/api/java/buildcraft/api/power/IPowerEmitter.java deleted file mode 100644 index 4a7115705..000000000 --- a/src/api/java/buildcraft/api/power/IPowerEmitter.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.power; - -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Essentially only used for Wooden Power Pipe connection rules. - * - * This Tile Entity interface allows you to indicate that a block can emit power - * from a specific side. - */ -public interface IPowerEmitter { - boolean canEmitPowerFrom(ForgeDirection side); -} diff --git a/src/api/java/buildcraft/api/power/IPowerReceptor.java b/src/api/java/buildcraft/api/power/IPowerReceptor.java deleted file mode 100644 index 17dca98cb..000000000 --- a/src/api/java/buildcraft/api/power/IPowerReceptor.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.power; - -import net.minecraft.world.World; - -import net.minecraftforge.common.util.ForgeDirection; - -/** - * This interface should be implemented by any Tile Entity that wishes to be - * able to receive power. - */ -public interface IPowerReceptor { - - /** - * Get the PowerReceiver for this side of the block. You can return the same - * PowerReceiver for all sides or one for each side. - * - * You should NOT return null to this method unless you mean to NEVER - * receive power from that side. Returning null, after previous returning a - * PowerReceiver, will most likely cause pipe connections to derp out and - * engines to eventually explode. - * - * @param side - */ - PowerHandler.PowerReceiver getPowerReceiver(ForgeDirection side); - - /** - * Call back from the PowerHandler that is called when the stored power - * exceeds the activation power. - * - * It can be triggered by update() calls or power modification calls. - * - * @param workProvider - */ - void doWork(PowerHandler workProvider); - - World getWorld(); -} diff --git a/src/api/java/buildcraft/api/power/PowerHandler.java b/src/api/java/buildcraft/api/power/PowerHandler.java deleted file mode 100644 index bcf8bffb5..000000000 --- a/src/api/java/buildcraft/api/power/PowerHandler.java +++ /dev/null @@ -1,516 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.power; - -import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.core.SafeTimeTracker; -import buildcraft.api.mj.BatteryObject; -import buildcraft.api.mj.IBatteryObject; -import buildcraft.api.mj.IBatteryProvider; -import buildcraft.api.mj.IOMode; -import buildcraft.api.mj.MjAPI; -import buildcraft.api.mj.MjBattery; - -/** - * The PowerHandler is similar to FluidTank in that it holds your power and - * allows standardized interaction between machines. - *

- * To receive power to your machine you needs create an instance of PowerHandler - * and implement IPowerReceptor on the TileEntity. - *

- * If you plan emit power, you need only implement IPowerEmitter. You do not - * need a PowerHandler. Engines have a PowerHandler because they can also - * receive power from other Engines. - *

- * See TileRefinery for a simple example of a power using machine. - * - * @see IPowerReceptor - * @see IPowerEmitter - */ -public final class PowerHandler implements IBatteryProvider { - - public static enum Type { - - ENGINE, GATE, MACHINE, PIPE, STORAGE; - - public boolean canReceiveFromPipes() { - switch (this) { - case MACHINE: - case STORAGE: - return true; - default: - return false; - } - } - - public boolean eatsEngineExcess() { - switch (this) { - case MACHINE: - case STORAGE: - return true; - default: - return false; - } - } - } - - /** - * Extend this class to create custom Perdition algorithms (its not final). - *

- * NOTE: It is not possible to create a Zero perdition algorithm. - */ - public static class PerditionCalculator { - - public static final float DEFAULT_POWERLOSS = 1F; - public static final float MIN_POWERLOSS = 0.01F; - private final double powerLoss; - - public PerditionCalculator() { - powerLoss = DEFAULT_POWERLOSS; - } - - /** - * Simple constructor for simple Perdition per tick. - * - * @param powerLoss power loss per tick - */ - public PerditionCalculator(double powerLoss) { - this.powerLoss = powerLoss; - } - - /** - * Apply the perdition algorithm to the current stored energy. This - * function can only be called once per tick, but it might not be called - * every tick. It is triggered by any manipulation of the stored energy. - * - * @param powerHandler the PowerHandler requesting the perdition update - * @param current the current stored energy - * @param ticksPassed ticks since the last time this function was called - */ - public double applyPerdition(PowerHandler powerHandler, double current, long ticksPassed) { - double newPower = current - powerLoss * ticksPassed; - - if (newPower < 0) { - newPower = 0; - } - - return newPower; - } - - /** - * Taxes a flat rate on all incoming power. - *

- * Defaults to 0% tax rate. - * - * @return percent of input to tax - */ - public double getTaxPercent() { - return 0; - } - } - - public static final PerditionCalculator DEFAULT_PERDITION = new PerditionCalculator(); - public static final double ROLLING_AVERAGE_WEIGHT = 100.0; - public static final double ROLLING_AVERAGE_NUMERATOR = ROLLING_AVERAGE_WEIGHT - 1; - public static final double ROLLING_AVERAGE_DENOMINATOR = 1.0 / ROLLING_AVERAGE_WEIGHT; - public final int[] powerSources = new int[6]; - public final IPowerReceptor receptor; - - private double activationEnergy; - private final SafeTimeTracker doWorkTracker = new SafeTimeTracker(1); - private final SafeTimeTracker sourcesTracker = new SafeTimeTracker(1); - private final SafeTimeTracker perditionTracker = new SafeTimeTracker(1); - private PerditionCalculator perdition; - private final PowerReceiver receiver; - private final Type type; - private IBatteryObject battery; - // Tracking - private double averageLostPower = 0; - private double averageReceivedPower = 0; - private double averageUsedPower = 0; - - public PowerHandler(IPowerReceptor receptor, Type type) { - this(receptor, type, null); - } - - public PowerHandler(IPowerReceptor receptor, Type type, Object battery) { - this.receptor = receptor; - this.type = type; - this.receiver = new PowerReceiver(); - this.perdition = DEFAULT_PERDITION; - - boolean created = false; - if (battery instanceof IBatteryObject) { - this.battery = (BatteryObject) battery; - } else if (battery != null) { - this.battery = MjAPI.createBattery(battery, MjAPI.DEFAULT_POWER_FRAMEWORK, ForgeDirection.UNKNOWN); - created = true; - } else { - this.battery = MjAPI.createBattery(new AnonymousBattery(), MjAPI.DEFAULT_POWER_FRAMEWORK, ForgeDirection.UNKNOWN); - created = true; - } - if (receptor instanceof IPowerEmitter && created) { - MjAPI.reconfigure().mode(this.battery, IOMode.Send); - } - } - - public PowerReceiver getPowerReceiver() { - return receiver; - } - - public double getMinEnergyReceived() { - return battery.minimumConsumption(); - } - - public double getMaxEnergyReceived() { - return battery.getEnergyRequested(); - } - - public double getMaxEnergyStored() { - return battery.maxCapacity(); - } - - public double getActivationEnergy() { - return activationEnergy; - } - - public double getEnergyStored() { - return battery.getEnergyStored(); - } - - @Override - public IBatteryObject getMjBattery(String kind) { - return battery.kind().equals(kind) ? battery : null; - } - - /** - * Setup your PowerHandler's settings. - * - * @param minEnergyReceived - * This is the minimum about of power that will be accepted by - * the PowerHandler. This should generally be greater than the - * activationEnergy if you plan to use the doWork() callback. - * Anything greater than 1 will prevent Redstone Engines from - * powering this Provider. - * @param maxEnergyReceived - * The maximum amount of power accepted by the PowerHandler. This - * should generally be less than 500. Too low and larger engines - * will overheat while trying to power the machine. Too high, and - * the engines will never warm up. Greater values also place - * greater strain on the power net. - * @param activationEnergy - * If the stored energy is greater than this value, the doWork() - * callback is called (once per tick). - * @param maxStoredEnergy - * The maximum amount of power this PowerHandler can store. - * Values tend to range between 100 and 5000. With 1000 and 1500 - * being common. - */ - public void configure(double minEnergyReceived, double maxEnergyReceived, double activationEnergy, - double maxStoredEnergy) { - double localMaxEnergyReceived = maxEnergyReceived; - - if (minEnergyReceived > localMaxEnergyReceived) { - localMaxEnergyReceived = minEnergyReceived; - } - this.activationEnergy = activationEnergy; - - MjAPI.reconfigure().maxCapacity(battery, maxStoredEnergy); - MjAPI.reconfigure().maxReceivedPerCycle(battery, localMaxEnergyReceived); - MjAPI.reconfigure().minimumConsumption(battery, minEnergyReceived); - } - - /** - * Allows you define perdition in terms of loss/ticks. - *

- * This function is mostly for legacy implementations. See - * PerditionCalculator for more complex perdition formulas. - * - * @param powerLoss - * @param powerLossRegularity - * @see PerditionCalculator - */ - public void configurePowerPerdition(int powerLoss, int powerLossRegularity) { - if (powerLoss == 0 || powerLossRegularity == 0) { - perdition = new PerditionCalculator(0); - return; - } - perdition = new PerditionCalculator((float) powerLoss / (float) powerLossRegularity); - } - - /** - * Allows you to define a new PerditionCalculator class to handler perdition - * calculations. - *

- * For example if you want exponentially increasing loss based on amount - * stored. - * - * @param perdition - */ - public void setPerdition(PerditionCalculator perdition) { - if (perdition == null) { - this.perdition = DEFAULT_PERDITION; - } else { - this.perdition = perdition; - } - } - - public PerditionCalculator getPerdition() { - if (perdition == null) { - return DEFAULT_PERDITION; - } else { - return perdition; - } - } - - /** - * Ticks the power handler. You should call this if you can, but its not - * required. - *

- * If you don't call it, the possibility exists for some weirdness with the - * perdition algorithm and work callback as its possible they will not be - * called on every tick they otherwise would be. You should be able to - * design around this though if you are aware of the limitations. - */ - public void update() { - applyPerdition(); - applyWork(); - validateEnergy(); - } - - private void applyPerdition() { - double energyStored = getEnergyStored(); - if (perditionTracker.markTimeIfDelay(receptor.getWorld()) && energyStored > 0) { - double newEnergy = getPerdition().applyPerdition(this, energyStored, perditionTracker.durationOfLastDelay()); - if (newEnergy != energyStored) { - battery.setEnergyStored(energyStored = newEnergy); - } - validateEnergy(); - - averageLostPower = (averageLostPower * ROLLING_AVERAGE_NUMERATOR + (getEnergyStored() - energyStored)) * ROLLING_AVERAGE_DENOMINATOR; - } - } - - private void applyWork() { - if (getEnergyStored() >= activationEnergy) { - if (doWorkTracker.markTimeIfDelay(receptor.getWorld())) { - receptor.doWork(this); - } - } - } - - private void updateSources(ForgeDirection source) { - if (sourcesTracker.markTimeIfDelay(receptor.getWorld())) { - for (int i = 0; i < 6; ++i) { - powerSources[i] -= sourcesTracker.durationOfLastDelay(); - if (powerSources[i] < 0) { - powerSources[i] = 0; - } - } - } - - if (source != null) { - powerSources[source.ordinal()] = 10; - } - } - - /** - * Extract energy from the PowerHandler. You must call this even if doWork() - * triggers. - * - * @param min - * @param max - * @param doUse - * @return amount used - */ - public double useEnergy(double min, double max, boolean doUse) { - applyPerdition(); - - double result = 0; - - double energyStored = getEnergyStored(); - if (energyStored >= min) { - if (energyStored <= max) { - result = energyStored; - if (doUse) { - energyStored = 0; - } - } else { - result = max; - if (doUse) { - energyStored -= max; - } - } - } - if (energyStored != getEnergyStored()) { - battery.setEnergyStored(energyStored); - } - - validateEnergy(); - - if (doUse) { - averageUsedPower = (averageUsedPower * ROLLING_AVERAGE_NUMERATOR + result) * ROLLING_AVERAGE_DENOMINATOR; - } - - return result; - } - - public void readFromNBT(NBTTagCompound data) { - readFromNBT(data, "powerProvider"); - } - - public void readFromNBT(NBTTagCompound data, String tag) { - NBTTagCompound nbt = data.getCompoundTag(tag); - battery.setEnergyStored(nbt.getDouble("energyStored")); - } - - public void writeToNBT(NBTTagCompound data) { - writeToNBT(data, "powerProvider"); - } - - public void writeToNBT(NBTTagCompound data, String tag) { - NBTTagCompound nbt = new NBTTagCompound(); - nbt.setDouble("energyStored", battery.getEnergyStored()); - data.setTag(tag, nbt); - } - - public final class PowerReceiver { - - private PowerReceiver() { - } - - public double getMinEnergyReceived() { - return PowerHandler.this.getMinEnergyReceived(); - } - - public double getMaxEnergyReceived() { - return PowerHandler.this.getMaxEnergyReceived(); - } - - public double getMaxEnergyStored() { - return PowerHandler.this.getMaxEnergyStored(); - } - - public double getActivationEnergy() { - return activationEnergy; - } - - public double getEnergyStored() { - return PowerHandler.this.getEnergyStored(); - } - - public double getAveragePowerReceived() { - return averageReceivedPower; - } - - public double getAveragePowerUsed() { - return averageUsedPower; - } - - public double getAveragePowerLost() { - return averageLostPower; - } - - public Type getType() { - return type; - } - - public void update() { - PowerHandler.this.update(); - } - - /** - * The amount of power that this PowerHandler currently needs. - */ - public double powerRequest() { - update(); - return battery.getEnergyRequested(); - } - - /** - * Add power to the PowerReceiver from an external source. - *

- * IPowerEmitters are responsible for calling this themselves. - * - * @param quantity - * @param from - * @return the amount of power used - */ - public double receiveEnergy(Type source, final double quantity, ForgeDirection from) { - double used = quantity; - if (source == Type.ENGINE) { - if (used < getMinEnergyReceived()) { - return 0; - } else if (used > getMaxEnergyReceived()) { - used = getMaxEnergyReceived(); - } - } - - updateSources(from); - - used -= used * getPerdition().getTaxPercent(); - - used = addEnergy(used); - - applyWork(); - - if (source == Type.ENGINE && type.eatsEngineExcess()) { - used = Math.min(quantity, getMaxEnergyReceived()); - } - - averageReceivedPower = (averageReceivedPower * ROLLING_AVERAGE_NUMERATOR + used) * ROLLING_AVERAGE_DENOMINATOR; - - return used; - } - - public IBatteryObject getMjBattery() { - return battery; - } - } - - /** - * @return the amount the power changed by - */ - public double addEnergy(double quantity) { - final double used = battery.addEnergy(quantity); - applyPerdition(); - return used; - } - - public void setEnergy(double quantity) { - battery.setEnergyStored(quantity); - validateEnergy(); - } - - public boolean isPowerSource(ForgeDirection from) { - return powerSources[from.ordinal()] != 0; - } - - private void validateEnergy() { - double energyStored = getEnergyStored(); - double maxEnergyStored = getMaxEnergyStored(); - if (energyStored < 0) { - energyStored = 0; - } - if (energyStored > maxEnergyStored) { - energyStored = maxEnergyStored; - } - if (energyStored != battery.getEnergyStored()) { - battery.setEnergyStored(energyStored); - } - } - - private static class AnonymousBattery { - @MjBattery - public double mjStored; - } -} diff --git a/src/api/java/buildcraft/api/recipes/CraftingResult.java b/src/api/java/buildcraft/api/recipes/CraftingResult.java index 332c851f7..09407ca04 100755 --- a/src/api/java/buildcraft/api/recipes/CraftingResult.java +++ b/src/api/java/buildcraft/api/recipes/CraftingResult.java @@ -19,7 +19,7 @@ public class CraftingResult { public T crafted = null; public ArrayList usedItems = new ArrayList(); public ArrayList usedFluids = new ArrayList(); - public double energyCost = 0; + public int energyCost = 0; public long craftingTime = 0; - public IFlexibleRecipe recipe; + public IFlexibleRecipe recipe; } diff --git a/src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java b/src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java index 450b91356..6e2ddf89f 100644 --- a/src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java +++ b/src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java @@ -21,13 +21,17 @@ public interface IAssemblyRecipeManager { * Object... containing either an ItemStack, or a paired string * and integer(ex: "dyeBlue", 1) * @param energyCost - * MJ cost to produce + * RF cost to produce * @param output * resulting ItemStack */ - void addRecipe(String id, double energyCost, ItemStack output, Object... input); + void addRecipe(String id, int energyCost, ItemStack output, Object... input); void addRecipe(IFlexibleRecipe recipe); + + void removeRecipe(String id); + + void removeRecipe(IFlexibleRecipe recipe); Collection> getRecipes(); } diff --git a/src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java b/src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java index c87a8212d..f1dfec236 100755 --- a/src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java +++ b/src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java @@ -8,11 +8,15 @@ */ package buildcraft.api.recipes; +import net.minecraft.item.ItemStack; + public interface IFlexibleRecipe { boolean canBeCrafted(IFlexibleCrafter crafter); CraftingResult craft(IFlexibleCrafter crafter, boolean preview); + CraftingResult canCraft(ItemStack expectedOutput); + String getId(); } diff --git a/src/api/java/buildcraft/api/recipes/IFlexibleRecipeViewable.java b/src/api/java/buildcraft/api/recipes/IFlexibleRecipeViewable.java new file mode 100644 index 000000000..92a765a06 --- /dev/null +++ b/src/api/java/buildcraft/api/recipes/IFlexibleRecipeViewable.java @@ -0,0 +1,27 @@ +package buildcraft.api.recipes; + +import java.util.Collection; + +/** + * This class is intended for mods such as Not Enough Items + * in order for them to be able to look inside a recipe. + * + * It is intentionally left as a separate interface, so that + * it remains possible to register a "dynamic" flexible + * recipe which does not have static inputs and outputs. + * + * @author asie + */ +public interface IFlexibleRecipeViewable { + Object getOutput(); + + /** + * With BuildCraft's implementation (as of 6.1.3), this might + * contain either an ItemStack, a List or a FluidStack. + */ + Collection getInputs(); + + long getCraftingTime(); + + int getEnergyCost(); +} diff --git a/src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java b/src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java index a20643341..4af07f49d 100644 --- a/src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java +++ b/src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java @@ -18,6 +18,10 @@ public interface IRefineryRecipeManager { void addRecipe(String id, FluidStack ingredient1, FluidStack ingredient2, FluidStack result, int energy, int delay); + void removeRecipe(String id); + + void removeRecipe(IFlexibleRecipe recipe); + Collection> getRecipes(); IFlexibleRecipe getRecipe(String currentRecipeId); diff --git a/src/api/java/buildcraft/api/transport/IPipe.java b/src/api/java/buildcraft/api/transport/IPipe.java index 979f536af..e4a82a4c0 100755 --- a/src/api/java/buildcraft/api/transport/IPipe.java +++ b/src/api/java/buildcraft/api/transport/IPipe.java @@ -8,9 +8,8 @@ */ package buildcraft.api.transport; -import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.gates.IGate; public interface IPipe { @@ -22,5 +21,11 @@ public interface IPipe { IPipeTile getTile(); - TileEntity getAdjacentTile(ForgeDirection dir); + IGate getGate(ForgeDirection side); + + boolean hasGate(ForgeDirection side); + + boolean isWired(PipeWire wire); + + boolean isWireActive(PipeWire wire); } diff --git a/src/api/java/buildcraft/api/transport/IPipeTile.java b/src/api/java/buildcraft/api/transport/IPipeTile.java index 94516c8fc..a37db11ad 100644 --- a/src/api/java/buildcraft/api/transport/IPipeTile.java +++ b/src/api/java/buildcraft/api/transport/IPipeTile.java @@ -9,8 +9,9 @@ package buildcraft.api.transport; import net.minecraft.item.ItemStack; - +import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.core.EnumColor; public interface IPipeTile { @@ -29,8 +30,16 @@ public interface IPipeTile { * @param doAdd If false no actual addition should take place. Implementors * should simulate. * @param from Orientation the ItemStack is offered from. + * @param color The color of the item to be added to the pipe, or null for no color. * @return Amount of items used from the passed stack. */ + int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from, EnumColor color); + + /** + * Same as + * {@link #injectItem(ItemStack, boolean, ForgeDirection, EnumColor)} + * but with no color attribute. + */ int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from); /** @@ -41,11 +50,7 @@ public interface IPipeTile { */ boolean isPipeConnected(ForgeDirection with); - /** - * True if the pipe has a powered wire of the specified color. - * - * @param wire - * @return true if powered - */ - boolean isWireActive(PipeWire wire); + TileEntity getAdjacentTile(ForgeDirection dir); + + IPipe getPipe(); } diff --git a/src/api/java/buildcraft/api/transport/IStripesHandler.java b/src/api/java/buildcraft/api/transport/IStripesHandler.java new file mode 100644 index 000000000..f8c36e364 --- /dev/null +++ b/src/api/java/buildcraft/api/transport/IStripesHandler.java @@ -0,0 +1,20 @@ +package buildcraft.api.transport; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +public interface IStripesHandler { + public static enum StripesHandlerType { + ITEM_USE, + BLOCK_BREAK + } + + StripesHandlerType getType(); + + boolean shouldHandle(ItemStack stack); + + boolean handle(World world, int x, int y, int z, ForgeDirection direction, + ItemStack stack, EntityPlayer player, IStripesPipe pipe); +} diff --git a/src/api/java/buildcraft/api/transport/IStripesPipe.java b/src/api/java/buildcraft/api/transport/IStripesPipe.java new file mode 100644 index 000000000..e65750973 --- /dev/null +++ b/src/api/java/buildcraft/api/transport/IStripesPipe.java @@ -0,0 +1,9 @@ +package buildcraft.api.transport; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; + +public interface IStripesPipe extends IPipe { + void sendItem(ItemStack itemStack, ForgeDirection direction); + void dropItem(ItemStack itemStack, ForgeDirection direction); +} diff --git a/src/api/java/buildcraft/api/transport/PipeManager.java b/src/api/java/buildcraft/api/transport/PipeManager.java index f0e6e74c7..6cc0e3429 100755 --- a/src/api/java/buildcraft/api/transport/PipeManager.java +++ b/src/api/java/buildcraft/api/transport/PipeManager.java @@ -15,11 +15,16 @@ import net.minecraft.world.World; public abstract class PipeManager { + public static List stripesHandlers = new ArrayList(); public static List extractionHandlers = new ArrayList(); public static void registerExtractionHandler(IExtractionHandler handler) { extractionHandlers.add(handler); } + + public static void registerStripesHandler(IStripesHandler handler) { + stripesHandlers.add(handler); + } /** * param extractor can be null diff --git a/src/api/java/buildcraft/api/transport/package-info.java b/src/api/java/buildcraft/api/transport/package-info.java index 210db5b4a..414098f2a 100644 --- a/src/api/java/buildcraft/api/transport/package-info.java +++ b/src/api/java/buildcraft/api/transport/package-info.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 */ -@API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|transport") +@API(apiVersion = "2.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|transport") package buildcraft.api.transport; import cpw.mods.fml.common.API; diff --git a/src/api/java/cofh/api/CoFHAPIProps.java b/src/api/java/cofh/api/CoFHAPIProps.java new file mode 100644 index 000000000..22096377f --- /dev/null +++ b/src/api/java/cofh/api/CoFHAPIProps.java @@ -0,0 +1,11 @@ +package cofh.api; + +public class CoFHAPIProps { + + private CoFHAPIProps() { + + } + + public static final String VERSION = "1.7.10R1.0.1"; + +} diff --git a/src/api/java/cofh/api/energy/EnergyStorage.java b/src/api/java/cofh/api/energy/EnergyStorage.java new file mode 100644 index 000000000..1674c1894 --- /dev/null +++ b/src/api/java/cofh/api/energy/EnergyStorage.java @@ -0,0 +1,158 @@ +package cofh.api.energy; + +import net.minecraft.nbt.NBTTagCompound; + +/** + * Reference implementation of {@link IEnergyStorage}. Use/extend this or implement your own. + * + * @author King Lemming + * + */ +public class EnergyStorage implements IEnergyStorage { + + protected int energy; + protected int capacity; + protected int maxReceive; + protected int maxExtract; + + public EnergyStorage(int capacity) { + + this(capacity, capacity, capacity); + } + + public EnergyStorage(int capacity, int maxTransfer) { + + this(capacity, maxTransfer, maxTransfer); + } + + public EnergyStorage(int capacity, int maxReceive, int maxExtract) { + + this.capacity = capacity; + this.maxReceive = maxReceive; + this.maxExtract = maxExtract; + } + + public EnergyStorage readFromNBT(NBTTagCompound nbt) { + + this.energy = nbt.getInteger("Energy"); + + if (energy > capacity) { + energy = capacity; + } + return this; + } + + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + + if (energy < 0) { + energy = 0; + } + nbt.setInteger("Energy", energy); + return nbt; + } + + public void setCapacity(int capacity) { + + this.capacity = capacity; + + if (energy > capacity) { + energy = capacity; + } + } + + public void setMaxTransfer(int maxTransfer) { + + setMaxReceive(maxTransfer); + setMaxExtract(maxTransfer); + } + + public void setMaxReceive(int maxReceive) { + + this.maxReceive = maxReceive; + } + + public void setMaxExtract(int maxExtract) { + + this.maxExtract = maxExtract; + } + + public int getMaxReceive() { + + return maxReceive; + } + + public int getMaxExtract() { + + return maxExtract; + } + + /** + * This function is included to allow for server -> client sync. Do not call this externally to the containing Tile Entity, as not all IEnergyHandlers + * are guaranteed to have it. + * + * @param energy + */ + public void setEnergyStored(int energy) { + + this.energy = energy; + + if (this.energy > capacity) { + this.energy = capacity; + } else if (this.energy < 0) { + this.energy = 0; + } + } + + /** + * This function is included to allow the containing tile to directly and efficiently modify the energy contained in the EnergyStorage. Do not rely on this + * externally, as not all IEnergyHandlers are guaranteed to have it. + * + * @param energy + */ + public void modifyEnergyStored(int energy) { + + this.energy += energy; + + if (this.energy > capacity) { + this.energy = capacity; + } else if (this.energy < 0) { + this.energy = 0; + } + } + + /* IEnergyStorage */ + @Override + public int receiveEnergy(int maxReceive, boolean simulate) { + + int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); + + if (!simulate) { + energy += energyReceived; + } + return energyReceived; + } + + @Override + public int extractEnergy(int maxExtract, boolean simulate) { + + int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); + + if (!simulate) { + energy -= energyExtracted; + } + return energyExtracted; + } + + @Override + public int getEnergyStored() { + + return energy; + } + + @Override + public int getMaxEnergyStored() { + + return capacity; + } + +} diff --git a/src/api/java/cofh/api/energy/IEnergyConnection.java b/src/api/java/cofh/api/energy/IEnergyConnection.java index 63faffb9f..79bdf77af 100644 --- a/src/api/java/cofh/api/energy/IEnergyConnection.java +++ b/src/api/java/cofh/api/energy/IEnergyConnection.java @@ -5,7 +5,7 @@ import net.minecraftforge.common.util.ForgeDirection; /** * Implement this interface on TileEntities which should connect to energy transportation blocks. This is intended for blocks which generate energy but do not * accept it; otherwise just use IEnergyHandler. - * + *

* Note that {@link IEnergyHandler} is an extension of this. * * @author King Lemming diff --git a/src/api/java/cofh/api/energy/IEnergyContainerItem.java b/src/api/java/cofh/api/energy/IEnergyContainerItem.java index 0bcfda600..c28455b1a 100644 --- a/src/api/java/cofh/api/energy/IEnergyContainerItem.java +++ b/src/api/java/cofh/api/energy/IEnergyContainerItem.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; /** * Implement this interface on Item classes that support external manipulation of their internal energy storages. - * + *

* A reference implementation is provided {@link ItemEnergyContainer}. * * @author King Lemming diff --git a/src/api/java/cofh/api/energy/IEnergyHandler.java b/src/api/java/cofh/api/energy/IEnergyHandler.java index 3df312346..22f2dbc62 100644 --- a/src/api/java/cofh/api/energy/IEnergyHandler.java +++ b/src/api/java/cofh/api/energy/IEnergyHandler.java @@ -4,17 +4,19 @@ import net.minecraftforge.common.util.ForgeDirection; /** * Implement this interface on Tile Entities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects. - * + *

* A reference implementation is provided {@link TileEnergyHandler}. - * + * * @author King Lemming - * + * */ -public interface IEnergyHandler extends IEnergyConnection { +public interface IEnergyHandler extends IEnergyProvider, IEnergyReceiver { + + // merely a convenience interface (remove these methods in 1.8; provided here for back-compat via compiler doing things) /** - * Add energy to an IEnergyHandler, internal distribution is left entirely to the IEnergyHandler. - * + * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver. + * * @param from * Orientation the energy is received from. * @param maxReceive @@ -23,11 +25,12 @@ public interface IEnergyHandler extends IEnergyConnection { * If TRUE, the charge will only be simulated. * @return Amount of energy that was (or would have been, if simulated) received. */ + @Override int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate); /** - * Remove energy from an IEnergyHandler, internal distribution is left entirely to the IEnergyHandler. - * + * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider. + * * @param from * Orientation the energy is extracted from. * @param maxExtract @@ -36,16 +39,20 @@ public interface IEnergyHandler extends IEnergyConnection { * If TRUE, the extraction will only be simulated. * @return Amount of energy that was (or would have been, if simulated) extracted. */ + @Override int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate); + /** * Returns the amount of energy currently stored. */ + @Override int getEnergyStored(ForgeDirection from); /** * Returns the maximum amount of energy that can be stored. */ + @Override int getMaxEnergyStored(ForgeDirection from); } diff --git a/src/api/java/cofh/api/energy/IEnergyProvider.java b/src/api/java/cofh/api/energy/IEnergyProvider.java new file mode 100644 index 000000000..05287b35e --- /dev/null +++ b/src/api/java/cofh/api/energy/IEnergyProvider.java @@ -0,0 +1,38 @@ +package cofh.api.energy; + +import net.minecraftforge.common.util.ForgeDirection; + +/** + * Implement this interface on Tile Entities which should provide energy, generally storing it in one or more internal {@link IEnergyStorage} objects. + *

+ * A reference implementation is provided {@link TileEnergyHandler}. + * + * @author King Lemming + * + */ +public interface IEnergyProvider extends IEnergyConnection { + + /** + * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider. + * + * @param from + * Orientation the energy is extracted from. + * @param maxExtract + * Maximum amount of energy to extract. + * @param simulate + * If TRUE, the extraction will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) extracted. + */ + int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate); + + /** + * Returns the amount of energy currently stored. + */ + int getEnergyStored(ForgeDirection from); + + /** + * Returns the maximum amount of energy that can be stored. + */ + int getMaxEnergyStored(ForgeDirection from); + +} diff --git a/src/api/java/cofh/api/energy/IEnergyReceiver.java b/src/api/java/cofh/api/energy/IEnergyReceiver.java new file mode 100644 index 000000000..c726e09e0 --- /dev/null +++ b/src/api/java/cofh/api/energy/IEnergyReceiver.java @@ -0,0 +1,38 @@ +package cofh.api.energy; + +import net.minecraftforge.common.util.ForgeDirection; + +/** + * Implement this interface on Tile Entities which should receive energy, generally storing it in one or more internal {@link IEnergyStorage} objects. + *

+ * A reference implementation is provided {@link TileEnergyHandler}. + * + * @author King Lemming + * + */ +public interface IEnergyReceiver extends IEnergyConnection { + + /** + * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver. + * + * @param from + * Orientation the energy is received from. + * @param maxReceive + * Maximum amount of energy to receive. + * @param simulate + * If TRUE, the charge will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) received. + */ + int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate); + + /** + * Returns the amount of energy currently stored. + */ + int getEnergyStored(ForgeDirection from); + + /** + * Returns the maximum amount of energy that can be stored. + */ + int getMaxEnergyStored(ForgeDirection from); + +} diff --git a/src/api/java/cofh/api/energy/IEnergyStorage.java b/src/api/java/cofh/api/energy/IEnergyStorage.java new file mode 100644 index 000000000..bc2065607 --- /dev/null +++ b/src/api/java/cofh/api/energy/IEnergyStorage.java @@ -0,0 +1,46 @@ +package cofh.api.energy; + +/** + * An energy storage is the unit of interaction with Energy inventories.
+ * This is not to be implemented on TileEntities. This is for internal use only. + *

+ * A reference implementation can be found at {@link EnergyStorage}. + * + * @author King Lemming + * + */ +public interface IEnergyStorage { + + /** + * Adds energy to the storage. Returns quantity of energy that was accepted. + * + * @param maxReceive + * Maximum amount of energy to be inserted. + * @param simulate + * If TRUE, the insertion will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) accepted by the storage. + */ + int receiveEnergy(int maxReceive, boolean simulate); + + /** + * Removes energy from the storage. Returns quantity of energy that was removed. + * + * @param maxExtract + * Maximum amount of energy to be extracted. + * @param simulate + * If TRUE, the extraction will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) extracted from the storage. + */ + int extractEnergy(int maxExtract, boolean simulate); + + /** + * Returns the amount of energy currently stored. + */ + int getEnergyStored(); + + /** + * Returns the maximum amount of energy that can be stored. + */ + int getMaxEnergyStored(); + +} diff --git a/src/api/java/cofh/api/energy/ItemEnergyContainer.java b/src/api/java/cofh/api/energy/ItemEnergyContainer.java new file mode 100644 index 000000000..055ae45bc --- /dev/null +++ b/src/api/java/cofh/api/energy/ItemEnergyContainer.java @@ -0,0 +1,110 @@ +package cofh.api.energy; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +/** + * Reference implementation of {@link IEnergyContainerItem}. Use/extend this or implement your own. + * + * @author King Lemming + * + */ +public class ItemEnergyContainer extends Item implements IEnergyContainerItem { + + protected int capacity; + protected int maxReceive; + protected int maxExtract; + + public ItemEnergyContainer() { + + } + + public ItemEnergyContainer(int capacity) { + + this(capacity, capacity, capacity); + } + + public ItemEnergyContainer(int capacity, int maxTransfer) { + + this(capacity, maxTransfer, maxTransfer); + } + + public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) { + + this.capacity = capacity; + this.maxReceive = maxReceive; + this.maxExtract = maxExtract; + } + + public ItemEnergyContainer setCapacity(int capacity) { + + this.capacity = capacity; + return this; + } + + public void setMaxTransfer(int maxTransfer) { + + setMaxReceive(maxTransfer); + setMaxExtract(maxTransfer); + } + + public void setMaxReceive(int maxReceive) { + + this.maxReceive = maxReceive; + } + + public void setMaxExtract(int maxExtract) { + + this.maxExtract = maxExtract; + } + + /* IEnergyContainerItem */ + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + + if (container.stackTagCompound == null) { + container.stackTagCompound = new NBTTagCompound(); + } + int energy = container.stackTagCompound.getInteger("Energy"); + int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); + + if (!simulate) { + energy += energyReceived; + container.stackTagCompound.setInteger("Energy", energy); + } + return energyReceived; + } + + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + + if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { + return 0; + } + int energy = container.stackTagCompound.getInteger("Energy"); + int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); + + if (!simulate) { + energy -= energyExtracted; + container.stackTagCompound.setInteger("Energy", energy); + } + return energyExtracted; + } + + @Override + public int getEnergyStored(ItemStack container) { + + if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { + return 0; + } + return container.stackTagCompound.getInteger("Energy"); + } + + @Override + public int getMaxEnergyStored(ItemStack container) { + + return capacity; + } + +} diff --git a/src/api/java/cofh/api/energy/TileEnergyHandler.java b/src/api/java/cofh/api/energy/TileEnergyHandler.java new file mode 100644 index 000000000..7cc655e92 --- /dev/null +++ b/src/api/java/cofh/api/energy/TileEnergyHandler.java @@ -0,0 +1,65 @@ +package cofh.api.energy; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; + +/** + * Reference implementation of {@link IEnergyHandler}. Use/extend this or implement your own. + * + * @author King Lemming + * + */ +public class TileEnergyHandler extends TileEntity implements IEnergyHandler { + + protected EnergyStorage storage = new EnergyStorage(32000); + + @Override + public void readFromNBT(NBTTagCompound nbt) { + + super.readFromNBT(nbt); + storage.readFromNBT(nbt); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + + super.writeToNBT(nbt); + storage.writeToNBT(nbt); + } + + /* IEnergyConnection */ + @Override + public boolean canConnectEnergy(ForgeDirection from) { + + return true; + } + + /* IEnergyReceiver */ + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + + return storage.receiveEnergy(maxReceive, simulate); + } + + /* IEnergyProvider */ + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + + return storage.extractEnergy(maxExtract, simulate); + } + + /* IEnergyReceiver and IEnergyProvider */ + @Override + public int getEnergyStored(ForgeDirection from) { + + return storage.getEnergyStored(); + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + + return storage.getMaxEnergyStored(); + } + +} diff --git a/src/api/java/cofh/api/energy/package-info.java b/src/api/java/cofh/api/energy/package-info.java index cb9be15c1..7379702b8 100644 --- a/src/api/java/cofh/api/energy/package-info.java +++ b/src/api/java/cofh/api/energy/package-info.java @@ -2,8 +2,9 @@ * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub * http://www.teamcofh.com */ -@API(apiVersion = "1.7.10R1.0.0", owner = "CoFHAPI", provides = "CoFHAPI|energy") +@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|energy") package cofh.api.energy; +import cofh.api.CoFHAPIProps; import cpw.mods.fml.common.API; diff --git a/src/api/java/cofh/api/package-info.java b/src/api/java/cofh/api/package-info.java deleted file mode 100644 index b7c49a120..000000000 --- a/src/api/java/cofh/api/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/** - * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub - * http://www.teamcofh.com - */ -@API(apiVersion = "1.0", owner = "CoFHLib", provides = "CoFHAPI") -package cofh.api; - -import cpw.mods.fml.common.API; - diff --git a/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java b/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java index ee7048472..9b8833d2b 100644 --- a/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java +++ b/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java @@ -154,7 +154,7 @@ public final class ComputerCraftAPI { try { computerCraft_registerBundledRedstoneProvider.invoke( null, handler ); - } catch (Exception e){ + } catch (Exception e) { // It failed } } @@ -241,7 +241,11 @@ public final class ComputerCraftAPI private static Method findCCMethod( String name, Class[] args ) { try { - return computerCraft.getMethod( name, args ); + if( computerCraft != null ) + { + return computerCraft.getMethod( name, args ); + } + return null; } catch( NoSuchMethodException e ) { System.out.println( "ComputerCraftAPI: ComputerCraft method " + name + " not found." ); return null; diff --git a/src/api/java/dan200/computercraft/api/filesystem/package-info.java b/src/api/java/dan200/computercraft/api/filesystem/package-info.java new file mode 100644 index 000000000..02bb7ea62 --- /dev/null +++ b/src/api/java/dan200/computercraft/api/filesystem/package-info.java @@ -0,0 +1,10 @@ +/** + * This file is part of the public ComputerCraft API - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. + * For help using the API, and posting your mods, visit the forums at computercraft.info. + */ + +@API( owner="ComputerCraft", provides="ComputerCraft|API|FileSystem", apiVersion="1.65" ) +package dan200.computercraft.api.filesystem; + +import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/api/java/dan200/computercraft/api/lua/ILuaContext.java b/src/api/java/dan200/computercraft/api/lua/ILuaContext.java index e4ba2414c..787a93d48 100644 --- a/src/api/java/dan200/computercraft/api/lua/ILuaContext.java +++ b/src/api/java/dan200/computercraft/api/lua/ILuaContext.java @@ -22,7 +22,7 @@ public interface ILuaContext * Do not attempt to common this exception, unless you wish to prevent termination, which is not recommended. * @throws InterruptedException If the user shuts down or reboots the computercraft while pullEvent() is waiting for an event, InterruptedException will be thrown. This exception must not be caught or intercepted, or the computercraft will leak memory and end up in a broken state. */ - public Object[] pullEvent( String filter ) throws Exception, InterruptedException; + public Object[] pullEvent( String filter ) throws LuaException, InterruptedException; /** * The same as pullEvent(), except "terminated" events are ignored. Only use this if you want to prevent program termination, which is not recommended. This method is exactly equivalent to os.pullEventRaw() in lua. @@ -32,7 +32,6 @@ public interface ILuaContext * @see #pullEvent(String) */ public Object[] pullEventRaw( String filter ) throws InterruptedException; - /** * Yield the current coroutine with some arguments until it is resumed. This method is exactly equivalent to coroutine.yield() in lua. Use pullEvent() if you wish to wait for events. diff --git a/src/api/java/dan200/computercraft/api/lua/ILuaObject.java b/src/api/java/dan200/computercraft/api/lua/ILuaObject.java index 7fbd96003..4005bbf85 100644 --- a/src/api/java/dan200/computercraft/api/lua/ILuaObject.java +++ b/src/api/java/dan200/computercraft/api/lua/ILuaObject.java @@ -22,5 +22,5 @@ public interface ILuaObject * Called when a user calls one of the methods that this object implements. This works the same as IPeripheral.callMethod(). See that method for detailed documentation. * @see dan200.computercraft.api.peripheral.IPeripheral#callMethod(dan200.computercraft.api.peripheral.IComputerAccess, ILuaContext, int, Object[]) */ - public Object[] callMethod( ILuaContext context, int method, Object[] arguments ) throws Exception; + public Object[] callMethod( ILuaContext context, int method, Object[] arguments ) throws LuaException, InterruptedException; } diff --git a/src/api/java/dan200/computercraft/api/lua/LuaException.java b/src/api/java/dan200/computercraft/api/lua/LuaException.java new file mode 100644 index 000000000..29874bdcf --- /dev/null +++ b/src/api/java/dan200/computercraft/api/lua/LuaException.java @@ -0,0 +1,31 @@ +/** + * This file is part of the public ComputerCraft API - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. + * For help using the API, and posting your mods, visit the forums at computercraft.info. + */ + +package dan200.computercraft.api.lua; + +/** + * An exception representing an error in Lua, like that raised by the error() function + */ +public class LuaException extends Exception +{ + private final int m_level; + + public LuaException( String message ) + { + this( message, 1 ); + } + + public LuaException( String message, int level ) + { + super( message ); + m_level = level; + } + + public int getLevel() + { + return m_level; + } +} diff --git a/src/api/java/dan200/computercraft/api/lua/package-info.java b/src/api/java/dan200/computercraft/api/lua/package-info.java new file mode 100644 index 000000000..9ea59b6fa --- /dev/null +++ b/src/api/java/dan200/computercraft/api/lua/package-info.java @@ -0,0 +1,10 @@ +/** + * This file is part of the public ComputerCraft API - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. + * For help using the API, and posting your mods, visit the forums at computercraft.info. + */ + +@API( owner="ComputerCraft", provides="ComputerCraft|API|Lua", apiVersion="1.65" ) +package dan200.computercraft.api.lua; + +import cpw.mods.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/media/package-info.java b/src/api/java/dan200/computercraft/api/media/package-info.java new file mode 100644 index 000000000..ec0695fbb --- /dev/null +++ b/src/api/java/dan200/computercraft/api/media/package-info.java @@ -0,0 +1,10 @@ +/** + * This file is part of the public ComputerCraft API - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. + * For help using the API, and posting your mods, visit the forums at computercraft.info. + */ + +@API( owner="ComputerCraft", provides="ComputerCraft|API|Media", apiVersion="1.65" ) +package dan200.computercraft.api.media; + +import cpw.mods.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/package-info.java b/src/api/java/dan200/computercraft/api/package-info.java new file mode 100644 index 000000000..5c16faf4c --- /dev/null +++ b/src/api/java/dan200/computercraft/api/package-info.java @@ -0,0 +1,10 @@ +/** + * This file is part of the public ComputerCraft API - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. + * For help using the API, and posting your mods, visit the forums at computercraft.info. + */ + +@API( owner="ComputerCraft", provides="ComputerCraft|API", apiVersion="1.65" ) +package dan200.computercraft.api; + +import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/api/java/dan200/computercraft/api/peripheral/IComputerAccess.java b/src/api/java/dan200/computercraft/api/peripheral/IComputerAccess.java index 7d4b6e735..1c9327d2c 100644 --- a/src/api/java/dan200/computercraft/api/peripheral/IComputerAccess.java +++ b/src/api/java/dan200/computercraft/api/peripheral/IComputerAccess.java @@ -28,7 +28,12 @@ public interface IComputerAccess * @see dan200.computercraft.api.filesystem.IMount */ public String mount( String desiredLocation, IMount mount ); - + + /** + * TODO: Document me + */ + public String mount( String desiredLocation, IMount mount, String driveName ); + /** * Mount a mount onto the computers' file system in a writable mode.
* @param desiredLocation The location on the computercraft's file system where you would like the mount to be mounted. @@ -41,7 +46,12 @@ public interface IComputerAccess * @see IMount */ public String mountWritable( String desiredLocation, IWritableMount mount ); - + + /** + * TODO: Document me + */ + public String mountWritable( String desiredLocation, IWritableMount mount, String driveName ); + /** * Unmounts a directory previously mounted onto the computers file system by mount() or mountWritable().
* When a directory is unmounted, it will disappear from the computers file system, and the user will no longer be able to diff --git a/src/api/java/dan200/computercraft/api/peripheral/IPeripheral.java b/src/api/java/dan200/computercraft/api/peripheral/IPeripheral.java index 3fff7b826..99396dd95 100644 --- a/src/api/java/dan200/computercraft/api/peripheral/IPeripheral.java +++ b/src/api/java/dan200/computercraft/api/peripheral/IPeripheral.java @@ -7,6 +7,7 @@ package dan200.computercraft.api.peripheral; import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; /** * The interface that defines a peripheral. This should be implemented by the @@ -59,7 +60,7 @@ public interface IPeripheral * arguments are supplied to your method. * @see #getMethodNames */ - public Object[] callMethod( IComputerAccess computer, ILuaContext context, int method, Object[] arguments ) throws Exception; + public Object[] callMethod( IComputerAccess computer, ILuaContext context, int method, Object[] arguments ) throws LuaException, InterruptedException; /** * Is called when canAttachToSide has returned true, and a computercraft is attaching to the peripheral. diff --git a/src/api/java/dan200/computercraft/api/peripheral/package-info.java b/src/api/java/dan200/computercraft/api/peripheral/package-info.java new file mode 100644 index 000000000..c3ee64845 --- /dev/null +++ b/src/api/java/dan200/computercraft/api/peripheral/package-info.java @@ -0,0 +1,10 @@ +/** + * This file is part of the public ComputerCraft API - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. + * For help using the API, and posting your mods, visit the forums at computercraft.info. + */ + +@API( owner="ComputerCraft", provides="ComputerCraft|API|Peripheral", apiVersion="1.65" ) +package dan200.computercraft.api.peripheral; + +import cpw.mods.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/redstone/package-info.java b/src/api/java/dan200/computercraft/api/redstone/package-info.java new file mode 100644 index 000000000..fa59ad32b --- /dev/null +++ b/src/api/java/dan200/computercraft/api/redstone/package-info.java @@ -0,0 +1,10 @@ +/** + * This file is part of the public ComputerCraft API - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. + * For help using the API, and posting your mods, visit the forums at computercraft.info. + */ + +@API( owner="ComputerCraft", provides="ComputerCraft|API|Redstone", apiVersion="1.65" ) +package dan200.computercraft.api.redstone; + +import cpw.mods.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/turtle/ITurtleAccess.java b/src/api/java/dan200/computercraft/api/turtle/ITurtleAccess.java index 34851eb76..e7e96810a 100644 --- a/src/api/java/dan200/computercraft/api/turtle/ITurtleAccess.java +++ b/src/api/java/dan200/computercraft/api/turtle/ITurtleAccess.java @@ -7,6 +7,7 @@ package dan200.computercraft.api.turtle; import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IPeripheral; import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; @@ -119,7 +120,7 @@ public interface ITurtleAccess * unchanged if called from a peripheral method. * @see ITurtleCommand */ - public Object[] executeCommand( ILuaContext context, ITurtleCommand command ) throws Exception; + public Object[] executeCommand( ILuaContext context, ITurtleCommand command ) throws LuaException, InterruptedException; /** * TODO: Document me diff --git a/src/api/java/dan200/computercraft/api/turtle/ITurtleCommand.java b/src/api/java/dan200/computercraft/api/turtle/ITurtleCommand.java index 0d37d8785..a551b649b 100644 --- a/src/api/java/dan200/computercraft/api/turtle/ITurtleCommand.java +++ b/src/api/java/dan200/computercraft/api/turtle/ITurtleCommand.java @@ -8,7 +8,7 @@ package dan200.computercraft.api.turtle; /** * An interface for objects executing custom turtle commands, used with ITurtleAccess.issueCommand - * @see ITurtleAccess#issueCommand(ITurtleCommand) + * @see ITurtleAccess#executeCommand(dan200.computercraft.api.lua.ILuaContext,ITurtleCommand) */ public interface ITurtleCommand { @@ -18,7 +18,7 @@ public interface ITurtleCommand * failure with an error message to indicate the command cannot be executed at this time. * @param turtle access to the turtle for whom the command was issued * @return TurtleCommandResult.success() or TurtleCommandResult.failure( errorMessage ) - * @see ITurtleAccess#issueCommand(ITurtleCommand) + * @see ITurtleAccess#executeCommand(dan200.computercraft.api.lua.ILuaContext,ITurtleCommand) * @see dan200.computercraft.api.turtle.TurtleCommandResult */ public TurtleCommandResult execute( ITurtleAccess turtle ); diff --git a/src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java b/src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java index fc12cc8c8..461d6e2bc 100644 --- a/src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java +++ b/src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java @@ -13,7 +13,7 @@ import net.minecraft.util.IIcon; /** * The primary interface for defining an turtle for Turtles. A turtle turtle * can either be a new tool, or a new peripheral. - * @see dan200.computercraft.api.ComputerCraftAPI#registerUpgrade( ITurtleUpgrade ) + * @see dan200.computercraft.api.ComputerCraftAPI#registerTurtleUpgrade( dan200.computercraft.api.turtle.ITurtleUpgrade ) */ public interface ITurtleUpgrade { @@ -24,7 +24,7 @@ public interface ITurtleUpgrade * The ID must be in the range 64 to 255, as the ID is stored as an 8-bit value, * and 0-64 is reserved for future use by ComputerCraft. The turtle will * fail registration if an already used ID is specified. - * @see dan200.computercraft.api.ComputerCraftAPI#registerUpgrade( ITurtleUpgrade ) + * @see dan200.computercraft.api.ComputerCraftAPI#registerTurtleUpgrade( dan200.computercraft.api.turtle.ITurtleUpgrade ) */ public int getUpgradeID(); @@ -32,7 +32,7 @@ public interface ITurtleUpgrade * Return a String to describe this type of turtle in turtle item names. * Examples of built-in adjectives are "Wireless", "Mining" and "Crafty". */ - public String getAdjective(); + public String getUnlocalisedAdjective(); /** * Return whether this turtle adds a tool or a peripheral to the turtle. @@ -78,12 +78,12 @@ public interface ITurtleUpgrade public TurtleCommandResult useTool( ITurtleAccess turtle, TurtleSide side, TurtleVerb verb, int direction ); /** - * Called to obtain the Icon to be used when rendering a turtle peripheral. Needs to be a "common" - * type Icon for now, as there is no way to determine which texture sheet an Icon is from by the - * Icon itself. + * Called to obtain the IIcon to be used when rendering a turtle peripheral. Needs to be a "common" + * type IIcon for now, as there is no way to determine which texture sheet an IIcon is from by the + * IIcon itself. * @param turtle Access to the turtle that the peripheral resides on. * @param side Which side of the turtle (left or right) the peripheral resides on. - * @return The Icon that you wish to be used to render your turtle peripheral. + * @return The IIcon that you wish to be used to render your turtle peripheral. */ public IIcon getIcon( ITurtleAccess turtle, TurtleSide side ); diff --git a/src/api/java/dan200/computercraft/api/turtle/TurtleCommandResult.java b/src/api/java/dan200/computercraft/api/turtle/TurtleCommandResult.java index 7a94ae6f6..f0f26fd0a 100644 --- a/src/api/java/dan200/computercraft/api/turtle/TurtleCommandResult.java +++ b/src/api/java/dan200/computercraft/api/turtle/TurtleCommandResult.java @@ -8,12 +8,24 @@ package dan200.computercraft.api.turtle; public final class TurtleCommandResult { - private static final TurtleCommandResult s_success = new TurtleCommandResult( true, null ); - private static final TurtleCommandResult s_emptyFailure = new TurtleCommandResult( false, null ); + private static final TurtleCommandResult s_success = new TurtleCommandResult( true, null, null ); + private static final TurtleCommandResult s_emptyFailure = new TurtleCommandResult( false, null, null ); public static TurtleCommandResult success() { - return s_success; + return success( null ); + } + + public static TurtleCommandResult success( Object[] results ) + { + if( results == null || results.length == 0 ) + { + return s_success; + } + else + { + return new TurtleCommandResult( true, null, results ); + } } public static TurtleCommandResult failure() @@ -23,23 +35,25 @@ public final class TurtleCommandResult public static TurtleCommandResult failure( String errorMessage ) { - if( errorMessage != null ) + if( errorMessage == null ) { - return new TurtleCommandResult( false, errorMessage ); + return s_emptyFailure; } else { - return s_emptyFailure; + return new TurtleCommandResult( false, errorMessage, null ); } } private final boolean m_success; private final String m_errorMessage; + private final Object[] m_results; - private TurtleCommandResult( boolean success, String errorMessage ) + private TurtleCommandResult( boolean success, String errorMessage, Object[] results ) { m_success = success; m_errorMessage = errorMessage; + m_results = results; } public boolean isSuccess() @@ -51,4 +65,9 @@ public final class TurtleCommandResult { return m_errorMessage; } + + public Object[] getResults() + { + return m_results; + } } diff --git a/src/api/java/dan200/computercraft/api/turtle/package-info.java b/src/api/java/dan200/computercraft/api/turtle/package-info.java new file mode 100644 index 000000000..13a832fcc --- /dev/null +++ b/src/api/java/dan200/computercraft/api/turtle/package-info.java @@ -0,0 +1,4 @@ +@API( owner="ComputerCraft", provides="ComputerCraft|API|Turtle", apiVersion="1.65" ) +package dan200.computercraft.api.turtle; + +import cpw.mods.fml.common.API; diff --git a/src/api/java/ic2/api/energy/tile/IHeatSource.java b/src/api/java/ic2/api/energy/tile/IHeatSource.java new file mode 100644 index 000000000..2e5db4111 --- /dev/null +++ b/src/api/java/ic2/api/energy/tile/IHeatSource.java @@ -0,0 +1,23 @@ +package ic2.api.energy.tile; + +import net.minecraftforge.common.util.ForgeDirection; + +public interface IHeatSource { + + /* + * Return max heat transmission peer Tick (only theoretical bandwidth not available amount) + */ + int maxrequestHeatTick(ForgeDirection directionFrom); + + /* + * @param requested amount of heat to transfer + * + * @return transmitted amount of heat + * + * example: You Request 100 units of heat but the Source have only 50 units left + * + * requestHeat(100) : return 50 : so 50 units of heat remove from HeatSource + */ + + int requestHeat(ForgeDirection directionFrom, int requestheat); +} diff --git a/src/api/java/ic2/api/energy/tile/IKineticSource.java b/src/api/java/ic2/api/energy/tile/IKineticSource.java new file mode 100644 index 000000000..a65140876 --- /dev/null +++ b/src/api/java/ic2/api/energy/tile/IKineticSource.java @@ -0,0 +1,22 @@ +package ic2.api.energy.tile; + +import net.minecraftforge.common.util.ForgeDirection; + +public interface IKineticSource { + /* + * Return max kinetic energy transmission peer Tick (only theoretical bandwidth not available amount) + */ + int maxrequestkineticenergyTick(ForgeDirection directionFrom); + + /* + * @param requested amount of kinetic energy to transfer + * + * @return transmitted amount of kineticenergy + * + * example: You Request 100 units of kinetic energy but the Source have only 50 units left + * + * requestkineticenergy(100) : return 50 : so 50 units of kinetic energy remove from KineticSource + */ + + int requestkineticenergy(ForgeDirection directionFrom, int requestkineticenergy); +} diff --git a/src/api/java/ic2/api/energy/tile/IMetaDelegate.java b/src/api/java/ic2/api/energy/tile/IMetaDelegate.java new file mode 100644 index 000000000..f7319d0e1 --- /dev/null +++ b/src/api/java/ic2/api/energy/tile/IMetaDelegate.java @@ -0,0 +1,36 @@ +package ic2.api.energy.tile; + +import java.util.List; + +import net.minecraft.tileentity.TileEntity; + +/** + * Interface for grouping multi-block structures to a single energy net delegate. + * + * The energy net uses TileEntity to refer to a specific xyz+world position. If multiple of those + * positions should belong to the same functional structure, i.e. they consume or produce energy + * only once for the whole multi-block instead of once per every single block, this interface + * allows to do so. + * + * The tile entity implementing IMetaDelegate has to be added/removed to/from the energy net + * instead of every single sub-TileEntity. The energy net interaction will be handled by the + * IMetaDelegate TileEntity as well. + * + * The sub tile array TileEntity[] just provides optional connectivity (IEnergyAcceptor, + * IEnergyEmitter) and mandatory position (x, y, z, World) data. + * If the connectivity data on the sub tile is missing, the meta delegate is queried instead. + * + * See ic2/api/energy/usage.txt for an overall description of the energy net api. + */ +public interface IMetaDelegate extends IEnergyTile { + /** + * Get the sub-TileEntities belonging to this Meta TileEntity. + * + * @note The list has to be consistent between the EnergyNet Load and Unload events. + * @note The list must have at least 1 element. + * @note The parent te implementing IMetaDelegate isn't automatically included. + * + * @return sub-TileEntity array + */ + List getSubTiles(); +} diff --git a/src/api/java/micdoodle8/mods/galacticraft/api/entity/IEntityBreathable.java b/src/api/java/micdoodle8/mods/galacticraft/api/entity/IEntityBreathable.java index 21072cf81..618c4529a 100644 --- a/src/api/java/micdoodle8/mods/galacticraft/api/entity/IEntityBreathable.java +++ b/src/api/java/micdoodle8/mods/galacticraft/api/entity/IEntityBreathable.java @@ -5,9 +5,9 @@ package micdoodle8.mods.galacticraft.api.entity; */ public interface IEntityBreathable { - /** - * Whether or not this entity can currently breathe without oxygen in it's - * vicinity - */ - public boolean canBreath(); + /** + * Whether or not this entity can currently breathe without oxygen in it's + * vicinity + */ + public boolean canBreath(); } diff --git a/src/api/java/micdoodle8/mods/galacticraft/api/world/ISolarLevel.java b/src/api/java/micdoodle8/mods/galacticraft/api/world/ISolarLevel.java index 9ec097988..721af2336 100644 --- a/src/api/java/micdoodle8/mods/galacticraft/api/world/ISolarLevel.java +++ b/src/api/java/micdoodle8/mods/galacticraft/api/world/ISolarLevel.java @@ -2,17 +2,17 @@ package micdoodle8.mods.galacticraft.api.world; /** * Used to change the solar multiplier of certain world providers - * + *

* If you have a solar feature in your mod, check whether the world's provider * inherits this class and multiply the solar generation by the solar multiplier * double - * + *

* for example: - * + *

* if (worldObj.provider instanceof ISolarLevel) solarStrength *= ((ISolarLevel) * worldObj.provider).getSolarEnergyMultiplier(); */ public interface ISolarLevel { - public double getSolarEnergyMultiplier(); + public double getSolarEnergyMultiplier(); } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 7756cf992..ad49fc7da 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -76,6 +76,7 @@ import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySalinationController; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntityTeleporter; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; @@ -200,8 +201,8 @@ public class CommonProxy Mekanism.userWorldGenVersion = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "WorldRegenVersion", 0).getInt(); Mekanism.FROM_IC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToEU", 10D).getDouble(10D); Mekanism.TO_IC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EUToJoules", .1D).getDouble(.1D); - Mekanism.FROM_BC = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToMJ", 25D).getDouble(25D); - Mekanism.TO_BC = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MJToJoules", .04D).getDouble(.04D); + Mekanism.FROM_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToRF", 2.5D).getDouble(25D); + Mekanism.TO_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "RFToJoules", .4D).getDouble(.04D); Mekanism.FROM_H2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HydrogenEnergyDensity", 200D, "THIS DETERMINES ELECTROLYTIC SEPARATOR USAGE").getDouble(200D); Mekanism.ENERGY_PER_REDSTONE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerRedstone", 10000D).getDouble(10000D); Mekanism.VOICE_PORT = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoicePort", 36123, null, 1, 65535).getInt(); @@ -231,10 +232,6 @@ public class CommonProxy } } - Mekanism.TO_TE = Mekanism.TO_BC*10; - Mekanism.FROM_TE = Mekanism.FROM_BC/10; - - Mekanism.blacklistBC = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistBuildCraftPower", false).getBoolean(); Mekanism.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); Mekanism.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index 6035ac015..f12524520 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -1,8 +1,5 @@ package mekanism.common; -import ic2.api.energy.EnergyNet; -import ic2.api.energy.tile.IEnergySink; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -20,15 +17,17 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.mj.IBatteryObject; -import buildcraft.api.mj.MjAPI; -import cofh.api.energy.IEnergyHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.Event; +import cofh.api.energy.IEnergyReceiver; +import ic2.api.energy.EnergyNet; +import ic2.api.energy.tile.IEnergySink; + public class EnergyNetwork extends DynamicNetwork { private double lastPowerScale = 0; @@ -154,10 +153,13 @@ public class EnergyNetwork extends DynamicNetwork return sent; } - public synchronized double emit(double energyToSend) + public synchronized double emit(double energyToSend, boolean doEmit) { double toUse = Math.min(getEnergyNeeded(), energyToSend); - electricityStored += toUse; + if(doEmit) + { + electricityStored += toUse; + } return energyToSend-toUse; } @@ -197,11 +199,11 @@ public class EnergyNetwork extends DynamicNetwork { sent += ((IStrictEnergyAcceptor)acceptor).transferEnergyToAcceptor(side.getOpposite(), currentSending); } - else if(MekanismUtils.useRF() && acceptor instanceof IEnergyHandler) + else if(MekanismUtils.useRF() && acceptor instanceof IEnergyReceiver) { - IEnergyHandler handler = (IEnergyHandler)acceptor; - int used = handler.receiveEnergy(side.getOpposite(), (int)Math.round(currentSending*Mekanism.TO_TE), false); - sent += used*Mekanism.FROM_TE; + IEnergyReceiver handler = (IEnergyReceiver)acceptor; + int used = handler.receiveEnergy(side.getOpposite(), (int) Math.round(currentSending * Mekanism.TO_TE), false); + sent += used * Mekanism.FROM_TE; } else if(MekanismUtils.useIC2() && acceptor instanceof IEnergySink) { @@ -209,12 +211,6 @@ public class EnergyNetwork extends DynamicNetwork toSend = Math.min(toSend, ((IEnergySink)acceptor).getDemandedEnergy()*Mekanism.FROM_IC2); sent += (toSend - (((IEnergySink)acceptor).injectEnergy(side.getOpposite(), toSend*Mekanism.TO_IC2, 0)*Mekanism.FROM_IC2)); } - else if(MekanismUtils.useBuildCraft() && MjAPI.getMjBattery(acceptor, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()) != null && !tryAgain) - { - IBatteryObject battery = MjAPI.getMjBattery(acceptor, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()); - double toSend = battery.addEnergy(Math.min(battery.getEnergyRequested(), currentSending*Mekanism.TO_BC)); - sent += toSend*Mekanism.FROM_BC; - } } } } @@ -254,9 +250,9 @@ public class EnergyNetwork extends DynamicNetwork } } } - else if(MekanismUtils.useRF() && acceptor instanceof IEnergyHandler) + else if(MekanismUtils.useRF() && acceptor instanceof IEnergyReceiver) { - IEnergyHandler handler = (IEnergyHandler)acceptor; + IEnergyReceiver handler = (IEnergyReceiver)acceptor; if(handler.canConnectEnergy(side.getOpposite())) { @@ -284,16 +280,6 @@ public class EnergyNetwork extends DynamicNetwork } } } - else if(MekanismUtils.useBuildCraft() && MjAPI.getMjBattery(acceptor, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()) != null) - { - IBatteryObject battery = MjAPI.getMjBattery(acceptor, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()); - - if(battery.getEnergyRequested() > 0) - { - toReturn.add(acceptor); - continue; - } - } } return toReturn; diff --git a/src/main/java/mekanism/common/FuelHandler.java b/src/main/java/mekanism/common/FuelHandler.java index f4ae79af7..10458b53c 100644 --- a/src/main/java/mekanism/common/FuelHandler.java +++ b/src/main/java/mekanism/common/FuelHandler.java @@ -3,11 +3,13 @@ package mekanism.common; import java.util.HashMap; import mekanism.api.gas.Gas; + import net.minecraftforge.fluids.FluidContainerRegistry; -import buildcraft.api.fuels.IronEngineFuel; -import buildcraft.api.fuels.IronEngineFuel.Fuel; import cpw.mods.fml.common.ModAPIManager; +import buildcraft.api.fuels.BuildcraftFuelRegistry; +import buildcraft.api.fuels.IFuel; + public class FuelHandler { public static HashMap fuels = new HashMap(); @@ -26,7 +28,7 @@ public class FuelHandler if(ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|fuels") && gas.hasFluid()) { - Fuel bcFuel = IronEngineFuel.getFuelForFluid(gas.getFluid()); + IFuel bcFuel = BuildcraftFuelRegistry.fuel.getFuel(gas.getFluid()); if(bcFuel != null) { @@ -51,10 +53,10 @@ public class FuelHandler energyPerTick = energyDensity / duration; } - public FuelGas(Fuel bcFuel) + public FuelGas(IFuel bcFuel) { - burnTicks = bcFuel.totalBurningTime / FluidContainerRegistry.BUCKET_VOLUME; - energyPerTick = bcFuel.powerPerCycle * Mekanism.FROM_BC; + burnTicks = bcFuel.getTotalBurningTime() / FluidContainerRegistry.BUCKET_VOLUME; + energyPerTick = bcFuel.getPowerPerCycle() * Mekanism.FROM_TE; } } } diff --git a/src/main/java/mekanism/common/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/IAdvancedBoundingBlock.java index ba1ca1e7e..eaef29dbf 100644 --- a/src/main/java/mekanism/common/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/IAdvancedBoundingBlock.java @@ -1,26 +1,25 @@ package mekanism.common; -import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.IFilterAccess; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; + import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; -import buildcraft.api.power.IPowerReceptor; import cofh.api.energy.IEnergyHandler; import dan200.computercraft.api.peripheral.IPeripheral; +import ic2.api.energy.tile.IEnergySink; @InterfaceList({ - @Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"), @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"), @Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft") }) -public interface IAdvancedBoundingBlock extends IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IPowerReceptor, IStrictEnergyStorage, IEnergyHandler, IPeripheral, IFilterAccess +public interface IAdvancedBoundingBlock extends IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyHandler, IPeripheral, IFilterAccess { public int[] getBoundSlots(Coord4D location, int side); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 51b67b67c..a61b083ef 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -109,6 +109,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.voice.VoiceServerManager; import mekanism.common.world.GenHandler; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -130,13 +131,6 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import net.minecraftforge.oredict.ShapelessOreRecipe; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import rebelkeithy.mods.metallurgy.api.IOreInfo; -import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; -import codechicken.multipart.handler.MultipartProxy; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.IFuelHandler; @@ -154,6 +148,12 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; +import codechicken.multipart.handler.MultipartProxy; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import rebelkeithy.mods.metallurgy.api.IOreInfo; +import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; + /** * Mekanism - a Minecraft mod * @author AidanBrady @@ -322,12 +322,10 @@ public class Mekanism public static EnergyType activeType = EnergyType.J; public static double TO_IC2; - public static double TO_BC; public static double TO_TE; public static double TO_UE = .001; public static double FROM_H2; public static double FROM_IC2; - public static double FROM_BC; public static double FROM_TE; public static double FROM_UE = 1/TO_UE; diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index 4ff1a7d16..aaca6a239 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -1,6 +1,7 @@ package mekanism.common.multipart; import mekanism.common.Tier; + import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultipartGenerator; @@ -28,7 +29,6 @@ public class MultipartMekanism implements IPartFactory MultipartGenerator.registerPassThroughInterface("mekanism.api.energy.IStrictEnergyAcceptor"); MultipartGenerator.registerPassThroughInterface("mekanism.api.transmitters.IGridTransmitter"); MultipartGenerator.registerPassThroughInterface("mekanism.common.ILogisticalTransporter"); - MultipartGenerator.registerPassThroughInterface("buildcraft.api.power.IPowerReceptor"); MultipartGenerator.registerPassThroughInterface("cofh.api.energy.IEnergyHandler"); MultipartGenerator.registerPassThroughInterface("mekanism.api.IConfigurable"); MultipartGenerator.registerPassThroughInterface("mekanism.common.ITileNetwork"); diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index 7dfb6b333..305dc8529 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -1,7 +1,5 @@ package mekanism.common.multipart; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.HashSet; import java.util.Set; @@ -24,6 +22,7 @@ import mekanism.common.transporter.TransporterStack.Path; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -35,14 +34,19 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.transport.IPipeTile; -import buildcraft.api.transport.PipeWire; -import codechicken.lib.vec.Vector3; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + +import buildcraft.api.gates.IGate; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.IPipeTile; +import buildcraft.api.transport.PipeWire; +import codechicken.lib.vec.Vector3; + @Interface(iface = "buildcraft.api.transport.IPipeTile", modid = "BuildCraftAPI|transport") public class PartLogisticalTransporter extends PartSidedPipe implements ILogisticalTransporter, IPipeTile { @@ -58,6 +62,8 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti public Set needsSync = new HashSet(); + public TransporterPipeProxy pipe = new TransporterPipeProxy(); + @Override public String getType() { @@ -667,6 +673,11 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti return PipeType.ITEM; } + @Override + public int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from, buildcraft.api.core.EnumColor color) { + return 0; + } + @Override public int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from) { @@ -681,12 +692,6 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti return 0; } - @Override - public boolean isPipeConnected(ForgeDirection with) - { - return true; - } - @Override protected boolean onConfigure(EntityPlayer player, int part, int side) { @@ -775,8 +780,64 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti @Override @Method(modid = "BuildCraftAPI|transport") - public boolean isWireActive(PipeWire wire) + public boolean isPipeConnected(ForgeDirection with) { - return false; + return connectionMapContainsSide(getAllCurrentConnections(), with); + } + + @Override + @Method(modid = "BuildCraftAPI|transport") + public TileEntity getAdjacentTile(ForgeDirection dir) { + return Coord4D.get(tile()).getFromSide(dir).getTileEntity(world()); + } + + @Override + @Method(modid = "BuildCraftAPI|transport") + public IPipe getPipe() { + return pipe; + } + + public class TransporterPipeProxy implements IPipe + { + + @Override + public int x() { + return PartLogisticalTransporter.this.x(); + } + + @Override + public int y() { + return PartLogisticalTransporter.this.y(); + } + + @Override + public int z() { + return PartLogisticalTransporter.this.y(); + } + + @Override + public IPipeTile getTile() { + return (IPipeTile)tile(); + } + + @Override + public IGate getGate(ForgeDirection side) { + return null; + } + + @Override + public boolean hasGate(ForgeDirection side) { + return false; + } + + @Override + public boolean isWired(PipeWire wire) { + return false; + } + + @Override + public boolean isWireActive(PipeWire wire) { + return false; + } } } diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index bd0b76944..3841d83bf 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -1,7 +1,5 @@ package mekanism.common.multipart; -import ic2.api.energy.tile.IEnergySource; - import java.util.List; import java.util.Set; @@ -15,35 +13,29 @@ import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.power.IPowerReceptor; -import buildcraft.api.power.PowerHandler; -import buildcraft.api.power.PowerHandler.PowerReceiver; -import codechicken.lib.vec.Vector3; -import cofh.api.energy.IEnergyHandler; - import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Vector3; +import cofh.api.energy.IEnergyHandler; +import ic2.api.energy.tile.IEnergySource; + @InterfaceList({ @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"), - @Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"), }) -public class PartUniversalCable extends PartTransmitter implements IStrictEnergyAcceptor, IEnergyHandler, IPowerReceptor +public class PartUniversalCable extends PartTransmitter implements IStrictEnergyAcceptor, IEnergyHandler { public Tier.CableTier tier; - /** A fake power handler used to initiate energy transfer calculations. */ - public PowerHandler powerHandler; - public static TransmitterIcons cableIcons = new TransmitterIcons(4, 1); public double currentPower = 0; @@ -54,11 +46,6 @@ public class PartUniversalCable extends PartTransmitter implement public PartUniversalCable(Tier.CableTier cableTier) { tier = cableTier; - - if(MekanismUtils.useBuildCraft()) - { - configure(); - } } @Override @@ -110,7 +97,7 @@ public class PartUniversalCable extends PartTransmitter implement if(received > 0) { - toDraw -= getTransmitterNetwork().emit(received); + toDraw -= getTransmitterNetwork().emit(received, true); } ((IEnergySource) acceptor).drawEnergy(toDraw * Mekanism.TO_IC2); } @@ -128,17 +115,6 @@ public class PartUniversalCable extends PartTransmitter implement return EnergyNetwork.round(getTransmitterNetwork().electricityStored*(1F/getTransmitterNetwork().transmitters.size())); } - @Override - public void refreshTransmitterNetwork() - { - super.refreshTransmitterNetwork(); - - if(MekanismUtils.useBuildCraft()) - { - reconfigure(); - } - } - @Override public TransmitterType getTransmitter() { @@ -271,12 +247,7 @@ public class PartUniversalCable extends PartTransmitter implement @Method(modid = "CoFHAPI|energy") public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - if(!simulate) - { - return maxReceive - (int)Math.round(getTransmitterNetwork().emit(maxReceive*Mekanism.FROM_TE)*Mekanism.TO_TE); - } - - return 0; + return maxReceive - (int)Math.round(getTransmitterNetwork().emit(maxReceive*Mekanism.FROM_TE, !simulate)*Mekanism.TO_TE); } @Override @@ -290,7 +261,7 @@ public class PartUniversalCable extends PartTransmitter implement @Method(modid = "CoFHAPI|energy") public boolean canConnectEnergy(ForgeDirection from) { - return canReceiveEnergy(from); + return canConnect(from); } @Override @@ -350,51 +321,4 @@ public class PartUniversalCable extends PartTransmitter implement { getTransmitterNetwork().electricityStored = energy; } - - @Override - @Method(modid = "BuildCraftAPI|power") - public PowerReceiver getPowerReceiver(ForgeDirection side) - { - if(getTransmitterNetwork().getEnergyNeeded() == 0) - { - return null; - } - - return powerHandler.getPowerReceiver(); - } - - @Override - @Method(modid = "BuildCraftAPI|power") - public World getWorld() - { - return world(); - } - - @Method(modid = "BuildCraftAPI|power") - private void configure() - { - powerHandler = new PowerHandler(this, PowerHandler.Type.STORAGE); - powerHandler.configurePowerPerdition(0, 0); - powerHandler.configure(0, 0, 0, 0); - } - - @Method(modid = "BuildCraftAPI|power") - private void reconfigure() - { - float needed = (float)(getTransmitterNetwork().getEnergyNeeded()*Mekanism.TO_BC); - powerHandler.configure(1, needed, 0, needed); - } - - @Override - @Method(modid = "BuildCraftAPI|power") - public void doWork(PowerHandler workProvider) - { - if(powerHandler.getEnergyStored() > 0) - { - getTransmitterNetwork().emit(powerHandler.getEnergyStored()*Mekanism.FROM_BC); - } - - powerHandler.setEnergy(0); - reconfigure(); - } } diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 958e400e1..63f487a5c 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -1,14 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.EnergyDisplay.EnergyType; import mekanism.common.IModule; import mekanism.common.Mekanism; import mekanism.common.network.PacketConfigSync.ConfigSyncMessage; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketConfigSync implements IMessageHandler { @Override @@ -36,8 +38,8 @@ public class PacketConfigSync implements IMessageHandler 0) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index e1e2c6e0b..0b6eef73e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -1,15 +1,5 @@ package mekanism.common.tile; -import ic2.api.energy.EnergyNet; -import ic2.api.energy.event.EnergyTileLoadEvent; -import ic2.api.energy.event.EnergyTileUnloadEvent; -import ic2.api.energy.tile.IEnergyConductor; -import ic2.api.energy.tile.IEnergySink; -import ic2.api.energy.tile.IEnergySource; -import ic2.api.energy.tile.IEnergyTile; -import ic2.api.tile.IEnergyStorage; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; @@ -21,29 +11,33 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.ITileNetwork; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; -import buildcraft.api.power.IPowerEmitter; -import buildcraft.api.power.IPowerReceptor; -import buildcraft.api.power.PowerHandler; -import buildcraft.api.power.PowerHandler.PowerReceiver; +import io.netty.buffer.ByteBuf; + import cofh.api.energy.IEnergyHandler; +import ic2.api.energy.EnergyNet; +import ic2.api.energy.event.EnergyTileLoadEvent; +import ic2.api.energy.event.EnergyTileUnloadEvent; +import ic2.api.energy.tile.IEnergyConductor; +import ic2.api.energy.tile.IEnergySink; +import ic2.api.energy.tile.IEnergySource; +import ic2.api.energy.tile.IEnergyTile; +import ic2.api.tile.IEnergyStorage; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2"), @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"), - @Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"), - @Interface(iface = "buildcraft.api.power.IPowerEmitter", modid = "BuildCraftAPI|power") }) -public abstract class TileEntityElectricBlock extends TileEntityContainerBlock implements ITileNetwork, IPowerEmitter, IPowerReceptor, IStrictEnergyStorage, IEnergyHandler, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, ICableOutputter +public abstract class TileEntityElectricBlock extends TileEntityContainerBlock implements ITileNetwork, IStrictEnergyStorage, IEnergyHandler, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, ICableOutputter { /** How much energy is stored in this block. */ public double electricityStored; @@ -51,9 +45,6 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i /** Maximum amount of energy this machine can hold. */ public double MAX_ELECTRICITY; - /** BuildCraft power handler. */ - public PowerHandler powerHandler; - /** Is this registered with IC2 */ public boolean ic2Registered = false; @@ -67,20 +58,8 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i { super(name); MAX_ELECTRICITY = maxEnergy; - - if(MekanismUtils.useBuildCraft()) - configure(); } - @Method(modid = "BuildCraftAPI|power") - public void configure() - { - powerHandler = new PowerHandler(this, PowerHandler.Type.STORAGE); - powerHandler.configurePowerPerdition(0, 0); - powerHandler.configure(0, 0, 0, 0); - } - - @Method(modid = "IC2") public void register() { @@ -118,8 +97,6 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Override public void onUpdate() { - if(MekanismUtils.useBuildCraft()) - reconfigure(); if(!ic2Registered && MekanismUtils.useIC2()) register(); } @@ -199,9 +176,6 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i super.readFromNBT(nbtTags); electricityStored = nbtTags.getDouble("electricityStored"); - - if(MekanismUtils.useBuildCraft()) - reconfigure(); } @Override @@ -212,48 +186,6 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i nbtTags.setDouble("electricityStored", getEnergy()); } - @Override - @Method(modid = "BuildCraftAPI|power") - public PowerReceiver getPowerReceiver(ForgeDirection side) - { - if(getConsumingSides().contains(side)) - { - return powerHandler.getPowerReceiver(); - } - - return null; - } - - @Method(modid = "BuildCraftAPI|power") - protected void reconfigure() - { - powerHandler.configure(0, (float)((getMaxEnergy() - getEnergy()) * Mekanism.TO_BC), 0, (float)(getMaxEnergy() * Mekanism.TO_BC)); - } - - @Override - @Method(modid = "BuildCraftAPI|power") - public void doWork(PowerHandler workProvider) - { - if(powerHandler.getEnergyStored() > 0) - { - if(getEnergy() < getMaxEnergy()) - { - setEnergy(getEnergy() + powerHandler.useEnergy(0, (float)((getMaxEnergy()-getEnergy())*Mekanism.TO_BC), true)*Mekanism.FROM_BC); - } - - powerHandler.setEnergy(0); - } - - reconfigure(); - } - - @Override - @Method(modid = "BuildCraftAPI|power") - public World getWorld() - { - return worldObj; - } - /** * Gets the scaled energy level for the GUI. * @param i - multiplier @@ -459,11 +391,4 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i return toUse; } - - @Override - @Method(modid = "BuildCraftAPI|power") - public boolean canEmitPowerFrom(ForgeDirection side) - { - return getOutputtingSides().contains(side); - } } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java index 06a74c2dc..1f84de284 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java @@ -10,12 +10,12 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; public abstract class TileEntityElectricMachine extends TileEntityBasicMachine @@ -188,7 +188,7 @@ public abstract class TileEntityElectricMachine extends TileEntityBasicMachine @Override @Method(modid = "ComputerCraft") - public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws Exception + public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws LuaException, InterruptedException { switch(method) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index ad9a13a7e..4a3c51f00 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.ChemicalPair; @@ -25,6 +23,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -39,7 +38,11 @@ import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; @@ -524,7 +527,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp @Override @Method(modid = "ComputerCraft") - public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws Exception + public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws LuaException, InterruptedException { switch(method) { diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index edd69606a..05e7cc6ab 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; @@ -15,13 +13,18 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.CableUtils; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; @@ -168,7 +171,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPe @Override @Method(modid = "ComputerCraft") - public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws Exception + public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws LuaException, InterruptedException { switch(method) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index b2dbac96d..7cb498f41 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -1,13 +1,12 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; +import mekanism.api.StackUtils; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -33,14 +32,18 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; @@ -700,7 +703,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip @Override @Method(modid = "ComputerCraft") - public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws Exception + public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws LuaException, InterruptedException { switch(method) { diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index df95eed8c..b66f8b993 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -30,11 +28,16 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; @@ -448,7 +451,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem @Override @Method(modid = "ComputerCraft") - public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws Exception + public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws LuaException, InterruptedException { switch(method) { diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 39d72ce41..583ca3545 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.Map; @@ -27,6 +25,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -39,7 +38,11 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; public class TileEntityPRC extends TileEntityBasicMachine implements IFluidHandler, IGasHandler, ITubeConnection, ISustainedData @@ -344,7 +347,7 @@ public class TileEntityPRC extends TileEntityBasicMachine implements IFluidHandl @Override @Method(modid = "ComputerCraft") - public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws Exception + public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws LuaException, InterruptedException { return null; } diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index ea4fab190..99eba802c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -18,6 +16,7 @@ import mekanism.common.network.PacketPortalFX.PortalFXMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayerMP; @@ -35,7 +34,11 @@ import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; @@ -539,7 +542,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IPe @Override @Method(modid = "ComputerCraft") - public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws Exception + public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws LuaException, InterruptedException { switch(method) { diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 31ed1a67b..3590cd0a0 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -1,10 +1,5 @@ package mekanism.common.util; -import ic2.api.energy.EnergyNet; -import ic2.api.energy.tile.IEnergyAcceptor; -import ic2.api.energy.tile.IEnergySink; -import ic2.api.energy.tile.IEnergySource; - import java.util.ArrayList; import java.util.EnumSet; import java.util.List; @@ -17,13 +12,17 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityElectricBlock; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.mj.IBatteryObject; -import buildcraft.api.mj.MjAPI; -import buildcraft.api.power.IPowerEmitter; + import cofh.api.energy.IEnergyConnection; -import cofh.api.energy.IEnergyHandler; +import cofh.api.energy.IEnergyProvider; +import cofh.api.energy.IEnergyReceiver; +import ic2.api.energy.EnergyNet; +import ic2.api.energy.tile.IEnergyAcceptor; +import ic2.api.energy.tile.IEnergySink; +import ic2.api.energy.tile.IEnergySource; public final class CableUtils { @@ -55,8 +54,7 @@ public final class CableUtils { return (tileEntity instanceof IStrictEnergyAcceptor || (MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) || - (MekanismUtils.useBuildCraft() && MjAPI.getMjBattery(tileEntity) != null && !(tileEntity instanceof IGridTransmitter)) || - (MekanismUtils.useRF() && tileEntity instanceof IEnergyHandler)); + (MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver)); } /** @@ -145,9 +143,7 @@ public final class CableUtils { return (tileEntity instanceof ICableOutputter && ((ICableOutputter)tileEntity).canOutputTo(side.getOpposite())) || (MekanismUtils.useIC2() && tileEntity instanceof IEnergySource && ((IEnergySource)tileEntity).emitsEnergyTo(null, side.getOpposite())) || - (MekanismUtils.useRF() && tileEntity instanceof IEnergyHandler && ((IEnergyHandler)tileEntity).canConnectEnergy(side.getOpposite())) || - (MekanismUtils.useRF() && tileEntity instanceof IEnergyConnection && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite())) || - (MekanismUtils.useBuildCraft() && tileEntity instanceof IPowerEmitter && ((IPowerEmitter)tileEntity).canEmitPowerFrom(side.getOpposite())); + (MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite())); } /** @@ -196,16 +192,9 @@ public final class CableUtils return true; } } - else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyHandler) + else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyConnection) { - if(((IEnergyHandler)tileEntity).canConnectEnergy(side.getOpposite())) - { - return true; - } - } - else if(MekanismUtils.useBuildCraft()) - { - if(MjAPI.getMjBattery(tileEntity, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()) != null) + if(((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite())) { return true; } @@ -298,9 +287,9 @@ public final class CableUtils sent += acceptor.transferEnergyToAcceptor(side.getOpposite(), currentSending); } } - else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyHandler) + else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver) { - IEnergyHandler handler = (IEnergyHandler)tileEntity; + IEnergyReceiver handler = (IEnergyReceiver)tileEntity; if(handler.canConnectEnergy(side.getOpposite())) { @@ -317,12 +306,6 @@ public final class CableUtils sent += (toSend - (((IEnergySink)tileEntity).injectEnergy(side.getOpposite(), toSend*Mekanism.TO_IC2, 0)*Mekanism.FROM_IC2)); } } - else if(MekanismUtils.useBuildCraft() && MjAPI.getMjBattery(tileEntity, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()) != null && !tryAgain) - { - IBatteryObject battery = MjAPI.getMjBattery(tileEntity, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()); - double toSend = battery.addEnergy(Math.min(battery.getEnergyRequested(), currentSending*Mekanism.TO_BC)); - sent += toSend*Mekanism.FROM_BC; - } return sent; } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 78004e571..d8a1fa75d 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -44,6 +44,7 @@ import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityElectricChest; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -1176,7 +1177,7 @@ public final class MekanismUtils case EU: return Math.round(energy*Mekanism.TO_IC2) + " EU"; case MJ: - return (Math.round((energy*Mekanism.TO_BC)*100)/100) + " MJ"; + return (Math.round((energy*Mekanism.TO_TE)*10)/100) + " MJ"; } return "error"; diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index e1ee78343..1310a120a 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -11,6 +11,7 @@ import mekanism.common.ILogisticalTransporter; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterManager; import mekanism.common.transporter.TransporterStack; + import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -18,8 +19,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.power.IPowerReceptor; -import buildcraft.api.power.PowerHandler.Type; public final class TransporterUtils { @@ -78,16 +77,6 @@ public final class TransporterUtils ForgeDirection forgeSide = ForgeDirection.getOrientation(side).getOpposite(); - //Immature BuildCraft inv check - if(MekanismUtils.useBuildCraft() && inventory instanceof IPowerReceptor) - { - if(((IPowerReceptor)inventory).getPowerReceiver(forgeSide) != null && ((IPowerReceptor)inventory).getPowerReceiver(forgeSide).getType() == Type.MACHINE) - { - connectable[side] = true; - continue; - } - } - if(inventory.getSizeInventory() > 0) { if(inventory instanceof ISidedInventory) diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index b3dcf425e..c526c485a 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -1,7 +1,5 @@ package mekanism.generators.common; -import io.netty.buffer.ByteBuf; - import java.io.IOException; import mekanism.api.gas.Gas; @@ -14,6 +12,7 @@ import mekanism.common.item.ItemMekanism; import mekanism.common.recipe.MekanismRecipe; import mekanism.generators.common.block.BlockGenerator; import mekanism.generators.common.item.ItemBlockGenerator; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -23,7 +22,6 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; -import buildcraft.api.fuels.IronEngineFuel; import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; @@ -37,6 +35,11 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; +import io.netty.buffer.ByteBuf; + +import buildcraft.api.fuels.BuildcraftFuelRegistry; +import buildcraft.api.fuels.IFuel; + @Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "7.1.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { @@ -72,19 +75,18 @@ public class MekanismGenerators implements IModule @EventHandler public void postInit(FMLPostInitializationEvent event) { - if(ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|fuels")) + if(ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|fuels") && BuildcraftFuelRegistry.fuel != null) { - for(String s : IronEngineFuel.fuels.keySet()) + for(IFuel s : BuildcraftFuelRegistry.fuel.getFuels()) { - Fluid f = FluidRegistry.getFluid(s); - if(!(f == null || GasRegistry.containsGas(s))) + if(!(s.getFluid() == null || GasRegistry.containsGas(s.getFluid().getName()))) { - GasRegistry.register(new Gas(f)); + GasRegistry.register(new Gas(s.getFluid())); } } - IronEngineFuel.addFuel("ethene", (float) (240 * Mekanism.TO_BC), 40 * FluidContainerRegistry.BUCKET_VOLUME); + BuildcraftFuelRegistry.fuel.addFuel(FluidRegistry.getFluid("ethene"), (int)(240 * Mekanism.TO_TE), 40 * FluidContainerRegistry.BUCKET_VOLUME); } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 33170f7a6..81a81c604 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -1,7 +1,5 @@ package mekanism.generators.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; @@ -12,6 +10,7 @@ import mekanism.common.Mekanism; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -24,7 +23,11 @@ import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; public class TileEntityBioGenerator extends TileEntityGenerator implements IFluidHandler, ISustainedData @@ -236,7 +239,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui @Override @Method(modid = "ComputerCraft") - public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws Exception + public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws LuaException, InterruptedException { switch(method) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 9130d91d0..8f6dbd8ee 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -1,7 +1,5 @@ package mekanism.generators.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.gas.Gas; @@ -13,16 +11,21 @@ import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; import mekanism.common.FuelHandler; +import mekanism.common.FuelHandler.FuelGas; import mekanism.common.ISustainedData; import mekanism.common.Mekanism; -import mekanism.common.FuelHandler.FuelGas; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; public class TileEntityGasGenerator extends TileEntityGenerator implements IGasHandler, ITubeConnection, ISustainedData @@ -169,7 +172,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH @Override @Method(modid = "ComputerCraft") - public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws Exception + public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws LuaException, InterruptedException { switch(method) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 671093120..4e651212a 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -1,7 +1,5 @@ package mekanism.generators.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; @@ -15,6 +13,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; @@ -22,6 +21,9 @@ import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; @@ -52,11 +54,6 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem { super(name, maxEnergy); - if(MekanismUtils.useBuildCraft()) - { - powerHandler.configure(0, 0, 0, 0); - } - output = out; isActive = false; controlType = RedstoneControl.DISABLED; @@ -274,11 +271,4 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem controlType = type; MekanismUtils.saveChunk(this); } - - @Override - @Method(modid = "BuildCraftAPI|power") - protected void reconfigure() - { - powerHandler.configure(0, 0, 0, 0); - } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 64a9457ea..41a910157 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -1,7 +1,5 @@ package mekanism.generators.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.ISustainedData; @@ -11,6 +9,7 @@ import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import mekanism.generators.common.MekanismGenerators; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -26,7 +25,11 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; public class TileEntityHeatGenerator extends TileEntityGenerator implements IFluidHandler, ISustainedData @@ -277,7 +280,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu @Override @Method(modid = "ComputerCraft") - public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws Exception + public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws LuaException, InterruptedException { switch(method) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 45a642c26..a79adee5c 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -1,7 +1,5 @@ package mekanism.generators.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; @@ -9,14 +7,19 @@ import mekanism.common.Mekanism; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; -import micdoodle8.mods.galacticraft.api.world.ISolarLevel; + import net.minecraft.item.ItemStack; import net.minecraft.world.biome.BiomeGenDesert; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; +import micdoodle8.mods.galacticraft.api.world.ISolarLevel; public class TileEntitySolarGenerator extends TileEntityGenerator { @@ -151,7 +154,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator @Override @Method(modid = "ComputerCraft") - public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws Exception + public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws LuaException, InterruptedException { switch(method) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java index d6e6c4a4b..a61428d2d 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java @@ -6,9 +6,12 @@ import mekanism.common.Mekanism; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.Optional.Method; + import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; public class TileEntityWindTurbine extends TileEntityGenerator implements IBoundingBlock @@ -80,7 +83,7 @@ public class TileEntityWindTurbine extends TileEntityGenerator implements IBound @Override @Method(modid = "ComputerCraft") - public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws Exception + public Object[] callMethod(IComputerAccess computer, ILuaContext context, int method, Object[] arguments) throws LuaException, InterruptedException { switch(method) { From 5b4f154040caa4b39fa1919d32a63de66c61d99c Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 10 Nov 2014 21:53:29 +0000 Subject: [PATCH 2/5] Giant optimise imports. --- src/main/java/mekanism/api/Coord4D.java | 4 +-- src/main/java/mekanism/api/MekanismAPI.java | 2 +- src/main/java/mekanism/api/RecipeHelper.java | 1 + .../java/mekanism/api/gas/GasNetwork.java | 1 + .../mekanism/api/gas/GasTransmission.java | 2 +- .../mekanism/api/gas/IGasTransmitter.java | 1 + .../api/transmitters/DynamicNetwork.java | 1 + .../api/transmitters/IGridTransmitter.java | 1 - .../api/transmitters/TransmissionType.java | 1 + .../mekanism/client/CapeBufferDownload.java | 1 + .../client/ClientConnectionHandler.java | 1 + .../mekanism/client/ClientPlayerTracker.java | 1 + .../java/mekanism/client/ClientProxy.java | 1 + .../mekanism/client/ClientTickHandler.java | 1 + .../java/mekanism/client/HolidayManager.java | 1 + .../java/mekanism/client/MekKeyHandler.java | 7 +---- .../java/mekanism/client/MekanismClient.java | 4 +-- .../mekanism/client/MekanismKeyHandler.java | 6 ++-- .../mekanism/client/ThreadClientUpdate.java | 1 + .../mekanism/client/ThreadTankSparkle.java | 1 + .../gui/GuiAdvancedElectricMachine.java | 6 ++-- .../java/mekanism/client/gui/GuiBucketIO.java | 4 ++- .../mekanism/client/gui/GuiChanceMachine.java | 6 ++-- .../client/gui/GuiChemicalCrystallizer.java | 6 ++-- .../gui/GuiChemicalDissolutionChamber.java | 6 ++-- .../client/gui/GuiChemicalInfuser.java | 7 ++--- .../gui/GuiChemicalInjectionChamber.java | 1 + .../client/gui/GuiChemicalOxidizer.java | 6 ++-- .../client/gui/GuiChemicalWasher.java | 6 ++-- .../java/mekanism/client/gui/GuiCombiner.java | 1 + .../mekanism/client/gui/GuiConfiguration.java | 6 ++-- .../client/gui/GuiConfigurationTab.java | 4 ++- .../client/gui/GuiContainerEditMode.java | 2 ++ .../java/mekanism/client/gui/GuiCredits.java | 1 + .../java/mekanism/client/gui/GuiCrusher.java | 1 + .../mekanism/client/gui/GuiDictionary.java | 6 ++-- .../mekanism/client/gui/GuiDigitalMiner.java | 6 ++-- .../client/gui/GuiDigitalMinerConfig.java | 6 ++-- .../mekanism/client/gui/GuiDynamicTank.java | 6 ++-- .../mekanism/client/gui/GuiElectricChest.java | 6 ++-- .../client/gui/GuiElectricMachine.java | 6 ++-- .../mekanism/client/gui/GuiElectricPump.java | 6 ++-- .../client/gui/GuiElectrolyticSeparator.java | 6 ++-- .../java/mekanism/client/gui/GuiElement.java | 4 ++- .../client/gui/GuiEnergizedSmelter.java | 1 + .../mekanism/client/gui/GuiEnergyCube.java | 6 ++-- .../mekanism/client/gui/GuiEnergyGauge.java | 4 ++- .../mekanism/client/gui/GuiEnergyInfo.java | 4 ++- .../client/gui/GuiEnrichmentChamber.java | 1 + .../java/mekanism/client/gui/GuiFactory.java | 6 ++-- .../mekanism/client/gui/GuiFluidGauge.java | 1 + .../client/gui/GuiFluidicPlenisher.java | 6 ++-- .../java/mekanism/client/gui/GuiGasGauge.java | 1 + .../java/mekanism/client/gui/GuiGasTank.java | 6 ++-- .../java/mekanism/client/gui/GuiGauge.java | 4 ++- .../client/gui/GuiLogisticalSorter.java | 6 ++-- .../mekanism/client/gui/GuiMFilterSelect.java | 6 ++-- .../client/gui/GuiMItemStackFilter.java | 6 ++-- .../client/gui/GuiMMaterialFilter.java | 6 ++-- .../mekanism/client/gui/GuiMModIDFilter.java | 6 ++-- .../client/gui/GuiMOreDictFilter.java | 9 ++---- .../java/mekanism/client/gui/GuiMekanism.java | 1 + .../client/gui/GuiMetallurgicInfuser.java | 6 ++-- .../client/gui/GuiOsmiumCompressor.java | 1 + src/main/java/mekanism/client/gui/GuiPRC.java | 6 ++-- .../mekanism/client/gui/GuiPasswordEnter.java | 6 ++-- .../client/gui/GuiPasswordModify.java | 6 ++-- .../mekanism/client/gui/GuiPortableTank.java | 6 ++-- .../client/gui/GuiPortableTeleporter.java | 6 ++-- .../java/mekanism/client/gui/GuiPowerBar.java | 4 ++- .../client/gui/GuiPrecisionSawmill.java | 1 + .../java/mekanism/client/gui/GuiProgress.java | 4 ++- .../client/gui/GuiPurificationChamber.java | 1 + .../mekanism/client/gui/GuiRecipeType.java | 4 ++- .../client/gui/GuiRedstoneControl.java | 4 ++- .../mekanism/client/gui/GuiRobitCrafting.java | 6 ++-- .../client/gui/GuiRobitInventory.java | 6 ++-- .../mekanism/client/gui/GuiRobitMain.java | 6 ++-- .../mekanism/client/gui/GuiRobitRepair.java | 7 +++-- .../mekanism/client/gui/GuiRobitSmelting.java | 1 + .../client/gui/GuiRotaryCondensentrator.java | 6 ++-- .../client/gui/GuiSalinationController.java | 6 ++-- .../mekanism/client/gui/GuiSeismicReader.java | 6 ++-- .../client/gui/GuiSeismicVibrator.java | 6 ++-- .../java/mekanism/client/gui/GuiSlot.java | 4 ++- .../mekanism/client/gui/GuiSortingTab.java | 4 ++- .../mekanism/client/gui/GuiTFilterSelect.java | 6 ++-- .../client/gui/GuiTItemStackFilter.java | 6 ++-- .../client/gui/GuiTMaterialFilter.java | 6 ++-- .../mekanism/client/gui/GuiTModIDFilter.java | 6 ++-- .../client/gui/GuiTOreDictFilter.java | 6 ++-- .../mekanism/client/gui/GuiTeleporter.java | 6 ++-- .../client/gui/GuiUpgradeManagement.java | 4 ++- .../client/model/ModelArmoredJetpack.java | 1 + .../client/model/ModelAtomicDisassembler.java | 1 + .../mekanism/client/model/ModelBalloon.java | 6 ++-- .../model/ModelChemicalCrystallizer.java | 1 + .../ModelChemicalDissolutionChamber.java | 1 + .../client/model/ModelChemicalInfuser.java | 6 ++-- .../client/model/ModelChemicalOxidizer.java | 6 ++-- .../client/model/ModelChemicalWasher.java | 1 + .../client/model/ModelDigitalMiner.java | 1 + .../client/model/ModelEnergyCube.java | 1 + .../mekanism/client/model/ModelGasMask.java | 6 ++-- .../mekanism/client/model/ModelJetpack.java | 6 ++-- .../client/model/ModelLogisticalSorter.java | 1 + .../client/model/ModelPortableTank.java | 1 + .../model/ModelRendererSelectiveFace.java | 6 ++-- .../mekanism/client/model/ModelRobit.java | 6 ++-- .../client/model/ModelSeismicVibrator.java | 4 +-- .../nei/AdvancedMachineRecipeHandler.java | 10 +++---- .../client/nei/BaseRecipeHandler.java | 10 ++++--- .../nei/ChanceMachineRecipeHandler.java | 11 +++---- .../ChemicalCrystallizerRecipeHandler.java | 10 +++---- ...emicalDissolutionChamberRecipeHandler.java | 12 ++++---- .../nei/ChemicalInfuserRecipeHandler.java | 11 ++++--- ...ChemicalInjectionChamberRecipeHandler.java | 1 + .../nei/ChemicalOxidizerRecipeHandler.java | 11 ++++--- .../nei/ChemicalWasherRecipeHandler.java | 11 ++++--- .../client/nei/CombinerRecipeHandler.java | 1 + .../client/nei/CrusherRecipeHandler.java | 3 -- .../ElectrolyticSeparatorRecipeHandler.java | 10 +++---- .../client/nei/ElementBoundHandler.java | 2 ++ .../client/nei/MachineRecipeHandler.java | 9 +++--- .../client/nei/MekanismRecipeHandler.java | 2 ++ .../client/nei/MekanismSlotClickHandler.java | 2 ++ .../nei/MetallurgicInfuserRecipeHandler.java | 9 +++--- .../client/nei/NEIMekanismConfig.java | 2 ++ .../nei/OsmiumCompressorRecipeHandler.java | 1 + .../mekanism/client/nei/PRCRecipeHandler.java | 10 +++---- .../nei/PurificationChamberRecipeHandler.java | 1 + .../RotaryCondensentratorRecipeHandler.java | 12 ++++---- .../SalinationControllerRecipeHandler.java | 10 +++---- .../client/render/MekanismRenderer.java | 8 ++--- .../client/render/ModelCustomArmor.java | 6 ++-- .../client/render/RenderGlowPanel.java | 2 ++ .../client/render/RenderPartTransmitter.java | 5 ++-- .../client/render/RenderTickHandler.java | 1 + .../render/block/BasicRenderingHandler.java | 6 ++-- .../render/block/MachineRenderingHandler.java | 6 ++-- .../client/render/entity/RenderBalloon.java | 6 ++-- .../entity/RenderObsidianTNTPrimed.java | 6 ++-- .../client/render/entity/RenderRobit.java | 1 + .../render/item/ItemRenderingHandler.java | 6 ++-- .../client/render/tileentity/RenderBin.java | 6 ++-- .../render/tileentity/RenderChargepad.java | 6 ++-- .../RenderChemicalCrystallizer.java | 6 ++-- .../RenderChemicalDissolutionChamber.java | 6 ++-- .../tileentity/RenderChemicalInfuser.java | 1 + .../tileentity/RenderChemicalOxidizer.java | 1 + .../tileentity/RenderChemicalWasher.java | 1 + .../tileentity/RenderConfigurableMachine.java | 6 ++-- .../render/tileentity/RenderDigitalMiner.java | 6 ++-- .../render/tileentity/RenderDynamicTank.java | 6 ++-- .../tileentity/RenderElectricChest.java | 6 ++-- .../render/tileentity/RenderElectricPump.java | 6 ++-- .../RenderElectrolyticSeparator.java | 6 ++-- .../render/tileentity/RenderEnergyCube.java | 6 ++-- .../tileentity/RenderFluidicPlenisher.java | 6 ++-- .../render/tileentity/RenderGasTank.java | 6 ++-- .../tileentity/RenderLogisticalSorter.java | 6 ++-- .../tileentity/RenderMetallurgicInfuser.java | 6 ++-- .../render/tileentity/RenderObsidianTNT.java | 6 ++-- .../render/tileentity/RenderPortableTank.java | 6 ++-- .../RenderPressurizedReactionChamber.java | 6 ++-- .../RenderRotaryCondensentrator.java | 6 ++-- .../RenderSalinationController.java | 6 ++-- .../tileentity/RenderSeismicVibrator.java | 6 ++-- .../render/tileentity/RenderTeleporter.java | 1 + .../mekanism/client/sound/GasMaskSound.java | 1 + .../mekanism/client/sound/JetpackSound.java | 1 + .../mekanism/client/sound/PlayerSound.java | 1 + .../java/mekanism/client/sound/Sound.java | 1 + .../mekanism/client/sound/SoundHandler.java | 4 ++- .../java/mekanism/client/sound/TileSound.java | 1 + .../mekanism/client/voice/VoiceClient.java | 5 ++-- .../mekanism/client/voice/VoiceInput.java | 11 +++---- .../mekanism/client/voice/VoiceOutput.java | 9 +++--- .../mekanism/common/BoxBlacklistParser.java | 1 + .../java/mekanism/common/CommandMekanism.java | 1 + .../common/CommonPlayerTickHandler.java | 1 + .../mekanism/common/CommonPlayerTracker.java | 1 + .../common/CommonWorldTickHandler.java | 1 + .../common/ConnectedTextureRenderer.java | 1 + .../java/mekanism/common/FluidNetwork.java | 1 + src/main/java/mekanism/common/IEjector.java | 1 + .../java/mekanism/common/IEnergyCube.java | 1 + src/main/java/mekanism/common/IFactory.java | 3 +- .../common/ILogisticalTransporter.java | 1 + src/main/java/mekanism/common/IModule.java | 4 +-- .../java/mekanism/common/ITileComponent.java | 4 +-- .../java/mekanism/common/ITileNetwork.java | 4 +-- .../java/mekanism/common/ItemAttacher.java | 1 + .../java/mekanism/common/OreDictCache.java | 1 + .../java/mekanism/common/PacketHandler.java | 6 ++-- .../java/mekanism/common/RobitAIFollow.java | 1 + .../java/mekanism/common/RobitAIPickup.java | 1 + src/main/java/mekanism/common/Tier.java | 1 + .../java/mekanism/common/asm/LoadingHook.java | 3 +- .../mekanism/common/block/BlockBasic.java | 1 + .../mekanism/common/block/BlockBounding.java | 1 + .../common/block/BlockCardboardBox.java | 1 + .../common/block/BlockEnergyCube.java | 9 +++--- .../mekanism/common/block/BlockGasTank.java | 5 ++-- .../mekanism/common/block/BlockMachine.java | 7 ++--- .../common/block/BlockObsidianTNT.java | 1 + .../java/mekanism/common/block/BlockOre.java | 1 + .../mekanism/common/block/BlockPlastic.java | 1 + .../common/block/BlockPlasticFence.java | 1 + .../java/mekanism/common/block/BlockSalt.java | 1 + .../mekanism/common/entity/EntityBalloon.java | 5 ++-- .../common/entity/EntityObsidianTNT.java | 1 + .../mekanism/common/entity/EntityRobit.java | 11 ++++--- .../common/integration/IC2ItemManager.java | 4 ++- .../common/integration/MekanismHooks.java | 2 ++ .../common/integration/OreDictManager.java | 9 +++--- .../common/inventory/InventoryBin.java | 3 +- .../inventory/InventoryElectricChest.java | 1 + .../ContainerAdvancedElectricMachine.java | 1 + .../container/ContainerChanceMachine.java | 1 + .../ContainerChemicalCrystallizer.java | 1 + .../ContainerChemicalDissolutionChamber.java | 1 + .../container/ContainerChemicalInfuser.java | 1 + .../container/ContainerChemicalOxidizer.java | 1 + .../container/ContainerChemicalWasher.java | 1 + .../container/ContainerDigitalMiner.java | 1 + .../container/ContainerDynamicTank.java | 1 + .../container/ContainerElectricChest.java | 1 + .../container/ContainerElectricMachine.java | 1 + .../container/ContainerElectricPump.java | 1 + .../ContainerElectrolyticSeparator.java | 1 + .../container/ContainerEnergyCube.java | 3 +- .../inventory/container/ContainerFactory.java | 1 + .../inventory/container/ContainerFilter.java | 1 + .../container/ContainerFluidicPlenisher.java | 1 + .../inventory/container/ContainerGasTank.java | 1 + .../ContainerMetallurgicInfuser.java | 1 + .../inventory/container/ContainerNull.java | 1 + .../inventory/container/ContainerPRC.java | 1 + .../container/ContainerPortableTank.java | 1 + .../container/ContainerRobitInventory.java | 1 + .../container/ContainerRobitMain.java | 1 + .../container/ContainerRobitSmelting.java | 1 + .../ContainerRotaryCondensentrator.java | 1 + .../ContainerSalinationController.java | 1 + .../container/ContainerSeismicVibrator.java | 1 + .../container/ContainerTeleporter.java | 1 + .../inventory/slot/SlotElectricChest.java | 1 + .../common/inventory/slot/SlotEnergy.java | 1 + .../inventory/slot/SlotMachineUpgrade.java | 1 + .../inventory/slot/SlotStorageTank.java | 1 + .../common/item/ItemAtomicDisassembler.java | 1 + .../mekanism/common/item/ItemBalloon.java | 1 + .../mekanism/common/item/ItemBlockBasic.java | 1 + .../common/item/ItemBlockCardboardBox.java | 1 + .../common/item/ItemBlockEnergyCube.java | 12 ++++---- .../common/item/ItemBlockGasTank.java | 3 +- .../common/item/ItemBlockMachine.java | 29 +++++-------------- .../mekanism/common/item/ItemBlockOre.java | 4 +-- .../common/item/ItemBlockPlastic.java | 1 + .../java/mekanism/common/item/ItemClump.java | 1 + .../common/item/ItemConfigurator.java | 3 +- .../common/item/ItemControlCircuit.java | 1 + .../mekanism/common/item/ItemCrystal.java | 1 + .../mekanism/common/item/ItemDictionary.java | 1 + .../mekanism/common/item/ItemDirtyDust.java | 1 + .../java/mekanism/common/item/ItemDust.java | 1 + .../mekanism/common/item/ItemElectricBow.java | 1 + .../mekanism/common/item/ItemEnergized.java | 6 ++-- .../mekanism/common/item/ItemFilterCard.java | 1 + .../mekanism/common/item/ItemFreeRunners.java | 10 +++---- .../mekanism/common/item/ItemGasMask.java | 1 + .../java/mekanism/common/item/ItemHDPE.java | 1 + .../java/mekanism/common/item/ItemIngot.java | 1 + .../mekanism/common/item/ItemJetpack.java | 1 + .../mekanism/common/item/ItemMekanism.java | 1 + .../common/item/ItemNetworkReader.java | 1 + .../common/item/ItemPortableTeleporter.java | 1 + .../java/mekanism/common/item/ItemProxy.java | 1 - .../java/mekanism/common/item/ItemRobit.java | 1 + .../mekanism/common/item/ItemScubaTank.java | 1 + .../common/item/ItemSeismicReader.java | 1 + .../java/mekanism/common/item/ItemShard.java | 1 + .../common/item/ItemWalkieTalkie.java | 1 + .../common/miner/MItemStackFilter.java | 5 ++-- .../common/miner/MMaterialFilter.java | 5 ++-- .../mekanism/common/miner/MModIDFilter.java | 5 ++-- .../mekanism/common/miner/MOreDictFilter.java | 5 ++-- .../mekanism/common/miner/MinerFilter.java | 4 +-- .../common/multipart/ItemGlowPanel.java | 7 +++-- .../common/multipart/ItemPartTransmitter.java | 7 ++--- .../multipart/PartDiversionTransporter.java | 5 ++-- .../common/multipart/PartGlowPanel.java | 6 ++-- .../common/multipart/PartMechanicalPipe.java | 4 ++- .../common/multipart/PartPressurizedTube.java | 5 ++-- .../common/multipart/PartSidedPipe.java | 13 ++++----- .../common/multipart/PartTransmitter.java | 3 +- .../common/multipart/TransmitterType.java | 1 + .../common/network/PacketBoxBlacklist.java | 5 ++-- .../network/PacketConfigurationUpdate.java | 5 ++-- .../network/PacketConfiguratorState.java | 4 ++- .../network/PacketContainerEditMode.java | 4 ++- .../common/network/PacketDataRequest.java | 5 ++-- .../common/network/PacketDigitUpdate.java | 4 ++- .../common/network/PacketDigitalMinerGui.java | 5 ++-- .../common/network/PacketEditFilter.java | 5 ++-- .../network/PacketElectricBowState.java | 4 ++- .../common/network/PacketElectricChest.java | 5 ++-- .../common/network/PacketJetpackData.java | 4 ++- .../mekanism/common/network/PacketKey.java | 4 ++- .../network/PacketLogisticalSorterGui.java | 4 ++- .../common/network/PacketNewFilter.java | 5 ++-- .../network/PacketPortableTankState.java | 4 ++- .../network/PacketPortableTeleport.java | 4 ++- .../common/network/PacketPortalFX.java | 5 ++-- .../common/network/PacketRedstoneControl.java | 4 ++- .../common/network/PacketRemoveUpgrade.java | 4 ++- .../mekanism/common/network/PacketRobit.java | 4 ++- .../common/network/PacketScubaTankData.java | 4 ++- .../common/network/PacketSimpleGui.java | 4 ++- .../common/network/PacketStatusUpdate.java | 4 ++- .../common/network/PacketTileEntity.java | 5 ++-- .../network/PacketTransmitterUpdate.java | 4 ++- .../network/PacketWalkieTalkieState.java | 4 ++- .../mekanism/common/recipe/BinRecipe.java | 2 +- .../common/recipe/MekanismRecipe.java | 1 + .../mekanism/common/recipe/RecipeHandler.java | 3 +- .../common/tank/DynamicFluidTank.java | 1 + .../common/tank/DynamicTankCache.java | 1 + .../common/tank/SynchronizedTankData.java | 2 +- .../common/tank/TankUpdateProtocol.java | 1 + .../common/tile/TileEntityBasicBlock.java | 8 +++-- .../common/tile/TileEntityBasicMachine.java | 6 ++-- .../mekanism/common/tile/TileEntityBin.java | 8 +++-- .../common/tile/TileEntityBoundingBlock.java | 5 ++-- .../common/tile/TileEntityCardboardBox.java | 1 + .../common/tile/TileEntityChargepad.java | 10 ++++--- .../tile/TileEntityChemicalCrystallizer.java | 5 ++-- .../TileEntityChemicalDissolutionChamber.java | 5 ++-- .../tile/TileEntityChemicalInfuser.java | 5 ++-- .../TileEntityChemicalInjectionChamber.java | 2 +- .../tile/TileEntityChemicalOxidizer.java | 5 ++-- .../common/tile/TileEntityChemicalWasher.java | 5 ++-- .../common/tile/TileEntityCombiner.java | 2 +- .../common/tile/TileEntityContainerBlock.java | 2 +- .../common/tile/TileEntityDynamicTank.java | 5 ++-- .../common/tile/TileEntityDynamicValve.java | 1 + .../common/tile/TileEntityElectricChest.java | 5 ++-- .../common/tile/TileEntityElectricPump.java | 6 ++-- .../tile/TileEntityEnergizedSmelter.java | 4 --- .../tile/TileEntityEnrichmentChamber.java | 1 - .../tile/TileEntityFluidicPlenisher.java | 6 ++-- .../common/tile/TileEntityGasTank.java | 4 ++- .../tile/TileEntityLogisticalSorter.java | 5 ++-- .../tile/TileEntityOsmiumCompressor.java | 1 + .../common/tile/TileEntityPortableTank.java | 5 ++-- .../tile/TileEntityPrecisionSawmill.java | 1 - .../tile/TileEntityPurificationChamber.java | 2 +- .../tile/TileEntityRotaryCondensentrator.java | 5 ++-- .../tile/TileEntitySalinationController.java | 7 ++--- .../tile/TileEntitySalinationValve.java | 1 + .../tile/TileEntitySeismicVibrator.java | 5 ++-- .../tile/component/TileComponentEjector.java | 5 ++-- .../tile/component/TileComponentUpgrade.java | 5 ++-- .../mekanism/common/transporter/Finder.java | 3 +- .../common/transporter/TItemStackFilter.java | 5 ++-- .../common/transporter/TMaterialFilter.java | 5 ++-- .../common/transporter/TModIDFilter.java | 5 ++-- .../common/transporter/TOreDictFilter.java | 5 ++-- .../common/transporter/TransporterFilter.java | 5 ++-- .../transporter/TransporterManager.java | 1 + .../transporter/TransporterPathfinder.java | 1 + .../common/transporter/TransporterStack.java | 4 ++- .../mekanism/common/util/ChargeUtils.java | 6 ++-- .../mekanism/common/util/InventoryUtils.java | 1 + .../java/mekanism/common/util/MinerUtils.java | 1 + .../java/mekanism/common/util/PipeUtils.java | 1 + .../common/voice/VoiceConnection.java | 1 + .../mekanism/common/world/GenHandler.java | 1 + .../mekanism/common/world/WorldGenSalt.java | 1 + .../client/BlockRenderingHandler.java | 8 ++--- .../client/GeneratorsClientProxy.java | 7 +++-- .../client/gui/GeneratorsGuiFactory.java | 2 -- .../client/gui/GuiBioGenerator.java | 6 ++-- .../client/gui/GuiGasGenerator.java | 6 ++-- .../client/gui/GuiGeneratorsConfig.java | 1 - .../client/gui/GuiHeatGenerator.java | 6 ++-- .../client/gui/GuiSolarGenerator.java | 7 ++--- .../generators/client/gui/GuiWindTurbine.java | 6 ++-- .../model/ModelAdvancedSolarGenerator.java | 1 + .../render/RenderAdvancedSolarGenerator.java | 6 ++-- .../client/render/RenderBioGenerator.java | 6 ++-- .../client/render/RenderGasGenerator.java | 6 ++-- .../client/render/RenderHeatGenerator.java | 6 ++-- .../client/render/RenderSolarGenerator.java | 1 + .../client/render/RenderWindTurbine.java | 1 + .../common/GeneratorsCommonProxy.java | 5 ++-- .../common/block/BlockGenerator.java | 11 ++++--- .../container/ContainerBioGenerator.java | 1 + .../container/ContainerGasGenerator.java | 1 + .../container/ContainerHeatGenerator.java | 1 + .../container/ContainerSolarGenerator.java | 1 + .../container/ContainerWindTurbine.java | 1 + .../common/item/ItemBlockGenerator.java | 12 ++++---- .../TileEntityAdvancedSolarGenerator.java | 1 + .../tools/client/gui/ToolsGuiFactory.java | 1 - .../mekanism/tools/common/MekanismTools.java | 5 ++-- .../tools/item/ItemMekanismArmor.java | 3 +- .../mekanism/tools/item/ItemMekanismHoe.java | 3 +- .../tools/item/ItemMekanismPaxel.java | 1 - .../tools/item/ItemMekanismSword.java | 1 + .../mekanism/tools/item/ItemMekanismTool.java | 3 +- 412 files changed, 910 insertions(+), 657 deletions(-) diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 22db2ccd1..66bd7a2bb 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -1,7 +1,5 @@ package mekanism.api; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import net.minecraft.block.Block; @@ -15,6 +13,8 @@ import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import io.netty.buffer.ByteBuf; + /** * Coord4D - an integer-based way to keep track of and perform operations on blocks in a Minecraft-based environment. This also takes * in account the dimension the coordinate is in. diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index 4f4cef4a9..04519bf72 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -5,8 +5,8 @@ import java.util.Set; import net.minecraft.block.Block; import net.minecraft.item.Item; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.eventhandler.Event; public class MekanismAPI { diff --git a/src/main/java/mekanism/api/RecipeHelper.java b/src/main/java/mekanism/api/RecipeHelper.java index 6e27c0cd5..fec82d28f 100644 --- a/src/main/java/mekanism/api/RecipeHelper.java +++ b/src/main/java/mekanism/api/RecipeHelper.java @@ -4,6 +4,7 @@ import java.lang.reflect.Method; import mekanism.api.gas.GasStack; import mekanism.api.infuse.InfusionInput; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index c65f04b99..35b651722 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -15,6 +15,7 @@ import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterNetwork; import mekanism.api.transmitters.TransmissionType; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/api/gas/GasTransmission.java b/src/main/java/mekanism/api/gas/GasTransmission.java index c90914116..7c4c2a54a 100644 --- a/src/main/java/mekanism/api/gas/GasTransmission.java +++ b/src/main/java/mekanism/api/gas/GasTransmission.java @@ -1,8 +1,8 @@ package mekanism.api.gas; import mekanism.api.Coord4D; -import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/api/gas/IGasTransmitter.java b/src/main/java/mekanism/api/gas/IGasTransmitter.java index 63eb02fd1..8be999c01 100644 --- a/src/main/java/mekanism/api/gas/IGasTransmitter.java +++ b/src/main/java/mekanism/api/gas/IGasTransmitter.java @@ -1,6 +1,7 @@ package mekanism.api.gas; import mekanism.api.transmitters.IGridTransmitter; + import net.minecraft.tileentity.TileEntity; public interface IGasTransmitter extends IGridTransmitter diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 684a264f5..b10b226db 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -13,6 +13,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.IClientTicker; import mekanism.api.Range4D; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java index ea222d8e6..2caf73d5e 100644 --- a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java +++ b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java @@ -1,6 +1,5 @@ package mekanism.api.transmitters; -import mekanism.api.Coord4D; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/api/transmitters/TransmissionType.java b/src/main/java/mekanism/api/transmitters/TransmissionType.java index ae9388cca..0e84f7b94 100644 --- a/src/main/java/mekanism/api/transmitters/TransmissionType.java +++ b/src/main/java/mekanism/api/transmitters/TransmissionType.java @@ -1,6 +1,7 @@ package mekanism.api.transmitters; import mekanism.api.gas.IGasTransmitter; + import net.minecraft.tileentity.TileEntity; public enum TransmissionType diff --git a/src/main/java/mekanism/client/CapeBufferDownload.java b/src/main/java/mekanism/client/CapeBufferDownload.java index ca686de0e..cf7fecab7 100644 --- a/src/main/java/mekanism/client/CapeBufferDownload.java +++ b/src/main/java/mekanism/client/CapeBufferDownload.java @@ -4,6 +4,7 @@ import java.lang.reflect.Method; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.ThreadDownloadImageData; diff --git a/src/main/java/mekanism/client/ClientConnectionHandler.java b/src/main/java/mekanism/client/ClientConnectionHandler.java index 25b53d9c3..754a9c539 100644 --- a/src/main/java/mekanism/client/ClientConnectionHandler.java +++ b/src/main/java/mekanism/client/ClientConnectionHandler.java @@ -4,6 +4,7 @@ import java.net.InetSocketAddress; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/ClientPlayerTracker.java b/src/main/java/mekanism/client/ClientPlayerTracker.java index 45ccc2e3c..af1a507f0 100644 --- a/src/main/java/mekanism/client/ClientPlayerTracker.java +++ b/src/main/java/mekanism/client/ClientPlayerTracker.java @@ -1,6 +1,7 @@ package mekanism.client; import mekanism.common.Mekanism; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 38a2e1aa2..f2bc01856 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -131,6 +131,7 @@ import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySalinationController; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntityTeleporter; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 13fed84cc..ad222d4d5 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -37,6 +37,7 @@ import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index 433199640..dad0117f4 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -6,6 +6,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; + import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChatComponentText; diff --git a/src/main/java/mekanism/client/MekKeyHandler.java b/src/main/java/mekanism/client/MekKeyHandler.java index 1c0f4530d..1fe1855ea 100644 --- a/src/main/java/mekanism/client/MekKeyHandler.java +++ b/src/main/java/mekanism/client/MekKeyHandler.java @@ -3,16 +3,11 @@ package mekanism.client; import java.util.EnumSet; import net.minecraft.client.settings.KeyBinding; +import cpw.mods.fml.common.gameevent.TickEvent.Type; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.Type; -import cpw.mods.fml.relauncher.Side; - public abstract class MekKeyHandler { public KeyBinding[] keyBindings; diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index 62f4253b5..56d4ae71f 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -6,12 +6,10 @@ import mekanism.client.sound.SoundHandler; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; import mekanism.common.network.PacketKey.KeyMessage; + import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.common.MinecraftForge; - -import org.lwjgl.input.Keyboard; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index bce9f9070..48386d2d1 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -4,10 +4,6 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; - import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -17,6 +13,8 @@ import cpw.mods.fml.common.gameevent.TickEvent.Type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; + @SideOnly(Side.CLIENT) public class MekanismKeyHandler extends MekKeyHandler { diff --git a/src/main/java/mekanism/client/ThreadClientUpdate.java b/src/main/java/mekanism/client/ThreadClientUpdate.java index 561c9bfbb..de9f4ffff 100644 --- a/src/main/java/mekanism/client/ThreadClientUpdate.java +++ b/src/main/java/mekanism/client/ThreadClientUpdate.java @@ -14,6 +14,7 @@ import mekanism.client.gui.GuiCredits; import mekanism.common.IModule; import mekanism.common.Mekanism; import mekanism.common.Version; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/ThreadTankSparkle.java b/src/main/java/mekanism/client/ThreadTankSparkle.java index 65378e158..afdbc2728 100644 --- a/src/main/java/mekanism/client/ThreadTankSparkle.java +++ b/src/main/java/mekanism/client/ThreadTankSparkle.java @@ -7,6 +7,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityDynamicTank; + import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index ac92aa8e5..9908ea149 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -13,13 +13,13 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiAdvancedElectricMachine extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiBucketIO.java b/src/main/java/mekanism/client/gui/GuiBucketIO.java index 7c6c00222..aa047f665 100644 --- a/src/main/java/mekanism/client/gui/GuiBucketIO.java +++ b/src/main/java/mekanism/client/gui/GuiBucketIO.java @@ -1,12 +1,14 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiBucketIO extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index 951dd816b..c0a29a53a 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -11,13 +11,13 @@ import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerChanceMachine; import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChanceMachine extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index bfff87b40..48bd1c7c0 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -21,16 +21,16 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalCrystallizer extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index 13e7abbd9..72b1b67d8 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -14,13 +14,13 @@ import mekanism.common.inventory.container.ContainerChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalDissolutionChamber extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index 0febf50f4..2240255e3 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -15,18 +15,17 @@ import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerChemicalInfuser; -import mekanism.common.network.PacketTileEntity; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalInfuser extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java index 127274263..336519fcc 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index f16ab7bb8..ae40a596f 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -14,13 +14,13 @@ import mekanism.common.inventory.container.ContainerChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalOxidizer extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index f749bc084..0bb452ef7 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -21,14 +21,14 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalWasher extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiCombiner.java b/src/main/java/mekanism/client/gui/GuiCombiner.java index fb6af5eb4..3dba41e96 100644 --- a/src/main/java/mekanism/client/gui/GuiCombiner.java +++ b/src/main/java/mekanism/client/gui/GuiCombiner.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiConfiguration.java b/src/main/java/mekanism/client/gui/GuiConfiguration.java index 4d28ccffa..acbc373c9 100644 --- a/src/main/java/mekanism/client/gui/GuiConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiConfiguration.java @@ -18,17 +18,17 @@ import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiConfiguration extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiConfigurationTab.java b/src/main/java/mekanism/client/gui/GuiConfigurationTab.java index de7233434..aa4458cae 100644 --- a/src/main/java/mekanism/client/gui/GuiConfigurationTab.java +++ b/src/main/java/mekanism/client/gui/GuiConfigurationTab.java @@ -7,12 +7,14 @@ import mekanism.common.Mekanism; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiConfigurationTab extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiContainerEditMode.java b/src/main/java/mekanism/client/gui/GuiContainerEditMode.java index a749ea1cc..9b855344e 100644 --- a/src/main/java/mekanism/client/gui/GuiContainerEditMode.java +++ b/src/main/java/mekanism/client/gui/GuiContainerEditMode.java @@ -8,8 +8,10 @@ import mekanism.common.network.PacketContainerEditMode.ContainerEditModeMessage; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import codechicken.lib.vec.Rectangle4i; public class GuiContainerEditMode extends GuiElement diff --git a/src/main/java/mekanism/client/gui/GuiCredits.java b/src/main/java/mekanism/client/gui/GuiCredits.java index 63059402b..2365ff7df 100644 --- a/src/main/java/mekanism/client/gui/GuiCredits.java +++ b/src/main/java/mekanism/client/gui/GuiCredits.java @@ -6,6 +6,7 @@ import mekanism.common.IModule; import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/gui/GuiCrusher.java b/src/main/java/mekanism/client/gui/GuiCrusher.java index 4e04ab99d..a7f330323 100644 --- a/src/main/java/mekanism/client/gui/GuiCrusher.java +++ b/src/main/java/mekanism/client/gui/GuiCrusher.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index 08e693d01..cfa2771da 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -7,16 +7,16 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.inventory.container.ContainerDictionary; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiDictionary extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index f1a5f6eb9..dcd10f4b7 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -18,19 +18,19 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiDigitalMiner extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 9314e43e1..0ab69b7bf 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -25,17 +25,17 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiDigitalMinerConfig extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index 190affb82..f9d330580 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -6,14 +6,14 @@ import mekanism.common.tank.TankUpdateProtocol; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiDynamicTank extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java index 605ce9b94..2d6463761 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ b/src/main/java/mekanism/client/gui/GuiElectricChest.java @@ -12,17 +12,17 @@ import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiElectricChest extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 9575418ff..8391adb1a 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -11,13 +11,13 @@ import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerElectricMachine; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiElectricMachine extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index 021da7f27..833b42e9a 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -7,15 +7,15 @@ import mekanism.common.inventory.container.ContainerElectricPump; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiElectricPump extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index bfe0edc78..ee846b228 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -20,14 +20,14 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiElectrolyticSeparator extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElement.java b/src/main/java/mekanism/client/gui/GuiElement.java index ac812f03c..98c4cba48 100644 --- a/src/main/java/mekanism/client/gui/GuiElement.java +++ b/src/main/java/mekanism/client/gui/GuiElement.java @@ -4,14 +4,16 @@ import java.util.List; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public abstract class GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java index 70f0a7bb4..67b68591a 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java +++ b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index 0e74daab1..761cc7f5c 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -12,13 +12,13 @@ import mekanism.common.inventory.container.ContainerEnergyCube; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiEnergyCube extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiEnergyGauge.java b/src/main/java/mekanism/client/gui/GuiEnergyGauge.java index 995f1d9ca..e361e79c7 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyGauge.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyGauge.java @@ -1,12 +1,14 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; + import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; + public class GuiEnergyGauge extends GuiGauge { IEnergyInfoHandler infoHandler; diff --git a/src/main/java/mekanism/client/gui/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/GuiEnergyInfo.java index 25be7860f..5feb2a503 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyInfo.java @@ -2,13 +2,15 @@ package mekanism.client.gui; import java.util.List; -import codechicken.lib.vec.Rectangle4i; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiEnergyInfo extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java index 3807bc145..acc4aeb06 100644 --- a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java +++ b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index bbbb55c61..94a86b540 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -11,13 +11,13 @@ import mekanism.common.Tier.FactoryTier; import mekanism.common.inventory.container.ContainerFactory; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiFactory extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/GuiFluidGauge.java index d1b8a6843..e9461e7cc 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/GuiFluidGauge.java @@ -1,6 +1,7 @@ package mekanism.client.gui; import mekanism.common.util.MekanismUtils; + import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index 17c13be02..877871d5c 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -8,15 +8,15 @@ import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiFluidicPlenisher extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiGasGauge.java b/src/main/java/mekanism/client/gui/GuiGasGauge.java index 0ed50aba1..7903eb1ac 100644 --- a/src/main/java/mekanism/client/gui/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/GuiGasGauge.java @@ -3,6 +3,7 @@ package mekanism.client.gui; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; import mekanism.common.util.MekanismUtils; + import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index c4a12e9e0..3f010158a 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -2,8 +2,6 @@ package mekanism.client.gui; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -12,7 +10,11 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/client/gui/GuiGauge.java b/src/main/java/mekanism/client/gui/GuiGauge.java index 00c334c10..59f8bc6b9 100644 --- a/src/main/java/mekanism/client/gui/GuiGauge.java +++ b/src/main/java/mekanism/client/gui/GuiGauge.java @@ -1,12 +1,14 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; + public abstract class GuiGauge extends GuiElement { protected int xLocation; diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 5f14603f1..8658d34b5 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -25,17 +25,17 @@ import mekanism.common.transporter.TOreDictFilter; import mekanism.common.transporter.TransporterFilter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiLogisticalSorter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index bf349d764..5e43be218 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -9,14 +9,14 @@ import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiMFilterSelect extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index cf842f4d5..a7c07f947 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -13,19 +13,19 @@ import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiMItemStackFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index c353c68e3..874a8b869 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -13,19 +13,19 @@ import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiMMaterialFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index d75085c29..7888979cc 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -16,17 +16,17 @@ import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiMModIDFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index f47f1cd39..407cf81e3 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -1,6 +1,5 @@ package mekanism.client.gui; -import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; @@ -17,19 +16,17 @@ import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiMOreDictFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index b2ed84332..26cee8da1 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -9,6 +9,7 @@ import mekanism.common.IInvConfiguration; import mekanism.common.SideData; import mekanism.common.item.ItemConfigurator; import mekanism.common.tile.TileEntityContainerBlock; + import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index dd004b7bd..742ba93be 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -17,13 +17,13 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiMetallurgicInfuser extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java index add0d4f92..fdd5abced 100644 --- a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java +++ b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index eb77220ae..5bf0047f5 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -15,14 +15,14 @@ import mekanism.common.inventory.container.ContainerPRC; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiPRC extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java index 68688a477..f218cc198 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java @@ -11,17 +11,17 @@ import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiPasswordEnter extends GuiScreen { diff --git a/src/main/java/mekanism/client/gui/GuiPasswordModify.java b/src/main/java/mekanism/client/gui/GuiPasswordModify.java index 09a8d0bfe..d99d6250c 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordModify.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordModify.java @@ -9,17 +9,17 @@ import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiPasswordModify extends GuiScreen { diff --git a/src/main/java/mekanism/client/gui/GuiPortableTank.java b/src/main/java/mekanism/client/gui/GuiPortableTank.java index 6e04888d1..ea33cc6ab 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTank.java +++ b/src/main/java/mekanism/client/gui/GuiPortableTank.java @@ -7,14 +7,14 @@ import mekanism.common.inventory.container.ContainerPortableTank; import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiPortableTank extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java b/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java index 4db74cdf1..b588f87c7 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiPortableTeleporter.java @@ -1,7 +1,5 @@ package mekanism.client.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.item.ItemPortableTeleporter; @@ -9,10 +7,14 @@ import mekanism.common.network.PacketDigitUpdate.DigitUpdateMessage; import mekanism.common.network.PacketPortableTeleport.PortableTeleportMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/client/gui/GuiPowerBar.java b/src/main/java/mekanism/client/gui/GuiPowerBar.java index ca141b653..3a9917bf7 100644 --- a/src/main/java/mekanism/client/gui/GuiPowerBar.java +++ b/src/main/java/mekanism/client/gui/GuiPowerBar.java @@ -1,13 +1,15 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiPowerBar extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java b/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java index 0f3cdcff8..01f10ca94 100644 --- a/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java +++ b/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityChanceMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiProgress.java b/src/main/java/mekanism/client/gui/GuiProgress.java index eafa1468a..9b01e183e 100644 --- a/src/main/java/mekanism/client/gui/GuiProgress.java +++ b/src/main/java/mekanism/client/gui/GuiProgress.java @@ -1,12 +1,14 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiProgress extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java index 337aa4e05..0b4ad0774 100644 --- a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java +++ b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; + import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiRecipeType.java b/src/main/java/mekanism/client/gui/GuiRecipeType.java index ed124ea20..79fc0fad1 100644 --- a/src/main/java/mekanism/client/gui/GuiRecipeType.java +++ b/src/main/java/mekanism/client/gui/GuiRecipeType.java @@ -1,11 +1,13 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; + public class GuiRecipeType extends GuiElement { TileEntityFactory tileEntity; diff --git a/src/main/java/mekanism/client/gui/GuiRedstoneControl.java b/src/main/java/mekanism/client/gui/GuiRedstoneControl.java index d2360f2d3..0987684ff 100644 --- a/src/main/java/mekanism/client/gui/GuiRedstoneControl.java +++ b/src/main/java/mekanism/client/gui/GuiRedstoneControl.java @@ -1,6 +1,5 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.IRedstoneControl; @@ -9,9 +8,12 @@ import mekanism.common.Mekanism; import mekanism.common.network.PacketRedstoneControl.RedstoneControlMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; + public class GuiRedstoneControl extends GuiElement { TileEntity tileEntity; diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index bef30bcd5..dfd496b80 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -7,14 +7,14 @@ import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.World; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiRobitCrafting extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java index 0c58f63a4..bbd9782c7 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -8,13 +8,13 @@ import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiRobitInventory extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index abe05ea3d..7d359b0ac 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -8,16 +8,16 @@ import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiRobitMain extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index a7456eade..9f7ec77e0 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -9,6 +9,7 @@ import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -18,13 +19,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; -import org.apache.commons.io.Charsets; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import org.apache.commons.io.Charsets; @SideOnly(Side.CLIENT) public class GuiRobitRepair extends GuiMekanism implements ICrafting diff --git a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java index 8ed95f2d1..272e97e31 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java @@ -8,6 +8,7 @@ import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index d0426b0dd..4cb22ab62 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -20,14 +20,14 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiRotaryCondensentrator extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiSalinationController.java b/src/main/java/mekanism/client/gui/GuiSalinationController.java index 27a8550af..ee568e9de 100644 --- a/src/main/java/mekanism/client/gui/GuiSalinationController.java +++ b/src/main/java/mekanism/client/gui/GuiSalinationController.java @@ -12,14 +12,14 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntitySalinationController; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiSalinationController extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index 9a6bf2036..b9537e905 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -7,6 +7,7 @@ import mekanism.api.Coord4D; import mekanism.common.item.ItemSeismicReader; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -15,13 +16,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.IFluidBlock; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiSeismicReader extends GuiScreen { diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index 9f124d4b2..fe2f6c580 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -6,13 +6,13 @@ import mekanism.common.inventory.container.ContainerSeismicVibrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiSeismicVibrator extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiSlot.java b/src/main/java/mekanism/client/gui/GuiSlot.java index 2e22eadbe..f2cce3a21 100644 --- a/src/main/java/mekanism/client/gui/GuiSlot.java +++ b/src/main/java/mekanism/client/gui/GuiSlot.java @@ -1,10 +1,12 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; + public class GuiSlot extends GuiElement { protected int xLocation; diff --git a/src/main/java/mekanism/client/gui/GuiSortingTab.java b/src/main/java/mekanism/client/gui/GuiSortingTab.java index 95cf17a2e..d3b3c581c 100644 --- a/src/main/java/mekanism/client/gui/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/GuiSortingTab.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import java.util.ArrayList; -import codechicken.lib.vec.Rectangle4i; import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -10,10 +9,13 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Rectangle4i; + @SideOnly(Side.CLIENT) public class GuiSortingTab extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index 9a44aab09..c381fd089 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -9,14 +9,14 @@ import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiTFilterSelect extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index bf02a3f78..8a9466fcf 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -15,18 +15,18 @@ import mekanism.common.transporter.TItemStackFilter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTItemStackFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index d3b6a6c18..0ea94e7ab 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -15,20 +15,20 @@ import mekanism.common.transporter.TMaterialFilter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; + import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTMaterialFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index 00ae93b16..f1fbc747b 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -18,18 +18,18 @@ import mekanism.common.transporter.TModIDFilter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTModIDFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index 6d2365822..e5a594796 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -18,18 +18,18 @@ import mekanism.common.transporter.TOreDictFilter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTOreDictFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index dc007e310..97ee2c3df 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -2,8 +2,6 @@ package mekanism.client.gui; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; @@ -14,7 +12,11 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index 8d871a7b8..3e33f1364 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -1,6 +1,5 @@ package mekanism.client.gui; -import codechicken.lib.vec.Rectangle4i; import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.IUpgradeTile; @@ -8,9 +7,12 @@ import mekanism.common.Mekanism; import mekanism.common.network.PacketRemoveUpgrade.RemoveUpgradeMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; + public class GuiUpgradeManagement extends GuiElement { TileEntity tileEntity; diff --git a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java index 55083bec4..12d500cc2 100644 --- a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java +++ b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java index c312595f5..a9ba4be4b 100644 --- a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java +++ b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/mekanism/client/model/ModelBalloon.java b/src/main/java/mekanism/client/model/ModelBalloon.java index dab4fb017..d1a16c4ef 100644 --- a/src/main/java/mekanism/client/model/ModelBalloon.java +++ b/src/main/java/mekanism/client/model/ModelBalloon.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.api.EnumColor; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelBalloon extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java index 18cc82b80..fc6e4c91d 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java index 470ae4726..9d21c26e9 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java index b7e2b8329..28cd2dd62 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java +++ b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelChemicalInfuser extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java index 9519791fd..f6dc605ab 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelChemicalOxidizer extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelChemicalWasher.java b/src/main/java/mekanism/client/model/ModelChemicalWasher.java index 434e29a32..82f2251e1 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ b/src/main/java/mekanism/client/model/ModelChemicalWasher.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index b54698b10..8c20ea876 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index bccffea10..33382ee42 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelGasMask.java b/src/main/java/mekanism/client/model/ModelGasMask.java index 469a43070..bcdbe9725 100644 --- a/src/main/java/mekanism/client/model/ModelGasMask.java +++ b/src/main/java/mekanism/client/model/ModelGasMask.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelGasMask extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelJetpack.java b/src/main/java/mekanism/client/model/ModelJetpack.java index 19d31a719..d5f5a0122 100644 --- a/src/main/java/mekanism/client/model/ModelJetpack.java +++ b/src/main/java/mekanism/client/model/ModelJetpack.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelJetpack extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java index fc065cd10..8979bda3c 100644 --- a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java +++ b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelPortableTank.java b/src/main/java/mekanism/client/model/ModelPortableTank.java index 3bdcb45af..297e199fc 100644 --- a/src/main/java/mekanism/client/model/ModelPortableTank.java +++ b/src/main/java/mekanism/client/model/ModelPortableTank.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelRendererSelectiveFace.java b/src/main/java/mekanism/client/model/ModelRendererSelectiveFace.java index fb20ac4eb..99c62e34f 100644 --- a/src/main/java/mekanism/client/model/ModelRendererSelectiveFace.java +++ b/src/main/java/mekanism/client/model/ModelRendererSelectiveFace.java @@ -7,14 +7,14 @@ import java.util.Map; import mekanism.client.render.MekanismRenderer.BooleanArray; import mekanism.client.render.MekanismRenderer.DisplayInteger; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.Tessellator; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelRendererSelectiveFace { diff --git a/src/main/java/mekanism/client/model/ModelRobit.java b/src/main/java/mekanism/client/model/ModelRobit.java index 6796e0798..d6a3a1eb5 100644 --- a/src/main/java/mekanism/client/model/ModelRobit.java +++ b/src/main/java/mekanism/client/model/ModelRobit.java @@ -1,15 +1,15 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelRobit extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java index 612042609..e27dd6bf5 100644 --- a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java +++ b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java @@ -1,12 +1,12 @@ package mekanism.client.model; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelSeismicVibrator extends ModelBase { diff --git a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java index ffd365a7a..781f7ff8b 100644 --- a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java @@ -1,10 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -25,6 +21,7 @@ import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -37,6 +34,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public abstract class AdvancedMachineRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/BaseRecipeHandler.java b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java index 7382cf7b3..64ad74355 100644 --- a/src/main/java/mekanism/client/nei/BaseRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java @@ -1,9 +1,5 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; -import static codechicken.lib.gui.GuiDraw.gui; - import java.util.HashSet; import java.util.List; import java.util.Set; @@ -12,13 +8,19 @@ import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiElement; import mekanism.client.gui.IGuiWrapper; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidStack; + import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.gui; + public abstract class BaseRecipeHandler extends TemplateRecipeHandler implements IGuiWrapper { public BaseRecipeHandler() diff --git a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java index 230731d39..3df452a8e 100644 --- a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java @@ -1,10 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; +import java.awt.*; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -21,6 +17,7 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; @@ -29,6 +26,10 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public abstract class ChanceMachineRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java index ae29dba17..9798418ad 100644 --- a/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java @@ -1,10 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -15,6 +11,7 @@ import mekanism.client.gui.GuiChemicalCrystallizer; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -27,6 +24,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class ChemicalCrystallizerRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java index 65266ccb9..2262797fe 100644 --- a/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java @@ -1,10 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -16,10 +12,9 @@ import mekanism.client.gui.GuiChemicalDissolutionChamber; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; @@ -30,6 +25,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class ChemicalDissolutionChamberRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java index d83deb3b6..187280eb8 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java @@ -1,10 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -13,10 +9,10 @@ import java.util.Set; import mekanism.api.ChemicalPair; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiChemicalInfuser; -import mekanism.client.nei.ChemicalOxidizerRecipeHandler.CachedIORecipe; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.inventory.GuiContainer; import org.lwjgl.opengl.GL11; @@ -27,6 +23,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class ChemicalInfuserRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index 324f8644f..3d6d1134b 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -11,6 +11,7 @@ import mekanism.client.gui.GuiChemicalInjectionChamber; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java index 9e680ef45..c76772352 100644 --- a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java @@ -1,10 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -21,11 +17,11 @@ import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.client.gui.GuiSlot; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; -import mekanism.client.nei.ElectrolyticSeparatorRecipeHandler.CachedIORecipe; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -38,6 +34,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class ChemicalOxidizerRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java index 1fab96d11..ba3ba6800 100644 --- a/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java @@ -1,21 +1,17 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.api.ChemicalPair; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiChemicalWasher; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -28,6 +24,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class ChemicalWasherRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java index da589b0e0..8e370a582 100644 --- a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java @@ -9,6 +9,7 @@ import mekanism.client.gui.GuiCombiner; import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java b/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java index 8032df384..a292e27b8 100644 --- a/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java @@ -3,12 +3,9 @@ package mekanism.client.nei; import java.util.Set; import mekanism.client.gui.GuiCrusher; -import mekanism.client.gui.GuiSlot; import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; public class CrusherRecipeHandler extends MachineRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java index cc6dd7d53..6ac700f82 100644 --- a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java @@ -1,10 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -29,6 +25,7 @@ import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidStack; @@ -40,6 +37,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class ElectrolyticSeparatorRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/ElementBoundHandler.java b/src/main/java/mekanism/client/nei/ElementBoundHandler.java index 08a3cb23d..1b5016abf 100644 --- a/src/main/java/mekanism/client/nei/ElementBoundHandler.java +++ b/src/main/java/mekanism/client/nei/ElementBoundHandler.java @@ -2,7 +2,9 @@ package mekanism.client.nei; import mekanism.client.gui.GuiElement; import mekanism.client.gui.GuiMekanism; + import net.minecraft.client.gui.inventory.GuiContainer; + import codechicken.lib.vec.Rectangle4i; import codechicken.nei.api.INEIGuiAdapter; diff --git a/src/main/java/mekanism/client/nei/MachineRecipeHandler.java b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java index e12abc42b..97290f8f3 100644 --- a/src/main/java/mekanism/client/nei/MachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java @@ -1,9 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; +import java.awt.*; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -19,6 +16,7 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; @@ -27,6 +25,9 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public abstract class MachineRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java b/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java index 78f373cc7..0dd5c0413 100644 --- a/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java @@ -11,10 +11,12 @@ import mekanism.common.IFactory; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.MekanismRecipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.oredict.OreDictionary; + import codechicken.nei.PositionedStack; import codechicken.nei.recipe.ShapedRecipeHandler; diff --git a/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java b/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java index 229831a5b..7eae53fb9 100644 --- a/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java +++ b/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java @@ -1,8 +1,10 @@ package mekanism.client.nei; import mekanism.client.gui.GuiMekanism; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; + import codechicken.nei.guihook.IContainerSlotClickHandler; public class MekanismSlotClickHandler implements IContainerSlotClickHandler diff --git a/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java index df1f96405..0a51ac21f 100644 --- a/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java @@ -1,9 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -28,6 +25,7 @@ import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; @@ -36,6 +34,9 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class MetallurgicInfuserRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java index d6e40d931..b3411a0ac 100644 --- a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java +++ b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java @@ -18,7 +18,9 @@ import mekanism.client.gui.GuiPurificationChamber; import mekanism.client.gui.GuiRotaryCondensentrator; import mekanism.client.gui.GuiSalinationController; import mekanism.common.Mekanism; + import net.minecraft.item.ItemStack; + import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; import codechicken.nei.guihook.GuiContainerManager; diff --git a/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java b/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java index 34f19a8cf..0a02d32e9 100644 --- a/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java @@ -10,6 +10,7 @@ import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.Mekanism; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler diff --git a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java index ecbdd4e9d..230638ac2 100644 --- a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java @@ -1,10 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -30,6 +26,7 @@ import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -43,6 +40,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class PRCRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java index e044fc44c..f37655f79 100644 --- a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java @@ -11,6 +11,7 @@ import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.client.gui.GuiPurificationChamber; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java index ed9e96e95..8f7a0f6a1 100644 --- a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java @@ -1,11 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import mekanism.api.gas.Gas; @@ -14,6 +9,7 @@ import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiRotaryCondensentrator; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidStack; @@ -25,6 +21,10 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class RotaryCondensentratorRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java b/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java index 105476ab1..b8712dd57 100644 --- a/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java @@ -1,9 +1,6 @@ package mekanism.client.nei; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; +import java.awt.*; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -12,8 +9,8 @@ import java.util.Set; import mekanism.client.gui.GuiSalinationController; import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -26,6 +23,9 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + public class SalinationControllerRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index e02bd410b..da22157ab 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -11,6 +11,7 @@ import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.common.ISpecialBounds; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; @@ -31,14 +32,13 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + @SideOnly(Side.CLIENT) public class MekanismRenderer { diff --git a/src/main/java/mekanism/client/render/ModelCustomArmor.java b/src/main/java/mekanism/client/render/ModelCustomArmor.java index 071937055..d908e0984 100644 --- a/src/main/java/mekanism/client/render/ModelCustomArmor.java +++ b/src/main/java/mekanism/client/render/ModelCustomArmor.java @@ -7,18 +7,18 @@ import mekanism.client.model.ModelJetpack; import mekanism.client.model.ModelScubaTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelCustomArmor extends ModelBiped { diff --git a/src/main/java/mekanism/client/render/RenderGlowPanel.java b/src/main/java/mekanism/client/render/RenderGlowPanel.java index bd78468dd..a007219d7 100644 --- a/src/main/java/mekanism/client/render/RenderGlowPanel.java +++ b/src/main/java/mekanism/client/render/RenderGlowPanel.java @@ -6,8 +6,10 @@ import mekanism.api.EnumColor; import mekanism.common.multipart.PartGlowPanel; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; + import codechicken.lib.colour.Colour; import codechicken.lib.colour.ColourRGBA; import codechicken.lib.lighting.LightModel; diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index bb73d4867..24edfafdf 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -22,6 +22,7 @@ import mekanism.common.transporter.TransporterStack; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; @@ -38,6 +39,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @@ -53,8 +56,6 @@ import codechicken.lib.render.TextureUtils.IIconSelfRegister; import codechicken.lib.render.uv.IconTransformation; import codechicken.lib.vec.Translation; import codechicken.lib.vec.Vector3; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderPartTransmitter implements IIconSelfRegister diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index c72d46924..4933d7489 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -13,6 +13,7 @@ import mekanism.common.Mekanism; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemScubaTank; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; diff --git a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java index a41c5c6af..9d2634b88 100644 --- a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java @@ -3,16 +3,16 @@ package mekanism.client.render.block; import mekanism.client.ClientProxy; import mekanism.client.render.MekanismRenderer; import mekanism.common.Mekanism; + import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class BasicRenderingHandler implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index a8c3cbe7a..9a542a891 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -20,17 +20,17 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class MachineRenderingHandler implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/mekanism/client/render/entity/RenderBalloon.java b/src/main/java/mekanism/client/render/entity/RenderBalloon.java index 880a3369f..b2f8571bf 100644 --- a/src/main/java/mekanism/client/render/entity/RenderBalloon.java +++ b/src/main/java/mekanism/client/render/entity/RenderBalloon.java @@ -5,17 +5,17 @@ import mekanism.client.model.ModelBalloon; import mekanism.common.entity.EntityBalloon; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderBalloon extends Render { diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index 51a4e5ce5..d6385a48d 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -4,17 +4,17 @@ import mekanism.client.model.ModelObsidianTNT; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderObsidianTNTPrimed extends Render { diff --git a/src/main/java/mekanism/client/render/entity/RenderRobit.java b/src/main/java/mekanism/client/render/entity/RenderRobit.java index d585102a2..2cb6c6bbf 100644 --- a/src/main/java/mekanism/client/render/entity/RenderRobit.java +++ b/src/main/java/mekanism/client/render/entity/RenderRobit.java @@ -4,6 +4,7 @@ import mekanism.client.model.ModelRobit; import mekanism.common.entity.EntityRobit; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 0eb054eaa..f72f1bb96 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -43,6 +43,7 @@ import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -60,13 +61,12 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ItemRenderingHandler implements IItemRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index e4b9d2839..cf21f9a86 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -2,6 +2,7 @@ package mekanism.client.render.tileentity; import mekanism.api.Coord4D; import mekanism.common.tile.TileEntityBin; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.OpenGlHelper; @@ -15,12 +16,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderBin extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java index 96c439baf..d95105987 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelChargepad; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderChargepad extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java index 73f91d754..483650f29 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java index 2fee0e8d1..d269af136 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderChemicalDissolutionChamber extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java index 290fb04b1..8685ed7cc 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java @@ -11,6 +11,7 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java index 6d094c4a2..1b23615e5 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java @@ -11,6 +11,7 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java index 04c8f889d..c3e61a58e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java @@ -4,6 +4,7 @@ import mekanism.client.model.ModelChemicalWasher; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index 14cee3e93..7b5354c99 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -10,6 +10,7 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.IInvConfiguration; import mekanism.common.item.ItemConfigurator; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -21,13 +22,12 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderConfigurableMachine extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java index ccd8f8fef..7128b5c75 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelDigitalMiner; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderDigitalMiner extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java index 039ab9a2d..de218522e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -10,6 +10,7 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tank.SynchronizedTankData.ValveData; import mekanism.common.tank.TankUpdateProtocol; import mekanism.common.tile.TileEntityDynamicTank; + import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; @@ -17,12 +18,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderDynamicTank extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java index 6cc21badb..2e661fc50 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java @@ -3,15 +3,15 @@ package mekanism.client.render.tileentity; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderElectricChest extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java index 0c08cb083..b852e29c6 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelElectricPump; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderElectricPump extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java index 79b1885ba..c3eefb923 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelElectrolyticSeparator; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderElectrolyticSeparator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index 534042bd1..9d73f6d37 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -8,14 +8,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderEnergyCube extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java index 52c1375b0..344b6dc4b 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelFluidicPlenisher; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderFluidicPlenisher extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index 6f2878cdf..67206eedc 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelGasTank; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderGasTank extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java index 3adaa8efd..0a0416bb0 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelLogisticalSorter; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderLogisticalSorter extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java b/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java index c0e8b3410..f0bab79e8 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderMetallurgicInfuser extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java b/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java index 0e0621cc4..321ff39e7 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelObsidianTNT; import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderObsidianTNT extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java b/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java index b30523d4e..b33eff539 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java @@ -10,16 +10,16 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderPortableTank extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java index ba955e013..0c8a43068 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderPressurizedReactionChamber extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java index f1a96863e..41ec74148 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelRotaryCondensentrator; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java b/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java index 6f9737df4..4f39815b0 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java @@ -9,18 +9,18 @@ import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tank.TankUpdateProtocol; import mekanism.common.tile.TileEntitySalinationController; + import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderSalinationController extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java index de2980387..f0b965fe7 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java @@ -5,14 +5,14 @@ import mekanism.common.Mekanism; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderSeismicVibrator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java index 15b7356bf..6dab060ea 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java @@ -10,6 +10,7 @@ import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityTeleporter; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/sound/GasMaskSound.java b/src/main/java/mekanism/client/sound/GasMaskSound.java index 050dc35e0..5f2c76a75 100644 --- a/src/main/java/mekanism/client/sound/GasMaskSound.java +++ b/src/main/java/mekanism/client/sound/GasMaskSound.java @@ -2,6 +2,7 @@ package mekanism.client.sound; import mekanism.client.ClientTickHandler; import mekanism.common.item.ItemGasMask; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/client/sound/JetpackSound.java b/src/main/java/mekanism/client/sound/JetpackSound.java index 4733cd63e..47d30dfd5 100644 --- a/src/main/java/mekanism/client/sound/JetpackSound.java +++ b/src/main/java/mekanism/client/sound/JetpackSound.java @@ -2,6 +2,7 @@ package mekanism.client.sound; import mekanism.client.ClientTickHandler; import mekanism.common.item.ItemJetpack; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/client/sound/PlayerSound.java b/src/main/java/mekanism/client/sound/PlayerSound.java index 5ec9ae2c7..e91755e09 100644 --- a/src/main/java/mekanism/client/sound/PlayerSound.java +++ b/src/main/java/mekanism/client/sound/PlayerSound.java @@ -1,6 +1,7 @@ package mekanism.client.sound; import mekanism.api.Pos3D; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/client/sound/Sound.java b/src/main/java/mekanism/client/sound/Sound.java index 94389fb89..a91970e85 100644 --- a/src/main/java/mekanism/client/sound/Sound.java +++ b/src/main/java/mekanism/client/sound/Sound.java @@ -5,6 +5,7 @@ import java.net.URL; import mekanism.api.Pos3D; import mekanism.client.MekanismClient; import mekanism.common.Mekanism; + import net.minecraft.client.Minecraft; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/client/sound/SoundHandler.java b/src/main/java/mekanism/client/sound/SoundHandler.java index 21f782acc..d0ae28871 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -19,6 +19,7 @@ import mekanism.client.MekanismClient; import mekanism.common.Mekanism; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.SoundCategory; @@ -28,12 +29,13 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.ChunkEvent; -import paulscode.sound.SoundSystem; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import paulscode.sound.SoundSystem; + /** * SoundHandler - a class that handles all Sounds used by Mekanism. * Runs off of PaulsCode's SoundSystem. diff --git a/src/main/java/mekanism/client/sound/TileSound.java b/src/main/java/mekanism/client/sound/TileSound.java index 762b5fd7c..d89c89d7f 100644 --- a/src/main/java/mekanism/client/sound/TileSound.java +++ b/src/main/java/mekanism/client/sound/TileSound.java @@ -3,6 +3,7 @@ package mekanism.client.sound; import mekanism.api.Pos3D; import mekanism.client.HolidayManager; import mekanism.common.IActiveState; + import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/voice/VoiceClient.java b/src/main/java/mekanism/client/voice/VoiceClient.java index 339975193..cb4c459b0 100644 --- a/src/main/java/mekanism/client/voice/VoiceClient.java +++ b/src/main/java/mekanism/client/voice/VoiceClient.java @@ -7,12 +7,13 @@ import java.io.DataOutputStream; import java.net.ConnectException; import java.net.Socket; -import javax.sound.sampled.AudioFormat; - import mekanism.common.Mekanism; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import javax.sound.sampled.AudioFormat; + @SideOnly(Side.CLIENT) public class VoiceClient extends Thread { diff --git a/src/main/java/mekanism/client/voice/VoiceInput.java b/src/main/java/mekanism/client/voice/VoiceInput.java index c4c418cd2..4147eae88 100644 --- a/src/main/java/mekanism/client/voice/VoiceInput.java +++ b/src/main/java/mekanism/client/voice/VoiceInput.java @@ -1,15 +1,16 @@ package mekanism.client.voice; +import mekanism.client.MekanismKeyHandler; +import mekanism.common.Mekanism; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine; import javax.sound.sampled.TargetDataLine; -import mekanism.client.MekanismKeyHandler; -import mekanism.common.Mekanism; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class VoiceInput extends Thread { diff --git a/src/main/java/mekanism/client/voice/VoiceOutput.java b/src/main/java/mekanism/client/voice/VoiceOutput.java index f037c2481..01c5e609f 100644 --- a/src/main/java/mekanism/client/voice/VoiceOutput.java +++ b/src/main/java/mekanism/client/voice/VoiceOutput.java @@ -1,13 +1,14 @@ package mekanism.client.voice; +import mekanism.common.Mekanism; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine; import javax.sound.sampled.SourceDataLine; -import mekanism.common.Mekanism; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class VoiceOutput extends Thread { diff --git a/src/main/java/mekanism/common/BoxBlacklistParser.java b/src/main/java/mekanism/common/BoxBlacklistParser.java index 37150cd81..9f4307661 100644 --- a/src/main/java/mekanism/common/BoxBlacklistParser.java +++ b/src/main/java/mekanism/common/BoxBlacklistParser.java @@ -8,6 +8,7 @@ import java.io.FileWriter; import java.io.IOException; import mekanism.api.MekanismAPI; + import net.minecraft.block.Block; public final class BoxBlacklistParser diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index 075606878..dab545366 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.util.MekanismUtils; + import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index bdb51c4f4..f1b728beb 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -9,6 +9,7 @@ import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemScubaTank; import mekanism.common.network.PacketStatusUpdate.StatusUpdateMessage; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index 42054c155..4129dcd8d 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -6,6 +6,7 @@ import mekanism.common.network.PacketJetpackData.JetpackDataMessage; import mekanism.common.network.PacketJetpackData.JetpackPacket; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/mekanism/common/CommonWorldTickHandler.java b/src/main/java/mekanism/common/CommonWorldTickHandler.java index 470a1c9b3..db10c3a05 100644 --- a/src/main/java/mekanism/common/CommonWorldTickHandler.java +++ b/src/main/java/mekanism/common/CommonWorldTickHandler.java @@ -11,6 +11,7 @@ import java.util.Random; import mekanism.api.Coord4D; import mekanism.common.tank.DynamicTankCache; import mekanism.common.tile.TileEntityDynamicTank; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.ChunkCoordIntPair; diff --git a/src/main/java/mekanism/common/ConnectedTextureRenderer.java b/src/main/java/mekanism/common/ConnectedTextureRenderer.java index 251471ae8..51044fd67 100644 --- a/src/main/java/mekanism/common/ConnectedTextureRenderer.java +++ b/src/main/java/mekanism/common/ConnectedTextureRenderer.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; import mekanism.api.Coord4D; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 982efc17b..8612e15c8 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -16,6 +16,7 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterNetwork; import mekanism.api.transmitters.TransmissionType; import mekanism.common.util.PipeUtils; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/common/IEjector.java b/src/main/java/mekanism/common/IEjector.java index 850e171a9..6f1c7bebd 100644 --- a/src/main/java/mekanism/common/IEjector.java +++ b/src/main/java/mekanism/common/IEjector.java @@ -1,6 +1,7 @@ package mekanism.common; import mekanism.api.EnumColor; + import net.minecraftforge.common.util.ForgeDirection; public interface IEjector diff --git a/src/main/java/mekanism/common/IEnergyCube.java b/src/main/java/mekanism/common/IEnergyCube.java index 7e2162375..1bf3cf3a4 100644 --- a/src/main/java/mekanism/common/IEnergyCube.java +++ b/src/main/java/mekanism/common/IEnergyCube.java @@ -1,6 +1,7 @@ package mekanism.common; import mekanism.common.Tier.EnergyCubeTier; + import net.minecraft.item.ItemStack; /** diff --git a/src/main/java/mekanism/common/IFactory.java b/src/main/java/mekanism/common/IFactory.java index d8bc2cccd..2d5fe10a3 100644 --- a/src/main/java/mekanism/common/IFactory.java +++ b/src/main/java/mekanism/common/IFactory.java @@ -3,6 +3,7 @@ package mekanism.common; import java.util.Map; import mekanism.api.AdvancedInput; +import mekanism.api.StackUtils; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.common.block.BlockMachine.MachineType; @@ -10,7 +11,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; diff --git a/src/main/java/mekanism/common/ILogisticalTransporter.java b/src/main/java/mekanism/common/ILogisticalTransporter.java index c63126d9f..6cf91fd39 100644 --- a/src/main/java/mekanism/common/ILogisticalTransporter.java +++ b/src/main/java/mekanism/common/ILogisticalTransporter.java @@ -5,6 +5,7 @@ import mekanism.api.EnumColor; import mekanism.api.transmitters.IBlockableConnection; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterStack; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/common/IModule.java b/src/main/java/mekanism/common/IModule.java index 9302c203c..c2e07325c 100644 --- a/src/main/java/mekanism/common/IModule.java +++ b/src/main/java/mekanism/common/IModule.java @@ -1,9 +1,9 @@ package mekanism.common; -import io.netty.buffer.ByteBuf; - import java.io.IOException; +import io.netty.buffer.ByteBuf; + /** * Implement in your main class if your mod happens to be completely reliant on Mekanism, or in other words, is a Mekanism module. * @author aidancbrady diff --git a/src/main/java/mekanism/common/ITileComponent.java b/src/main/java/mekanism/common/ITileComponent.java index 270a27155..f382593cf 100644 --- a/src/main/java/mekanism/common/ITileComponent.java +++ b/src/main/java/mekanism/common/ITileComponent.java @@ -1,11 +1,11 @@ package mekanism.common; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public interface ITileComponent { public void tick(); diff --git a/src/main/java/mekanism/common/ITileNetwork.java b/src/main/java/mekanism/common/ITileNetwork.java index 758c497f0..376e7d7f4 100644 --- a/src/main/java/mekanism/common/ITileNetwork.java +++ b/src/main/java/mekanism/common/ITileNetwork.java @@ -1,9 +1,9 @@ package mekanism.common; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; +import io.netty.buffer.ByteBuf; + /** * Internal interface used for blocks that send data between clients and the server * @author AidanBrady diff --git a/src/main/java/mekanism/common/ItemAttacher.java b/src/main/java/mekanism/common/ItemAttacher.java index dc870e182..ce6b84862 100644 --- a/src/main/java/mekanism/common/ItemAttacher.java +++ b/src/main/java/mekanism/common/ItemAttacher.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import mekanism.common.multipart.TransmitterType; + import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java index d642d56bb..f90063ce5 100644 --- a/src/main/java/mekanism/common/OreDictCache.java +++ b/src/main/java/mekanism/common/OreDictCache.java @@ -6,6 +6,7 @@ import java.util.List; import mekanism.api.ItemInfo; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index be3565a37..0a9abf7b9 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -1,11 +1,8 @@ package mekanism.common; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.List; -import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.network.PacketBoxBlacklist; import mekanism.common.network.PacketBoxBlacklist.BoxBlacklistMessage; @@ -61,6 +58,7 @@ import mekanism.common.network.PacketTransmitterUpdate; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; import mekanism.common.network.PacketWalkieTalkieState; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -77,6 +75,8 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; +import io.netty.buffer.ByteBuf; + /** * Mekanism packet handler. As always, use packets sparingly! * @author AidanBrady diff --git a/src/main/java/mekanism/common/RobitAIFollow.java b/src/main/java/mekanism/common/RobitAIFollow.java index 64738d22f..dd43c42d0 100644 --- a/src/main/java/mekanism/common/RobitAIFollow.java +++ b/src/main/java/mekanism/common/RobitAIFollow.java @@ -1,6 +1,7 @@ package mekanism.common; import mekanism.common.entity.EntityRobit; + import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.pathfinding.PathNavigate; diff --git a/src/main/java/mekanism/common/RobitAIPickup.java b/src/main/java/mekanism/common/RobitAIPickup.java index bf4e6f25f..28f3aeaed 100644 --- a/src/main/java/mekanism/common/RobitAIPickup.java +++ b/src/main/java/mekanism/common/RobitAIPickup.java @@ -4,6 +4,7 @@ import java.util.Iterator; import java.util.List; import mekanism.common.entity.EntityRobit; + import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.pathfinding.PathNavigate; diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 8ecf4bc4b..7f71a93d0 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -2,6 +2,7 @@ package mekanism.common; import mekanism.api.EnumColor; import mekanism.common.multipart.TransmitterType; + import net.minecraft.util.ResourceLocation; /** diff --git a/src/main/java/mekanism/common/asm/LoadingHook.java b/src/main/java/mekanism/common/asm/LoadingHook.java index f2807c9cf..e84895469 100644 --- a/src/main/java/mekanism/common/asm/LoadingHook.java +++ b/src/main/java/mekanism/common/asm/LoadingHook.java @@ -2,9 +2,10 @@ package mekanism.common.asm; import java.util.Map; -import codechicken.core.launch.DepLoader; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; +import codechicken.core.launch.DepLoader; + public class LoadingHook implements IFMLLoadingPlugin { public LoadingHook() diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 4b53b05c0..41033c4d7 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -23,6 +23,7 @@ import mekanism.common.tile.TileEntitySalinationController; import mekanism.common.tile.TileEntitySalinationTank; import mekanism.common.tile.TileEntitySalinationValve; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index 9276a4100..103f0c818 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -4,6 +4,7 @@ import java.util.Random; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index e49ee4e0d..3d855be6e 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -5,6 +5,7 @@ import java.util.Random; import mekanism.common.Mekanism; import mekanism.common.item.ItemBlockCardboardBox; import mekanism.common.tile.TileEntityCardboardBox; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index e5013bb16..e8420f4d2 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -11,7 +11,6 @@ import mekanism.common.Mekanism; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.tile.TileEntityBasicBlock; -import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; @@ -32,16 +31,16 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.tools.IToolWrench; -import dan200.computercraft.api.peripheral.IPeripheral; -import dan200.computercraft.api.peripheral.IPeripheralProvider; - import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.api.tools.IToolWrench; +import dan200.computercraft.api.peripheral.IPeripheral; +import dan200.computercraft.api.peripheral.IPeripheralProvider; + /** * Block class for handling multiple energy cube block IDs. * 0: Basic Energy Cube diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 7e74b0c44..e4dc9e2c0 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -24,13 +24,12 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.tools.IToolWrench; - import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.api.tools.IToolWrench; + public class BlockGasTank extends BlockContainer { public BlockGasTank() diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 5551c4b29..19a97f1fa 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -56,9 +56,8 @@ import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntityTeleporter; -import mekanism.common.transporter.TransporterFilter; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.TransporterUtils; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -72,7 +71,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; @@ -83,12 +81,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + +import buildcraft.api.tools.IToolWrench; import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.api.peripheral.IPeripheralProvider; diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index fe37074a0..580ed6aa7 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -3,6 +3,7 @@ package mekanism.common.block; import mekanism.common.Mekanism; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.tile.TileEntityObsidianTNT; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/block/BlockOre.java b/src/main/java/mekanism/common/block/BlockOre.java index d8679fa69..538383975 100644 --- a/src/main/java/mekanism/common/block/BlockOre.java +++ b/src/main/java/mekanism/common/block/BlockOre.java @@ -3,6 +3,7 @@ package mekanism.common.block; import java.util.List; import mekanism.common.Mekanism; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 43893b7bf..935159c62 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java index 8179736a8..b0cdb565b 100644 --- a/src/main/java/mekanism/common/block/BlockPlasticFence.java +++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java @@ -1,6 +1,7 @@ package mekanism.common.block; import mekanism.common.Mekanism; + import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; diff --git a/src/main/java/mekanism/common/block/BlockSalt.java b/src/main/java/mekanism/common/block/BlockSalt.java index 6d00a9ef6..808bc9354 100644 --- a/src/main/java/mekanism/common/block/BlockSalt.java +++ b/src/main/java/mekanism/common/block/BlockSalt.java @@ -3,6 +3,7 @@ package mekanism.common.block; import java.util.Random; import mekanism.common.Mekanism; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index 0a1300d4f..ff0ce20bc 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -1,12 +1,11 @@ package mekanism.common.entity; -import io.netty.buffer.ByteBuf; - import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Pos3D; + import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.particle.EntityReddustFX; @@ -20,6 +19,8 @@ import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData { public EnumColor color = EnumColor.DARK_BLUE; diff --git a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java index 84c71aff4..cf3591941 100644 --- a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java +++ b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java @@ -1,6 +1,7 @@ package mekanism.common.entity; import mekanism.common.Mekanism; + import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 0c4bc68c1..f28309771 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -1,8 +1,5 @@ package mekanism.common.entity; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; - import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; @@ -10,7 +7,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; -import mekanism.client.sound.SoundHandler; import mekanism.common.ISustainedInventory; import mekanism.common.Mekanism; import mekanism.common.RobitAIFollow; @@ -19,7 +15,7 @@ import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemRobit; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; -import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; + import net.minecraft.entity.EntityCreature; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAILookIdle; @@ -41,8 +37,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.util.Constants; import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.Method; + import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; @Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = "Galacticraft API") public class EntityRobit extends EntityCreature implements IInventory, ISustainedInventory, IEntityBreathable diff --git a/src/main/java/mekanism/common/integration/IC2ItemManager.java b/src/main/java/mekanism/common/integration/IC2ItemManager.java index 93fb6bbb2..fd406e7b0 100644 --- a/src/main/java/mekanism/common/integration/IC2ItemManager.java +++ b/src/main/java/mekanism/common/integration/IC2ItemManager.java @@ -1,11 +1,13 @@ package mekanism.common.integration; -import ic2.api.item.IElectricItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; +import ic2.api.item.IElectricItemManager; + public class IC2ItemManager implements IElectricItemManager { public IEnergizedItem energizedItem; diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 2f2b4e09f..2474a107f 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -7,6 +7,7 @@ import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine; import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -16,6 +17,7 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.event.FMLInterModComms; + import dan200.computercraft.api.ComputerCraftAPI; import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeInputItemStack; diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 2275ed592..bb6230e43 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -1,12 +1,10 @@ package mekanism.common.integration; -import ic2.api.recipe.RecipeInputOreDict; -import ic2.api.recipe.Recipes; - import java.util.ArrayList; import mekanism.api.AdvancedInput; import mekanism.api.ChanceOutput; +import mekanism.api.StackUtils; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.infuse.InfuseObject; @@ -16,7 +14,7 @@ import mekanism.common.Mekanism; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -28,6 +26,9 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.Optional.Method; +import ic2.api.recipe.RecipeInputOreDict; +import ic2.api.recipe.Recipes; + public final class OreDictManager { public static void init() diff --git a/src/main/java/mekanism/common/inventory/InventoryBin.java b/src/main/java/mekanism/common/inventory/InventoryBin.java index 3cfdde7a3..927dfc98b 100644 --- a/src/main/java/mekanism/common/inventory/InventoryBin.java +++ b/src/main/java/mekanism/common/inventory/InventoryBin.java @@ -2,8 +2,7 @@ package mekanism.common.inventory; import mekanism.api.StackUtils; import mekanism.common.item.ItemBlockBasic; -import mekanism.common.util.MekanismUtils; -import net.minecraft.item.Item; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java index 545ec4600..1a3e15c53 100644 --- a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java +++ b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java @@ -2,6 +2,7 @@ package mekanism.common.inventory; import mekanism.common.IElectricChest; import mekanism.common.ISustainedInventory; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryBasic; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index 1db193a7e..5f2390278 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -9,6 +9,7 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java index 587922a28..44d27626e 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java @@ -7,6 +7,7 @@ import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java index 956005c43..8bdc768d2 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java @@ -8,6 +8,7 @@ import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java index a59e395f4..7b3336c27 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java @@ -9,6 +9,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java index 1b6c362e2..d17aea086 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java @@ -5,6 +5,7 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java index fb8b10ae8..616190d21 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java @@ -9,6 +9,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java index f715faee0..8770f3bc2 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java @@ -6,6 +6,7 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java index 82e7c4c9a..2ae8290f1 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java @@ -5,6 +5,7 @@ import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java b/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java index 2102eae2f..93057f6c9 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java @@ -2,6 +2,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityDynamicTank; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java index a64e9c8b0..7fdebe410 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java @@ -6,6 +6,7 @@ import mekanism.common.inventory.slot.SlotElectricChest; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java index a33308b1b..950695892 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java @@ -7,6 +7,7 @@ import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java index f47acc965..bf5a39c4e 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java @@ -4,6 +4,7 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java index b2e8e301c..c1a7c5192 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java @@ -7,6 +7,7 @@ import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java index b545ba3e1..a31c05dfb 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java @@ -1,6 +1,5 @@ package mekanism.common.inventory.container; -import ic2.api.item.IElectricItem; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityEnergyCube; @@ -14,6 +13,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import ic2.api.item.IElectricItem; + public class ContainerEnergyCube extends Container { private TileEntityEnergyCube tileEntity; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java index 35a35cc07..e2e4a769b 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java @@ -11,6 +11,7 @@ import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java index 51a230ad2..da89aef93 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java @@ -1,6 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.tile.TileEntityContainerBlock; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java index 4306c04a1..9e41d5785 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java @@ -4,6 +4,7 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java index 8f9283952..cafbf2e18 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java @@ -3,6 +3,7 @@ package mekanism.common.inventory.container; import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityGasTank; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java index 3e15e8425..9fb699efc 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java @@ -10,6 +10,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerNull.java b/src/main/java/mekanism/common/inventory/container/ContainerNull.java index eb8b6ed52..e330bc472 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerNull.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerNull.java @@ -1,6 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.tile.TileEntityContainerBlock; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java index caa26ffc9..3306be0dc 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java @@ -7,6 +7,7 @@ import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java b/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java index bb4b1a9bd..a1efb2434 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java @@ -2,6 +2,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityPortableTank; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java index 92d44b6be..57cf97c55 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java @@ -1,6 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.entity.EntityRobit; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java index f0db34ebe..ae76b9b29 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java @@ -2,6 +2,7 @@ package mekanism.common.inventory.container; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java index acff166b5..543018c05 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java @@ -1,6 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.entity.EntityRobit; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java index bda6cdb44..dbae9eac6 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java @@ -6,6 +6,7 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java b/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java index 3bc87aa20..aa3bf9759 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSalinationController.java @@ -2,6 +2,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntitySalinationController; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java index 5b9677253..1cc6acc99 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java @@ -3,6 +3,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java index b4ea02a91..e2f2e26f6 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java @@ -3,6 +3,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.ChargeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java b/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java index 87249361e..cfb0c1312 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java @@ -2,6 +2,7 @@ package mekanism.common.inventory.slot; import mekanism.common.IElectricChest; import mekanism.common.block.BlockMachine.MachineType; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java b/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java index 370bcc29e..b860ff6b6 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java @@ -1,6 +1,7 @@ package mekanism.common.inventory.slot; import mekanism.common.util.ChargeUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java b/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java index a7ca6acd4..71013716b 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java @@ -1,6 +1,7 @@ package mekanism.common.inventory.slot; import mekanism.common.item.ItemMachineUpgrade; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java b/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java index eed145d7b..a2348dd38 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java @@ -5,6 +5,7 @@ import java.util.Collections; import mekanism.api.gas.Gas; import mekanism.api.gas.IGasItem; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 56ae1be0a..145d85976 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -10,6 +10,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.ListUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index 50c697ce2..190201869 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -7,6 +7,7 @@ import mekanism.api.EnumColor; import mekanism.api.Pos3D; import mekanism.common.entity.EntityBalloon; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.BlockDispenser; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 150ca507e..e793dbb0f 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -6,6 +6,7 @@ import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.inventory.InventoryBin; import mekanism.common.tile.TileEntityBin; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 38ef801a5..edaf5a0ec 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -9,6 +9,7 @@ import mekanism.common.block.BlockCardboardBox.BlockData; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index d10825912..39b070724 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -1,8 +1,5 @@ package mekanism.common.item; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - import java.util.ArrayList; import java.util.List; @@ -21,6 +18,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; @@ -31,16 +29,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; - -import org.lwjgl.input.Keyboard; - -import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + @InterfaceList({ @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHAPI|energy"), @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2API") diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 79026f003..aaf10d7bf 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -14,6 +14,7 @@ import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.client.settings.GameSettings; import net.minecraft.creativetab.CreativeTabs; @@ -27,8 +28,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; -import org.lwjgl.input.Keyboard; - public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory { public Block metaBlock; diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index e6d23a12c..059c57f57 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -1,17 +1,11 @@ package mekanism.common.item; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; -import mekanism.api.gas.GasStack; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.IElectricChest; @@ -30,26 +24,15 @@ import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityBasicBlock; -import mekanism.common.tile.TileEntityChemicalCrystallizer; -import mekanism.common.tile.TileEntityChemicalDissolutionChamber; -import mekanism.common.tile.TileEntityChemicalInfuser; -import mekanism.common.tile.TileEntityChemicalOxidizer; -import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityElectricChest; -import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.tile.TileEntityFactory; -import mekanism.common.tile.TileEntityLogisticalSorter; -import mekanism.common.tile.TileEntityPRC; import mekanism.common.tile.TileEntityPortableTank; -import mekanism.common.tile.TileEntityRotaryCondensentrator; -import mekanism.common.transporter.TransporterFilter; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.TransporterUtils; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -69,16 +52,18 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; - -import org.lwjgl.input.Keyboard; - -import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + /** * Item class for handling multiple machine block IDs. * 0:0: Enrichment Chamber diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index 2831c0bd2..28500ce36 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -6,15 +6,13 @@ import mekanism.api.EnumColor; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; - -import org.lwjgl.input.Keyboard; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index 1816b3390..5d3eb309d 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -1,6 +1,7 @@ package mekanism.common.item; import mekanism.api.EnumColor; + import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemClump.java b/src/main/java/mekanism/common/item/ItemClump.java index cf416027f..3dd70440e 100644 --- a/src/main/java/mekanism/common/item/ItemClump.java +++ b/src/main/java/mekanism/common/item/ItemClump.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.Resource; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 5e9664e24..6d8487afe 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -27,10 +27,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; +import buildcraft.api.tools.IToolWrench; + @Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraftAPI|tools") public class ItemConfigurator extends ItemEnergized implements IMekWrench, IToolWrench { diff --git a/src/main/java/mekanism/common/item/ItemControlCircuit.java b/src/main/java/mekanism/common/item/ItemControlCircuit.java index e7d5afac3..77554fa4a 100644 --- a/src/main/java/mekanism/common/item/ItemControlCircuit.java +++ b/src/main/java/mekanism/common/item/ItemControlCircuit.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemCrystal.java b/src/main/java/mekanism/common/item/ItemCrystal.java index 7cce13099..a3ae6e58a 100644 --- a/src/main/java/mekanism/common/item/ItemCrystal.java +++ b/src/main/java/mekanism/common/item/ItemCrystal.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.Resource; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemDictionary.java b/src/main/java/mekanism/common/item/ItemDictionary.java index 217c8af08..2f8af5b31 100644 --- a/src/main/java/mekanism/common/item/ItemDictionary.java +++ b/src/main/java/mekanism/common/item/ItemDictionary.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemDirtyDust.java b/src/main/java/mekanism/common/item/ItemDirtyDust.java index 31c2b284b..8805a6854 100644 --- a/src/main/java/mekanism/common/item/ItemDirtyDust.java +++ b/src/main/java/mekanism/common/item/ItemDirtyDust.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.Resource; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemDust.java b/src/main/java/mekanism/common/item/ItemDust.java index c73d13e28..4a7824848 100644 --- a/src/main/java/mekanism/common/item/ItemDust.java +++ b/src/main/java/mekanism/common/item/ItemDust.java @@ -3,6 +3,7 @@ package mekanism.common.item; import java.util.List; import mekanism.common.Mekanism; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index 0e7220702..fd1284b7d 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 73104f1d7..550e85c4e 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -1,8 +1,5 @@ package mekanism.common.item; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - import java.util.List; import mekanism.api.EnumColor; @@ -10,6 +7,7 @@ import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; import mekanism.common.util.MekanismUtils; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -20,6 +18,8 @@ import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; @InterfaceList({ @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHAPI|energy"), diff --git a/src/main/java/mekanism/common/item/ItemFilterCard.java b/src/main/java/mekanism/common/item/ItemFilterCard.java index fb366245e..d5f20c75b 100644 --- a/src/main/java/mekanism/common/item/ItemFilterCard.java +++ b/src/main/java/mekanism/common/item/ItemFilterCard.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.IFilterAccess; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index b0f6cd567..8e43ba208 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -1,8 +1,5 @@ package mekanism.common.item; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - import java.util.List; import mekanism.api.EnumColor; @@ -12,6 +9,7 @@ import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -26,8 +24,6 @@ import net.minecraft.util.DamageSource; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; -import cofh.api.energy.IEnergyContainerItem; - import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; @@ -35,6 +31,10 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + @InterfaceList({ @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHAPI|energy"), @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2API") diff --git a/src/main/java/mekanism/common/item/ItemGasMask.java b/src/main/java/mekanism/common/item/ItemGasMask.java index d024bfb52..241091f26 100644 --- a/src/main/java/mekanism/common/item/ItemGasMask.java +++ b/src/main/java/mekanism/common/item/ItemGasMask.java @@ -3,6 +3,7 @@ package mekanism.common.item; import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/src/main/java/mekanism/common/item/ItemHDPE.java b/src/main/java/mekanism/common/item/ItemHDPE.java index 068e42271..5badc57f0 100644 --- a/src/main/java/mekanism/common/item/ItemHDPE.java +++ b/src/main/java/mekanism/common/item/ItemHDPE.java @@ -3,6 +3,7 @@ package mekanism.common.item; import java.util.List; import mekanism.common.Mekanism; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemIngot.java b/src/main/java/mekanism/common/item/ItemIngot.java index 1679b8ab1..1323dda65 100644 --- a/src/main/java/mekanism/common/item/ItemIngot.java +++ b/src/main/java/mekanism/common/item/ItemIngot.java @@ -3,6 +3,7 @@ package mekanism.common.item; import java.util.List; import mekanism.common.Mekanism; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index 5814587a2..8b5f06707 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -11,6 +11,7 @@ import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/mekanism/common/item/ItemMekanism.java b/src/main/java/mekanism/common/item/ItemMekanism.java index b7156ebff..81cd58200 100644 --- a/src/main/java/mekanism/common/item/ItemMekanism.java +++ b/src/main/java/mekanism/common/item/ItemMekanism.java @@ -1,6 +1,7 @@ package mekanism.common.item; import mekanism.common.Mekanism; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index c4ef0a79e..191fc4d19 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -4,6 +4,7 @@ import mekanism.api.EnumColor; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.common.Mekanism; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 1b962bb28..71d19bb1d 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -4,6 +4,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemProxy.java b/src/main/java/mekanism/common/item/ItemProxy.java index efb7bb841..afa8dbda8 100644 --- a/src/main/java/mekanism/common/item/ItemProxy.java +++ b/src/main/java/mekanism/common/item/ItemProxy.java @@ -1,6 +1,5 @@ package mekanism.common.item; -import mekanism.common.Mekanism; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index 57482730f..4299f9c86 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -8,6 +8,7 @@ import mekanism.common.ISustainedInventory; import mekanism.common.entity.EntityRobit; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 7a830ed55..bbbe27b33 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -11,6 +11,7 @@ import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/mekanism/common/item/ItemSeismicReader.java b/src/main/java/mekanism/common/item/ItemSeismicReader.java index 09b53ee2c..4244bb50c 100644 --- a/src/main/java/mekanism/common/item/ItemSeismicReader.java +++ b/src/main/java/mekanism/common/item/ItemSeismicReader.java @@ -4,6 +4,7 @@ import mekanism.api.Chunk3D; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; diff --git a/src/main/java/mekanism/common/item/ItemShard.java b/src/main/java/mekanism/common/item/ItemShard.java index ca372a484..9b1624552 100644 --- a/src/main/java/mekanism/common/item/ItemShard.java +++ b/src/main/java/mekanism/common/item/ItemShard.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.Resource; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index 3b0faecb6..89402f7da 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/miner/MItemStackFilter.java b/src/main/java/mekanism/common/miner/MItemStackFilter.java index 845f4bf66..a1485ab7f 100644 --- a/src/main/java/mekanism/common/miner/MItemStackFilter.java +++ b/src/main/java/mekanism/common/miner/MItemStackFilter.java @@ -1,18 +1,19 @@ package mekanism.common.miner; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.List; import mekanism.api.ListUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class MItemStackFilter extends MinerFilter { private static List metaIgnoreArray = ListUtils.asList(Blocks.planks, Blocks.ladder, Blocks.torch, diff --git a/src/main/java/mekanism/common/miner/MMaterialFilter.java b/src/main/java/mekanism/common/miner/MMaterialFilter.java index 0a5f4f817..c115d7b4e 100644 --- a/src/main/java/mekanism/common/miner/MMaterialFilter.java +++ b/src/main/java/mekanism/common/miner/MMaterialFilter.java @@ -1,11 +1,10 @@ package mekanism.common.miner; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.transporter.Finder.MaterialFinder; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.Item; @@ -13,6 +12,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class MMaterialFilter extends MinerFilter { public ItemStack materialItem; diff --git a/src/main/java/mekanism/common/miner/MModIDFilter.java b/src/main/java/mekanism/common/miner/MModIDFilter.java index 5e4b6531b..c80d6c2af 100644 --- a/src/main/java/mekanism/common/miner/MModIDFilter.java +++ b/src/main/java/mekanism/common/miner/MModIDFilter.java @@ -1,15 +1,16 @@ package mekanism.common.miner; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.transporter.Finder.ModIDFinder; + import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class MModIDFilter extends MinerFilter { public String modID; diff --git a/src/main/java/mekanism/common/miner/MOreDictFilter.java b/src/main/java/mekanism/common/miner/MOreDictFilter.java index 5e7d8e7f4..a024effe4 100644 --- a/src/main/java/mekanism/common/miner/MOreDictFilter.java +++ b/src/main/java/mekanism/common/miner/MOreDictFilter.java @@ -1,15 +1,16 @@ package mekanism.common.miner; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.transporter.Finder.OreDictFinder; + import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class MOreDictFilter extends MinerFilter { public String oreDictName; diff --git a/src/main/java/mekanism/common/miner/MinerFilter.java b/src/main/java/mekanism/common/miner/MinerFilter.java index 4745065e5..fada59c34 100644 --- a/src/main/java/mekanism/common/miner/MinerFilter.java +++ b/src/main/java/mekanism/common/miner/MinerFilter.java @@ -1,12 +1,12 @@ package mekanism.common.miner; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public abstract class MinerFilter { public abstract boolean canFilter(ItemStack itemStack); diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index 051834121..5b182216f 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -11,6 +12,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.microblock.HollowMicroblock; @@ -18,9 +22,6 @@ import codechicken.multipart.JItemMultiPart; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class ItemGlowPanel extends JItemMultiPart { public ItemGlowPanel() diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index 3f126a021..5326ba70c 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -13,6 +13,7 @@ import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.settings.GameSettings; import net.minecraft.creativetab.CreativeTabs; @@ -22,15 +23,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.input.Keyboard; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.JItemMultiPart; import codechicken.multipart.TMultiPart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemPartTransmitter extends JItemMultiPart { diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index 18f85190d..984ba8fc1 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -1,7 +1,5 @@ package mekanism.common.multipart; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -11,12 +9,15 @@ import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.transporter.TransporterStack; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class PartDiversionTransporter extends PartLogisticalTransporter { public int[] modes = {0, 0, 0, 0, 0, 0}; diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index 4a58aaf17..d9c1ec020 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -6,12 +6,16 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.RenderGlowPanel; import mekanism.common.Mekanism; + import net.minecraft.client.particle.EffectRenderer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Cuboid6; @@ -26,8 +30,6 @@ import codechicken.multipart.JNormalOcclusion; import codechicken.multipart.NormalOcclusionTest; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIconHitEffects { diff --git a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java index 2301b3889..4b79ff796 100644 --- a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java +++ b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java @@ -9,6 +9,7 @@ import mekanism.common.FluidNetwork; import mekanism.common.Tier; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -20,10 +21,11 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import codechicken.lib.vec.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Vector3; + public class PartMechanicalPipe extends PartTransmitter implements IFluidHandler { public Tier.PipeTier tier; diff --git a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java index ebd570188..1c39254b5 100644 --- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java +++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java @@ -10,17 +10,18 @@ import mekanism.api.gas.IGasHandler; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.RenderPartTransmitter; -import mekanism.common.multipart.PartSidedPipe.ConnectionType; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; -import codechicken.lib.vec.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import codechicken.lib.vec.Vector3; + public class PartPressurizedTube extends PartTransmitter implements IGasHandler { public static TransmitterIcons tubeIcons = new TransmitterIcons(1, 1); diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 506343139..002c9a90d 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -1,7 +1,5 @@ package mekanism.common.multipart; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -19,7 +17,6 @@ import mekanism.client.render.RenderPartTransmitter; import mekanism.common.ITileNetwork; import mekanism.common.Mekanism; import mekanism.common.Tier; -import mekanism.common.item.ItemConfigurator; import mekanism.common.multipart.TransmitterType.Size; import mekanism.common.util.MekanismUtils; @@ -32,7 +29,11 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import io.netty.buffer.ByteBuf; + import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.raytracer.ExtendedMOP; @@ -51,10 +52,6 @@ import codechicken.multipart.PartMap; import codechicken.multipart.TMultiPart; import codechicken.multipart.TSlottedPart; -import cpw.mods.fml.common.ModAPIManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, JNormalOcclusion, ISidedHollowConnect, JIconHitEffects, ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, INeighborTileChange { public static IndexedCuboid6[] smallSides = new IndexedCuboid6[7]; diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index 68000cf7a..da84ac416 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -4,7 +4,6 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.IConfigurable; import mekanism.api.Range4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; @@ -14,8 +13,10 @@ import mekanism.client.ClientTickHandler; import mekanism.common.Mekanism; import mekanism.common.network.PacketTransmitterUpdate.PacketType; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; + import codechicken.multipart.TileMultipart; public abstract class PartTransmitter> extends PartSidedPipe implements IGridTransmitter diff --git a/src/main/java/mekanism/common/multipart/TransmitterType.java b/src/main/java/mekanism/common/multipart/TransmitterType.java index 41a0527df..d466b9af4 100644 --- a/src/main/java/mekanism/common/multipart/TransmitterType.java +++ b/src/main/java/mekanism/common/multipart/TransmitterType.java @@ -1,6 +1,7 @@ package mekanism.common.multipart; import mekanism.api.transmitters.TransmissionType; + import net.minecraft.util.IIcon; diff --git a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java index 2855a18a0..d353bb600 100644 --- a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java +++ b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java @@ -1,16 +1,17 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import mekanism.api.BlockInfo; import mekanism.api.MekanismAPI; import mekanism.common.Mekanism; import mekanism.common.network.PacketBoxBlacklist.BoxBlacklistMessage; + import net.minecraft.block.Block; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketBoxBlacklist implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 40e09036d..6325fb14c 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -1,7 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -15,6 +13,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; @@ -23,6 +22,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketConfigurationUpdate implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketConfiguratorState.java b/src/main/java/mekanism/common/network/PacketConfiguratorState.java index 97da2433b..797419416 100644 --- a/src/main/java/mekanism/common/network/PacketConfiguratorState.java +++ b/src/main/java/mekanism/common/network/PacketConfiguratorState.java @@ -1,14 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemConfigurator; import mekanism.common.network.PacketConfiguratorState.ConfiguratorStateMessage; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketConfiguratorState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketContainerEditMode.java b/src/main/java/mekanism/common/network/PacketContainerEditMode.java index 32fbb6757..5eca64ee7 100644 --- a/src/main/java/mekanism/common/network/PacketContainerEditMode.java +++ b/src/main/java/mekanism/common/network/PacketContainerEditMode.java @@ -1,17 +1,19 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.IFluidContainerManager; import mekanism.common.PacketHandler; import mekanism.common.network.PacketContainerEditMode.ContainerEditModeMessage; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketContainerEditMode implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index 0964f08f3..af78c7468 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -1,7 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -13,6 +11,7 @@ import mekanism.common.PacketHandler; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDynamicTank; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; @@ -22,6 +21,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketDataRequest implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketDigitUpdate.java b/src/main/java/mekanism/common/network/PacketDigitUpdate.java index ef7dc188d..853eec5a9 100644 --- a/src/main/java/mekanism/common/network/PacketDigitUpdate.java +++ b/src/main/java/mekanism/common/network/PacketDigitUpdate.java @@ -1,14 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketDigitUpdate.DigitUpdateMessage; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketDigitUpdate implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index e92801c02..931d3b7d4 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -1,7 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -21,6 +19,7 @@ import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityDigitalMiner; + import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -33,6 +32,8 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + public class PacketDigitalMinerGui implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketEditFilter.java b/src/main/java/mekanism/common/network/PacketEditFilter.java index 4c518e41b..4872cc461 100644 --- a/src/main/java/mekanism/common/network/PacketEditFilter.java +++ b/src/main/java/mekanism/common/network/PacketEditFilter.java @@ -1,7 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -13,6 +11,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterFilter; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; @@ -21,6 +20,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketEditFilter implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketElectricBowState.java b/src/main/java/mekanism/common/network/PacketElectricBowState.java index 1c9b05569..10ab0c739 100644 --- a/src/main/java/mekanism/common/network/PacketElectricBowState.java +++ b/src/main/java/mekanism/common/network/PacketElectricBowState.java @@ -1,14 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemElectricBow; import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketElectricBowState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketElectricChest.java b/src/main/java/mekanism/common/network/PacketElectricChest.java index 74d50e407..ba3932d3e 100644 --- a/src/main/java/mekanism/common/network/PacketElectricChest.java +++ b/src/main/java/mekanism/common/network/PacketElectricChest.java @@ -1,6 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.energy.IEnergizedItem; import mekanism.common.IElectricChest; @@ -9,9 +8,9 @@ import mekanism.common.PacketHandler; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -19,6 +18,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketElectricChest implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketJetpackData.java b/src/main/java/mekanism/common/network/PacketJetpackData.java index 7f1de1a51..ccd5cf1cc 100644 --- a/src/main/java/mekanism/common/network/PacketJetpackData.java +++ b/src/main/java/mekanism/common/network/PacketJetpackData.java @@ -1,17 +1,19 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketJetpackData implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketKey.java b/src/main/java/mekanism/common/network/PacketKey.java index 05fad0273..d700a6932 100644 --- a/src/main/java/mekanism/common/network/PacketKey.java +++ b/src/main/java/mekanism/common/network/PacketKey.java @@ -1,13 +1,15 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.network.PacketKey.KeyMessage; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketKey implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java index 5250048ee..a5dcb9ac4 100644 --- a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java @@ -1,6 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.client.gui.GuiLogisticalSorter; import mekanism.client.gui.GuiTFilterSelect; @@ -15,6 +14,7 @@ import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityLogisticalSorter; + import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -27,6 +27,8 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + public class PacketLogisticalSorterGui implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketNewFilter.java b/src/main/java/mekanism/common/network/PacketNewFilter.java index 2a13d74e3..5a121bf6d 100644 --- a/src/main/java/mekanism/common/network/PacketNewFilter.java +++ b/src/main/java/mekanism/common/network/PacketNewFilter.java @@ -1,7 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -13,6 +11,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterFilter; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; @@ -21,6 +20,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketNewFilter implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketPortableTankState.java b/src/main/java/mekanism/common/network/PacketPortableTankState.java index c04a30158..28069cde4 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTankState.java +++ b/src/main/java/mekanism/common/network/PacketPortableTankState.java @@ -1,14 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketPortableTankState.PortableTankStateMessage; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketPortableTankState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleport.java b/src/main/java/mekanism/common/network/PacketPortableTeleport.java index 08bcd3cf8..1ae6852c6 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleport.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleport.java @@ -1,6 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; @@ -12,6 +11,7 @@ import mekanism.common.network.PacketPortableTeleport.PortableTeleportMessage; import mekanism.common.network.PacketPortalFX.PortalFXMessage; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -22,6 +22,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketPortableTeleport implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketPortalFX.java b/src/main/java/mekanism/common/network/PacketPortalFX.java index 0ed7b2fe4..da959db99 100644 --- a/src/main/java/mekanism/common/network/PacketPortalFX.java +++ b/src/main/java/mekanism/common/network/PacketPortalFX.java @@ -1,17 +1,18 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.Random; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.network.PacketPortalFX.PortalFXMessage; + import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketPortalFX implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketRedstoneControl.java b/src/main/java/mekanism/common/network/PacketRedstoneControl.java index 2b9724f07..47deee84e 100644 --- a/src/main/java/mekanism/common/network/PacketRedstoneControl.java +++ b/src/main/java/mekanism/common/network/PacketRedstoneControl.java @@ -1,17 +1,19 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.IRedstoneControl; import mekanism.common.IRedstoneControl.RedstoneControl; import mekanism.common.PacketHandler; import mekanism.common.network.PacketRedstoneControl.RedstoneControlMessage; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketRedstoneControl implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java index 977433e01..61bc90463 100644 --- a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java +++ b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java @@ -1,12 +1,12 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.IUpgradeManagement; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.network.PacketRemoveUpgrade.RemoveUpgradeMessage; import mekanism.common.tile.TileEntityBasicBlock; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -14,6 +14,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketRemoveUpgrade implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketRobit.java b/src/main/java/mekanism/common/network/PacketRobit.java index bf5069455..77a6d09d3 100644 --- a/src/main/java/mekanism/common/network/PacketRobit.java +++ b/src/main/java/mekanism/common/network/PacketRobit.java @@ -1,15 +1,17 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.entity.EntityRobit; import mekanism.common.network.PacketRobit.RobitMessage; + import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketRobit implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketScubaTankData.java b/src/main/java/mekanism/common/network/PacketScubaTankData.java index a44ffbb36..82c2a4500 100644 --- a/src/main/java/mekanism/common/network/PacketScubaTankData.java +++ b/src/main/java/mekanism/common/network/PacketScubaTankData.java @@ -1,16 +1,18 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.item.ItemScubaTank; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketScubaTankData implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketSimpleGui.java b/src/main/java/mekanism/common/network/PacketSimpleGui.java index 6775d5636..ff2ee34ed 100644 --- a/src/main/java/mekanism/common/network/PacketSimpleGui.java +++ b/src/main/java/mekanism/common/network/PacketSimpleGui.java @@ -1,11 +1,11 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.tile.TileEntityBasicBlock; + import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -17,6 +17,8 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + public class PacketSimpleGui implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketStatusUpdate.java b/src/main/java/mekanism/common/network/PacketStatusUpdate.java index 9d53843fa..a6cb005e6 100644 --- a/src/main/java/mekanism/common/network/PacketStatusUpdate.java +++ b/src/main/java/mekanism/common/network/PacketStatusUpdate.java @@ -1,14 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketStatusUpdate.StatusUpdateMessage; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketStatusUpdate implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketTileEntity.java b/src/main/java/mekanism/common/network/PacketTileEntity.java index 54f9467c7..f5b4692ec 100644 --- a/src/main/java/mekanism/common/network/PacketTileEntity.java +++ b/src/main/java/mekanism/common/network/PacketTileEntity.java @@ -1,18 +1,19 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.common.ITileNetwork; import mekanism.common.PacketHandler; import mekanism.common.network.PacketTileEntity.TileEntityMessage; + import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketTileEntity implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java index 3b01c90ed..6afeffcd4 100644 --- a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java +++ b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java @@ -1,6 +1,5 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasNetwork; @@ -11,6 +10,7 @@ import mekanism.common.EnergyNetwork; import mekanism.common.FluidNetwork; import mekanism.common.PacketHandler; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; @@ -20,6 +20,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketTransmitterUpdate implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java index 561ce8b72..130de17a1 100644 --- a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java +++ b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java @@ -1,14 +1,16 @@ package mekanism.common.network; -import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + public class PacketWalkieTalkieState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/recipe/BinRecipe.java b/src/main/java/mekanism/common/recipe/BinRecipe.java index 9cb36e00d..6da494469 100644 --- a/src/main/java/mekanism/common/recipe/BinRecipe.java +++ b/src/main/java/mekanism/common/recipe/BinRecipe.java @@ -4,12 +4,12 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemProxy; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; diff --git a/src/main/java/mekanism/common/recipe/MekanismRecipe.java b/src/main/java/mekanism/common/recipe/MekanismRecipe.java index 93f265090..51740a080 100644 --- a/src/main/java/mekanism/common/recipe/MekanismRecipe.java +++ b/src/main/java/mekanism/common/recipe/MekanismRecipe.java @@ -10,6 +10,7 @@ import mekanism.common.IEnergyCube; import mekanism.common.IFactory; import mekanism.common.IUpgradeManagement; import mekanism.common.block.BlockMachine.MachineType; + import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/recipe/RecipeHandler.java b/src/main/java/mekanism/common/recipe/RecipeHandler.java index 859c5b983..2296c88a7 100644 --- a/src/main/java/mekanism/common/recipe/RecipeHandler.java +++ b/src/main/java/mekanism/common/recipe/RecipeHandler.java @@ -10,12 +10,13 @@ import mekanism.api.ChemicalPair; import mekanism.api.PressurizedProducts; import mekanism.api.PressurizedReactants; import mekanism.api.PressurizedRecipe; +import mekanism.api.StackUtils; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.infuse.InfusionInput; import mekanism.api.infuse.InfusionOutput; -import mekanism.api.StackUtils; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/tank/DynamicFluidTank.java b/src/main/java/mekanism/common/tank/DynamicFluidTank.java index 8d543cf4e..9ffbd8816 100644 --- a/src/main/java/mekanism/common/tank/DynamicFluidTank.java +++ b/src/main/java/mekanism/common/tank/DynamicFluidTank.java @@ -4,6 +4,7 @@ import mekanism.api.Coord4D; import mekanism.common.tank.SynchronizedTankData.ValveData; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.util.MekanismUtils; + import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; diff --git a/src/main/java/mekanism/common/tank/DynamicTankCache.java b/src/main/java/mekanism/common/tank/DynamicTankCache.java index 85de08bca..230bd1d15 100644 --- a/src/main/java/mekanism/common/tank/DynamicTankCache.java +++ b/src/main/java/mekanism/common/tank/DynamicTankCache.java @@ -4,6 +4,7 @@ import java.util.HashSet; import mekanism.api.Coord4D; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/mekanism/common/tank/SynchronizedTankData.java b/src/main/java/mekanism/common/tank/SynchronizedTankData.java index 2526010f4..18544a711 100644 --- a/src/main/java/mekanism/common/tank/SynchronizedTankData.java +++ b/src/main/java/mekanism/common/tank/SynchronizedTankData.java @@ -4,8 +4,8 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; + import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/tank/TankUpdateProtocol.java b/src/main/java/mekanism/common/tank/TankUpdateProtocol.java index b9e25561d..61ba89238 100644 --- a/src/main/java/mekanism/common/tank/TankUpdateProtocol.java +++ b/src/main/java/mekanism/common/tank/TankUpdateProtocol.java @@ -9,6 +9,7 @@ import mekanism.common.tank.SynchronizedTankData.ValveData; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; import mekanism.common.util.MekanismUtils; + import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java index a2d5da2d5..b8b831381 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java @@ -1,8 +1,5 @@ package mekanism.common.tile; -import ic2.api.tile.IWrenchable; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -15,6 +12,7 @@ import mekanism.common.Mekanism; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -24,6 +22,10 @@ import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; +import io.netty.buffer.ByteBuf; + +import ic2.api.tile.IWrenchable; + @Interface(iface = "ic2.api.tile.IWrenchable", modid = "IC2API") public abstract class TileEntityBasicBlock extends TileEntity implements IWrenchable, ITileNetwork { diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java index 285ab9095..45b0be820 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -19,10 +17,14 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.MekanismUtils; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; + +import io.netty.buffer.ByteBuf; + import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 42b343847..9c13d3693 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -18,6 +16,7 @@ import mekanism.common.transporter.TransporterManager; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -25,9 +24,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import cpw.mods.fml.common.Optional.Interface; +import io.netty.buffer.ByteBuf; + +import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; + @Interface(iface = "powercrystals.minefactoryreloaded.api.IDeepStorageUnit", modid = "MineFactoryReloaded") public class TileEntityBin extends TileEntityBasicBlock implements ISidedInventory, IActiveState, IDeepStorageUnit, IConfigurable { diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index e5fcb3bbd..52b35c5fe 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -10,10 +8,13 @@ import mekanism.common.ITileNetwork; import mekanism.common.Mekanism; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; + import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import io.netty.buffer.ByteBuf; + public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork { public int mainX; diff --git a/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java b/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java index 768da48de..26c250109 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java +++ b/src/main/java/mekanism/common/tile/TileEntityCardboardBox.java @@ -1,6 +1,7 @@ package mekanism.common.tile; import mekanism.common.block.BlockCardboardBox.BlockData; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 7fafb8a04..59b2523e2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -1,9 +1,5 @@ package mekanism.common.tile; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; import java.util.List; @@ -20,13 +16,19 @@ import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.entity.EntityRobit; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.EntityLivingBase; 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 io.netty.buffer.ByteBuf; + import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; public class TileEntityChargepad extends TileEntityElectricBlock implements IActiveState, IHasSound { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index c3631c64a..5b0cf3734 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -32,6 +30,7 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -40,6 +39,8 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; +import io.netty.buffer.ByteBuf; + public class TileEntityChemicalCrystallizer extends TileEntityElectricBlock implements IActiveState, IGasHandler, ITubeConnection, IRedstoneControl, IHasSound, IInvConfiguration, IUpgradeTile, ISustainedData { public static final int MAX_GAS = 10000; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index d39f1a4bb..518b85f6f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -28,11 +26,14 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileEntityChemicalDissolutionChamber extends TileEntityElectricBlock implements IActiveState, ITubeConnection, IRedstoneControl, IHasSound, IGasHandler, IUpgradeTile, ISustainedData { public GasTank injectTank = new GasTank(MAX_GAS); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 75a4442bc..1aa9b8553 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -25,6 +23,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -32,6 +31,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileEntityChemicalInfuser extends TileEntityElectricBlock implements IActiveState, IGasHandler, ITubeConnection, IRedstoneControl, IHasSound, ISustainedData { public GasTank leftTank = new GasTank(MAX_GAS); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java index 6e9ee5d90..11a995ec0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java @@ -9,11 +9,11 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index ce522d48c..e4d212b82 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -27,11 +25,14 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileEntityChemicalOxidizer extends TileEntityElectricBlock implements IActiveState, ITubeConnection, IRedstoneControl, IHasSound, IUpgradeTile, ISustainedData { public GasTank gasTank = new GasTank(MAX_GAS); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 9e0936471..d7121a38f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -27,6 +25,7 @@ import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -42,6 +41,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; +import io.netty.buffer.ByteBuf; + public class TileEntityChemicalWasher extends TileEntityElectricBlock implements IActiveState, IGasHandler, ITubeConnection, IRedstoneControl, IHasSound, IFluidHandler, ISustainedData { public FluidTank fluidTank = new FluidTank(MAX_FLUID); diff --git a/src/main/java/mekanism/common/tile/TileEntityCombiner.java b/src/main/java/mekanism/common/tile/TileEntityCombiner.java index c16220ae0..d8acda41f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCombiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityCombiner.java @@ -5,10 +5,10 @@ import java.util.Map; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java index 13325142b..c14e5f15b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java @@ -1,9 +1,9 @@ package mekanism.common.tile; import mekanism.common.ISustainedInventory; -import mekanism.common.Mekanism; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 1f9eb3dcc..e3e280244 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -18,6 +16,7 @@ import mekanism.common.tank.TankUpdateProtocol; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -29,6 +28,8 @@ import net.minecraftforge.fluids.IFluidContainerItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + public class TileEntityDynamicTank extends TileEntityContainerBlock implements IFluidContainerManager { /** Unique inventory ID for the dynamic tank, serves as a way to retrieve cached inventories. */ diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java index 3896123a9..a8e2fb868 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java @@ -2,6 +2,7 @@ package mekanism.common.tile; import mekanism.common.tank.DynamicFluidTank; import mekanism.common.util.PipeUtils; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java b/src/main/java/mekanism/common/tile/TileEntityElectricChest.java index e46163f5f..827de3ce2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricChest.java @@ -1,16 +1,17 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class TileEntityElectricChest extends TileEntityElectricBlock { public static int[] INV; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 2cb3f6823..58145494b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -15,11 +13,11 @@ import mekanism.api.EnumColor; import mekanism.api.IConfigurable; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -36,6 +34,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; +import io.netty.buffer.ByteBuf; + public class TileEntityElectricPump extends TileEntityElectricBlock implements IFluidHandler, ISustainedTank, IConfigurable { /** This pump's tank */ diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java index ddfd6ef22..36ce011dd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java @@ -3,14 +3,10 @@ package mekanism.common.tile; import java.util.HashMap; import java.util.Map; -import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.recipe.RecipeHandler; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; public class TileEntityEnergizedSmelter extends TileEntityElectricMachine { diff --git a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java index 5bb8b3daa..f3f9c39c5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index aa051c34e..34adfdcd3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; import java.util.HashSet; @@ -17,7 +15,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; -import net.minecraft.block.Block; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -33,6 +31,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; +import io.netty.buffer.ByteBuf; + public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implements IConfigurable, IFluidHandler, ISustainedTank { public Set activeNodes = new HashSet(); diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index a7e13ecb7..6df2f930e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import java.util.ArrayList; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -16,6 +15,7 @@ import mekanism.common.IRedstoneControl; import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -24,6 +24,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileEntityGasTank extends TileEntityContainerBlock implements IGasHandler, ITubeConnection, IRedstoneControl { public enum Mode diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index ef9660b3a..317e057c5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; @@ -25,6 +23,7 @@ import mekanism.common.transporter.TransporterManager; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; @@ -35,6 +34,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, IFilterAccess, ISustainedData { public HashList filters = new HashList(); diff --git a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java index a7492c6a3..714ed53fa 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java +++ b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java @@ -8,6 +8,7 @@ import mekanism.api.gas.GasStack; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; + import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java index c024b561d..763c56c65 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -17,6 +15,7 @@ import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -31,6 +30,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; +import io.netty.buffer.ByteBuf; + public class TileEntityPortableTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager { public boolean isActive; diff --git a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java index 5146289ed..1dbe0c144 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java +++ b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; diff --git a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java index 7d8764f0e..6b4fc9398 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java @@ -9,10 +9,10 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.client.gui.GuiProgress.ProgressBar; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; + import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 16f0779b4..03f5a38bf 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.Coord4D; @@ -23,6 +21,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -37,6 +36,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; +import io.netty.buffer.ByteBuf; + public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock implements IActiveState, ISustainedData, IFluidHandler, IGasHandler, ITubeConnection, IRedstoneControl { public GasTank gasTank = new GasTank(MAX_FLUID); diff --git a/src/main/java/mekanism/common/tile/TileEntitySalinationController.java b/src/main/java/mekanism/common/tile/TileEntitySalinationController.java index 3a99053ae..4cdf4f972 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySalinationController.java +++ b/src/main/java/mekanism/common/tile/TileEntitySalinationController.java @@ -1,21 +1,18 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.IConfigurable; import mekanism.api.ISalinationSolar; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tank.TankUpdateProtocol; import mekanism.common.util.MekanismUtils; + 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; @@ -28,6 +25,8 @@ import net.minecraftforge.fluids.FluidTank; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + public class TileEntitySalinationController extends TileEntitySalinationTank { public static final int MAX_BRINE = 10000; diff --git a/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java b/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java index 2bba1f93f..16a673c32 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntitySalinationValve.java @@ -2,6 +2,7 @@ package mekanism.common.tile; import mekanism.api.Coord4D; import mekanism.common.util.PipeUtils; + import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index d666b8a11..8d62f1be4 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -1,7 +1,5 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.EnumSet; @@ -14,10 +12,13 @@ import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl { public boolean isActive; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index c8526788c..292731833 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -1,7 +1,5 @@ package mekanism.common.tile.component; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.List; @@ -17,12 +15,15 @@ import mekanism.common.transporter.TransporterManager; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; + 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 io.netty.buffer.ByteBuf; + public class TileComponentEjector implements ITileComponent, IEjector { public TileEntityContainerBlock tileEntity; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index b1a16a5cf..6fb3bd594 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -1,15 +1,16 @@ package mekanism.common.tile.component; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.ITileComponent; import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityContainerBlock; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class TileComponentUpgrade implements ITileComponent { /** How long it takes this machine to install an upgrade. */ diff --git a/src/main/java/mekanism/common/transporter/Finder.java b/src/main/java/mekanism/common/transporter/Finder.java index 5cfa3bbb5..77cba9ef9 100644 --- a/src/main/java/mekanism/common/transporter/Finder.java +++ b/src/main/java/mekanism/common/transporter/Finder.java @@ -2,8 +2,9 @@ package mekanism.common.transporter; import java.util.List; -import mekanism.common.util.MekanismUtils; import mekanism.api.StackUtils; +import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/transporter/TItemStackFilter.java b/src/main/java/mekanism/common/transporter/TItemStackFilter.java index a1afc70a0..b1fc844ea 100644 --- a/src/main/java/mekanism/common/transporter/TItemStackFilter.java +++ b/src/main/java/mekanism/common/transporter/TItemStackFilter.java @@ -1,18 +1,19 @@ package mekanism.common.transporter; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.transporter.Finder.ItemStackFinder; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + 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 io.netty.buffer.ByteBuf; + public class TItemStackFilter extends TransporterFilter { public boolean sizeMode; diff --git a/src/main/java/mekanism/common/transporter/TMaterialFilter.java b/src/main/java/mekanism/common/transporter/TMaterialFilter.java index f0db77e7a..6fe4c65c7 100644 --- a/src/main/java/mekanism/common/transporter/TMaterialFilter.java +++ b/src/main/java/mekanism/common/transporter/TMaterialFilter.java @@ -1,12 +1,11 @@ package mekanism.common.transporter; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.transporter.Finder.MaterialFinder; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.inventory.IInventory; @@ -16,6 +15,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TMaterialFilter extends TransporterFilter { public ItemStack materialItem; diff --git a/src/main/java/mekanism/common/transporter/TModIDFilter.java b/src/main/java/mekanism/common/transporter/TModIDFilter.java index fd382e092..bb4e3378c 100644 --- a/src/main/java/mekanism/common/transporter/TModIDFilter.java +++ b/src/main/java/mekanism/common/transporter/TModIDFilter.java @@ -1,17 +1,18 @@ package mekanism.common.transporter; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.transporter.Finder.ModIDFinder; import mekanism.common.util.InventoryUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TModIDFilter extends TransporterFilter { public String modID; diff --git a/src/main/java/mekanism/common/transporter/TOreDictFilter.java b/src/main/java/mekanism/common/transporter/TOreDictFilter.java index b7a8356f1..492306c02 100644 --- a/src/main/java/mekanism/common/transporter/TOreDictFilter.java +++ b/src/main/java/mekanism/common/transporter/TOreDictFilter.java @@ -1,17 +1,18 @@ package mekanism.common.transporter; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.transporter.Finder.OreDictFinder; import mekanism.common.util.InventoryUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TOreDictFilter extends TransporterFilter { public String oreDictName; diff --git a/src/main/java/mekanism/common/transporter/TransporterFilter.java b/src/main/java/mekanism/common/transporter/TransporterFilter.java index 1c929cebf..bdbbd6577 100644 --- a/src/main/java/mekanism/common/transporter/TransporterFilter.java +++ b/src/main/java/mekanism/common/transporter/TransporterFilter.java @@ -1,16 +1,17 @@ package mekanism.common.transporter; -import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import mekanism.api.EnumColor; import mekanism.common.util.TransporterUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public abstract class TransporterFilter { public EnumColor color; diff --git a/src/main/java/mekanism/common/transporter/TransporterManager.java b/src/main/java/mekanism/common/transporter/TransporterManager.java index 427c09d2d..a76fac142 100644 --- a/src/main/java/mekanism/common/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/transporter/TransporterManager.java @@ -12,6 +12,7 @@ import mekanism.common.tile.TileEntityBin; import mekanism.common.transporter.TransporterStack.Path; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/transporter/TransporterPathfinder.java index 87524c456..6ff3214fe 100644 --- a/src/main/java/mekanism/common/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/transporter/TransporterPathfinder.java @@ -15,6 +15,7 @@ import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterPathfinder.Pathfinder.DestChecker; import mekanism.common.transporter.TransporterStack.Path; import mekanism.common.util.InventoryUtils; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/transporter/TransporterStack.java b/src/main/java/mekanism/common/transporter/TransporterStack.java index 909452980..87f6bf5f5 100644 --- a/src/main/java/mekanism/common/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/transporter/TransporterStack.java @@ -3,7 +3,6 @@ package mekanism.common.transporter; import java.util.ArrayList; import java.util.List; -import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.ILogisticalTransporter; @@ -11,11 +10,14 @@ import mekanism.common.PacketHandler; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterPathfinder.Destination; import mekanism.common.util.TransporterUtils; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import io.netty.buffer.ByteBuf; + public class TransporterStack { public ItemStack itemStack; diff --git a/src/main/java/mekanism/common/util/ChargeUtils.java b/src/main/java/mekanism/common/util/ChargeUtils.java index aa6c5dadb..b30f1167d 100644 --- a/src/main/java/mekanism/common/util/ChargeUtils.java +++ b/src/main/java/mekanism/common/util/ChargeUtils.java @@ -1,14 +1,16 @@ package mekanism.common.util; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityElectricBlock; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; + import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; public final class ChargeUtils { diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java index 60329ed61..2d7a2b33f 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -7,6 +7,7 @@ import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.Finder; import mekanism.common.transporter.InvStack; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.InventoryLargeChest; diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index c51edadb6..6261d14e9 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.ListUtils; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index 8b846ea65..e712eb443 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -5,6 +5,7 @@ import java.util.Arrays; import mekanism.api.Coord4D; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/mekanism/common/voice/VoiceConnection.java b/src/main/java/mekanism/common/voice/VoiceConnection.java index a68ab4acc..0d3027295 100644 --- a/src/main/java/mekanism/common/voice/VoiceConnection.java +++ b/src/main/java/mekanism/common/voice/VoiceConnection.java @@ -11,6 +11,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.item.ItemWalkieTalkie; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/mekanism/common/world/GenHandler.java b/src/main/java/mekanism/common/world/GenHandler.java index 741ce5960..607802b96 100644 --- a/src/main/java/mekanism/common/world/GenHandler.java +++ b/src/main/java/mekanism/common/world/GenHandler.java @@ -3,6 +3,7 @@ package mekanism.common.world; import java.util.Random; import mekanism.common.Mekanism; + import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; diff --git a/src/main/java/mekanism/common/world/WorldGenSalt.java b/src/main/java/mekanism/common/world/WorldGenSalt.java index a33fc2b5d..953ad2a37 100644 --- a/src/main/java/mekanism/common/world/WorldGenSalt.java +++ b/src/main/java/mekanism/common/world/WorldGenSalt.java @@ -3,6 +3,7 @@ package mekanism.common.world; import java.util.Random; import mekanism.common.Mekanism; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index 90568aff2..90dba6990 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -5,23 +5,23 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelAdvancedSolarGenerator; import mekanism.generators.client.model.ModelBioGenerator; -import mekanism.generators.client.model.ModelHeatGenerator; import mekanism.generators.client.model.ModelGasGenerator; +import mekanism.generators.client.model.ModelHeatGenerator; import mekanism.generators.client.model.ModelSolarGenerator; import mekanism.generators.client.model.ModelWindTurbine; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.block.BlockGenerator.GeneratorType; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class BlockRenderingHandler implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index bacdd9188..dc35bd8e5 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -1,23 +1,24 @@ package mekanism.generators.client; import mekanism.generators.client.gui.GuiBioGenerator; -import mekanism.generators.client.gui.GuiHeatGenerator; import mekanism.generators.client.gui.GuiGasGenerator; +import mekanism.generators.client.gui.GuiHeatGenerator; import mekanism.generators.client.gui.GuiSolarGenerator; import mekanism.generators.client.gui.GuiWindTurbine; import mekanism.generators.client.render.RenderAdvancedSolarGenerator; import mekanism.generators.client.render.RenderBioGenerator; -import mekanism.generators.client.render.RenderHeatGenerator; import mekanism.generators.client.render.RenderGasGenerator; +import mekanism.generators.client.render.RenderHeatGenerator; import mekanism.generators.client.render.RenderSolarGenerator; import mekanism.generators.client.render.RenderWindTurbine; import mekanism.generators.common.GeneratorsCommonProxy; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; -import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; +import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import mekanism.generators.common.tile.TileEntityWindTurbine; + import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/generators/client/gui/GeneratorsGuiFactory.java b/src/main/java/mekanism/generators/client/gui/GeneratorsGuiFactory.java index 0544b5ebc..924cb9b54 100644 --- a/src/main/java/mekanism/generators/client/gui/GeneratorsGuiFactory.java +++ b/src/main/java/mekanism/generators/client/gui/GeneratorsGuiFactory.java @@ -2,8 +2,6 @@ package mekanism.generators.client.gui; import java.util.Set; -import mekanism.client.gui.GuiMekanismConfig; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import cpw.mods.fml.client.IModGuiFactory; diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java index 12d3ca377..7375db3a9 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java @@ -16,13 +16,13 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.inventory.container.ContainerBioGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiBioGenerator extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index 511196e2b..d245113cc 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -19,13 +19,13 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerGasGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiGasGenerator extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java b/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java index 4cc8732ac..cc60772cc 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java @@ -4,7 +4,6 @@ import mekanism.common.Mekanism; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; -import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.client.config.GuiConfig; /** diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index a2264d7dd..0f70712a6 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -19,14 +19,14 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiHeatGenerator extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index cdf477136..bfe730c4d 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -13,16 +13,15 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiSolarGenerator extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java index 751a22956..601d36a61 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java @@ -18,13 +18,13 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.inventory.container.ContainerWindTurbine; import mekanism.generators.common.tile.TileEntityWindTurbine; + import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiWindTurbine extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java index d1d9515d7..23a211b18 100644 --- a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java @@ -1,6 +1,7 @@ package mekanism.generators.client.model; import mekanism.client.render.MekanismRenderer; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java index 036cd9aff..4d634eee4 100644 --- a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java @@ -4,14 +4,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java index 6b3e9a9e6..3a856510a 100644 --- a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java @@ -10,16 +10,16 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelBioGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderBioGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java index a8db431d2..9c975ed0a 100644 --- a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java @@ -4,14 +4,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelGasGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderGasGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java index af366eec4..8b9866218 100644 --- a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java @@ -4,14 +4,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelHeatGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderHeatGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java index e4c90d06f..59a244546 100644 --- a/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java @@ -4,6 +4,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelSolarGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java b/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java index d35096479..c42c05ef4 100644 --- a/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java +++ b/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java @@ -5,6 +5,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelWindTurbine; import mekanism.generators.common.tile.TileEntityWindTurbine; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index ebf9ae3e8..5d95fa8ab 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -2,16 +2,17 @@ package mekanism.generators.common; import mekanism.common.Mekanism; import mekanism.generators.common.inventory.container.ContainerBioGenerator; -import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.inventory.container.ContainerGasGenerator; +import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; import mekanism.generators.common.inventory.container.ContainerWindTurbine; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; -import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; +import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import mekanism.generators.common.tile.TileEntityWindTurbine; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 7eb817cf4..65b57b5ae 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.block; import java.util.List; import java.util.Random; -import mekanism.api.IMekWrench; import mekanism.api.energy.IEnergizedItem; import mekanism.common.IActiveState; import mekanism.common.IBoundingBlock; @@ -13,7 +12,6 @@ import mekanism.common.ISustainedInventory; import mekanism.common.ISustainedTank; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; -import mekanism.common.integration.MekanismHooks; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; @@ -25,6 +23,7 @@ import mekanism.generators.common.tile.TileEntityGasGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import mekanism.generators.common.tile.TileEntityWindTurbine; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -41,16 +40,16 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.tools.IToolWrench; -import dan200.computercraft.api.peripheral.IPeripheral; -import dan200.computercraft.api.peripheral.IPeripheralProvider; - import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.api.tools.IToolWrench; +import dan200.computercraft.api.peripheral.IPeripheral; +import dan200.computercraft.api.peripheral.IPeripheralProvider; + /** * Block class for handling multiple generator block IDs. * 0: Heat Generator diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java index ebf9396ff..0aa6bbd57 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java @@ -3,6 +3,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityBioGenerator; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java index 3088950f2..a9b0116c1 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java @@ -5,6 +5,7 @@ import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityGasGenerator; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java index 2b2b465a0..b70668dc6 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java @@ -3,6 +3,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityHeatGenerator; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java index 6883ce957..c7400fcfc 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java @@ -3,6 +3,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntitySolarGenerator; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindTurbine.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindTurbine.java index 696f9c885..9e6efd0a6 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindTurbine.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindTurbine.java @@ -3,6 +3,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityWindTurbine; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 9cb20675d..da8e33ac2 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -1,8 +1,5 @@ package mekanism.generators.common.item; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - import java.util.List; import mekanism.api.EnumColor; @@ -18,6 +15,7 @@ import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.block.BlockGenerator.GeneratorType; + import net.minecraft.block.Block; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; @@ -30,16 +28,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.input.Keyboard; - -import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import cofh.api.energy.IEnergyContainerItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + /** * Item class for handling multiple generator block IDs. * 0: Heat Generator diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index 4533b155d..df077a241 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -7,6 +7,7 @@ import mekanism.api.ISalinationSolar; import mekanism.common.IBoundingBlock; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; + import net.minecraftforge.common.util.ForgeDirection; public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock, ISalinationSolar diff --git a/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java b/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java index 80da391be..12d1ac6ba 100644 --- a/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java +++ b/src/main/java/mekanism/tools/client/gui/ToolsGuiFactory.java @@ -2,7 +2,6 @@ package mekanism.tools.client.gui; import java.util.Set; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import cpw.mods.fml.client.IModGuiFactory; diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 1d48f9dcf..264dbd015 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -1,7 +1,5 @@ package mekanism.tools.common; -import io.netty.buffer.ByteBuf; - import java.io.IOException; import mekanism.common.IModule; @@ -15,6 +13,7 @@ import mekanism.tools.item.ItemMekanismPaxel; import mekanism.tools.item.ItemMekanismPickaxe; import mekanism.tools.item.ItemMekanismShovel; import mekanism.tools.item.ItemMekanismSword; + import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.Items; @@ -36,6 +35,8 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; +import io.netty.buffer.ByteBuf; + @Mod(modid = "MekanismTools", name = "MekanismTools", version = "7.1.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule { diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index 70ea0beb7..8569254e8 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -2,11 +2,12 @@ package mekanism.tools.item; import java.util.List; +import mekanism.api.StackUtils; import mekanism.client.render.ModelCustomArmor; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; import mekanism.tools.common.MekanismTools; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index b47ab340d..5d63b3a37 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -2,9 +2,10 @@ package mekanism.tools.item; import java.util.List; +import mekanism.api.StackUtils; import mekanism.common.item.ItemMekanism; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; + import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java b/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java index 2a1b993d5..774b9be56 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java @@ -4,7 +4,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeHooks; public class ItemMekanismPaxel extends ItemMekanismTool { diff --git a/src/main/java/mekanism/tools/item/ItemMekanismSword.java b/src/main/java/mekanism/tools/item/ItemMekanismSword.java index ed6157252..9a8ddd366 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismSword.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismSword.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismTool.java b/src/main/java/mekanism/tools/item/ItemMekanismTool.java index 5e7aa0dbf..f2d000aaf 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismTool.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismTool.java @@ -4,10 +4,11 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; +import mekanism.api.StackUtils; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; import mekanism.tools.common.MekanismTools; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; From 92f1579bbac5410d4b051ddd6b138548a9e4f193 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Tue, 11 Nov 2014 12:25:10 +0000 Subject: [PATCH 3/5] Make PULL mode actually, and exclusively, pull. --- .../common/multipart/PartUniversalCable.java | 43 +++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 3841d83bf..543ac3987 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -3,7 +3,9 @@ package mekanism.common.multipart; import java.util.List; import java.util.Set; +import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.client.MekanismClient; @@ -27,6 +29,7 @@ import cpw.mods.fml.relauncher.SideOnly; import codechicken.lib.vec.Vector3; import cofh.api.energy.IEnergyHandler; +import cofh.api.energy.IEnergyProvider; import ic2.api.energy.tile.IEnergySource; @InterfaceList({ @@ -43,6 +46,8 @@ public class PartUniversalCable extends PartTransmitter implement public double cacheEnergy = 0; public double lastWrite = 0; + public double drawAmount = 100; + public PartUniversalCable(Tier.CableTier cableTier) { tier = cableTier; @@ -77,8 +82,6 @@ public class PartUniversalCable extends PartTransmitter implement cacheEnergy = 0; } - if(MekanismUtils.useIC2()) - { List sides = getConnections(ConnectionType.PULL); if(!sides.isEmpty()) { @@ -88,23 +91,47 @@ public class PartUniversalCable extends PartTransmitter implement { if(connectedOutputters[side.ordinal()] != null) { - TileEntity acceptor = connectedOutputters[side.ordinal()]; + TileEntity outputter = connectedOutputters[side.ordinal()]; - if(acceptor instanceof IEnergySource) + if(outputter instanceof ICableOutputter && outputter instanceof IStrictEnergyStorage) { - double received = ((IEnergySource) acceptor).getOfferedEnergy() * Mekanism.FROM_IC2; + if(((ICableOutputter)outputter).canOutputTo(side.getOpposite())) + { + double received = Math.min(((IStrictEnergyStorage)outputter).getEnergy(), drawAmount); + double toDraw = received; + + if(received > 0) + { + toDraw -= getTransmitterNetwork().emit(received, true); + } + ((IStrictEnergyStorage)outputter).setEnergy(((IStrictEnergyStorage)outputter).getEnergy() - toDraw); + } + } + else if(MekanismUtils.useRF() && outputter instanceof IEnergyProvider) + { + double received = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)drawAmount, true) * Mekanism.FROM_TE; double toDraw = received; if(received > 0) { toDraw -= getTransmitterNetwork().emit(received, true); } - ((IEnergySource) acceptor).drawEnergy(toDraw * Mekanism.TO_IC2); + ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)toDraw, false); + } + else if(MekanismUtils.useIC2() && outputter instanceof IEnergySource) + { + double received = Math.min(((IEnergySource)outputter).getOfferedEnergy() * Mekanism.FROM_IC2, drawAmount); + double toDraw = received; + + if(received > 0) + { + toDraw -= getTransmitterNetwork().emit(received, true); + } + ((IEnergySource)outputter).drawEnergy(toDraw * Mekanism.TO_IC2); } } } } - } } super.update(); @@ -301,7 +328,7 @@ public class PartUniversalCable extends PartTransmitter implement @Override public boolean canReceiveEnergy(ForgeDirection side) { - return getConnectionType(side) == ConnectionType.NORMAL || getConnectionType(side) == ConnectionType.PULL; + return getConnectionType(side) == ConnectionType.NORMAL; } @Override From 0d21d201a9e71b7af7f41c8b791066cc4a0b57cf Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Tue, 11 Nov 2014 12:25:58 +0000 Subject: [PATCH 4/5] Only receive RF from sides in NORMAL mode. --- .../java/mekanism/common/multipart/PartUniversalCable.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 543ac3987..08d8afff1 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -274,7 +274,11 @@ public class PartUniversalCable extends PartTransmitter implement @Method(modid = "CoFHAPI|energy") public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return maxReceive - (int)Math.round(getTransmitterNetwork().emit(maxReceive*Mekanism.FROM_TE, !simulate)*Mekanism.TO_TE); + if(canReceiveEnergy(from)) + { + return maxReceive - (int)Math.round(getTransmitterNetwork().emit(maxReceive * Mekanism.FROM_TE, !simulate) * Mekanism.TO_TE); + } + return 0; } @Override From 8f6b24ba6782b131ec8c70c1eebc2d70633c8978 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Tue, 11 Nov 2014 12:27:03 +0000 Subject: [PATCH 5/5] Stop UniCables claiming to carry MJ --- src/main/java/mekanism/common/multipart/ItemPartTransmitter.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index 5326ba70c..7c727a5a0 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -110,7 +110,6 @@ public class ItemPartTransmitter extends JItemMultiPart list.add(EnumColor.DARK_GREY + MekanismUtils.localize("tooltip.capableTrans") + ":"); list.add("- " + EnumColor.PURPLE + "RF " + EnumColor.GREY + "(ThermalExpansion)"); list.add("- " + EnumColor.PURPLE + "EU " + EnumColor.GREY + "(IndustrialCraft)"); - list.add("- " + EnumColor.PURPLE + "MJ " + EnumColor.GREY + "(BuildCraft)"); list.add("- " + EnumColor.PURPLE + "Joules " + EnumColor.GREY + "(Mekanism)"); break; }