diff --git a/dependencies.gradle b/dependencies.gradle index f1765290..60e0f9d1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,26 +1,27 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:EnderCore:0.5.7:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.4:dev') - compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.60-GTNH:dev') - api("com.github.GTNewHorizons:GTNHLib:0.9.10:dev") - compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:dev') + api('com.github.GTNewHorizons:EnderCore:0.5.14:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.30:dev') + compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.110-GTNH:dev') + api("com.github.GTNewHorizons:GTNHLib:0.11.30:dev") + compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.61:dev') api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748 shadowImplementation('cglib:cglib-nodep:3.3.0') - api("com.github.GTNewHorizons:TinkersConstruct:1.14.27-GTNH:dev") + api("com.github.GTNewHorizons:TinkersConstruct:1.14.93-GTNH:dev") - devOnlyNonPublishable('com.github.GTNewHorizons:waila:1.19.22:dev') {transitive = false} + devOnlyNonPublishable('com.github.GTNewHorizons:waila:1.19.30:dev') {transitive = false} + compileOnly('ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.48-GTNH:dev') {transitive = false} runtimeOnlyNonPublishable('com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev') {transitive = false} - compileOnly("com.github.GTNewHorizons:Backhand:1.8.4:dev") { transitive = false } - compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-812-GTNH:api') {transitive = false} - compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.261:dev') {transitive = false} - compileOnly("com.github.GTNewHorizons:ModularUI2:2.3.37-1.7.10:dev") {transitive = false} - compileOnly('com.github.GTNewHorizons:Railcraft:9.17.17:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.9-GTNH:api') {transitive = false} - compileOnly('com.github.GTNewHorizons:Chisel:2.17.14-GTNH:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.16-GTNH:api') {transitive = false} + compileOnly("com.github.GTNewHorizons:Backhand:1.8.11:dev") { transitive = false } + compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-997-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.21-GTNH:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.14:dev') {transitive = false} + compileOnly("com.github.GTNewHorizons:ModularUI2:2.3.79-1.7.10:dev") {transitive = false} + compileOnly('com.github.GTNewHorizons:Railcraft:9.17.28:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.26-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:Chisel:2.17.26-GTNH:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.48-GTNH:api') {transitive = false} compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150 compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023 @@ -28,6 +29,7 @@ dependencies { compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797 compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2 - compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta66a:api') {transitive = false} - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.58:dev") + compileOnlyApi('com.github.GTNewHorizons:Angelica:2.1.49:api') {transitive = false} + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.166:dev") + compileOnly('curse.maven:automagy-222153:2285272') } diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index b30b5507..fa4ed510 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,12 +1,12 @@ #This file is generated by updateDaemonJvm -toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect -toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect -toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect -toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect -toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/46949723aaa20c7b64d7ecfed7207034/redirect -toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d6690dfd71c4c91e08577437b5b2beb0/redirect -toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect -toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect -toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect -toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/redirect +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect toolchainVersion=25 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f8e1ee31..d997cfc6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 23449a2b..dbc3ce4a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index adff685a..0262dcbd 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/settings.gradle b/settings.gradle index 23a58cee..7371c582 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.19' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.26' } diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 0ad856ae..c9ee15b3 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -262,7 +262,7 @@ public class ClientProxy extends CommonProxy { BlockObeliskAbstract.defaultObeliskRenderId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(defaultObeliskRenderer); - ObeliskSpecialRenderer attRen = new ObeliskSpecialRenderer( + ObeliskSpecialRenderer attRen = new ObeliskSpecialRenderer<>( new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()), defaultObeliskRenderer); ClientRegistry.bindTileEntitySpecialRenderer(TileAttractor.class, attRen); @@ -272,7 +272,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileAversionObelisk.class, sgr); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockSpawnGuard), sgr); - ObeliskSpecialRenderer eor = new ObeliskSpecialRenderer( + ObeliskSpecialRenderer eor = new ObeliskSpecialRenderer<>( new ItemStack(EnderIO.itemXpTransfer), defaultObeliskRenderer); ClientRegistry.bindTileEntitySpecialRenderer(TileExperienceObelisk.class, eor); @@ -285,7 +285,7 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockWeatherObelisk), twr); BlockCombustionGenerator.renderId = RenderingRegistry.getNextAvailableRenderId(); - TechneMachineRenderer cr = new TechneMachineRenderer( + TechneMachineRenderer cr = new TechneMachineRenderer<>( EnderIO.blockCombustionGenerator, "models/combustionGen"); RenderingRegistry.registerBlockHandler(cr); @@ -301,7 +301,7 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockKillerJoe), kjr); BlockVat.renderId = RenderingRegistry.getNextAvailableRenderId(); - TechneMachineRenderer vr = new TechneMachineRenderer(EnderIO.blockVat, "models/vat"); + TechneMachineRenderer vr = new TechneMachineRenderer<>(EnderIO.blockVat, "models/vat"); RenderingRegistry.registerBlockHandler(vr); FusedQuartzFrameRenderer fqfr = new FusedQuartzFrameRenderer(); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 6c6cd141..fa5c08dd 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -184,7 +184,7 @@ import crazypants.util.EE3Util; @Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = """ required-after:CoFHLib@[1.7.10R1.0.3B3,);\ required-after:endercore;\ - required-after:gtnhlib@[0.2.10,);\ + required-after:gtnhlib@[0.9.47,);\ after:MineFactoryReloaded;\ after:Forestry;\ after:Waila@[1.5.8,);\ @@ -214,7 +214,9 @@ public class EnderIO { public static final boolean hasLwjgl3 = Loader.isModLoaded("lwjgl3ify"); public static final boolean hasGT5 = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi"); public static final boolean hasHP = Loader.isModLoaded("hodgepodge"); + public static final boolean hasEtFuturum = Loader.isModLoaded("etfuturum"); public static final boolean hasWailaPlugins = Loader.isModLoaded("wailaplugins"); + public static final boolean hasAutomagy = Loader.isModLoaded("Automagy"); // Materials public static ItemCapacitor itemBasicCapacitor; diff --git a/src/main/java/crazypants/enderio/GuiHandler.java b/src/main/java/crazypants/enderio/GuiHandler.java index 40f65dbf..f9549613 100644 --- a/src/main/java/crazypants/enderio/GuiHandler.java +++ b/src/main/java/crazypants/enderio/GuiHandler.java @@ -60,7 +60,7 @@ public class GuiHandler implements IGuiHandler { public static final int GUI_ID_CAP_BANK = 142; // leave room for more machines - protected final Map guiHandlers = new HashMap(); + protected final Map guiHandlers = new HashMap<>(); public void registerGuiHandler(int id, IGuiHandler handler) { guiHandlers.put(id, handler); diff --git a/src/main/java/crazypants/enderio/block/ContainerDarkSteelAnvil.java b/src/main/java/crazypants/enderio/block/ContainerDarkSteelAnvil.java index 9de66e78..635c0ff7 100644 --- a/src/main/java/crazypants/enderio/block/ContainerDarkSteelAnvil.java +++ b/src/main/java/crazypants/enderio/block/ContainerDarkSteelAnvil.java @@ -16,12 +16,9 @@ import crazypants.enderio.config.Config; public class ContainerDarkSteelAnvil extends ContainerRepair { - private int x, y, z; - - private final Field _outputSlot = ReflectionHelper.findField(ContainerRepair.class, "outputSlot", "field_82852_f"); - private final Field _inputSlots = ReflectionHelper.findField(ContainerRepair.class, "inputSlots", "field_82853_g"); - private final Field _materialCost = ReflectionHelper - .findField(ContainerRepair.class, "materialCost", "stackSizeToBeUsedInRepair", "field_82856_l"); + private final int x; + private final int y; + private final int z; public ContainerDarkSteelAnvil(InventoryPlayer playerInv, final World world, final int x, final int y, final int z, EntityPlayer player) { @@ -31,8 +28,12 @@ public class ContainerDarkSteelAnvil extends ContainerRepair { final int materialCost; try { + Field _outputSlot = ReflectionHelper.findField(ContainerRepair.class, "outputSlot", "field_82852_f"); outputSlot = (IInventory) _outputSlot.get(this); + Field _inputSlots = ReflectionHelper.findField(ContainerRepair.class, "inputSlots", "field_82853_g"); inputSlots = (IInventory) _inputSlots.get(this); + Field _materialCost = ReflectionHelper + .findField(ContainerRepair.class, "materialCost", "stackSizeToBeUsedInRepair", "field_82856_l"); materialCost = _materialCost.getInt(this); } catch (Exception e) { throw new RuntimeException(e); diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java index 8f1ca8c0..3a5726c3 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java @@ -73,8 +73,7 @@ public abstract class AbstractConduit implements IConduit { protected List collidables; - protected final EnumMap conectionModes = new EnumMap( - ForgeDirection.class); + protected final EnumMap conectionModes = new EnumMap<>(ForgeDirection.class); protected boolean collidablesDirty = true; @@ -454,7 +453,7 @@ public abstract class AbstractConduit implements IConduit { needUpdateConnections = false; boolean externalConnectionsChanged = false; - List copy = new ArrayList(externalConnections); + List copy = new ArrayList<>(externalConnections); // remove any no longer valid connections for (ForgeDirection dir : copy) { if (!canConnectToExternal(dir, false)) { @@ -634,7 +633,7 @@ public abstract class AbstractConduit implements IConduit { return collidables; } - List result = new ArrayList(); + List result = new ArrayList<>(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { Collection col = getCollidables(dir); if (col != null) { diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/AbstractConduitNetwork.java index adecf839..2222d2c1 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduitNetwork.java @@ -12,7 +12,7 @@ import crazypants.enderio.EnderIO; // I=base type, I is the base class of the implementations accepted by the network public abstract class AbstractConduitNetwork { - protected final List conduits = new ArrayList(); + protected final List conduits = new ArrayList<>(); protected final Class implClass; protected final Class baseConduitClass; diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index bd9628b4..ca74df83 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -480,7 +480,7 @@ public class BlockConduitBundle extends BlockEio IConduitBundle te = (IConduitBundle) rte; boolean breakBlock = true; - List drop = new ArrayList(); + List drop = new ArrayList<>(); if (ConduitUtil.isSolidFacadeRendered(te, player)) { breakBlock = false; ItemStack fac = new ItemStack(EnderIO.itemConduitFacade, 1, te.getFacadeType().ordinal()); @@ -538,7 +538,7 @@ public class BlockConduitBundle extends BlockEio if (type == null) { // broke a conector so drop any conduits with no connections as there // is no other way to remove these - List cons = new ArrayList(te.getConduits()); + List cons = new ArrayList<>(te.getConduits()); boolean droppedUnconected = false; for (IConduit con : cons) { if (con.getConduitConnections().isEmpty() && con.getExternalConnections().isEmpty() @@ -1035,7 +1035,7 @@ public class BlockConduitBundle extends BlockEio return null; } IConduitBundle bundle = (IConduitBundle) te; - List hits = new ArrayList(); + List hits = new ArrayList<>(); if (player == null) { player = EnderIO.proxy.getClientPlayer(); @@ -1052,8 +1052,7 @@ public class BlockConduitBundle extends BlockEio } } else { ConduitDisplayMode mode = ConduitUtil.getDisplayMode(player); - Collection components = new ArrayList( - bundle.getCollidableComponents()); + Collection components = new ArrayList<>(bundle.getCollidableComponents()); for (CollidableComponent component : components) { if ((component.conduitType != null || mode == ConduitDisplayMode.ALL) && ConduitUtil.renderConduit(player, component.conduitType)) { diff --git a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java index 6f350f96..78af8602 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java @@ -196,7 +196,7 @@ public class ConduitDisplayMode { } public static Iterable getRenderableModes() { - return FluentIterable.from(registrar).filter(new Predicate() { + return FluentIterable.from(registrar).filter(new Predicate<>() { @Override public boolean apply(ConduitDisplayMode input) { diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index b73a806e..58e919e5 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -254,7 +254,7 @@ public class ConduitUtil { if (!(te instanceof IConduitBundle)) { return Collections.emptyList(); } - List result = new ArrayList(); + List result = new ArrayList<>(); IConduitBundle root = (IConduitBundle) te; T con = root.getConduit(type); if (con != null) { @@ -363,7 +363,7 @@ public class ConduitUtil { return; } IConduitBundle cb = (IConduitBundle) te; - Set cons = new HashSet(); + Set cons = new HashSet<>(); boolean hasInsulated = false; for (IConduit con : cb.getConduits()) { cons.addAll(con.getExternalConnections()); diff --git a/src/main/java/crazypants/enderio/conduit/RaytraceResult.java b/src/main/java/crazypants/enderio/conduit/RaytraceResult.java index 5b871542..77c31196 100644 --- a/src/main/java/crazypants/enderio/conduit/RaytraceResult.java +++ b/src/main/java/crazypants/enderio/conduit/RaytraceResult.java @@ -33,7 +33,7 @@ public class RaytraceResult { if (origin == null || toSort == null) { return; } - Collections.sort(toSort, new Comparator() { + Collections.sort(toSort, new Comparator<>() { @Override public int compare(RaytraceResult o1, RaytraceResult o2) { diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index 5e3eeac5..18b71184 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -564,7 +564,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { cachedConnectors.clear(); // TODO: What an unholly mess! (and it doesn't even work correctly...) - List coreBounds = new ArrayList(); + List coreBounds = new ArrayList<>(); for (IConduit con : conduits) { addConduitCores(coreBounds, con); } @@ -572,13 +572,13 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { result.addAll(coreBounds); // 1st algorithm - List conduitsBounds = new ArrayList(); + List conduitsBounds = new ArrayList<>(); for (IConduit con : conduits) { conduitsBounds.addAll(con.getCollidableComponents()); addConduitCores(conduitsBounds, con); } - Set> collidingTypes = new HashSet>(); + Set> collidingTypes = new HashSet<>(); for (CollidableComponent conCC : conduitsBounds) { for (CollidableComponent innerCC : conduitsBounds) { if (!InsulatedRedstoneConduit.COLOR_CONTROLLER_ID.equals(innerCC.data) @@ -592,7 +592,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { // TODO: Remove the core geometries covered up by this as no point in rendering these if (!collidingTypes.isEmpty()) { - List colCores = new ArrayList(); + List colCores = new ArrayList<>(); for (Class c : collidingTypes) { IConduit con = getConduit(c); if (con != null) { @@ -624,7 +624,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { for (IConduit con : conduits) { if (con.hasConnections()) { - List cores = new ArrayList(); + List cores = new ArrayList<>(); addConduitCores(cores, con); if (cores.size() > 1) { BoundingBox bb = cores.get(0).bound; diff --git a/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java index a383bb4d..4cac5359 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java @@ -140,7 +140,7 @@ public class BlockConduitFacade extends BlockEio implements IPaintedBlock, Clone return new Mimic(id, meta); } - class Mimic { + static class Mimic { int meta; Block block; diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java index d408ee7a..21bbeeb6 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java @@ -25,12 +25,10 @@ import mekanism.api.gas.IGasHandler; public abstract class AbstractGasConduit extends AbstractConduit implements IGasConduit { - protected final EnumMap extractionModes = new EnumMap( - ForgeDirection.class); - protected final EnumMap extractionColors = new EnumMap( - ForgeDirection.class); + protected final EnumMap extractionModes = new EnumMap<>(ForgeDirection.class); + protected final EnumMap extractionColors = new EnumMap<>(ForgeDirection.class); - protected final Map externalRedstoneSignals = new HashMap(); + protected final Map externalRedstoneSignals = new HashMap<>(); protected boolean redstoneStateDirty = true; @Method(modid = GasUtil.API_NAME) diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java index 89505569..5352c7c8 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java @@ -18,7 +18,7 @@ public class GasConduitNetwork extends AbstractGasTankConduitNetwork private final ConduitGasTank tank = new ConduitGasTank(0); - private final Set outputs = new HashSet(); + private final Set outputs = new HashSet<>(); private Iterator outputIterator; diff --git a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java index 9744ebcd..90c70340 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java @@ -21,7 +21,7 @@ import crazypants.enderio.gui.IconEIO; public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTooltipProvider { - private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + private static final ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { new ItemConduitSubtype(ModObject.itemGasConduit.name(), "enderio:itemGasConduit"), }; public static ItemGasConduit create() { diff --git a/src/main/java/crazypants/enderio/conduit/geom/CollidableCache.java b/src/main/java/crazypants/enderio/conduit/geom/CollidableCache.java index b05977ce..8ce7d3bb 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/CollidableCache.java +++ b/src/main/java/crazypants/enderio/conduit/geom/CollidableCache.java @@ -12,7 +12,7 @@ public class CollidableCache { public static final CollidableCache instance = new CollidableCache(); - private final Map> cache = new HashMap>(); + private final Map> cache = new HashMap<>(); public CacheKey createKey(Class baseType, Offset offset, ForgeDirection dir, boolean isStub) { return new CacheKey(baseType, offset, dir, isStub); diff --git a/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java b/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java index d0ef88fa..e286c7da 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java +++ b/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java @@ -33,7 +33,7 @@ public class ConduitGeometryUtil { public static final float CONNECTOR_DEPTH = 0.05f; - private static Map EXTERNAL_CONNECTOR_BOUNDS = new HashMap(); + private static final Map EXTERNAL_CONNECTOR_BOUNDS = new HashMap<>(); static { setupBounds(0.5f); @@ -106,9 +106,9 @@ public class ConduitGeometryUtil { return val < 0 ? 1 + val : val; } - private Map boundsCache = new HashMap(); + private final Map boundsCache = new HashMap<>(); - private EnumMap connectorBounds = new EnumMap( + private final EnumMap connectorBounds = new EnumMap<>( ConduitConnectorType.class); private ConduitGeometryUtil() {} diff --git a/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java b/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java index 7477a153..f282dc09 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java +++ b/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java @@ -21,8 +21,7 @@ import com.enderio.core.common.vecmath.Vertex; public class ConnectionModeGeometry { - private static final EnumMap> VERTS = new EnumMap>( - ForgeDirection.class); + private static final EnumMap> VERTS = new EnumMap<>(ForgeDirection.class); static { float scale = 0.9f; @@ -84,7 +83,7 @@ public class ConnectionModeGeometry { } private static List createVerticesForDir(BoundingBox refBB, VertexTransform xform) { - List result = new ArrayList(24); + List result = new ArrayList<>(24); for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { result.addAll(refBB.getCornersWithUvForFace(face)); } diff --git a/src/main/java/crazypants/enderio/conduit/geom/Offsets.java b/src/main/java/crazypants/enderio/conduit/geom/Offsets.java index d8331fb0..bea5506f 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/Offsets.java +++ b/src/main/java/crazypants/enderio/conduit/geom/Offsets.java @@ -16,7 +16,7 @@ import crazypants.enderio.conduit.redstone.IRedstoneConduit; public class Offsets { - private static Map OFFSETS = new HashMap(); + private static final Map OFFSETS = new HashMap<>(); static { OFFSETS.put(key(IRedstoneConduit.class, Axis.NONE), Offset.UP); diff --git a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java index fd36e110..31526c12 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java @@ -31,7 +31,7 @@ public class BaseSettingsPanel implements ITabPanel { static final int ID_EXTRACT_ENABLED = 328; protected static final int ID_INSERT_FILTER_OPTIONS = 329; protected static final int ID_EXTRACT_FILTER_OPTIONS = 330; - protected final int ID_ENABLED = 331; + protected static final int ID_ENABLED = 331; protected final @Nonnull IWidgetIcon icon; protected final @Nonnull GuiExternalConnection gui; @@ -41,8 +41,8 @@ public class BaseSettingsPanel implements ITabPanel { protected ConnectionMode oldConnectionMode; - private @Nonnull String inputHeading; - private @Nonnull String outputHeading; + private final @Nonnull String inputHeading; + private final @Nonnull String outputHeading; private boolean insertEnabled = false; private boolean extractEnabled = false; @@ -142,7 +142,7 @@ public class BaseSettingsPanel implements ITabPanel { } }; - ArrayList funcUpgradeTips = new ArrayList(); + ArrayList funcUpgradeTips = new ArrayList<>(); SpecialTooltipHandler.addTooltipFromResources(funcUpgradeTips, "enderio.gui.conduit.item.functionupgrade.line"); for (FunctionUpgrade upgrade : FunctionUpgrade.values()) { funcUpgradeTips.add(EnderIO.lang.localizeExact(upgrade.unlocName.concat(".name"))); diff --git a/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java b/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java index 88387fed..d4168505 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java @@ -28,13 +28,13 @@ public class GasSettings extends BaseSettingsPanel { private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); - private RedstoneModeButton rsB; + private final RedstoneModeButton rsB; - private ColorButton colorB; + private final ColorButton colorB; - private String autoExtractStr = EnderIO.lang.localize("gui.conduit.gas.autoExtract"); + private final String autoExtractStr = EnderIO.lang.localize("gui.conduit.gas.autoExtract"); - private IGasConduit conduit; + private final IGasConduit conduit; protected GasSettings(final GuiExternalConnection gui, IConduit con) { super(IconEIO.WRENCH_OVERLAY_GAS, EnderIO.lang.localize("itemGasConduit.name"), gui, con); diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java index c0a6d33e..5d23cad1 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java @@ -50,7 +50,7 @@ public class GuiExternalConnection extends GuiContainerBaseEIO { return id; } - private static final Map, Integer> TAB_ORDER = new HashMap, Integer>(); + private static final Map, Integer> TAB_ORDER = new HashMap<>(); static { TAB_ORDER.put(IItemConduit.class, 0); @@ -66,11 +66,11 @@ public class GuiExternalConnection extends GuiContainerBaseEIO { final IConduitBundle bundle; private final ForgeDirection dir; - private final List conduits = new ArrayList(); - private final List tabs = new ArrayList(); + private final List conduits = new ArrayList<>(); + private final List tabs = new ArrayList<>(); private int activeTab = 0; - private int tabYOffset = 4; + private static final int tabYOffset = 4; private final ExternalConnectionContainer container; @@ -86,8 +86,8 @@ public class GuiExternalConnection extends GuiContainerBaseEIO { container.setInoutSlotsVisible(false, false); - List cons = new ArrayList(bundle.getConduits()); - Collections.sort(cons, new Comparator() { + List cons = new ArrayList<>(bundle.getConduits()); + Collections.sort(cons, new Comparator<>() { @Override public int compare(IConduit o1, IConduit o2) { diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java index 55ed5500..2fb31b0a 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java @@ -34,7 +34,7 @@ public class GuiExternalConnectionSelector extends GuiScreen { public GuiExternalConnectionSelector(IConduitBundle cb) { this.cb = cb; - cons = new HashSet(); + cons = new HashSet<>(); for (IConduit con : cb.getConduits()) { if (con instanceof IInsulatedRedstoneConduit) { Set conCons = con.getConduitConnections(); diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index f86c513b..0fccf41f 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -62,7 +62,7 @@ public class LiquidSettings extends BaseSettingsPanel { private final ILiquidConduit conduit; private AbstractEnderLiquidConduit eConduit; - private boolean isEnder; + private final boolean isEnder; private static final int filterIX = 4; private static final int filterEX = 104; private static final int filterY = 63; @@ -70,7 +70,7 @@ public class LiquidSettings extends BaseSettingsPanel { private static final Rectangle extractFilterBounds = new Rectangle(filterEX, filterY, 90, 18); private GuiToolTip[] filterToolTips; - private boolean inOutShowIn = true; + private static final boolean inOutShowIn = true; private IconButton insertWhiteListB; private IconButton extractWhiteListB; diff --git a/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java b/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java index 06a2df48..b4f3c9ff 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java @@ -18,9 +18,9 @@ import crazypants.enderio.network.PacketHandler; public class OCSettings extends BaseSettingsPanel { private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); - private ColorButton cb; + private final ColorButton cb; - private String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color"); + private final String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color"); private final IOCConduit occon; public OCSettings(GuiExternalConnection gui, IConduit con) { diff --git a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java index c1796c93..65431b97 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java @@ -21,9 +21,9 @@ public class PowerSettings extends BaseSettingsPanel { private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); - private IPowerConduit conduit; - private RedstoneModeButton rsB; - private ColorButton colorB; + private final IPowerConduit conduit; + private final RedstoneModeButton rsB; + private final ColorButton colorB; protected PowerSettings(final GuiExternalConnection gui, IConduit con) { super(IconEIO.WRENCH_OVERLAY_POWER, EnderIO.lang.localize("itemPowerConduit.name"), gui, con); diff --git a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java index fb3ad6d9..b982b393 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java @@ -25,8 +25,8 @@ public class RedstoneSettings extends BaseSettingsPanel { private CheckBox strongCB; - private String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color"); - private String signalStringthStr = EnderIO.lang.localize("gui.conduit.redstone.signalStrengh"); + private final String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color"); + private final String signalStringthStr = EnderIO.lang.localize("gui.conduit.redstone.signalStrengh"); private IInsulatedRedstoneConduit insCon; private int stongLabelX; diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java index 0fbeb27c..cf1914ec 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java @@ -39,11 +39,11 @@ public class BasicItemFilterGui implements IItemFilterGui { private final IItemFilterContainer filterContainer; private final ItemFilter filter; - private int buttonIdOffset; - private int xOffset; - private int yOffset; + private final int buttonIdOffset; + private final int xOffset; + private final int yOffset; - private boolean isInput; + private final boolean isInput; public BasicItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable, boolean isInput) { diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/BigItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/BigItemFilterGui.java index 84c5ac1a..8cb1118c 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/BigItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/BigItemFilterGui.java @@ -39,7 +39,7 @@ public class BigItemFilterGui implements IItemFilterGui { private final IItemFilterContainer filterContainer; private final ItemFilter filter; - private int buttonIdOffset; + private final int buttonIdOffset; private int xOffset; private int yOffset; diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java index db7589fa..5b5991a6 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java @@ -38,26 +38,26 @@ public class ExistingItemFilterGui implements IItemFilterGui { private static final int ID_SHOW = GuiExternalConnection.nextButtonId(); private static final int ID_MERGE = GuiExternalConnection.nextButtonId(); - private IItemConduit itemConduit; - private GuiExternalConnection gui; + private final IItemConduit itemConduit; + private final GuiExternalConnection gui; - private ToggleButton useMetaB; - private ToggleButton useNbtB; - private ToggleButton useOreDictB; - private ToggleButton stickyB; + private final ToggleButton useMetaB; + private final ToggleButton useNbtB; + private final ToggleButton useOreDictB; + private final ToggleButton stickyB; private final IconButton whiteListB; - private GuiButton snapshotB; - private GuiButton clearB; - private GuiButton showB; - private GuiButton mergeB; - private SnapshotOverlay snapshotOverlay; + private final GuiButton snapshotB; + private final GuiButton clearB; + private final GuiButton showB; + private final GuiButton mergeB; + private final SnapshotOverlay snapshotOverlay; boolean isInput; private int buttonIdOffset = 0; - private ExistingItemFilter filter; + private final ExistingItemFilter filter; public ExistingItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { this.gui = gui; diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemConduitFilterContainer.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemConduitFilterContainer.java index 653cd488..bc5f5a40 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemConduitFilterContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemConduitFilterContainer.java @@ -9,9 +9,9 @@ import crazypants.enderio.network.PacketHandler; public class ItemConduitFilterContainer implements IItemFilterContainer { - private IItemConduit itemConduit; - private ForgeDirection dir; - private boolean isInput; + private final IItemConduit itemConduit; + private final ForgeDirection dir; + private final boolean isInput; public ItemConduitFilterContainer(IItemConduit itemConduit, ForgeDirection dir, boolean isInput) { this.itemConduit = itemConduit; diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index 95a29c27..f13ea571 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -31,6 +31,7 @@ import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; +import crazypants.util.ColorUtils; public class ItemSettings extends BaseSettingsPanel { @@ -43,7 +44,7 @@ public class ItemSettings extends BaseSettingsPanel { private static final int ID_INSERT_CHANNEL = 23; private static final int ID_EXTRACT_CHANNEL = 27; - private @Nonnull IItemConduit itemConduit; + private final @Nonnull IItemConduit itemConduit; private final ToggleButton loopB; private final ToggleButton roundRobinB; @@ -54,11 +55,11 @@ public class ItemSettings extends BaseSettingsPanel { private final RedstoneModeButton rsB; private final @Nonnull ColorButton colorB; - private ColorButton insertChannelB; - private ColorButton extractChannelB; + private final ColorButton insertChannelB; + private final ColorButton extractChannelB; - private int priLeft = 46; - private int priWidth = 32; + private static final int priLeft = 46; + private static final int priWidth = 32; private IItemFilterGui insertFilterGui; private IItemFilterGui extractFilterGui; @@ -239,7 +240,7 @@ public class ItemSettings extends BaseSettingsPanel { String priority = EnderIO.lang.localize("gui.conduit.item.priority"); fr.drawString(priority, left + 12, top1 + 25, ColorUtil.getRGB(Color.black)); - fr.drawString(str, left + priLeft + priWidth - sw - gap, top1 + 25, ColorUtil.getRGB(Color.black)); + fr.drawString(str, left + priLeft + priWidth - sw - gap, top1 + 25, ColorUtils.priorityString.getColor()); if (insertFilterGui != null) insertFilterGui.renderCustomOptions(top1, par1, par2, par3); if (extractFilterGui != null) extractFilterGui.renderCustomOptions(top1, par1, par2, par3); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/LimitedItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/LimitedItemFilterGui.java index 8f3889a4..a1db41c8 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/LimitedItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/LimitedItemFilterGui.java @@ -35,11 +35,11 @@ public class LimitedItemFilterGui implements IItemFilterGui { private final IItemFilterContainer filterContainer; private final ItemFilter filter; - private int buttonIdOffset; - private int xOffset; - private int yOffset; + private final int buttonIdOffset; + private final int xOffset; + private final int yOffset; final boolean isStickyModeAvailable; - private boolean isInput; + private final boolean isInput; public LimitedItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable, boolean isInput) { diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java index 019b6030..ce33f16b 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java @@ -37,7 +37,6 @@ public class ModItemFilterGui implements IItemFilterGui { private final IconButton whiteListB; - private final int inputOffsetX; private final int tfWidth; private final int tfTextureX; private final int tfTextureY; @@ -56,13 +55,12 @@ public class ModItemFilterGui implements IItemFilterGui { } else { filter = (ModItemFilter) itemConduit.getOutputFilter(gui.getDir()); } - inputOffsetX = x; tfWidth = 52; tfTextureX = 120; tfTextureY = 214; - inputBounds = new Rectangle[] { new Rectangle(inputOffsetX, y, 16, 16), - new Rectangle(inputOffsetX, y + 18, 16, 16), new Rectangle(inputOffsetX, y + 36, 16, 16) }; + inputBounds = new Rectangle[] { new Rectangle(x, y, 16, 16), new Rectangle(x, y + 18, 16, 16), + new Rectangle(x, y + 36, 16, 16) }; deleteButs = new IconButton[inputBounds.length]; for (int i = 0; i < deleteButs.length; i++) { diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index 228bfb89..65ca499a 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -60,7 +60,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { public static final String ICON_KEY_ENDER = "enderio:ender_still"; - static final Map ICONS = new HashMap(); + static final Map ICONS = new HashMap<>(); public static void initIcons() { IconUtil.addIconProvider(new IconUtil.IIconProvider() { @@ -87,37 +87,24 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { ItemConduitNetwork network; - protected final EnumMap extractionModes = new EnumMap( - ForgeDirection.class); - protected final EnumMap extractionColors = new EnumMap( - ForgeDirection.class); + protected final EnumMap extractionModes = new EnumMap<>(ForgeDirection.class); + protected final EnumMap extractionColors = new EnumMap<>(ForgeDirection.class); - protected final EnumMap outputFilters = new EnumMap( - ForgeDirection.class); - protected final EnumMap inputFilters = new EnumMap( - ForgeDirection.class); - protected final EnumMap outputFilterUpgrades = new EnumMap( - ForgeDirection.class); - protected final EnumMap inputFilterUpgrades = new EnumMap( - ForgeDirection.class); - protected final EnumMap speedUpgrades = new EnumMap( - ForgeDirection.class); - protected final EnumMap functionUpgrades = new EnumMap( - ForgeDirection.class); + protected final EnumMap outputFilters = new EnumMap<>(ForgeDirection.class); + protected final EnumMap inputFilters = new EnumMap<>(ForgeDirection.class); + protected final EnumMap outputFilterUpgrades = new EnumMap<>(ForgeDirection.class); + protected final EnumMap inputFilterUpgrades = new EnumMap<>(ForgeDirection.class); + protected final EnumMap speedUpgrades = new EnumMap<>(ForgeDirection.class); + protected final EnumMap functionUpgrades = new EnumMap<>(ForgeDirection.class); - protected final EnumMap selfFeed = new EnumMap( - ForgeDirection.class); + protected final EnumMap selfFeed = new EnumMap<>(ForgeDirection.class); - protected final EnumMap roundRobin = new EnumMap( - ForgeDirection.class); + protected final EnumMap roundRobin = new EnumMap<>(ForgeDirection.class); - protected final EnumMap priority = new EnumMap( - ForgeDirection.class); + protected final EnumMap priority = new EnumMap<>(ForgeDirection.class); - protected final EnumMap outputColors = new EnumMap( - ForgeDirection.class); - protected final EnumMap inputColors = new EnumMap( - ForgeDirection.class); + protected final EnumMap outputColors = new EnumMap<>(ForgeDirection.class); + protected final EnumMap inputColors = new EnumMap<>(ForgeDirection.class); private int metaData; @@ -146,7 +133,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { metaData = 0; } - Map converted = new HashMap(); + Map converted = new HashMap<>(); convertToItemUpgrades(filterMeta, converted, inputFilters); for (Entry entry : converted.entrySet()) { @@ -198,7 +185,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { @Override public List getDrops() { - List res = new ArrayList(); + List res = new ArrayList<>(); res.add(createItem()); for (ItemStack stack : speedUpgrades.values()) { res.add(stack); diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java index 9b359d24..bdb5dcda 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -19,10 +19,10 @@ import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; public class ItemConduitNetwork extends AbstractConduitNetwork { - final List inventories = new ArrayList(); - private final Map> invMap = new HashMap>(); + final List inventories = new ArrayList<>(); + private final Map> invMap = new HashMap<>(); - final Map conMap = new HashMap(); + final Map conMap = new HashMap<>(); private boolean requiresSort = true; @@ -77,7 +77,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork getInventoryPanelSources() { - ArrayList res = new ArrayList(); + ArrayList res = new ArrayList<>(); for (NetworkedInventory inv : inventories) { if (inv.con.hasInventoryPanelUpgrade(inv.conDir)) { res.add(inv); @@ -89,7 +89,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork getOrCreate(BlockCoord bc) { List res = invMap.get(bc); if (res == null) { - res = new ArrayList(); + res = new ArrayList<>(); invMap.put(bc, res); } return res; @@ -177,7 +177,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork getTargetsForExtraction(BlockCoord extractFrom, IItemConduit con, ItemStack input) { - List result = new ArrayList(); + List result = new ArrayList<>(); List invs = getOrCreate(extractFrom); for (NetworkedInventory source : invs) { @@ -203,7 +203,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork getInputSourcesFor(IItemConduit con, ForgeDirection dir, ItemStack input) { - List result = new ArrayList(); + List result = new ArrayList<>(); for (NetworkedInventory inv : inventories) { if (inv.hasTarget(con, dir)) { IItemFilter f = inv.con.getInputFilter(inv.conDir); diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java index b99331be..be1de10e 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java @@ -14,7 +14,7 @@ public class ItemItemConduit extends AbstractItemConduit { // new ItemConduitSubtype(ModObject.itemItemConduit.name(), "enderio:itemItemConduit"), // new ItemConduitSubtype(ModObject.itemItemConduit.name() + "Empowered", "enderio:itemItemConduitAdvanced") // }; - private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + private static final ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { new ItemConduitSubtype(ModObject.itemItemConduit.name(), "enderio:itemItemConduit") }; public static ItemItemConduit create() { diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index 9f6ef8fd..ed951eba 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -34,8 +34,8 @@ public class NetworkedInventory { BlockCoord location; int inventorySide; - List sendPriority = new ArrayList(); - RoundRobinIterator rrIter = new RoundRobinIterator(sendPriority); + List sendPriority = new ArrayList<>(); + RoundRobinIterator rrIter = new RoundRobinIterator<>(sendPriority); private int extractFromSlot = -1; @@ -336,7 +336,7 @@ public class NetworkedInventory { if (!canExtract()) { return; } - List result = new ArrayList(); + List result = new ArrayList<>(); for (NetworkedInventory other : network.inventories) { if ((con.isSelfFeedEnabled(conDir) || (other != this)) && other.canInsert() @@ -354,8 +354,8 @@ public class NetworkedInventory { Collections.sort(sendPriority); } else { if (!result.isEmpty()) { - Map visited = new HashMap(); - List steps = new ArrayList(); + Map visited = new HashMap<>(); + List steps = new ArrayList<>(); steps.add(con.getLocation()); calculateDistances(result, visited, steps, 0); @@ -372,7 +372,7 @@ public class NetworkedInventory { return; } - ArrayList nextSteps = new ArrayList(); + ArrayList nextSteps = new ArrayList<>(); for (BlockCoord bc : steps) { IItemConduit con = network.conMap.get(bc); if (con != null) { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java index 47d2b720..fcf95608 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java @@ -107,13 +107,13 @@ public class ExistingItemFilter implements IItemFilter { } public void setSnapshot(NetworkedInventory ni) { - snapshot = new ArrayList(); + snapshot = new ArrayList<>(); mergeSnapshot(ni); } public void mergeSnapshot(NetworkedInventory ni) { if (snapshot == null) { - snapshot = new ArrayList(); + snapshot = new ArrayList<>(); } int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide()); for (int i = 0; i < slots.length; i++) { @@ -126,7 +126,7 @@ public class ExistingItemFilter implements IItemFilter { public boolean mergeSnapshot(IInventory inventory) { if (snapshot == null) { - snapshot = new ArrayList(); + snapshot = new ArrayList<>(); } int size = inventory.getSizeInventory(); boolean added = false; @@ -200,7 +200,7 @@ public class ExistingItemFilter implements IItemFilter { readSettingsFromNBT(nbtRoot); if (nbtRoot.hasKey("snapshot")) { - snapshot = new ArrayList(); + snapshot = new ArrayList<>(); NBTTagList itemList = (NBTTagList) nbtRoot.getTag("snapshot"); for (int i = 0; i < itemList.tagCount(); i++) { NBTTagCompound itemTag = itemList.getCompoundTagAt(i); @@ -274,7 +274,7 @@ public class ExistingItemFilter implements IItemFilter { snapshot = null; return; } - snapshot = new ArrayList(numItems); + snapshot = new ArrayList<>(numItems); for (int i = 0; i < numItems; i++) { NBTTagCompound itemTag = NetworkUtil.readNBTTagCompound(buf); ItemStack item = ItemStack.loadItemStackFromNBT(itemTag); diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java index dd8b5562..fee76eb0 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java @@ -75,7 +75,7 @@ public class ItemFilter implements IInventory, IItemFilter { this.isAdvanced = isAdvanced; this.numItems = numItems; items = new ItemStack[numItems]; - oreIds = new ArrayList(numItems); + oreIds = new ArrayList<>(numItems); for (int i = 0; i < numItems; i++) { oreIds.add(null); } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java index 597d859a..d832ffbc 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java @@ -109,15 +109,11 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit { private EnderLiquidConduitNetwork network; private int ticksSinceFailedExtract; - private final EnumMap outputFilters = new EnumMap( - ForgeDirection.class); - private final EnumMap inputFilters = new EnumMap( - ForgeDirection.class); + private final EnumMap outputFilters = new EnumMap<>(ForgeDirection.class); + private final EnumMap inputFilters = new EnumMap<>(ForgeDirection.class); - protected final EnumMap outputColors = new EnumMap( - ForgeDirection.class); - protected final EnumMap inputColors = new EnumMap( - ForgeDirection.class); + protected final EnumMap outputColors = new EnumMap<>(ForgeDirection.class); + protected final EnumMap inputColors = new EnumMap<>(ForgeDirection.class); private int roundRobin = 0; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java index 5ac3fb2a..d58e34db 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java @@ -29,12 +29,10 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; public abstract class AbstractLiquidConduit extends AbstractConduit implements ILiquidConduit { - protected final EnumMap extractionModes = new EnumMap( - ForgeDirection.class); - protected final EnumMap extractionColors = new EnumMap( - ForgeDirection.class); + protected final EnumMap extractionModes = new EnumMap<>(ForgeDirection.class); + protected final EnumMap extractionColors = new EnumMap<>(ForgeDirection.class); - protected final Map externalRedstoneSignals = new HashMap(); + protected final Map externalRedstoneSignals = new HashMap<>(); protected boolean redstoneStateDirty = true; public static IFluidHandler getExternalFluidHandler(IBlockAccess world, BlockCoord bc) { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java index 97b718f2..5f01229c 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java @@ -19,7 +19,7 @@ public class AdvancedLiquidConduitNetwork extends AbstractTankConduitNetwork outputs = new HashSet(); + private final Set outputs = new HashSet<>(); private Iterator outputIterator; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java index 68b80619..353687d8 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java @@ -58,8 +58,8 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork tanks = new ArrayList(); - Map tankMap = new HashMap(); + List tanks = new ArrayList<>(); + Map tankMap = new HashMap<>(); Map iterators; @@ -203,7 +203,7 @@ public class EnderLiquidConduitNetwork extends AbstractConduitNetwork res = new ArrayList(tanks.size()); + List res = new ArrayList<>(tanks.size()); NetworkTank tank = getTank(con, conDir); for (NetworkTank target : tanks) { if (!target.equals(tank) && target.isValid()) { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java index 24f617aa..aabd675a 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java @@ -19,7 +19,7 @@ import crazypants.enderio.config.Config; public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedTooltipProvider { - private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + private static final ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { new ItemConduitSubtype(ModObject.itemLiquidConduit.name(), "enderio:itemLiquidConduit"), new ItemConduitSubtype( ModObject.itemLiquidConduit.name() + "Advanced", diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java index 23673e11..da9c28f6 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java @@ -21,10 +21,10 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork actions = new ArrayList(); + List actions = new ArrayList<>(); for (int i = 0; i < Math.min(maxFlowsPerTick, conduits.size()); i++) { if (lastFlowIndex >= conduits.size()) { @@ -116,7 +116,7 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork toEmpty = new ArrayList(); + List toEmpty = new ArrayList<>(); for (LiquidConduit con : conduits) { if (con != null && con.getTank().getFluidAmount() < 10) { toEmpty.add(con); @@ -129,7 +129,7 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork externals = new ArrayList(); + List externals = new ArrayList<>(); for (AbstractTankConduit con : conduits) { Set extCons = con.getExternalConnections(); diff --git a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java index abbfff68..5d887082 100644 --- a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java @@ -13,7 +13,7 @@ import crazypants.enderio.gui.IconEIO; public class ItemMEConduit extends AbstractItemConduit { - private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + private static final ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { new ItemConduitSubtype(ModObject.itemMEConduit.name(), "enderio:itemMeConduit"), new ItemConduitSubtype(ModObject.itemMEConduit.name() + "Dense", "enderio:itemMeConduitDense") }; diff --git a/src/main/java/crazypants/enderio/conduit/oc/ItemOCConduit.java b/src/main/java/crazypants/enderio/conduit/oc/ItemOCConduit.java index 224e521b..a2b827ca 100644 --- a/src/main/java/crazypants/enderio/conduit/oc/ItemOCConduit.java +++ b/src/main/java/crazypants/enderio/conduit/oc/ItemOCConduit.java @@ -12,7 +12,7 @@ import crazypants.enderio.gui.IconEIO; public class ItemOCConduit extends AbstractItemConduit { - private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + private static final ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { new ItemConduitSubtype(ModObject.itemOCConduit.name(), "enderio:itemOCConduit") }; public static ItemOCConduit create() { diff --git a/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java b/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java index 81baa20c..8e40d876 100644 --- a/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java +++ b/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java @@ -49,7 +49,7 @@ public class OCConduit extends AbstractConduit implements IOCConduit { protected OCConduitNetwork network; - private Map signalColors = new HashMap(); + private final Map signalColors = new HashMap<>(); public static IIcon[] coreTextures; public static IIcon[] longTextures; @@ -113,7 +113,7 @@ public class OCConduit extends AbstractConduit implements IOCConduit { BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset); CollidableComponent cc = new CollidableComponent(IOCConduit.class, bb, key.dir, COLOR_CONTROLLER_ID); - List result = new ArrayList(); + List result = new ArrayList<>(); result.addAll(baseCollidables); result.add(cc); @@ -351,7 +351,7 @@ public class OCConduit extends AbstractConduit implements IOCConduit { World world = getBundle().getWorld(); EnumSet conns = getConnections(); for (DyeColor color : DyeColor.VALUES) { - Set should = new HashSet(); + Set should = new HashSet<>(); for (ForgeDirection direction : conns) { if (getSignalColor(direction) == color) { TileEntity te = getLocation().getLocation(direction).getTileEntity(world); @@ -417,7 +417,7 @@ public class OCConduit extends AbstractConduit implements IOCConduit { // we need to check if that node has another way of connecting to our // network. First find out which of our neighbor(s) it belongs to. May // be just one, may be many. - List toCheck = new ArrayList(); + List toCheck = new ArrayList<>(); if (otherHost instanceof TileEntity) { TileEntity otherTe = (TileEntity) otherHost; toCheck.add(otherTe); diff --git a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java index 80a9e587..398e9404 100644 --- a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java +++ b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java @@ -26,17 +26,17 @@ public class NetworkPowerManager { int maxEnergyStored; int energyStored; - private int updateRenderTicks = 10; - private int inactiveTicks = 100; + private static final int updateRenderTicks = 10; + private static final int inactiveTicks = 100; - private final List receptors = new ArrayList(); + private final List receptors = new ArrayList<>(); private ListIterator receptorIterator = receptors.listIterator(); - private final List storageReceptors = new ArrayList(); + private final List storageReceptors = new ArrayList<>(); private boolean receptorsDirty = true; - private final Map powerTrackers = new HashMap(); + private final Map powerTrackers = new HashMap<>(); private final PowerTracker networkPowerTracker = new PowerTracker(); @@ -79,7 +79,7 @@ public class NetworkPowerManager { public long getPowerInReceptors() { long result = 0; - Set done = new HashSet(); + Set done = new HashSet<>(); for (ReceptorEntry re : receptors) { if (!re.emmiter.getConnectionsDirty()) { IPowerInterface powerReceptor = re.powerInterface; @@ -94,7 +94,7 @@ public class NetworkPowerManager { public long getMaxPowerInReceptors() { long result = 0; - Set done = new HashSet(); + Set done = new HashSet<>(); for (ReceptorEntry re : receptors) { if (!re.emmiter.getConnectionsDirty()) { IPowerInterface powerReceptor = re.powerInterface; @@ -346,13 +346,13 @@ public class NetworkPowerManager { int canExtract; int canFill; - Set capBanks = new HashSet(); + Set capBanks = new HashSet<>(); double filledRatio; long stored = 0; long maxCap = 0; - List enteries = new ArrayList(); + List enteries = new ArrayList<>(); CapBankSupply() {} diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index af998221..6afd7c55 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -46,7 +46,7 @@ import crazypants.enderio.tool.ToolUtil; public class PowerConduit extends AbstractConduit implements IPowerConduit { - static final Map ICONS = new HashMap(); + static final Map ICONS = new HashMap<>(); private static ICapacitor[] capacitors; @@ -106,14 +106,12 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { private int subtype; - protected final EnumMap rsModes = new EnumMap( - ForgeDirection.class); - protected final EnumMap rsColors = new EnumMap( - ForgeDirection.class); + protected final EnumMap rsModes = new EnumMap<>(ForgeDirection.class); + protected final EnumMap rsColors = new EnumMap<>(ForgeDirection.class); protected EnumMap recievedTicks; - private final Map externalRedstoneSignals = new HashMap(); + private final Map externalRedstoneSignals = new HashMap<>(); private boolean redstoneStateDirty = true; @@ -388,7 +386,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { if (getBundle() != null) { if (recievedTicks == null) { - recievedTicks = new EnumMap(ForgeDirection.class); + recievedTicks = new EnumMap<>(ForgeDirection.class); } recievedTicks.put(from, getBundle().getWorld().getTotalWorldTime()); } @@ -544,7 +542,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset); CollidableComponent cc = new CollidableComponent(IPowerConduit.class, bb, key.dir, COLOR_CONTROLLER_ID); - List result = new ArrayList(); + List result = new ArrayList<>(); result.addAll(baseCollidables); result.add(cc); diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java index dab0d759..cf4fce85 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java @@ -23,7 +23,7 @@ public class PowerConduitNetwork extends AbstractConduitNetwork powerReceptors = new HashMap(); + private final Map powerReceptors = new HashMap<>(); public PowerConduitNetwork() { super(IPowerConduit.class, IPowerConduit.class); @@ -92,7 +92,7 @@ public class PowerConduitNetwork extends AbstractConduitNetwork remove = new ArrayList(); + List remove = new ArrayList<>(); for (ReceptorKey key : powerReceptors.keySet()) { if (key != null && key.coord.equals(bc)) { remove.add(key); diff --git a/src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java b/src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java index b274f06e..26b96fb7 100644 --- a/src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java +++ b/src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java @@ -19,7 +19,7 @@ import crazypants.enderio.power.ICapacitor; public class PowerConduitEndergy extends PowerConduit { - static final Map ICONS = new HashMap(); + static final Map ICONS = new HashMap<>(); private static ICapacitor[] capacitors; diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java index 99db5171..7e4900f5 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java @@ -43,7 +43,7 @@ import crazypants.enderio.tool.ToolUtil; public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsulatedRedstoneConduit { - static final Map ICONS = new HashMap(); + static final Map ICONS = new HashMap<>(); @SideOnly(Side.CLIENT) public static void initIcons() { @@ -130,7 +130,7 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula private static Map, Boolean> getConnectableInterfaces() { if (CONNECTABLE_CLASSES == null) { - CONNECTABLE_CLASSES = new HashMap, Boolean>(); + CONNECTABLE_CLASSES = new HashMap<>(); CONNECTABLE_CLASSES.put(IRedstoneControl.class, false); try { Class conInterface = Class @@ -149,11 +149,11 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula return CONNECTABLE_CLASSES; } - private Map forcedConnections = new HashMap(); + private final Map forcedConnections = new HashMap<>(); - private Map signalColors = new HashMap(); + private final Map signalColors = new HashMap<>(); - private Map signalStrengths = new HashMap(); + private final Map signalStrengths = new HashMap<>(); @Override public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { @@ -460,7 +460,7 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula } DyeColor col = getSignalColor(side); - Set result = new HashSet(); + Set result = new HashSet<>(); for (Signal signal : allSigs) { if (signal.color == col) { result.add(signal); @@ -494,7 +494,7 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset); CollidableComponent cc = new CollidableComponent(IRedstoneConduit.class, bb, key.dir, COLOR_CONTROLLER_ID); - List result = new ArrayList(); + List result = new ArrayList<>(); result.addAll(baseCollidables); result.add(cc); diff --git a/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java index b017eae3..01b086e7 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java @@ -10,7 +10,7 @@ import crazypants.enderio.conduit.ItemConduitSubtype; public class ItemRedstoneConduit extends AbstractItemConduit { - private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + private static final ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { new ItemConduitSubtype(ModObject.itemRedstoneConduit.name(), "enderio:itemRedstoneConduit"), new ItemConduitSubtype(ModObject.itemRedstoneConduit.name() + "Switch", "enderio:itemRedstoneSwitch"), new ItemConduitSubtype( diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java index c797e11e..d5dd06c4 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java @@ -68,7 +68,7 @@ public class RedstoneConduit extends AbstractConduit implements IRedstoneConduit protected RedstoneConduitNetwork network; - protected final List> externalSignals = new ArrayList>(); + protected final List> externalSignals = new ArrayList<>(); protected boolean neighbourDirty = true; @@ -140,7 +140,7 @@ public class RedstoneConduit extends AbstractConduit implements IRedstoneConduit network.setNetworkEnabled(false); } - Set res = new HashSet(); + Set res = new HashSet<>(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { if ((side == null || dir == side) && acceptSignalsForDir(dir)) { int input = getExternalPowerLevel(dir); diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java index 200c2952..b5c8abbb 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java @@ -20,7 +20,7 @@ import crazypants.enderio.conduit.IConduitBundle; public class RedstoneConduitNetwork extends AbstractConduitNetwork { - private final Set signals = new HashSet(); + private final Set signals = new HashSet<>(); boolean updatingNetwork = false; @@ -45,7 +45,7 @@ public class RedstoneConduitNetwork extends AbstractConduitNetwork copy = new ArrayList(signals); + List copy = new ArrayList<>(signals); signals.clear(); for (Signal s : copy) { notifyNeigborsOfSignalUpdate(s); @@ -172,7 +172,7 @@ public class RedstoneConduitNetwork extends AbstractConduitNetwork conduitsCopy = new ArrayList(conduits); + ArrayList conduitsCopy = new ArrayList<>(conduits); for (IRedstoneConduit con : conduitsCopy) { notifyConduitNeighbours(con, signal); } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/SignalSource.java b/src/main/java/crazypants/enderio/conduit/redstone/SignalSource.java index 84f7f247..c02da52e 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/SignalSource.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/SignalSource.java @@ -77,7 +77,7 @@ public class SignalSource { } public static Set fromIntArray(int[] enc) { - Set result = new HashSet(); + Set result = new HashSet<>(); for (int i = 0; i < enc.length; i += 5) { // Signal sig = new Signal(enc[i], enc[i + 1], enc[i + 2], enc[i + 3], ForgeDirection.UNKNOWN,14, // SignalColor.values()[enc[i + 4]]); diff --git a/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java b/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java index f149e6bf..2458a16a 100644 --- a/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java @@ -22,9 +22,9 @@ import crazypants.enderio.conduit.geom.Offsets.Axis; public class RoundedSegmentRenderer { private static final int NUM_VERTICES = 16; - private static Vertex[][] DIR_COORDS = new Vertex[ForgeDirection.VALID_DIRECTIONS.length][]; - private static Vertex[][] DIR_STUB_COORDS = new Vertex[ForgeDirection.VALID_DIRECTIONS.length][]; - private static Vertex[][] DIR_STUB_CAPS = new Vertex[ForgeDirection.VALID_DIRECTIONS.length][]; + private static final Vertex[][] DIR_COORDS = new Vertex[ForgeDirection.VALID_DIRECTIONS.length][]; + private static final Vertex[][] DIR_STUB_COORDS = new Vertex[ForgeDirection.VALID_DIRECTIONS.length][]; + private static final Vertex[][] DIR_STUB_CAPS = new Vertex[ForgeDirection.VALID_DIRECTIONS.length][]; private static final Vector3d REF_TRANS = new Vector3d(0.5, 0.5, 0.5); diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index a30b9805..0a3234ce 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -48,7 +48,7 @@ public final class Config { public static final List
sections; static { - sections = new ArrayList
(); + sections = new ArrayList<>(); } public static Configuration config; @@ -389,7 +389,7 @@ public final class Config { "ThermalFoundation:tool.hoeSilver", "ThermalFoundation:tool.hoeElectrum", "ThermalFoundation:tool.hoeTin", "ThermalFoundation:tool.hoeLead", "ThermalFoundation:tool.hoeNickel", "ThermalFoundation:tool.hoePlatinum", "TwilightForest:item.steeleafHoe", "TwilightForest:item.ironwoodHoe", "IC2:itemToolBronzeHoe" }; - public static List farmHoes = new ArrayList(); + public static List farmHoes = new ArrayList<>(); public static int farmSaplingReserveAmount = 8; public static double farmParticlesMaxRange = 64; public static int farmParticlesCount = 15; diff --git a/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java b/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java index cde71e2c..6bae8630 100644 --- a/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java +++ b/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java @@ -28,7 +28,7 @@ public class GuiConfigFactoryEIO extends GuiConfig { } private static List getConfigElements(GuiScreen parent) { - List list = new ArrayList(); + List list = new ArrayList<>(); String prefix = EnderIO.lang.addPrefix("config."); for (Section section : Config.sections) { diff --git a/src/main/java/crazypants/enderio/enderface/EnderIOController.java b/src/main/java/crazypants/enderio/enderface/EnderIOController.java index 0e6f4cf1..be4f656c 100644 --- a/src/main/java/crazypants/enderio/enderface/EnderIOController.java +++ b/src/main/java/crazypants/enderio/enderface/EnderIOController.java @@ -21,7 +21,7 @@ public enum EnderIOController { INSTANCE; - private TObjectIntMap openedContainers = new TObjectIntHashMap(); + private final TObjectIntMap openedContainers = new TObjectIntHashMap<>(); private int clientWindowId; private boolean locked = false; diff --git a/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java b/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java index adb56030..c32eecb8 100644 --- a/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java +++ b/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java @@ -27,7 +27,7 @@ import crazypants.enderio.teleport.anchor.TravelEntitySpecialRenderer; @SideOnly(Side.CLIENT) public class EnderIoRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private TravelEntitySpecialRenderer selectionRenderer = new TravelEntitySpecialRenderer() { + private final TravelEntitySpecialRenderer selectionRenderer = new TravelEntitySpecialRenderer() { protected void renderBlock() {} diff --git a/src/main/java/crazypants/enderio/enderface/GuiEnderface.java b/src/main/java/crazypants/enderio/enderface/GuiEnderface.java index 7d6f5d48..f5450069 100644 --- a/src/main/java/crazypants/enderio/enderface/GuiEnderface.java +++ b/src/main/java/crazypants/enderio/enderface/GuiEnderface.java @@ -53,9 +53,9 @@ public class GuiEnderface extends GuiScreen { private final int ioX; private final int ioY; private final int ioZ; - private boolean chunkLoaded; + private final boolean chunkLoaded; - private List blocks = new ArrayList(); + private final List blocks = new ArrayList<>(); private int gw; private int gh; @@ -77,8 +77,6 @@ public class GuiEnderface extends GuiScreen { private float scaleAnimX; - private int range; - boolean dragging = false; private double distance; @@ -92,7 +90,7 @@ public class GuiEnderface extends GuiScreen { this.ioY = ioY; this.ioZ = ioZ; - range = Config.enderIoRange; + int range = Config.enderIoRange; distance = 10 + (range * 2); TileEntity te = world.getTileEntity(ioX, ioY, ioZ); diff --git a/src/main/java/crazypants/enderio/etfuturum/EtFuturumCompat.java b/src/main/java/crazypants/enderio/etfuturum/EtFuturumCompat.java new file mode 100644 index 00000000..54d9ae87 --- /dev/null +++ b/src/main/java/crazypants/enderio/etfuturum/EtFuturumCompat.java @@ -0,0 +1,22 @@ +package crazypants.enderio.etfuturum; + +import net.minecraft.entity.player.EntityPlayer; + +import crazypants.enderio.EnderIO; +import ganymedes01.etfuturum.elytra.IElytraPlayer; + +public final class EtFuturumCompat { + + private EtFuturumCompat() {} + + public static boolean isElytraFlying(EntityPlayer player) { + return EnderIO.hasEtFuturum && player instanceof IElytraPlayer + && ((IElytraPlayer) player).etfu$isElytraFlying(); + } + + public static void stopElytraFlying(EntityPlayer player) { + if (EnderIO.hasEtFuturum && player instanceof IElytraPlayer) { + ((IElytraPlayer) player).etfu$setElytraFlying(false); + } + } +} diff --git a/src/main/java/crazypants/enderio/fluid/BucketHandler.java b/src/main/java/crazypants/enderio/fluid/BucketHandler.java index 0e39720b..6c0eef93 100644 --- a/src/main/java/crazypants/enderio/fluid/BucketHandler.java +++ b/src/main/java/crazypants/enderio/fluid/BucketHandler.java @@ -23,7 +23,7 @@ public class BucketHandler { MinecraftForge.EVENT_BUS.register(instance); } - private Map buckets = new HashMap(); + private final Map buckets = new HashMap<>(); private BucketHandler() {} diff --git a/src/main/java/crazypants/enderio/fluid/FluidFuelRegister.java b/src/main/java/crazypants/enderio/fluid/FluidFuelRegister.java index 3dcd934e..4c697025 100644 --- a/src/main/java/crazypants/enderio/fluid/FluidFuelRegister.java +++ b/src/main/java/crazypants/enderio/fluid/FluidFuelRegister.java @@ -22,10 +22,10 @@ public class FluidFuelRegister implements IFluidRegister { private static final String KEY_TOTAL_BURN_TIME = "totalBurnTime"; private static final String KEY_COOLING_PER_MB = "coolingPerMb"; - private final Map coolants = new HashMap(); - private final Map fuels = new HashMap(); + private final Map coolants = new HashMap<>(); + private final Map fuels = new HashMap<>(); - private final List otherRegisters = new ArrayList(); + private final List otherRegisters = new ArrayList<>(); private FluidFuelRegister() { addCoolant(FluidRegistry.WATER, 0.0023f); diff --git a/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java b/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java index 4807a9e1..17ecf7d6 100644 --- a/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java +++ b/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java @@ -25,7 +25,7 @@ public class ItemBucketEio extends ItemBucket { return b; } - private String fluidName; + private final String fluidName; protected ItemBucketEio(Block block, String fluidName) { super(block); diff --git a/src/main/java/crazypants/enderio/gui/GuiContainerBaseEIO.java b/src/main/java/crazypants/enderio/gui/GuiContainerBaseEIO.java index b70657a4..cfc22330 100644 --- a/src/main/java/crazypants/enderio/gui/GuiContainerBaseEIO.java +++ b/src/main/java/crazypants/enderio/gui/GuiContainerBaseEIO.java @@ -16,7 +16,7 @@ public abstract class GuiContainerBaseEIO extends GuiContainerBase { private static final String TEXTURE_PATH = ":textures/gui/23/"; private static final String TEXTURE_EXT = ".png"; - private final List guiTextures = new ArrayList(); + private final List guiTextures = new ArrayList<>(); public GuiContainerBaseEIO(Container par1Container, String... guiTexture) { super(par1Container); diff --git a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java index a21f0c7b..928f0ae1 100644 --- a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java +++ b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java @@ -53,16 +53,16 @@ import crazypants.util.RenderPassHelper; public class IoConfigRenderer { - protected static final RenderBlocks RB = new RenderBlocks(); + protected final RenderBlocks RB = new RenderBlocks(); private boolean dragging = false; - private float pitch = 0; - private float yaw = 0; + private float pitch; + private float yaw; private double distance; private long initTime; - private Minecraft mc = Minecraft.getMinecraft(); - private World world = mc.thePlayer.worldObj; + private final Minecraft mc = Minecraft.getMinecraft(); + private final World world; private final Vector3d origin = new Vector3d(); private final Vector3d eye = new Vector3d(); @@ -72,8 +72,8 @@ public class IoConfigRenderer { public BlockCoord originBC; - private List configurables = new ArrayList(); - private List neighbours = new ArrayList(); + private final List configurables = new ArrayList<>(); + private final List neighbours = new ArrayList<>(); private SelectedFace selection; @@ -191,7 +191,7 @@ public class IoConfigRenderer { private void updateSelection(Vector3d start, Vector3d end) { start.add(origin); end.add(origin); - List hits = new ArrayList(); + List hits = new ArrayList<>(); for (BlockCoord bc : configurables) { Block block = world.getBlock(bc.x, bc.y, bc.z); diff --git a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java index f1421f71..aa57636d 100644 --- a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java +++ b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java @@ -12,9 +12,9 @@ import crazypants.enderio.network.PacketHandler; public class RedstoneModeButton extends CycleButton { - private IRedstoneModeControlable model; + private final IRedstoneModeControlable model; - private BlockCoord bc; + private final BlockCoord bc; private String tooltipKey = "enderio.gui.tooltip.redstoneControlMode"; diff --git a/src/main/java/crazypants/enderio/item/ItemEnderFood.java b/src/main/java/crazypants/enderio/item/ItemEnderFood.java index af176b98..266756a2 100644 --- a/src/main/java/crazypants/enderio/item/ItemEnderFood.java +++ b/src/main/java/crazypants/enderio/item/ItemEnderFood.java @@ -31,8 +31,8 @@ public class ItemEnderFood extends ItemFood implements IResourceTooltipProvider @SideOnly(Side.CLIENT) public class SpecialFont extends FontRenderer { - private FontRenderer wrapped; - private ItemStack stack = EnderFood.ENDERIOS.getStack(); + private final FontRenderer wrapped; + private final ItemStack stack = EnderFood.ENDERIOS.getStack(); private int inARow = 0; public SpecialFont(FontRenderer wrapped) { diff --git a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java index 28224e17..23c73865 100644 --- a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java +++ b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java @@ -49,13 +49,13 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { private IIcon filledIcon; - private List blackList; + private final List blackList; protected ItemSoulVessel() { setCreativeTab(EnderIOTab.tabEnderIO); setUnlocalizedName(ModObject.itemSoulVessel.unlocalisedName); setMaxStackSize(64); - blackList = new ArrayList(); + blackList = new ArrayList<>(); for (String ent : Config.soulVesselBlackList) { blackList.add(ent); } diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index caf6d759..091162fb 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -198,7 +198,7 @@ public class ItemYetaWrench extends Item @Override public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - ArrayList tmp = new ArrayList(); + ArrayList tmp = new ArrayList<>(); SpecialTooltipHandler.addDetailedTooltipFromResources(tmp, getUnlocalizedName()); String keyName = Keyboard.getKeyName(KeyTracker.instance.getYetaWrenchMode().getKeyCode()); for (String line : tmp) { diff --git a/src/main/java/crazypants/enderio/item/KeyTracker.java b/src/main/java/crazypants/enderio/item/KeyTracker.java index 04446bd3..5e6570f4 100644 --- a/src/main/java/crazypants/enderio/item/KeyTracker.java +++ b/src/main/java/crazypants/enderio/item/KeyTracker.java @@ -328,8 +328,10 @@ public class KeyTracker { } private void handleGlide() { - if (glideKey.isPressed() - && DarkSteelController.instance.isGliderUpgradeEquipped(Minecraft.getMinecraft().thePlayer)) { + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + if (glideKey.isPressed() && DarkSteelController.instance.isGliderUpgradeEquipped(player) + && (DarkSteelController.instance.isGlideActive(player) + || DarkSteelController.instance.canActivateGlide(player))) { toggleDarkSteelController(Type.GLIDE, "darksteel.upgrade.glider"); } } diff --git a/src/main/java/crazypants/enderio/item/MagnetController.java b/src/main/java/crazypants/enderio/item/MagnetController.java index 08b339aa..e2f81e06 100644 --- a/src/main/java/crazypants/enderio/item/MagnetController.java +++ b/src/main/java/crazypants/enderio/item/MagnetController.java @@ -108,7 +108,7 @@ public class MagnetController { private static List blacklist = null; private static void initBlacklist() { - blacklist = new ArrayList(); + blacklist = new ArrayList<>(); for (String name : Config.magnetBlacklist) { String[] parts = name.split(":"); if (parts.length == 2) { @@ -161,8 +161,7 @@ public class MagnetController { } if (gotOne) { if (arraylist == null) { - arraylist = new ArrayList( - Config.magnetMaxItems > 0 ? Config.magnetMaxItems : 20); + arraylist = new ArrayList<>(Config.magnetMaxItems > 0 ? Config.magnetMaxItems : 20); } arraylist.add(entity); if (itemsRemaining-- <= 0) { diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index 8cc613de..1984eb55 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -41,6 +41,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; +import crazypants.enderio.etfuturum.EtFuturumCompat; import crazypants.enderio.item.darksteel.PacketUpgradeState.Type; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.GliderUpgrade; @@ -104,7 +105,7 @@ public class DarkSteelController { private static final EnumSet DEFAULT_ACTIVE = EnumSet.of(Type.SPEED, Type.STEP_ASSIST, Type.JUMP); - private final Map> allActive = new HashMap>(); + private final Map> allActive = new HashMap<>(); private boolean nightVisionActive = false; private boolean removeNightvision = false; @@ -146,6 +147,8 @@ public class DarkSteelController { } public void setActive(EntityPlayer player, Type type, boolean isActive) { + if (type == Type.GLIDE && isActive && !canActivateGlide(player)) return; + EnumSet set = getActiveSet(player); if (isActive) { set.add(type); @@ -158,6 +161,10 @@ public class DarkSteelController { return isActive(player, Type.GLIDE); } + public boolean canActivateGlide(EntityPlayer player) { + return !EtFuturumCompat.isElytraFlying(player); + } + public boolean isSpeedActive(EntityPlayer player) { return isActive(player, Type.SPEED); } @@ -246,8 +253,10 @@ public class DarkSteelController { } private void updateGlide(EntityPlayer player) { - if (!isGlideActive(player) || !isGliderUpgradeEquipped(player)) { - return; + if (!isGlideActive(player) || !isGliderUpgradeEquipped(player)) return; + + if (EtFuturumCompat.isElytraFlying(player)) { + EtFuturumCompat.stopElytraFlying(player); } if (!player.onGround && player.motionY < 0 && !player.isSneaking() && !player.isInWater()) { diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java index ac72d5bd..4bd7d5be 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -43,7 +43,7 @@ public class DarkSteelRecipeManager { public static DarkSteelRecipeManager instance = new DarkSteelRecipeManager(); - private List upgrades = new ArrayList(); + private final List upgrades = new ArrayList<>(); public DarkSteelRecipeManager() { upgrades.add(EnergyUpgrade.EMPOWERED); @@ -207,7 +207,7 @@ public class DarkSteelRecipeManager { public void addAdvancedTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - List applyableUpgrades = new ArrayList(); + List applyableUpgrades = new ArrayList<>(); for (IDarkSteelUpgrade upgrade : upgrades) { if (upgrade.hasUpgrade(itemstack)) { upgrade.addDetailedEntries(itemstack, entityplayer, list, flag); diff --git a/src/main/java/crazypants/enderio/item/darksteel/EnergyContainer.java b/src/main/java/crazypants/enderio/item/darksteel/EnergyContainer.java index 088da52c..cd062ee7 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/EnergyContainer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/EnergyContainer.java @@ -5,9 +5,9 @@ import net.minecraft.nbt.NBTTagCompound; public class EnergyContainer { - private int capacityRF; - private int maxReceiveRF; - private int maxExtractRF; + private final int capacityRF; + private final int maxReceiveRF; + private final int maxExtractRF; public EnergyContainer(int capacityRF, int maxReceiveRF, int maxExtractRF) { this.capacityRF = capacityRF; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index aa929f7b..1b74177e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -123,7 +123,7 @@ public class ItemDarkSteelAxe extends ItemAxe BlockCoord bc = new BlockCoord(X, Y, Z); harvester.harvest(player.worldObj, bc, res); - List sortedTargets = new ArrayList(res.getHarvestedBlocks()); + List sortedTargets = new ArrayList<>(res.getHarvestedBlocks()); harvestComparator.refPoint = bc; Collections.sort(sortedTargets, harvestComparator); diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java index 71729b49..818ef97d 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java @@ -122,12 +122,13 @@ public class ItemDarkSteelShears extends ItemShears BlockCoord bc = new BlockCoord(x, y, z); HarvestResult res = new HarvestResult(null, bc); - for (int dx = -Config.darkSteelShearsBlockAreaBoostWhenPowered; dx - <= Config.darkSteelShearsBlockAreaBoostWhenPowered; dx++) { - for (int dy = -Config.darkSteelShearsBlockAreaBoostWhenPowered; dy - <= Config.darkSteelShearsBlockAreaBoostWhenPowered; dy++) { - for (int dz = -Config.darkSteelShearsBlockAreaBoostWhenPowered; dz - <= Config.darkSteelShearsBlockAreaBoostWhenPowered; dz++) { + int range = Config.darkSteelShearsBlockAreaBoostWhenPowered; + for (int dx = -range; dx <= range; dx++) { + for (int dy = -range; dy <= range; dy++) { + for (int dz = -range; dz <= range; dz++) { + // Skip center block, already added via HarvestResult constructor + if (dx == 0 && dy == 0 && dz == 0) continue; + Block block2 = player.worldObj.getBlock(x + dx, y + dy, z + dz); if (block2 instanceof IShearable && ((IShearable) block2) .isShearable(itemstack, player.worldObj, x + dx, y + dy, z + dz)) { @@ -137,16 +138,19 @@ public class ItemDarkSteelShears extends ItemShears } } - List sortedTargets = new ArrayList(res.getHarvestedBlocks()); + List sortedTargets = new ArrayList<>(res.getHarvestedBlocks()); harvestComparator.refPoint = bc; Collections.sort(sortedTargets, harvestComparator); int maxBlocks = Math.min(sortedTargets.size(), powerStored / Config.darkSteelShearsPowerUsePerDamagePoint); for (int i = 0; i < maxBlocks; i++) { BlockCoord bc2 = sortedTargets.get(i); - super.onBlockStartBreak(itemstack, bc2.x, bc2.y, bc2.z, player); - if (bc2 != bc) { - player.worldObj.setBlockToAir(bc2.x, bc2.y, bc2.z); + Block target = player.worldObj.getBlock(bc2.x, bc2.y, bc2.z); + if (target instanceof IShearable + && ((IShearable) target).isShearable(itemstack, player.worldObj, bc2.x, bc2.y, bc2.z)) { + if (!super.onBlockStartBreak(itemstack, bc2.x, bc2.y, bc2.z, player)) { + player.worldObj.setBlockToAir(bc2.x, bc2.y, bc2.z); + } } } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java index f0013387..0ad8dd92 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java @@ -85,6 +85,6 @@ public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelIt @Optional.Method(modid = "gregtech_nh") @Override public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) { - return true; + return Hazard.STANDARD_HAZARDS.contains(hazard); } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java index 0b4b5ad6..7e110a62 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java @@ -20,7 +20,7 @@ import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; public class PoweredItemRenderer implements IItemRenderer { - private RenderItem ri = new RenderItem(); + private final RenderItem ri = new RenderItem(); @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { diff --git a/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java b/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java index 9dbff7dc..dec7e220 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java @@ -25,10 +25,9 @@ public class SoundDetector { public static SoundDetector instance = new SoundDetector(); - private List sounds; - private ArrayBlockingQueue soundQueue = new ArrayBlockingQueue(MAX_ENTITIES); + private final ArrayBlockingQueue soundQueue = new ArrayBlockingQueue<>(MAX_ENTITIES); - private Minecraft mc = Minecraft.getMinecraft(); + private final Minecraft mc = Minecraft.getMinecraft(); boolean enabled = false; @@ -63,7 +62,7 @@ public class SoundDetector { return; } - sounds = new ArrayList(MAX_ENTITIES); + List sounds = new ArrayList<>(MAX_ENTITIES); soundQueue.drainTo(sounds); try { diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java index 6e31a1ba..335695f8 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java @@ -11,7 +11,7 @@ import crazypants.enderio.item.darksteel.ItemDarkSteelArmor; public class ApiaristArmorUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "apiaristArmor"; + private static final String UPGRADE_NAME = "apiaristArmor"; private static final String forestryItemNames[] = { "apiaristHelmet", "apiaristChest", "apiaristLegs", "apiaristBoots" }; diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java index 6b7c7737..fbf529e6 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java @@ -218,7 +218,7 @@ public class EnergyUpgrade extends AbstractUpgrade { @SideOnly(Side.CLIENT) public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - List upgradeStr = new ArrayList(); + List upgradeStr = new ArrayList<>(); upgradeStr.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localizeExact(getUnlocalizedName() + ".name")); SpecialTooltipHandler.addDetailedTooltipFromResources(upgradeStr, getUnlocalizedName()); diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java index c1acc20b..58e4e10c 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java @@ -2,7 +2,6 @@ package crazypants.enderio.item.darksteel.upgrade; import static org.lwjgl.opengl.GL11.glDepthMask; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; @@ -21,7 +20,7 @@ import crazypants.enderio.item.darksteel.DarkSteelItems; public class GliderUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "glide"; + private static final String UPGRADE_NAME = "glide"; public static final GliderUpgrade INSTANCE = new GliderUpgrade(); @@ -75,13 +74,13 @@ public class GliderUpgrade extends AbstractUpgrade { public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) {} @SideOnly(Side.CLIENT) - private class Render implements IRenderUpgrade { + private static class Render implements IRenderUpgrade { - private EntityItem item = new EntityItem(Minecraft.getMinecraft().theWorld); - private ItemStack glider = new ItemStack(DarkSteelItems.itemGliderWing, 1, 1); + private final EntityItem item; private Render() { - item.setEntityItemStack(glider); + ItemStack glider = new ItemStack(DarkSteelItems.itemGliderWing, 1, 1); + item = new EntityItem(null, 0, 0, 0, glider); } @Override @@ -94,7 +93,12 @@ public class GliderUpgrade extends AbstractUpgrade { GL11.glTranslatef(-0, 1, 0.25f); GL11.glRotatef(180, 1, 0, 0); GL11.glScalef(3, 3, 3); - RenderManager.instance.renderEntityWithPosYaw(item, 0, 0, 0, 0, 0); + try { + item.setWorld(event.entityPlayer.worldObj); + RenderManager.instance.renderEntityWithPosYaw(item, 0, 0, 0, 0, 0); + } finally { + item.setWorld(null); + } } } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/JumpUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/JumpUpgrade.java index 0ed0b762..66b92652 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/JumpUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/JumpUpgrade.java @@ -12,7 +12,7 @@ public class JumpUpgrade extends AbstractUpgrade { private static final String KEY_LEVEL = "level"; - private static String UPGRADE_NAME = "jumpBoost"; + private static final String UPGRADE_NAME = "jumpBoost"; public static JumpUpgrade JUMP_ONE = new JumpUpgrade( "enderio.darksteel.upgrade.jump_one", @@ -27,7 +27,7 @@ public class JumpUpgrade extends AbstractUpgrade { 3, Config.darkSteelJumpThreeCost); - private short level; + private final short level; public static boolean isEquipped(EntityPlayer player) { ItemStack boots = player.getEquipmentInSlot(1); diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NaturalistEyeUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NaturalistEyeUpgrade.java index 0d9a96d2..599ab06d 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NaturalistEyeUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NaturalistEyeUpgrade.java @@ -11,7 +11,7 @@ import crazypants.enderio.item.darksteel.DarkSteelItems; public class NaturalistEyeUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "naturalistEye"; + private static final String UPGRADE_NAME = "naturalistEye"; public static final NaturalistEyeUpgrade INSTANCE = new NaturalistEyeUpgrade(); diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java index 0be045e2..d4c2dcaf 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java @@ -10,7 +10,7 @@ import crazypants.enderio.item.darksteel.DarkSteelItems; public class NightVisionUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "nightVision"; + private static final String UPGRADE_NAME = "nightVision"; public static final NightVisionUpgrade INSTANCE = new NightVisionUpgrade(); diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java index 822ba379..18278815 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java @@ -2,7 +2,6 @@ package crazypants.enderio.item.darksteel.upgrade; import static org.lwjgl.opengl.GL11.glDepthMask; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; @@ -57,7 +56,7 @@ public class SolarUpgrade extends AbstractUpgrade { return new ItemStack(EnderIO.blockSolarPanel, 1, level - 1); } - private byte level; + private final byte level; public SolarUpgrade(NBTTagCompound tag) { super(UPGRADE_NAME, tag); @@ -117,9 +116,9 @@ public class SolarUpgrade extends AbstractUpgrade { } @SideOnly(Side.CLIENT) - private class Render implements IRenderUpgrade { + private static class Render implements IRenderUpgrade { - private EntityItem item = new EntityItem(Minecraft.getMinecraft().theWorld); + private final EntityItem item = new EntityItem(null); @Override public void render(RenderPlayerEvent event, ItemStack stack, boolean head) { @@ -132,8 +131,13 @@ public class SolarUpgrade extends AbstractUpgrade { GL11.glRotated(180, 1, 0, 0); GL11.glScalef(2.1f, 2.1f, 2.1f); byte level = loadFromItem(stack).level; - item.setEntityItemStack(new ItemStack(EnderIO.blockSolarPanel, 1, level - 1)); - RenderManager.instance.renderEntityWithPosYaw(item, 0, 0, 0, 0, 0); + try { + item.setWorld(event.entityPlayer.worldObj); + item.setEntityItemStack(new ItemStack(EnderIO.blockSolarPanel, 1, level - 1)); + RenderManager.instance.renderEntityWithPosYaw(item, 0, 0, 0, 0, 0); + } finally { + item.setWorld(null); + } } } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SoundDetectorUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SoundDetectorUpgrade.java index 2f7d0858..75e132a3 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SoundDetectorUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SoundDetectorUpgrade.java @@ -9,7 +9,7 @@ import crazypants.enderio.item.darksteel.DarkSteelItems; public class SoundDetectorUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "soundDetector"; + private static final String UPGRADE_NAME = "soundDetector"; public static final SoundDetectorUpgrade INSTANCE = new SoundDetectorUpgrade(); diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpeedUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpeedUpgrade.java index b3cbbc8d..c1ee81bd 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpeedUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpeedUpgrade.java @@ -15,7 +15,7 @@ public class SpeedUpgrade extends AbstractUpgrade { private static final String KEY_MULTIPLIER = "multiplier"; - private static String UPGRADE_NAME = "speedBoost"; + private static final String UPGRADE_NAME = "speedBoost"; public static float[] WALK_MULTIPLIERS = new float[] { Config.darkSteelSpeedOneWalkModifier, Config.darkSteelSpeedTwoWalkMultiplier, Config.darkSteelSpeedThreeWalkMultiplier }; @@ -36,7 +36,7 @@ public class SpeedUpgrade extends AbstractUpgrade { 3, Config.darkSteelSpeedThreeCost); - private short level; + private final short level; private float walkMultiplier; protected float sprintMultiplier; diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpoonUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpoonUpgrade.java index 62755c3f..e6bc1a79 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpoonUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpoonUpgrade.java @@ -9,7 +9,7 @@ import crazypants.enderio.item.darksteel.DarkSteelItems; public class SpoonUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "spoon"; + private static final String UPGRADE_NAME = "spoon"; public static final SpoonUpgrade INSTANCE = new SpoonUpgrade(); diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SwimUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SwimUpgrade.java index ba9bf1fb..1afc8ee2 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SwimUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SwimUpgrade.java @@ -9,7 +9,7 @@ import crazypants.enderio.item.darksteel.DarkSteelItems; public class SwimUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "swim"; + private static final String UPGRADE_NAME = "swim"; public static final SwimUpgrade INSTANCE = new SwimUpgrade(); diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/TrackmanGogglesUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/TrackmanGogglesUpgrade.java index 39aa577e..29a61199 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/TrackmanGogglesUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/TrackmanGogglesUpgrade.java @@ -11,7 +11,7 @@ import crazypants.enderio.item.darksteel.DarkSteelItems; public class TrackmanGogglesUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "trackmansGoggles"; + private static final String UPGRADE_NAME = "trackmansGoggles"; public static final TrackmanGogglesUpgrade INSTANCE = new TrackmanGogglesUpgrade(); diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 8f5db05e..d3b6f5b6 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -102,7 +102,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio return; } if (faceModes == null) { - faceModes = new EnumMap(ForgeDirection.class); + faceModes = new EnumMap<>(ForgeDirection.class); } faceModes.put(faceHit, mode); forceClientUpdate = true; diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java index 78f35c12..f7b57229 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java @@ -29,7 +29,7 @@ import crazypants.enderio.machine.painter.PainterUtil; @ThreadSafeISBRH(perThread = true) public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { - private OverlayRenderer overlayRenderer = new OverlayRenderer() { + private final OverlayRenderer overlayRenderer = new OverlayRenderer() { @Override public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, @@ -40,7 +40,7 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, II } }; - private CustomCubeRenderer ccr = new CustomCubeRenderer(); + private final CustomCubeRenderer ccr = new CustomCubeRenderer(); private final PaintedBlockRenderer paintedRenderer = new PaintedBlockRenderer(this.getRenderId(), null); // renderer for @@ -112,6 +112,7 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, II ccr.renderBlock(world, block, x, y, z, overlayRenderer); } ccr.setOverrideTexture(null); + overlayRenderer.setTile(null); return true; } diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index ad2a1a84..25b2d0f8 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -174,7 +174,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt } protected void mergeResults(ResultStack[] results) { - List outputStacks = new ArrayList(slotDefinition.getNumOutputSlots()); + List outputStacks = new ArrayList<>(slotDefinition.getNumOutputSlots()); if (slotDefinition.getNumOutputSlots() > 0) { for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { ItemStack it = inventory[i]; @@ -275,7 +275,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt protected boolean canInsertResult(float chance, IMachineRecipe nextRecipe) { ResultStack[] nextResults = nextRecipe.getCompletedResult(chance, getRecipeInputs()); - List outputStacks = new ArrayList(slotDefinition.getNumOutputSlots()); + List outputStacks = new ArrayList<>(slotDefinition.getNumOutputSlots()); if (slotDefinition.getNumOutputSlots() > 0) { boolean allFull = true; for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java b/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java index 6253d876..aa4bddf7 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java @@ -11,7 +11,7 @@ public class MachineRecipeRegistry { public static final MachineRecipeRegistry instance = new MachineRecipeRegistry(); - private final Map> machineRecipes = new HashMap>(); + private final Map> machineRecipes = new HashMap<>(); public void registerRecipe(String machine, IMachineRecipe recipe) { getRecipesForMachine(machine).put(recipe.getUid(), recipe); @@ -20,7 +20,7 @@ public class MachineRecipeRegistry { public Map getRecipesForMachine(String machineName) { Map res = machineRecipes.get(machineName); if (res == null) { - res = new LinkedHashMap(); + res = new LinkedHashMap<>(); machineRecipes.put(machineName, res); } return res; @@ -57,7 +57,7 @@ public class MachineRecipeRegistry { if (input == null) { return Collections.emptyList(); } - List result = new ArrayList(); + List result = new ArrayList<>(); Map recipes = getRecipesForMachine(machineName); for (IMachineRecipe recipe : recipes.values()) { if (recipe.isValidInput(input)) { diff --git a/src/main/java/crazypants/enderio/machine/PoweredTask.java b/src/main/java/crazypants/enderio/machine/PoweredTask.java index c14eb670..94d2628b 100644 --- a/src/main/java/crazypants/enderio/machine/PoweredTask.java +++ b/src/main/java/crazypants/enderio/machine/PoweredTask.java @@ -24,9 +24,9 @@ public class PoweredTask implements IPoweredTask { private float requiredEnergy; - private RecipeBonusType bonusType; + private final RecipeBonusType bonusType; - private IMachineRecipe recipe; + private final IMachineRecipe recipe; private float chance; @@ -158,7 +158,7 @@ public class PoweredTask implements IPoweredTask { return null; } - List ins = new ArrayList(3); + List ins = new ArrayList<>(3); for (int i = 0; i < inputItems.tagCount(); i++) { NBTTagCompound stackTag = inputItems.getCompoundTagAt(i); MachineRecipeInput mi = MachineRecipeInput.readFromNBT(stackTag); diff --git a/src/main/java/crazypants/enderio/machine/PoweredTaskProgress.java b/src/main/java/crazypants/enderio/machine/PoweredTaskProgress.java index 38653fdc..bb0f5c97 100644 --- a/src/main/java/crazypants/enderio/machine/PoweredTaskProgress.java +++ b/src/main/java/crazypants/enderio/machine/PoweredTaskProgress.java @@ -10,7 +10,7 @@ import crazypants.enderio.machine.recipe.RecipeBonusType; */ public class PoweredTaskProgress implements IPoweredTask { - private float progress; + private final float progress; public PoweredTaskProgress(IPoweredTask task) { progress = task.getProgress(); diff --git a/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java b/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java index 46ac9064..32a26451 100644 --- a/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java +++ b/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java @@ -19,7 +19,7 @@ public enum RedstoneControlMode implements ICycleEnum { OFF(IconEIO.REDSTONE_MODE_WITHOUT_SIGNAL), NEVER(IconEIO.REDSTONE_MODE_NEVER); - private IWidgetIcon icon; + private final IWidgetIcon icon; RedstoneControlMode(IWidgetIcon icon) { this.icon = icon; diff --git a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java index ee6d4730..2ba93e9f 100644 --- a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java @@ -18,8 +18,8 @@ import crazypants.enderio.EnderIO; public class TechneMachineRenderer extends TechneModelRenderer { - private CustomCubeRenderer ccr = new CustomCubeRenderer(); - private OverlayRenderer overlay = new OverlayRenderer(); + private final CustomCubeRenderer ccr = new CustomCubeRenderer(); + private final OverlayRenderer overlay = new OverlayRenderer(); public TechneMachineRenderer(AbstractMachineBlock block, String modelPath) { super( @@ -51,7 +51,7 @@ public class TechneMachineRenderer extends Tech public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { @SuppressWarnings("unchecked") - T te = (T) world.getTileEntity(x, y, z); + final T te = (T) world.getTileEntity(x, y, z); if (te != null) { setFacingDir(te.getFacingDir()); overlay.setTile(te); @@ -63,6 +63,8 @@ public class TechneMachineRenderer extends Tech ccr.renderBlock(world, block, x, y, z, overlay); } + overlay.setTile(null); + return true; } diff --git a/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java b/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java index ca72d364..ecdaa03b 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java @@ -66,7 +66,7 @@ public class AlloyRecipeManager extends ManyToOneRecipeManager { private Boolean enabled = null; - private List excludes = new ArrayList(); + private final List excludes = new ArrayList<>(); @Override public boolean startElement(String uri, String localName, String qName, Attributes attributes) diff --git a/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java b/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java index 17893155..2f7276be 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java +++ b/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java @@ -26,11 +26,11 @@ public class VanillaSmeltingRecipe implements IMachineRecipe { // We will use the same energy as per a standard furnace. // To do the conversion between fuel burning and RF, use the Stirling Gen // which produces ten RF per tick of burn time - private static int RF_PER_ITEM = TileEntityFurnace.getItemBurnTime(new ItemStack(Items.coal, 1, 0)) * 10 / 8; + private static final int RF_PER_ITEM = TileEntityFurnace.getItemBurnTime(new ItemStack(Items.coal, 1, 0)) * 10 / 8; private boolean enabled = true; - private List excludes = new ArrayList(); + private final List excludes = new ArrayList<>(); @Override public String getUid() { @@ -154,7 +154,7 @@ public class VanillaSmeltingRecipe implements IMachineRecipe { @Override public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { int consumed = 0; - List result = new ArrayList(); + List result = new ArrayList<>(); for (MachineRecipeInput ri : inputs) { if (isValidInput(new MachineRecipeInput(ri.slotNumber, ri.item)) && consumed < 3 && ri != null @@ -177,7 +177,7 @@ public class VanillaSmeltingRecipe implements IMachineRecipe { if (!enabled) { return Collections.emptyList(); } - List result = new ArrayList(); + List result = new ArrayList<>(); Map metaList = FurnaceRecipes.smelting().getSmeltingList(); for (Entry entry : metaList.entrySet()) { ItemStack output = entry.getValue(); diff --git a/src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java index 79e9c4bb..60d49bc0 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java @@ -44,6 +44,10 @@ public class BlockItemBuffer extends ItemBlockWithMetadata { return "tile." + ModObject.blockBuffer.unlocalisedName + "." + name().toLowerCase(Locale.US); } + public String getGuiUnlocalizedName() { + return "enderio.gui." + ModObject.blockBuffer.unlocalisedName + "." + name().toLowerCase(Locale.US); + } + public static ItemStack getStack(Type type) { return new ItemStack(EnderIO.blockBuffer, 1, type.ordinal()); } diff --git a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java index 856e0616..5e2108ae 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java @@ -146,7 +146,7 @@ public class GuiBuffer extends GuiPoweredMachineBase { super.drawGuiContainerBackgroundLayer(par1, par2, par3); - String invName = EnderIO.lang.localizeExact(getTileEntity().getInventoryName() + ".name"); + String invName = EnderIO.lang.localizeExact(getTileEntity().getGuiInventoryName() + ".name"); getFontRenderer().drawStringWithShadow( invName, sx + (xSize / 2) - (getFontRenderer().getStringWidth(invName) / 2), diff --git a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java index 3c005d4c..b353178c 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java @@ -38,6 +38,10 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl return BlockItemBuffer.Type.get(this).getUnlocalizedName(); } + public String getGuiInventoryName() { + return BlockItemBuffer.Type.get(this).getGuiUnlocalizedName(); + } + @Override protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { return true; diff --git a/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java index eafb84d2..bdf76a45 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java +++ b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java @@ -62,7 +62,7 @@ public class CapBankType { "enderio:capacitorBankOutput", "enderio:capacitorBankLocked"); - private static final List TYPES = new ArrayList(); + private static final List TYPES = new ArrayList<>(); static { TYPES.add(CREATIVE); diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 0a207044..3b63c5ba 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -48,23 +48,22 @@ public class GuiCapBank extends GuiContainerBaseEIO { private static final int POWER_HEIGHT = 68; protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; - private int inputX = 78 + 24; - private int inputY = 18; + private static final int inputX = 78 + 24; + private static final int inputY = 18; - private int outputX = 78 + 24; - private int outputY = 36; + private static final int outputX = 78 + 24; + private static final int outputY = 36; - private int rightMargin = 8 + 24; + private static final int rightMargin = 8 + 24; private final TileCapBank capBank; - private RedstoneModeButton inputRsButton; - private RedstoneModeButton outputRsButton; + private final RedstoneModeButton inputRsButton; + private final RedstoneModeButton outputRsButton; - private TextFieldEnder maxInputTF; - private TextFieldEnder maxOutputTF; + private final TextFieldEnder maxInputTF; + private final TextFieldEnder maxOutputTF; - private final GuiOverlayIoConfig configOverlay; private final GuiButtonIoConfig configB; private CapBankClientNetwork network; @@ -144,7 +143,7 @@ public class GuiCapBank extends GuiContainerBaseEIO { }); outputRsButton.setTooltipKey("enderio.gui.capBank.outputRs"); - List coords = new ArrayList(); + List coords = new ArrayList<>(); if (network != null && network.getMembers().size() < 200) { for (TileCapBank cb : network.getMembers()) { coords.add(cb.getLocation()); @@ -154,7 +153,7 @@ public class GuiCapBank extends GuiContainerBaseEIO { coords.add(te.getLocation()); } - configOverlay = new GuiOverlayIoConfig(coords) { + GuiOverlayIoConfig configOverlay = new GuiOverlayIoConfig(coords) { @Override protected String getLabelForMode(IoMode mode) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index 904829e1..80c3bfbc 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -64,7 +64,7 @@ public class TileCapBank extends TileEntityEio private boolean redstoneStateDirty = true; private boolean isRecievingRedstoneSignal; - private final List receptors = new ArrayList(); + private final List receptors = new ArrayList<>(); private boolean receptorsDirty = true; private ICapBankNetwork network; @@ -270,7 +270,7 @@ public class TileCapBank extends TileEntityEio } } else { if (faceModes == null) { - faceModes = new EnumMap(ForgeDirection.class); + faceModes = new EnumMap<>(ForgeDirection.class); } faceModes.put(faceHit, mode); } @@ -357,7 +357,7 @@ public class TileCapBank extends TileEntityEio } if (faceDisplayTypes == null) { - faceDisplayTypes = new EnumMap(ForgeDirection.class); + faceDisplayTypes = new EnumMap<>(ForgeDirection.class); } if (type == InfoDisplayType.NONE) { @@ -377,7 +377,7 @@ public class TileCapBank extends TileEntityEio if (faceDisplayTypes == null) { return; } - List reset = new ArrayList(); + List reset = new ArrayList<>(); for (Entry entry : faceDisplayTypes.entrySet()) { BlockCoord bc = getLocation().getLocation(entry.getKey()); Block block = worldObj.getBlock(bc.x, bc.y, bc.z); diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java index 3031da34..37821005 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java @@ -24,7 +24,7 @@ import crazypants.enderio.power.IPowerStorage; public class CapBankClientNetwork implements ICapBankNetwork { private final int id; - private final Map members = new HashMap(); + private final Map members = new HashMap<>(); private int maxEnergySent; private int maxEnergyRecieved; @@ -282,7 +282,7 @@ public class CapBankClientNetwork implements ICapBankNetwork { public IOInfo getIODisplayInfo(int x, int y, int z, ForgeDirection face) { DisplayInfoKey key = new DisplayInfoKey(x, y, z, face); if (ioDisplayInfoCache == null) { - ioDisplayInfoCache = new HashMap(); + ioDisplayInfoCache = new HashMap<>(); } IOInfo value = ioDisplayInfoCache.get(key); if (value == null) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java index be1ca9da..837f8401 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java @@ -35,9 +35,9 @@ public class CapBankNetwork implements ICapBankNetwork { private static final int IO_CAP = 2000000000; - private final List capBanks = new ArrayList(); + private final List capBanks = new ArrayList<>(); - private final Set receptors = new HashSet(); + private final Set receptors = new HashSet<>(); private RoundRobinIterator receptorIterator; private final int id; @@ -59,7 +59,7 @@ public class CapBankNetwork implements ICapBankNetwork { private CapBankType type; - private final Set redstoneRecievers = new HashSet(); + private final Set redstoneRecievers = new HashSet<>(); private RedstoneControlMode inputControlMode = RedstoneControlMode.IGNORE; private RedstoneControlMode outputControlMode = RedstoneControlMode.IGNORE; @@ -103,7 +103,7 @@ public class CapBankNetwork implements ICapBankNetwork { if (cap == null) { return; } - Set work = new HashSet(); + Set work = new HashSet<>(); for (;;) { ICapBankNetwork network = cap.getNetwork(); if (network != this) { @@ -255,8 +255,8 @@ public class CapBankNetwork implements ICapBankNetwork { } if (receptorIterator == null) { - List rl = new ArrayList(receptors); - receptorIterator = new RoundRobinIterator(rl); + List rl = new ArrayList<>(receptors); + receptorIterator = new RoundRobinIterator<>(rl); } int totalSent = 0; diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java b/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java index 3d74ca9e..dd6ae282 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java @@ -22,7 +22,7 @@ public class ClientNetworkManager { return instance; } - private final Map networks = new HashMap(); + private final Map networks = new HashMap<>(); ClientNetworkManager() {} diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java index a1493aa4..1351c20f 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java @@ -15,7 +15,7 @@ import crazypants.enderio.machine.capbank.TileCapBank; public class NetworkUtil { - private static AtomicInteger nextID = new AtomicInteger(0); + private static final AtomicInteger nextID = new AtomicInteger(0); public static void ensureValidNetwork(TileCapBank cap) { World world = cap.getWorldObj(); @@ -32,7 +32,7 @@ public class NetworkUtil { if (!cap.getType().isMultiblock()) { return Collections.emptyList(); } - Collection res = new ArrayList(); + Collection res = new ArrayList<>(); getNeigbours(cap, res); return res; } diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java index 21c5b49b..db4bcaa9 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java @@ -40,10 +40,10 @@ import crazypants.enderio.power.PowerHandlerUtil; @ThreadSafeISBRH(perThread = true) public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { - private ConnectedTextureRenderer connectedTexRenderer; + private final ConnectedTextureRenderer connectedTexRenderer; - private Map infoRenderers; - private FillGauge fillGaugeRenderer; + private final Map infoRenderers; + private final FillGauge fillGaugeRenderer; public CapBankRenderer() { connectedTexRenderer = new ConnectedTextureRenderer(); diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java index d1002c4b..0e8e7e3c 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java @@ -40,9 +40,6 @@ public class FillGauge implements IInfoRenderer, IResourceManagerReloadListener MIDDLE } - private IIcon barIcon; - private IIcon gaugeIcon; - private float barHeightV; private Map> gaugeVertexCache; @@ -180,13 +177,13 @@ public class FillGauge implements IInfoRenderer, IResourceManagerReloadListener } private void createVertexCache() { - barIcon = EnderIO.blockCapBank.getFillBarIcon(); + IIcon barIcon = EnderIO.blockCapBank.getFillBarIcon(); barMinV = barIcon.getMinV(); barHeightV = barIcon.getMaxV() - barIcon.getMinV(); - gaugeIcon = EnderIO.blockCapBank.getGaugeIcon(); + IIcon gaugeIcon = EnderIO.blockCapBank.getGaugeIcon(); - gaugeVertexCache = new HashMap>(); - levelVertexCache = new HashMap>(); + gaugeVertexCache = new HashMap<>(); + levelVertexCache = new HashMap<>(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { if (dir.offsetY == 0) { for (Type type : Type.values()) { @@ -238,8 +235,8 @@ public class FillGauge implements IInfoRenderer, IResourceManagerReloadListener public static final GaugeInfo DEFAULT = new GaugeInfo(1, 0); - private int height; - private int yPosition; + private final int height; + private final int yPosition; Type type; GaugeInfo(int height, int position) { diff --git a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java index c82538d4..2f3bf8e1 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java @@ -43,7 +43,7 @@ public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuf public TileCrafter() { super(new SlotDefinition(9, 1)); - containerItems = new ArrayList(); + containerItems = new ArrayList<>(); } @Override diff --git a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java index 6eb0038d..8397c1b0 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java @@ -39,13 +39,13 @@ public class CrusherRecipeManager { return instance; } - private final List recipes = new ArrayList(); + private final List recipes = new ArrayList<>(); - private final List ballExcludes = new ArrayList(); + private final List ballExcludes = new ArrayList<>(); - private final List balls = new ArrayList(); + private final List balls = new ArrayList<>(); - private Set excludedStacks = new HashSet(); + private final Set excludedStacks = new HashSet<>(); public CrusherRecipeManager() {} diff --git a/src/main/java/crazypants/enderio/machine/crusher/GrindingBallTagHandler.java b/src/main/java/crazypants/enderio/machine/crusher/GrindingBallTagHandler.java index c1f008aa..f11a9af5 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GrindingBallTagHandler.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GrindingBallTagHandler.java @@ -28,8 +28,8 @@ public class GrindingBallTagHandler implements CustomTagHandler { private static final String AT_CM = "chanceMultiplier"; private static final String AT_DMJ = "durationRF"; - Map balls = new HashMap(); - List excludes = new ArrayList(); + Map balls = new HashMap<>(); + List excludes = new ArrayList<>(); boolean processStack = false; boolean processExclude = false; diff --git a/src/main/java/crazypants/enderio/machine/crusher/GrindingMultiplierNBT.java b/src/main/java/crazypants/enderio/machine/crusher/GrindingMultiplierNBT.java index 1c968ef6..51679d8d 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GrindingMultiplierNBT.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GrindingMultiplierNBT.java @@ -12,10 +12,10 @@ public class GrindingMultiplierNBT implements IGrindingMultiplier { int durationMJ; - private static String CM = "grindBall.chanceMultiplier"; - private static String PM = "grindBall.powerMultiplier"; - private static String GM = "grindBall.grindingMultiplier"; - private static String DMJ = "grindBall.durationMJ"; + private static final String CM = "grindBall.chanceMultiplier"; + private static final String PM = "grindBall.powerMultiplier"; + private static final String GM = "grindBall.grindingMultiplier"; + private static final String DMJ = "grindBall.durationMJ"; public static GrindingMultiplierNBT readFromNBT(NBTTagCompound nbtRoot) { if (nbtRoot.hasKey(CM) && nbtRoot.hasKey(PM) && nbtRoot.hasKey(GM) && nbtRoot.hasKey(DMJ)) { diff --git a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java index 655b0b54..757acd42 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java @@ -5,6 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; @@ -140,4 +141,25 @@ public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTo public String getUnlocalizedNameForTooltip(ItemStack itemStack) { return getUnlocalizedName(); } + + @Override + public boolean hasComparatorInputOverride() { + return true; + } + + // 0, 1, 2, 3, 4, 5, 8, 12, 20, 24, 32, 36, 48, 60, 64 are 0-15 respectively + // the power values are all possible values of the second slot to make automation possible + // (it has to be able to differentiate from them all) + @Override + public int getComparatorInputOverride(World worldIn, int x, int y, int z, int side) { + if (worldIn.getTileEntity(x, y, z) instanceof IInventory inv) { + ItemStack stuff = inv.getStackInSlot(1); + int size; + return stuff == null ? 0 + : (size = stuff.stackSize) < 6 ? size + : size < 40 ? size / 4 + (size < 28 ? 4 : 3) + : size < 48 ? 12 : size < 60 ? 13 : size < 64 ? 14 : 15; + } + return 0; + } } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java index 7f8c5e21..35c8c1cc 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java @@ -27,11 +27,6 @@ public class ContainerEnchanter extends ContainerEnderTileEntity addSlotToContainer(new Slot(te, 0, 27, 35) { - @Override - public int getSlotStackLimit() { - return 1; - } - @Override public boolean isItemValid(ItemStack itemStack) { return te.isItemValidForSlot(0, itemStack); @@ -58,6 +53,11 @@ public class ContainerEnchanter extends ContainerEnderTileEntity addSlotToContainer(new Slot(te, 2, 134, 35) { + @Override + public ItemStack decrStackSize(int amt) { + return te.decrStackSize(2, amt, false); + } + @Override public int getSlotStackLimit() { return 1; @@ -81,18 +81,19 @@ public class ContainerEnchanter extends ContainerEnderTileEntity || enchData.enchantmentLevel >= curStack.stackSize) { te.setInventorySlotContents(1, (ItemStack) null); } else { - - curStack = curStack.copy(); curStack.stackSize -= recipe.getItemsPerLevel() * enchData.enchantmentLevel; - if (curStack.stackSize > 0) { - te.setInventorySlotContents(1, curStack); - } else { + if (curStack.stackSize <= 0) { te.setInventorySlotContents(1, null); } te.markDirty(); } - te.setInventorySlotContents(0, (ItemStack) null); + curStack = te.getStackInSlot(0); + if (curStack == null || curStack.stackSize <= 1) te.setInventorySlotContents(0, null); + else { + curStack.stackSize -= 1; + te.setInventorySlotContents(0, curStack); + } if (!te.getWorldObj().isRemote) { te.getWorldObj().playAuxSFX(1021, te.xCoord, te.yCoord, te.zCoord, 0); } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModelRenderer.java b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModelRenderer.java index 427fce8e..1fe724e3 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModelRenderer.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModelRenderer.java @@ -22,7 +22,7 @@ public class EnchanterModelRenderer extends TileEntitySpecialRenderer implements private static final String TEXTURE = "enderio:models/BookStand.png"; - private EnchanterModel model = new EnchanterModel(); + private final EnchanterModel model = new EnchanterModel(); @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { diff --git a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeManager.java b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeManager.java index 77a69ecd..1f7364bd 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeManager.java @@ -9,13 +9,13 @@ import crazypants.enderio.Log; public class EnchanterRecipeManager { - private static EnchanterRecipeManager instance = new EnchanterRecipeManager(); + private static final EnchanterRecipeManager instance = new EnchanterRecipeManager(); public static EnchanterRecipeManager getInstance() { return instance; } - private final List recipes = new ArrayList(); + private final List recipes = new ArrayList<>(); public void loadRecipesFromConfig() { List res = EnchanterRecipeParser.loadRecipeConfig(); diff --git a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeParser.java b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeParser.java index c30dceb7..b5994877 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeParser.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeParser.java @@ -167,7 +167,7 @@ public class EnchanterRecipeParser extends DefaultHandler { public static final String AT_NAME = "name"; private static final String AT_LEVEL = "costPerLevel"; - private List result = new ArrayList(); + private final List result = new ArrayList<>(); private Enchantment curEnchantment = null; private int curLevelCost = -1; diff --git a/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java index c80b3e1b..276fe587 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java @@ -11,8 +11,8 @@ import crazypants.enderio.gui.GuiContainerBaseEIO; public class GuiEnchanter extends GuiContainerBaseEIO { - private TileEnchanter te; - private ContainerEnchanter container; + private final TileEnchanter te; + private final ContainerEnchanter container; public GuiEnchanter(EntityPlayer player, InventoryPlayer inventory, TileEnchanter te) { super(new ContainerEnchanter(player, inventory, te), "enchanter"); diff --git a/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java index a9aad4c3..6eb64c1e 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java @@ -1,5 +1,9 @@ package crazypants.enderio.machine.enchanter; +import static crazypants.enderio.EnderIO.hasAutomagy; + +import java.util.ArrayList; + import net.minecraft.enchantment.EnchantmentData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -9,13 +13,20 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; +import com.gtnewhorizon.gtnhlib.geometry.CubeIterator; + import crazypants.enderio.ModObject; import crazypants.enderio.TileEntityEio; import crazypants.enderio.config.Config; +import crazypants.enderio.machine.obelisk.xp.TileExperienceObelisk; +import crazypants.enderio.xp.ExperienceContainer; +import crazypants.enderio.xp.XpUtil; +import tuhljin.automagy.tiles.TileEntityJarXP; public class TileEnchanter extends TileEntityEio implements ISidedInventory { - private ItemStack[] inv = new ItemStack[3]; + private final ItemStack[] inv = new ItemStack[3]; + private byte[] stacksizes = new byte[2]; private short facing = (short) ForgeDirection.NORTH.ordinal(); @@ -27,6 +38,19 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory { return facing; } + // The *ACTUAL* updateEntity and canUpdate are final in TileEntityEnder. Great. + + @Override + protected void doUpdate() { + if (!shouldUpdate_()) return; + if (inv[0].stackSize != stacksizes[0] || inv[1].stackSize != stacksizes[1]) updateOut(); + } + + // @Override + public boolean shouldUpdate_() { + return inv[0] != null && inv[1] != null; + } + @Override protected void writeCustomNBT(NBTTagCompound root) { NBTTagList itemList = new NBTTagList(); @@ -39,6 +63,7 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory { } } root.setTag("Items", itemList); + root.setByteArray("SizeCache", stacksizes); root.setShort("facing", facing); } @@ -54,6 +79,8 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory { } } } + stacksizes = root.getByteArray("SizeCache"); + if (stacksizes == null || stacksizes.length < 2) stacksizes = new byte[2]; facing = root.getShort("facing"); } @@ -77,6 +104,10 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory { @Override public ItemStack decrStackSize(int slot, int amount) { + return decrStackSize(slot, amount, true); + } + + public ItemStack decrStackSize(int slot, int amount, boolean auto) { if (amount <= 0 || slot < 0 || slot >= inv.length || inv[slot] == null) { return null; } @@ -84,8 +115,10 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory { if (fromStack == null) { return null; } + if (slot == 2 && auto && checkAndDrainXP(Math.min(amount, fromStack.stackSize))) return null; if (fromStack.stackSize <= amount) { inv[slot] = null; + updateOut(); return fromStack; } ItemStack result = new ItemStack(fromStack.getItem(), amount, fromStack.getItemDamage()); @@ -93,9 +126,95 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory { result.stackTagCompound = (NBTTagCompound) fromStack.stackTagCompound.copy(); } fromStack.stackSize -= amount; + updateOut(); return result; } + // part of the next method + public boolean absorbXP(int amt) { + if (inv[2] == null || amt <= 0 || inv[2].stackSize < amt) return true; + int LV = getCurrentEnchantmentCost(); + if (LV == 0) return false; + int xpCost = XpUtil.getExperienceForLevel(LV * amt); + int xp; + absorb: { + ArrayList obelisksToEmpty = new ArrayList<>(); + if (true) { + CubeIterator iter = new CubeIterator(8); + while (iter.hasNext()) { + iter.next(); + if (worldObj.getTileEntity( + iter.n + xCoord, + iter.l + yCoord, + iter.m + zCoord) instanceof TileExperienceObelisk obelisk) { + ExperienceContainer cont = obelisk.getContainer(); + xp = cont.getExperienceTotal(); + if (xp >= xpCost) { + if (!worldObj.isRemote) { + obelisksToEmpty.forEach(o -> o.drain(null, Integer.MAX_VALUE, true)); + cont.drain(null, Integer.MAX_VALUE, true); + cont.addExperience(Math.max(0, xp - xpCost)); + } + return false; + } + xpCost -= xp; + obelisksToEmpty.add(cont); + } + } + } + if (hasAutomagy) { + ArrayList jarsToEmpty = new ArrayList<>(); + CubeIterator iter = new CubeIterator(8); + while (iter.hasNext()) { + iter.next(); + if (worldObj.getTileEntity( + iter.n + xCoord, + iter.l + yCoord, + iter.m + zCoord) instanceof TileEntityJarXP jar) { + xp = jar.getXP(); + if (xp >= xpCost) { + if (!worldObj.isRemote) { + obelisksToEmpty.forEach(o -> o.drain(null, Integer.MAX_VALUE, true)); + jarsToEmpty.forEach(j -> j.setXP(0)); + jar.setXP(xp - xpCost); + } + return false; + } + xpCost -= xp; + jarsToEmpty.add(jar); + } + } + } + return true; + } + } + + // checks AND drains XP; returns true if xp is NOT sufficient + // also removes the items from the other two slots when automation does the recipe + public boolean checkAndDrainXP(int amt) { + if (absorbXP(amt)) return true; + EnchantmentData enchData = getCurrentEnchantmentData(); + EnchanterRecipe recipe = getCurrentEnchantmentRecipe(); + ItemStack curStack = inv[1]; + if (recipe == null || enchData == null || curStack == null || enchData.enchantmentLevel >= curStack.stackSize) { + inv[1] = null; + } else { + curStack = curStack.copy(); + curStack.stackSize -= recipe.getItemsPerLevel() * enchData.enchantmentLevel; + inv[1] = curStack.stackSize > 0 ? curStack : null; + markDirty(); + } + + curStack = inv[0]; + if (curStack == null || curStack.stackSize <= 1) inv[0] = null; + else inv[0].stackSize -= 1; + + if (!worldObj.isRemote) { + worldObj.playSoundEffect(xCoord + 0.5d, yCoord + 0.5d, zCoord + 0.5d, "random.anvil_land", 0.2f, 1.0f); + } + return false; + } + @Override public ItemStack getStackInSlotOnClosing(int p_70304_1_) { return null; @@ -111,6 +230,20 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory { if (contents != null && contents.stackSize > getInventoryStackLimit()) { contents.stackSize = getInventoryStackLimit(); } + updateOut(); + } + + public void updateOut() { + ItemStack output = null; + EnchantmentData enchantment = getCurrentEnchantmentData(); + if (enchantment != null) { + output = new ItemStack(Items.enchanted_book); + Items.enchanted_book.addEnchantment(output, enchantment); + } + setOutput(output); + + if (inv[0] != null) stacksizes[0] = (byte) inv[0].stackSize; + if (inv[1] != null) stacksizes[1] = (byte) inv[1].stackSize; } @Override @@ -226,7 +359,7 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory { return getEnchantmentCost(getCurrentEnchantmentRecipe()); } - private int getEnchantmentCost(EnchanterRecipe currentEnchantment) { + public int getEnchantmentCost(EnchanterRecipe currentEnchantment) { ItemStack item = inv[1]; if (item == null) { return 0; @@ -256,17 +389,17 @@ public class TileEnchanter extends TileEntityEio implements ISidedInventory { } @Override - public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return new int[0]; + public int[] getAccessibleSlotsFromSide(int side) { + return side == 0 ? new int[] { 2 } : new int[] { 0, 1 }; } @Override public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) { - return false; + return true; } @Override public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { - return false; + return true; } } diff --git a/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java b/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java index e3eaa485..eedaefa8 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java @@ -25,7 +25,7 @@ public class FakeFarmPlayer extends EntityPlayerMP { private static final UUID uuid = UUID.fromString("c1ddfd7f-120a-4437-8b64-38660d3ec62d"); - private static GameProfile DUMMY_PROFILE = new GameProfile(uuid, "[EioFarmer]"); + private static final GameProfile DUMMY_PROFILE = new GameProfile(uuid, "[EioFarmer]"); public FakeFarmPlayer(WorldServer world) { super( diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java b/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java index a8b61051..3fcf1cba 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java @@ -29,7 +29,7 @@ public class FarmStationContainer extends AbstractMachineContainer slotItemsStacks1 = new ArrayList(); + private static final List slotItemsStacks1 = new ArrayList<>(); static { for (Item item : slotItems1) { @@ -44,7 +44,7 @@ public class FarmStationContainer extends AbstractMachineContainer slotItemsSeeds = new ArrayList(); + public static final List slotItemsSeeds = new ArrayList<>(); static { slotItemsSeeds.add(new ItemStack(Items.wheat_seeds)); @@ -57,7 +57,7 @@ public class FarmStationContainer extends AbstractMachineContainer slotItemsProduce = new ArrayList(); + public static final List slotItemsProduce = new ArrayList<>(); static { slotItemsProduce.add(new ItemStack(Blocks.log, 1, 0)); @@ -66,7 +66,7 @@ public class FarmStationContainer extends AbstractMachineContainer slotItemsFertilizer = new ArrayList(); + public static final List slotItemsFertilizer = new ArrayList<>(); static { slotItemsFertilizer.add(new ItemStack(Items.dye, 1, 15)); diff --git a/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java b/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java index a424ec87..25406345 100644 --- a/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java +++ b/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java @@ -90,7 +90,7 @@ public enum Fertilizer { } }; - private ItemStack stack; + private final ItemStack stack; private Fertilizer(Item item) { this(new ItemStack(item)); diff --git a/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java index 99facbbc..20156954 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java @@ -15,7 +15,7 @@ import io.netty.buffer.ByteBuf; public class PacketFarmAction implements IMessage, IMessageHandler { - private static Random rand = new Random(); + private static final Random rand = new Random(); private List coords; @@ -26,7 +26,7 @@ public class PacketFarmAction implements IMessage, IMessageHandler(1); + this.coords = new ArrayList<>(1); this.coords.add(bc); } @@ -44,7 +44,7 @@ public class PacketFarmAction implements IMessage, IMessageHandler(size); + coords = new ArrayList<>(size); for (int i = 0; i < size; i++) { coords.add(new BlockCoord(buffer.readInt(), buffer.readInt(), buffer.readInt())); } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java index f9c0200e..e53f072b 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java @@ -24,7 +24,7 @@ public class CustomSeedFarmer implements IFarmerJoe { protected int grownBlockMeta; protected ItemStack seeds; protected boolean requiresFarmland = true; - protected List tilledBlocks = new ArrayList(); + protected List tilledBlocks = new ArrayList<>(); protected boolean ignoreSustainCheck = false; protected boolean disableTreeFarm; @@ -141,7 +141,7 @@ public class CustomSeedFarmer implements IFarmerJoe { } World worldObj = farm.getWorldObj(); - List result = new ArrayList(); + List result = new ArrayList<>(); ArrayList drops = block.getDrops(worldObj, bc.x, bc.y, bc.z, meta, farm.getMaxLootingValue()); farm.damageHoe(1, bc); diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java b/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java index 11cc88f2..0cbaee8c 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java @@ -13,7 +13,7 @@ import crazypants.enderio.machine.farm.TileFarmStation; public class FarmersCommune implements IFarmerJoe { public static FarmersCommune instance = new FarmersCommune(); - private static List disableTrees = new ArrayList(); + private static final List disableTrees = new ArrayList<>(); public static void joinCommune(IFarmerJoe joe) { if (joe instanceof CustomSeedFarmer) { @@ -27,7 +27,7 @@ public class FarmersCommune implements IFarmerJoe { throw new UnsupportedOperationException("As if this would be implemented. The commune is for life!"); } - private List farmers = new ArrayList(); + private final List farmers = new ArrayList<>(); private FarmersCommune() {} diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java b/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java index 092abb36..6085a6f9 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java @@ -15,7 +15,7 @@ import crazypants.enderio.machine.farm.TileFarmStation; public class FlowerPicker implements IFarmerJoe { - protected List flowers = new ArrayList(); + protected List flowers = new ArrayList<>(); public FlowerPicker() {} @@ -58,7 +58,7 @@ public class FlowerPicker implements IFarmerJoe { } World worldObj = farm.getWorldObj(); - List result = new ArrayList(); + List result = new ArrayList<>(); ArrayList drops = block.getDrops(worldObj, bc.x, bc.y, bc.z, meta, farm.getMaxLootingValue()); farm.damageHoe(1, bc); diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/ForestryFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/ForestryFarmer.java index cadc51da..c1bd1e6a 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/ForestryFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/ForestryFarmer.java @@ -16,8 +16,8 @@ import forestry.api.genetics.AlleleManager; public class ForestryFarmer implements IFarmerJoe { - private ITreeRoot root; - private Item forestrySapling; + private final ITreeRoot root; + private final Item forestrySapling; private ForestryFarmer(ITreeRoot root, Item forestrySapling) { this.root = root; diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/HarvestResult.java b/src/main/java/crazypants/enderio/machine/farm/farmers/HarvestResult.java index f8f94f0e..4f8591c6 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/HarvestResult.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/HarvestResult.java @@ -19,13 +19,13 @@ public class HarvestResult implements IHarvestResult { public HarvestResult(List drops, BlockCoord harvestedBlock) { this.drops = drops; - this.harvestedBlocks = new ArrayList(); + this.harvestedBlocks = new ArrayList<>(); harvestedBlocks.add(harvestedBlock); } public HarvestResult() { - drops = new ArrayList(); - harvestedBlocks = new ArrayList(); + drops = new ArrayList<>(); + harvestedBlocks = new ArrayList<>(); } @Override diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java index 00843549..824c07c9 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java @@ -9,7 +9,7 @@ import crazypants.enderio.machine.farm.TileFarmStation; public class MelonFarmer extends CustomSeedFarmer { - private Block grownBlock; + private final Block grownBlock; public MelonFarmer(Block plantedBlock, Block grownBlock, ItemStack seeds) { super(plantedBlock, seeds); diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java index e0c124ef..562787de 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java @@ -42,7 +42,7 @@ public class PickableFarmer extends CustomSeedFarmer { player.theItemInWorldManager .activateBlockOrUseItem(player, player.worldObj, null, bc.x, bc.y, bc.z, 0, 0, 0, 0); - List drops = new ArrayList(); + List drops = new ArrayList<>(); ItemStack[] inv = player.inventory.mainInventory; for (int slot = 0; slot < inv.length; slot++) { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java index 9e8347ed..0beb8cbc 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java @@ -24,7 +24,7 @@ import crazypants.enderio.machine.farm.TileFarmStation; public class PlantableFarmer implements IFarmerJoe { - private Set harvestExcludes = new HashSet(); + private final Set harvestExcludes = new HashSet<>(); public void addHarvestExlude(Block block) { harvestExcludes.add(block); @@ -160,7 +160,7 @@ public class PlantableFarmer implements IFarmerJoe { } World worldObj = farm.getWorldObj(); - List result = new ArrayList(); + List result = new ArrayList<>(); ItemStack removedPlantable = null; diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java index 6b161e73..6aa75b1f 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java @@ -79,7 +79,7 @@ public class StemFarmer extends CustomSeedFarmer { } } while (!done); - List toClear = new ArrayList(res.getHarvestedBlocks()); + List toClear = new ArrayList<>(res.getHarvestedBlocks()); Collections.sort(toClear, COMP); for (BlockCoord coord : toClear) { farm.getWorldObj().setBlockToAir(coord.x, coord.y, coord.z); diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java index 4f4b2373..293a65ea 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java @@ -120,7 +120,7 @@ public class TreeFarmer implements IFarmerJoe { harvester.harvest(farm, this, bc, res); Collections.sort(res.harvestedBlocks, comp); - List actualHarvests = new ArrayList(); + List actualHarvests = new ArrayList<>(); // avoid calling this in a loop boolean hasShears = farm.hasShears(); diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModelRenderer.java b/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModelRenderer.java index 5b473898..ceea4a42 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModelRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModelRenderer.java @@ -23,7 +23,7 @@ public class CombustionGeneratorModelRenderer extends TileEntitySpecialRenderer private static final String TEXTURE = "enderio:models/combustionGenerator.png"; - private CombustionGeneratorModel model = new CombustionGeneratorModel(); + private final CombustionGeneratorModel model = new CombustionGeneratorModel(); @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java index d9401ff4..f15df66b 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java @@ -43,9 +43,9 @@ public class TileCombustionGenerator extends AbstractGeneratorEntity implements private boolean generatedDirty = false; - private int maxOutputTick = 1280; + private static final int maxOutputTick = 1280; - private static int IO_MB_TICK = 250; + private static final int IO_MB_TICK = 250; private IFluidFuel curFuel; private IFluidCoolant curCoolant; diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java index 977d7c7b..df7672bf 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java @@ -22,9 +22,9 @@ public class TranslatedCubeRenderer { public static TranslatedCubeRenderer instance = new TranslatedCubeRenderer(); - private XFormRenderer xformRenderer = new XFormRenderer(); + private final XFormRenderer xformRenderer = new XFormRenderer(); - private CustomCubeRenderer ccr = new CustomCubeRenderer(); + private final CustomCubeRenderer ccr = new CustomCubeRenderer(); public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt, boolean enableLighting) { @@ -51,7 +51,7 @@ public class TranslatedCubeRenderer { block.setBlockBounds(0, 0, 0, 1, 1, 1); } - private class XFormRenderer implements IRenderFace { + private static class XFormRenderer implements IRenderFace { VertexTransform xform; boolean enableLighting = true; diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java index 587b3654..5a96cd7e 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java @@ -70,7 +70,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity } } - private static int IO_MB_TICK = 250; + private static final int IO_MB_TICK = 250; final SmartTank fuelTank; diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java index 44371fde..159a17a4 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java @@ -29,7 +29,7 @@ import crazypants.util.RenderPassHelper; @SideOnly(Side.CLIENT) public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private ModelZombieJar model = new ModelZombieJar(); + private final ModelZombieJar model = new ModelZombieJar(); @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { diff --git a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java index 35815a1a..0668681c 100644 --- a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java @@ -168,7 +168,7 @@ public abstract class AbstractMachineContainer return Collections.singletonList(getPlayerInventorySlotRange(true)); } } else if (slotNumber >= startPlayerSlot) { - List res = new ArrayList(); + List res = new ArrayList<>(); addInputSlotRanges(res); addUpgradeSlotRanges(res); addPlayerSlotRanges(res, slotNumber); diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java index 78824226..1f9c0074 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java @@ -30,7 +30,7 @@ public class GuiButtonIoConfig extends ToggleButton { String configTooltip = EnderIO.lang.localize("gui.machine.ioMode.overlay.tooltip"); setUnselectedToolTip(configTooltip); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(configTooltip); SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.machine.ioMode.overlay.tooltip.visible.line"); if (list.size() > 1) { diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java index 2941712f..ac5ccb11 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java @@ -137,7 +137,7 @@ public abstract class GuiMachineBase extends Gu protected void addProgressTooltip(int x, int y, int w, int h) { if (progressTooltips == null) { - progressTooltips = new ArrayList(); + progressTooltips = new ArrayList<>(); } GuiToolTip tt = new GuiToolTip(new Rectangle(x, y, w, h), (String[]) null); diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java index 81847459..058d2c13 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java @@ -33,7 +33,7 @@ public class GuiOverlayIoConfig implements IGuiOverlay { private IoConfigRenderer renderer; - private List coords = new ArrayList(); + private final List coords = new ArrayList<>(); public GuiOverlayIoConfig(IIoConfigurable ioConf) { coords.add(ioConf.getLocation()); diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java index 3dd405c2..c1257ef8 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java @@ -16,7 +16,7 @@ import crazypants.enderio.power.PowerDisplayUtil; public abstract class GuiPoweredMachineBase extends GuiMachineBase { protected static final int POWER_Y = 14; - protected final int POWER_X = 15; + protected static final int POWER_X = 15; protected static final int POWER_WIDTH = 10; protected static final int POWER_HEIGHT = 42; protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/ClientChannelRegister.java b/src/main/java/crazypants/enderio/machine/hypercube/ClientChannelRegister.java index 7d78618a..95945954 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/ClientChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/ClientChannelRegister.java @@ -8,10 +8,10 @@ public class ClientChannelRegister { static final ClientChannelRegister instance = new ClientChannelRegister(); - private final List publicChannels = new ArrayList(); + private final List publicChannels = new ArrayList<>(); private final List publicChannelsRO = Collections.unmodifiableList(publicChannels); - private final List privateChannels = new ArrayList(); + private final List privateChannels = new ArrayList<>(); private final List privateChannelsRO = Collections.unmodifiableList(privateChannels); void setPublicChannels(List channels) { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java b/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java index 903d35d8..f85fd922 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java @@ -15,7 +15,7 @@ import crazypants.enderio.ModObject; public class CompositeInventory implements ISidedInventory { - private final List inventories = new ArrayList(); + private final List inventories = new ArrayList<>(); private int size = 0; public void addInventory(CompositeInventory inv) { @@ -97,7 +97,7 @@ public class CompositeInventory implements ISidedInventory { @Override public int[] getAccessibleSlotsFromSide(int var1) { - List resList = new ArrayList(); + List resList = new ArrayList<>(); for (InvEntry inv : inventories) { int[] slots = inv.inv.getAccessibleSlotsFromSide(inv.side.ordinal()); if (slots != null) { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiChannelList.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiChannelList.java index a1ce3b9b..42bba23b 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiChannelList.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiChannelList.java @@ -13,7 +13,7 @@ import com.enderio.core.client.render.ColorUtil; public class GuiChannelList extends GuiScrollableList { - private List channels = new ArrayList(); + private List channels = new ArrayList<>(); private Channel activeChannel; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index cadba947..70df53c9 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -14,7 +14,6 @@ import com.enderio.core.api.client.gui.IGuiOverlay; import com.enderio.core.api.client.gui.ListSelectionListener; import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.button.ToggleButton; -import com.enderio.core.client.gui.widget.GuiScrollableList; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.gui.widget.TextFieldEnder; import com.enderio.core.client.render.ColorUtil; @@ -55,26 +54,25 @@ public class GuiHyperCube extends GuiContainerBaseEIO { private final TileHyperCube cube; - private IconButton addButton; - private ToggleButton privateButton; + private final IconButton addButton; + private final ToggleButton privateButton; - private TextFieldEnder newChannelTF; + private final TextFieldEnder newChannelTF; - private GuiChannelList publicChannelList; - private GuiChannelList privateChannelList; - private ListSelectionListener selectionListener; + private final GuiChannelList publicChannelList; + private final GuiChannelList privateChannelList; - private IconButton selectPublicB; - private IconButton deletePublicB; + private final IconButton selectPublicB; + private final IconButton deletePublicB; - private IconButton selectPrivateB; - private IconButton deletePrivateB; + private final IconButton selectPrivateB; + private final IconButton deletePrivateB; - private IconButton powerB; - private IconButton fluidB; - private IconButton itemB; + private final IconButton powerB; + private final IconButton fluidB; + private final IconButton itemB; - private RedstoneModeButton rsB; + private final RedstoneModeButton rsB; public GuiHyperCube(TileHyperCube te) { super(new ContainerHyperCube(), "hyperCube"); @@ -151,15 +149,11 @@ public class GuiHyperCube extends GuiContainerBaseEIO { privateChannelList.setScrollButtonIds(102, 103); privateChannelList.setActiveChannel(isPrivate(activeChannel) ? activeChannel : null); - selectionListener = new ListSelectionListener() { - - @Override - public void selectionChanged(GuiScrollableList list, int selectedIndex) { - Channel selected = list.getSelectedElement(); - if (selected != null) { - GuiChannelList clear = list == publicChannelList ? privateChannelList : publicChannelList; - clear.setSelection(-1); - } + ListSelectionListener selectionListener = (list, selectedIndex) -> { + Channel selected = list.getSelectedElement(); + if (selected != null) { + GuiChannelList clear = list == publicChannelList ? privateChannelList : publicChannelList; + clear.setSelection(-1); } }; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java index 9721c6a1..b33873ac 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java @@ -33,9 +33,9 @@ public class HyperCubeConfig { private final Properties props = new Properties(); - private final List publicChannels = new ArrayList(); + private final List publicChannels = new ArrayList<>(); - private final Map> userChannels = new HashMap>(); + private final Map> userChannels = new HashMap<>(); private final File file; @@ -135,7 +135,7 @@ public class HyperCubeConfig { loadChannelList(KEY_PUBLIC_CHANNELS, null, publicChannels); userChannels.clear(); - List users = new ArrayList(); + List users = new ArrayList<>(); String usersStr = props.getProperty(KEY_USERS, ""); String[] usersSplit = usersStr.split(DELIM); for (String user : usersSplit) { @@ -145,7 +145,7 @@ public class HyperCubeConfig { } for (String user : users) { - List channels = new ArrayList(); + List channels = new ArrayList<>(); UUID uuid = PlayerUtil.getPlayerUIDUnstable(user); loadChannelList(user + KEY_USER_CHANNEL, uuid, channels); if (!channels.isEmpty()) { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java index b5957d36..c1fedefb 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java @@ -16,7 +16,7 @@ public class HyperCubeModel extends ModelBase implements IModel { private static final String TEXTURE = "enderio:models/hyperCube.png"; private static final String MODEL = "enderio:models/hyperCube.obj"; - private IModelCustom model; + private final IModelCustom model; public HyperCubeModel() { model = AdvancedModelLoader.loadModel(new ResourceLocation(MODEL)); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java index 8a1fb6a4..753ab60c 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java @@ -20,12 +20,12 @@ public class HyperCubeRegister { public static HyperCubeRegister instance; - private final Map> channelMapping = new HashMap>(); + private final Map> channelMapping = new HashMap<>(); - private final List publicChannels = new ArrayList(); + private final List publicChannels = new ArrayList<>(); private final List publicChannelsRO = Collections.unmodifiableList(publicChannels); - private final Map> userChannels = new HashMap>(); + private final Map> userChannels = new HashMap<>(); // private Configuration config; private HyperCubeConfig conf; @@ -49,7 +49,7 @@ public class HyperCubeRegister { public synchronized List getChannelsForUser(UUID user) { List result = userChannels.get(user); if (result == null) { - result = new ArrayList(); + result = new ArrayList<>(); userChannels.put(user, result); } return result; @@ -81,7 +81,7 @@ public class HyperCubeRegister { if (chans == null) { return Collections.emptyList(); } - return new ArrayList(chans); + return new ArrayList<>(chans); } public synchronized void addChannel(Channel channel) { @@ -138,7 +138,7 @@ public class HyperCubeRegister { } List result = channelMapping.get(channel); if (result == null) { - result = new ArrayList(); + result = new ArrayList<>(); channelMapping.put(channel, result); } return result; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java index d73cb4eb..d7b9dcca 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java @@ -23,9 +23,9 @@ import crazypants.enderio.config.Config; @SideOnly(Side.CLIENT) public class HyperCubeRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private IModel model; + private final IModel model; - private BoundingBox bb; + private final BoundingBox bb; private boolean adjustForItem = false; diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java index 2a0e5f8f..4d1d2878 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java @@ -41,9 +41,9 @@ public class PacketChannelList implements IMessage, IMessageHandler(res); + channels = new ArrayList<>(res); } else { - channels = new ArrayList(); + channels = new ArrayList<>(); } } @@ -72,7 +72,7 @@ public class PacketChannelList implements IMessage, IMessageHandler(); + channels = new ArrayList<>(); for (int i = 0; i < numChannels; i++) { channels.add(new Channel(ByteBufUtils.readUTF8String(buffer), userId)); } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java index f30b38e5..4dc5009d 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java @@ -31,7 +31,7 @@ public class PacketClientState implements IMessage, IMessageHandler(SubChannel.values().length); + modes = new ArrayList<>(SubChannel.values().length); for (SubChannel sc : SubChannel.values()) { modes.add(te.getModeForChannel(sc)); } @@ -78,7 +78,7 @@ public class PacketClientState implements IMessage, IMessageHandler(SubChannel.values().length); + modes = new ArrayList<>(SubChannel.values().length); for (int i = 0; i < SubChannel.values().length; i++) { short ordinal = buf.readShort(); modes.add(IoMode.values()[ordinal]); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java index 2e224aed..9659eea6 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -107,11 +107,11 @@ public class TileHyperCube extends TileEntityEio private int lastSyncPowerStored = 0; private int storedEnergyRF; - private final List receptors = new ArrayList(); + private final List receptors = new ArrayList<>(); private ListIterator receptorIterator = receptors.listIterator(); private boolean receptorsDirty = true; - private final List fluidHandlers = new ArrayList(); + private final List fluidHandlers = new ArrayList<>(); private boolean fluidHandlersDirty = true; private CompositeInventory localInventory = new CompositeInventory(); @@ -121,14 +121,13 @@ public class TileHyperCube extends TileEntityEio private Channel registeredChannel = null; private UUID owner; - private boolean init = true; + private static final boolean init = true; private float milliBucketsTransfered = 0; - private EnumMap ioModes = new EnumMap( - SubChannel.class); + private final EnumMap ioModes = new EnumMap<>(SubChannel.class); - private ItemRecieveBuffer recieveBuffer; + private final ItemRecieveBuffer recieveBuffer; protected RedstoneControlMode redstoneControlMode = RedstoneControlMode.IGNORE; protected boolean redstoneCheckPassed; @@ -570,7 +569,7 @@ public class TileHyperCube extends TileEntityEio @Override public FluidTankInfo[] getTankInfo(ForgeDirection from) { - List res = new ArrayList(); + List res = new ArrayList<>(); for (NetworkFluidHandler h : getNetworkHandlers()) { FluidTankInfo[] ti = h.handler.getTankInfo(h.dirOp); if (ti != null) { @@ -596,7 +595,7 @@ public class TileHyperCube extends TileEntityEio if (cubes == null || cubes.isEmpty()) { return Collections.emptyList(); } - List result = new ArrayList(); + List result = new ArrayList<>(); for (TileHyperCube cube : cubes) { if (cube != this && cube != null) { List handlers = cube.fluidHandlers; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index 402c459a..c64469d4 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -106,7 +106,7 @@ public class GuiInventoryPanel extends GuiMachineBase { int sortMode = te.getGuiSortMode(); int sortOrderIdx = sortMode >> 1; SortOrder[] orders = SortOrder.values(); - if (sortOrderIdx >= 0 && te.getGuiSortMode() < orders.length) { + if (sortOrderIdx >= 0 && sortOrderIdx < orders.length) { view.setSortOrder(orders[sortOrderIdx], (sortMode & 1) != 0); } @@ -161,7 +161,7 @@ public class GuiInventoryPanel extends GuiMachineBase { infoTextFilter = EnderIO.lang.localize("gui.inventorypanel.info.filter"); infoTextOffline = EnderIO.lang.localize("gui.inventorypanel.info.offline"); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.return.line"); addToolTip(new GuiToolTip(btnReturnArea, list) { @@ -509,7 +509,7 @@ public class GuiInventoryPanel extends GuiMachineBase { private void updateSortButton() { SortOrder order = view.getSortOrder(); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); SpecialTooltipHandler.addTooltipFromResources( list, "enderio.gui.inventorypanel.tooltip.sort." + order.name().toLowerCase(Locale.US) @@ -663,7 +663,7 @@ public class GuiInventoryPanel extends GuiMachineBase { } } - class InvSlot extends GhostSlot { + static class InvSlot extends GhostSlot { ItemEntry entry; ItemStack stack; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java index e7e65161..17fff198 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java @@ -26,9 +26,9 @@ public abstract class InventoryDatabase { protected int generation; public InventoryDatabase() { - simpleRegsitry = new HashMap(); - complexRegistry = new HashMap(); - complexItems = new ArrayList(); + simpleRegsitry = new HashMap<>(); + complexRegistry = new HashMap<>(); + complexItems = new ArrayList<>(); } public int getGeneration() { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java index 3ca5c221..73fe3ff6 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java @@ -68,7 +68,7 @@ public class InventoryPanelContainer extends AbstractMachineContainer(); + changedItems = new HashSet<>(); } } @@ -297,7 +297,7 @@ public class InventoryPanelContainer extends AbstractMachineContainer= firstSlotCraftingGrid && slotIndex < endSlotCraftingGrid) { - ArrayList res = new ArrayList(); + ArrayList res = new ArrayList<>(); res.add(new SlotRange(firstSlotReturn, endSlotReturn, false)); res.add(getPlayerInventorySlotRange(false)); return res; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java index cbe9b6e0..4eb5003c 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java @@ -64,7 +64,7 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH public TileInventoryPanel() { super(new SlotDefinition(0, 8, 11, 20, 21, 20)); this.fuelTank = new SmartTank(EnderIO.fluidNutrientDistillation, Config.inventoryPanelFree ? 0 : 2000); - this.storedCraftingRecipes = new ArrayList(); + this.storedCraftingRecipes = new ArrayList<>(); } public InventoryDatabaseServer getDatabaseServer() { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/ClientDatabaseManager.java b/src/main/java/crazypants/enderio/machine/invpanel/client/ClientDatabaseManager.java index d0149153..51db8f79 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/ClientDatabaseManager.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/ClientDatabaseManager.java @@ -15,7 +15,7 @@ public class ClientDatabaseManager { FMLCommonHandler.instance().bus().register(this); } - private final HashMap dbRegistry = new HashMap(); + private final HashMap dbRegistry = new HashMap<>(); public InventoryDatabaseClient getOrCreateDatabase(int generation) { InventoryDatabaseClient db = dbRegistry.get(generation); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java index 70b0ec27..50d1af3a 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java @@ -224,7 +224,7 @@ public class CraftingHelper { static class Candidate { final ItemStack stack; - final ArrayList sourceSlots = new ArrayList(); + final ArrayList sourceSlots = new ArrayList<>(); ItemEntry entry; int available; int used; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelperNEI.java b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelperNEI.java index 914f9291..789ed274 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelperNEI.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelperNEI.java @@ -26,7 +26,7 @@ public class CraftingHelperNEI extends CraftingHelper { if (overlayRenderer != null) { LayoutManager.overlayRenderer = (IRecipeOverlayRenderer) overlayRenderer; } else { - List list = new ArrayList(); + List list = new ArrayList<>(); for (int y = 0; y < 3; y++) { for (int x = 0; x < 3; x++) { ItemStack[] ingredient = ingredients[y * 3 + x]; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/DatabaseView.java b/src/main/java/crazypants/enderio/machine/invpanel/client/DatabaseView.java index 8a80d2af..0f9f9b0e 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/DatabaseView.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/DatabaseView.java @@ -44,7 +44,7 @@ public class DatabaseView { private final Collator collator; public DatabaseView() { - filteredItems = new ArrayList(); + filteredItems = new ArrayList<>(); currentFilter = ""; collator = Collator.getInstance(LOCALE); } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java index ef4c25ff..cbaf9cb6 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java @@ -22,8 +22,8 @@ public class InventoryDatabaseClient extends InventoryDatabase { InventoryDatabaseClient(int generation) { this.generation = generation; - clientItems = new ArrayList(); - requestedItems = new HashSet(); + clientItems = new ArrayList<>(); + requestedItems = new HashSet<>(); } public int getItemsChangeCount() { @@ -147,7 +147,7 @@ public class InventoryDatabaseClient extends InventoryDatabase { private List addMissingItems(List list, Integer dbId) { if (!requestedItems.contains(dbId)) { if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); } list.add(dbId); requestedItems.add(dbId); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/ItemFilter.java b/src/main/java/crazypants/enderio/machine/invpanel/client/ItemFilter.java index 4e211917..aaac8321 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/ItemFilter.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/ItemFilter.java @@ -14,7 +14,7 @@ public abstract class ItemFilter { public abstract boolean matches(ItemEntry entry); public static ItemFilter parse(String filter, Locale locale, IItemFilter filterCard) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); if (filterCard != null) { list.add(new CardFilter(filterCard)); } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/ChangeLogList.java b/src/main/java/crazypants/enderio/machine/invpanel/server/ChangeLogList.java index 08df4283..47c1c711 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/ChangeLogList.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/ChangeLogList.java @@ -7,7 +7,7 @@ final class ChangeLogList implements ChangeLog { final ArrayList clList; public ChangeLogList(ChangeLog cl0, ChangeLog cl1) { - clList = new ArrayList(2); + clList = new ArrayList<>(2); clList.add(cl0); clList.add(cl1); } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java index 05ac8e2c..b9cbe773 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java @@ -74,7 +74,7 @@ public class InventoryDatabaseServer extends InventoryDatabase { return Collections.emptyList(); } int numIDs = cdi.readVariable(); - ArrayList items = new ArrayList(numIDs); + ArrayList items = new ArrayList<>(numIDs); for (int i = 0; i < numIDs; i++) { int dbIndex = cdi.readVariable(); if (dbIndex < complexItems.size()) { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryFactory.java b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryFactory.java index c5b84ad1..9f823bad 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryFactory.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryFactory.java @@ -15,7 +15,7 @@ public abstract class InventoryFactory { private static final ArrayList factories; static { - factories = new ArrayList(); + factories = new ArrayList<>(); factories.add(new DSUFactory()); if (Loader.isModLoaded("StorageDrawers")) { factories.add(new DrawerFactory()); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/ItemEntry.java b/src/main/java/crazypants/enderio/machine/invpanel/server/ItemEntry.java index b6771317..fb15fd08 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/ItemEntry.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/ItemEntry.java @@ -8,7 +8,7 @@ import crazypants.enderio.machine.invpanel.ItemEntryBase; public class ItemEntry extends ItemEntryBase { - private final IdentityHashMap slots = new IdentityHashMap(); + private final IdentityHashMap slots = new IdentityHashMap<>(); public ItemEntry(int dbID, int hash, int itemID, int meta, NBTTagCompound nbt) { super(dbID, hash, itemID, meta, nbt); diff --git a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java index f515ae50..3252832c 100644 --- a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java @@ -32,8 +32,8 @@ public class GuiKillerJoe extends GuiMachineBase { private static final int XP_ID = 3489; private static final int XP10_ID = 34892; - private IconButton xpB; - private IconButton xp10B; + private final IconButton xpB; + private final IconButton xp10B; public GuiKillerJoe(InventoryPlayer inventory, final TileKillerJoe tileEntity) { super(tileEntity, new ContainerKillerJoe(inventory, tileEntity), "killerJoe"); diff --git a/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java b/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java index 8d77a238..3a12d99a 100644 --- a/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java @@ -35,7 +35,7 @@ public class KillerJoeRenderer extends TileEntitySpecialRenderer implements IIte private static final ItemStack DEFAULT_SWORD = new ItemStack(Items.iron_sword); - private ModelZombieJar model = new ModelZombieJar(); + private final ModelZombieJar model = new ModelZombieJar(); @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index c62bb33d..9e11e4b3 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -104,7 +104,7 @@ public class TileKillerJoe extends AbstractMachineEntity public static class ZombieCache { - private Set cache = Sets.newHashSet(); + private final Set cache = Sets.newHashSet(); @SubscribeEvent public void onSummonAid(SummonAidEvent event) { diff --git a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java index 6eeda215..d42ee436 100644 --- a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java @@ -170,20 +170,20 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe private void updateLightNodes() { Set before; if (lightNodes != null && !lightNodes.isEmpty()) { - before = new HashSet(lightNodes.size()); + before = new HashSet<>(lightNodes.size()); for (TileLightNode node : lightNodes) { before.add(node.getLocation()); } } else { before = Collections.emptySet(); } - Set after = new HashSet(17); + Set after = new HashSet<>(17); updatingLightNodes = true; try { if (lightNodeCoords != null) { // just loaded - lightNodes = new ArrayList(); + lightNodes = new ArrayList<>(); for (int i = 0; i < lightNodeCoords.length; i += 3) { TileEntity te = worldObj .getTileEntity(lightNodeCoords[i], lightNodeCoords[i + 1], lightNodeCoords[i + 2]); @@ -195,7 +195,7 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe } else if (lightNodes == null) { // just created - lightNodes = new ArrayList(); + lightNodes = new ArrayList<>(); } for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { diff --git a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java index 32ce389e..8c884081 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java @@ -51,27 +51,27 @@ public class GuiPowerMonitor extends GuiContainerBaseEIO { private boolean isRedstoneMode = false; - private CheckBox enabledB; + private final CheckBox enabledB; - private TextFieldEnder startTF; - private TextFieldEnder endTF; + private final TextFieldEnder startTF; + private final TextFieldEnder endTF; - private String titleStr; + private final String titleStr; - private String engineTxt1; - private String engineTxt2; - private String engineTxt3; - private String engineTxt4; - private String engineTxt5; - private String engineTxt6; + private final String engineTxt1; + private final String engineTxt2; + private final String engineTxt3; + private final String engineTxt4; + private final String engineTxt5; + private final String engineTxt6; - private String monHeading1; - private String monHeading2; - private String monHeading3; - private String monHeading4; - private String monHeading5; + private final String monHeading1; + private final String monHeading2; + private final String monHeading3; + private final String monHeading4; + private final String monHeading5; - private String noNetworkError; + private final String noNetworkError; public GuiPowerMonitor(InventoryPlayer playerInv, final TilePowerMonitor te) { super(new ContainerNoInv(te), "powerMonitor"); diff --git a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java index e67d904d..cc627d16 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java @@ -38,10 +38,10 @@ import crazypants.enderio.EnderIO; @SideOnly(Side.CLIENT) public class ObeliskSpecialRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private ItemStack floatingStack; + private final ItemStack floatingStack; - private Random rand = new Random(); - private ObeliskRenderer blockRen; + private final Random rand = new Random(); + private final ObeliskRenderer blockRen; public ObeliskSpecialRenderer(ItemStack itemStack, ObeliskRenderer renderer) { this.floatingStack = itemStack; diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java index 6bd0f71c..5a04bb39 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java @@ -71,7 +71,7 @@ public class GuiAttractor extends GuiPoweredMachineBase { drawCenteredString( fontRendererObj, EnderIO.lang.localize("gui.spawnGurad.range") + " " + range, - getGuiLeft() + sx / 2 + 9, + getGuiLeft() + sx / 2 - 25, getGuiTop() + 68, ColorUtil.getRGB(Color.white)); } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java index 2f81bbcd..3c83c5b3 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java @@ -50,9 +50,9 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange private int rangeSqu; private int range; private int powerPerTick; - private Set tracking = new HashSet(); + private Set tracking = new HashSet<>(); private int tickCounter = 0; - private int maxMobsAttracted = 20; + private static final int maxMobsAttracted = 20; private boolean showingRange; @@ -168,7 +168,7 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange } tickCounter = 0; - Set trackingThisTick = new HashSet(); + Set trackingThisTick = new HashSet<>(); List entsInBounds = worldObj.getEntitiesWithinAABB(EntityLiving.class, attractorBounds); for (EntityLiving ent : entsInBounds) { @@ -304,7 +304,7 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange private void cancelCurrentTasks(EntityLiving ent) { Iterator iterator = ent.tasks.taskEntries.iterator(); - List currentTasks = new ArrayList(); + List currentTasks = new ArrayList<>(); while (iterator.hasNext()) { EntityAITaskEntry entityaitaskentry = (EntityAITasks.EntityAITaskEntry) iterator.next(); if (entityaitaskentry != null) { @@ -400,10 +400,10 @@ public class TileAttractor extends AbstractPowerConsumerEntity implements IRange private static class AttractTask extends EntityAIBase { - private EntityLiving mob; - private BlockCoord coord; - private FakePlayer target; - private String entityId; + private final EntityLiving mob; + private final BlockCoord coord; + private final FakePlayer target; + private final String entityId; private int updatesSincePathing; private boolean started = false; diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java index 018b22ac..e4b58b04 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java @@ -23,7 +23,7 @@ public class AversionObeliskController { MinecraftForge.EVENT_BUS.register(AversionObeliskController.instance); } - private Map> perWorldGuards = new HashMap>(); + private final Map> perWorldGuards = new HashMap<>(); private AversionObeliskController() {} @@ -67,7 +67,7 @@ public class AversionObeliskController { private Map getGuardsForWorld(World world) { Map res = perWorldGuards.get(world.provider.dimensionId); if (res == null) { - res = new HashMap(); + res = new HashMap<>(); perWorldGuards.put(world.provider.dimensionId, res); } return res; diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskRenderer.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskRenderer.java index 8eae842d..68239e00 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskRenderer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskRenderer.java @@ -12,11 +12,11 @@ import crazypants.enderio.machine.obelisk.ObeliskSpecialRenderer; @SideOnly(Side.CLIENT) public class AversionObeliskRenderer extends ObeliskSpecialRenderer { - private ItemStack offStack = new ItemStack( + private final ItemStack offStack = new ItemStack( EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.TORMENTED.ordinal()); - private ItemStack onStack = new ItemStack( + private final ItemStack onStack = new ItemStack( EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.REANIMATED_TORMENTED.ordinal()); diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java index 78545dda..331f1bb9 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java @@ -62,7 +62,7 @@ public class GuiAversionObelisk extends GuiPoweredMachineBase 0) { - WorldServer worldserver = server.worldServers[0]; - task.complete(worldserver); + if (!worldObj.isRemote) { + WeatherTask task = WeatherTask.values()[getDataWatcher().getWatchableObjectInt(DATA_ID)]; + task.complete(worldObj); } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java index 5a2590d2..f58d5edf 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java @@ -106,7 +106,7 @@ public class TileWeatherObelisk extends AbstractPowerConsumerEntity private static final ICapacitor cap = Capacitors.BASIC_CAPACITOR.capacitor; - private FluidTank inputTank = new FluidTank(8000); + private final FluidTank inputTank = new FluidTank(8000); /* client fields */ private float progress = 0; // client only diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java index 332f096c..8f988db3 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java @@ -20,13 +20,13 @@ import crazypants.enderio.xp.PacketGivePlayerXP; public class GuiExperienceObelisk extends GuiMachineBase { - private IconButton p; - private IconButton pp; - private IconButton ppp; + private final IconButton p; + private final IconButton pp; + private final IconButton ppp; - private IconButton m; - private IconButton mm; - private IconButton mmm; + private final IconButton m; + private final IconButton mm; + private final IconButton mmm; public GuiExperienceObelisk(InventoryPlayer playerInv, TileExperienceObelisk te) { super(te, new ContainerNoInv(te), "experianceObelisk"); diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceObelisk.java index 560e6089..32309f80 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceObelisk.java @@ -25,7 +25,7 @@ import crazypants.enderio.xp.XpUtil; public class TileExperienceObelisk extends AbstractMachineEntity implements IFluidHandler, IHaveExperience, ITankAccess { - private ExperienceContainer xpCont = new ExperienceContainer( + private final ExperienceContainer xpCont = new ExperienceContainer( XpUtil.getExperienceForLevel(Config.xpObeliskMaxXpLevel)); public TileExperienceObelisk() { diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedSlab.java b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedSlab.java index 4a14f1d0..7fcb7687 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedSlab.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedSlab.java @@ -16,7 +16,7 @@ import crazypants.enderio.ModObject; public class BlockItemPaintedSlab extends ItemSlab { - private boolean isFullBlock; + private final boolean isFullBlock; public BlockItemPaintedSlab(Block blk) { super(blk, EnderIO.blockPaintedSlab, EnderIO.blockPaintedDoubleSlab, blk == EnderIO.blockPaintedDoubleSlab); diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java index 812e1da0..1424d13f 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java @@ -40,7 +40,7 @@ public class BlockPaintedCarpet extends BlockCarpet implements ITileEntityProvid private IIcon lastRemovedComponetIcon = null; - private Random rand = new Random(); + private final Random rand = new Random(); protected BlockPaintedCarpet() { super(); diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java index 522be319..b75c67a5 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java @@ -41,7 +41,7 @@ public class BlockPaintedFence extends BlockFence implements ITileEntityProvider private IIcon lastRemovedComponetIcon = null; - private Random rand = new Random(); + private final Random rand = new Random(); public BlockPaintedFence() { super(ModObject.blockPaintedFence.unlocalisedName, Material.wood); diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGate.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGate.java index 61bfb8a5..899a2d8c 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGate.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGate.java @@ -42,7 +42,7 @@ public class BlockPaintedFenceGate extends BlockFenceGate implements ITileEntity private IIcon lastRemovedComponetIcon = null; - private Random rand = new Random(); + private final Random rand = new Random(); public BlockPaintedFenceGate() { setCreativeTab(null); diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java index 9a76af88..8c2e46e6 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java @@ -35,7 +35,7 @@ public class BlockPaintedSlab extends BlockSlab implements ITileEntityProvider, private IIcon lastRemovedComponetIcon = null; - private Random rand = new Random(); + private final Random rand = new Random(); private final boolean isDouble; diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedStair.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedStair.java index fa6365dc..ed00c85f 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedStair.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedStair.java @@ -40,7 +40,7 @@ public class BlockPaintedStair extends BlockStairs implements ITileEntityProvide private IIcon lastRemovedComponetIcon = null; - private Random rand = new Random(); + private final Random rand = new Random(); protected BlockPaintedStair() { super(Blocks.stone, 0); @@ -243,7 +243,7 @@ public class BlockPaintedStair extends BlockStairs implements ITileEntityProvide return 0; // need to do custom dropping to maintain source metadata } - public final class PainterTemplate extends BasicPainterTemplate { + public static final class PainterTemplate extends BasicPainterTemplate { @Override public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java index b4ce223d..62bd6ff7 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java @@ -39,7 +39,7 @@ public class BlockPaintedWall extends BlockWall implements ITileEntityProvider, private IIcon lastRemovedComponetIcon = null; - private Random rand = new Random(); + private final Random rand = new Random(); public BlockPaintedWall() { super(Blocks.cobblestone); diff --git a/src/main/java/crazypants/enderio/machine/painter/PaintSourceValidator.java b/src/main/java/crazypants/enderio/machine/painter/PaintSourceValidator.java index 2f4980d9..f6addbdb 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PaintSourceValidator.java +++ b/src/main/java/crazypants/enderio/machine/painter/PaintSourceValidator.java @@ -18,9 +18,9 @@ public class PaintSourceValidator { public static PaintSourceValidator instance = new PaintSourceValidator(); - private boolean listsPopulated = false; - private final List whitelist = new ArrayList(); - private final List blacklist = new ArrayList(); + private static final boolean listsPopulated = false; + private final List whitelist = new ArrayList<>(); + private final List blacklist = new ArrayList<>(); public boolean isValidSourceDefault(ItemStack paintSource) { if (paintSource == null) { diff --git a/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java b/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java index 1a7865d1..debc60d7 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java +++ b/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java @@ -19,8 +19,8 @@ import cpw.mods.fml.common.Optional; @Optional.Interface(modid = "angelica", iface = "com.gtnewhorizons.angelica.api.ThreadSafeISBRHFactory") public class PaintedBlockRenderer implements ISimpleBlockRenderingHandler, ThreadSafeISBRHFactory { - private int renderId; - private Block defaultBlock; + private final int renderId; + private final Block defaultBlock; public PaintedBlockRenderer(int renderId, Block defaultBlock) { this.renderId = renderId; diff --git a/src/main/java/crazypants/enderio/machine/ranged/RangeEntity.java b/src/main/java/crazypants/enderio/machine/ranged/RangeEntity.java index 74bf9681..3f7a326c 100644 --- a/src/main/java/crazypants/enderio/machine/ranged/RangeEntity.java +++ b/src/main/java/crazypants/enderio/machine/ranged/RangeEntity.java @@ -17,7 +17,7 @@ public class RangeEntity extends Entity { private Vector3d lastRange; private AxisAlignedBB lastBounds; private final IRanged spawnGuard; - private int color; + private final int color; private AxisAlignedBB rangeBounds; private Vector3d range; diff --git a/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java index b33472ae..b074861c 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java @@ -32,7 +32,7 @@ public abstract class AbstractMachineRecipe implements IMachineRecipe { @Override public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { IRecipe recipe = getRecipeForInputs(inputs); - List result = new ArrayList(); + List result = new ArrayList<>(); // Need to make copies so we can reduce their values as we go MachineRecipeInput[] availableInputs = new MachineRecipeInput[inputs.length]; @@ -128,7 +128,7 @@ public abstract class AbstractMachineRecipe implements IMachineRecipe { if (outputs == null) { return new ResultStack[0]; } - List result = new ArrayList(); + List result = new ArrayList<>(); for (RecipeOutput output : outputs) { if (output.getChance() >= chance) { if (output.isFluid()) { diff --git a/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java index 9f1d27b8..377dada5 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java @@ -31,7 +31,7 @@ public class BasicManyToOneRecipe implements IManyToOneRecipe { @Override public boolean isValidRecipeComponents(ItemStack... items) { - List inputs = new ArrayList(Arrays.asList(recipe.getInputs())); + List inputs = new ArrayList<>(Arrays.asList(recipe.getInputs())); for (ItemStack is : items) { if (is != null) { RecipeInput remove = null; diff --git a/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java b/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java index 7a893be4..f36cd72c 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java @@ -14,7 +14,7 @@ import crazypants.enderio.machine.MachineRecipeInput; public class ManyToOneRecipeManager { - private final List recipes = new ArrayList(); + private final List recipes = new ArrayList<>(); private final String coreFileName; private final String customFileName; diff --git a/src/main/java/crazypants/enderio/machine/recipe/OreDictionaryRecipeInput.java b/src/main/java/crazypants/enderio/machine/recipe/OreDictionaryRecipeInput.java index f0f995c5..50ca71d4 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/OreDictionaryRecipeInput.java +++ b/src/main/java/crazypants/enderio/machine/recipe/OreDictionaryRecipeInput.java @@ -7,7 +7,7 @@ import net.minecraftforge.oredict.OreDictionary; public class OreDictionaryRecipeInput extends RecipeInput { - private int oreId; + private final int oreId; public OreDictionaryRecipeInput(ItemStack itemStack, int oreId, int slot) { this(itemStack, oreId, 1, slot); diff --git a/src/main/java/crazypants/enderio/machine/recipe/Recipe.java b/src/main/java/crazypants/enderio/machine/recipe/Recipe.java index 191fc5ce..d7592186 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/Recipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/Recipe.java @@ -38,7 +38,7 @@ public class Recipe implements IRecipe { return false; } - List requiredInputs = new ArrayList(); + List requiredInputs = new ArrayList<>(); for (RecipeInput input : inputs) { if (input.getFluidInput() != null || input.getInput() != null) { requiredInputs.add(input.copy()); @@ -113,7 +113,7 @@ public class Recipe implements IRecipe { if (inputs == null) { return Collections.emptyList(); } - List res = new ArrayList(inputs.length); + List res = new ArrayList<>(inputs.length); for (int i = 0; i < inputs.length; i++) { RecipeInput in = inputs[i]; if (in != null && in.getInput() != null) { @@ -128,7 +128,7 @@ public class Recipe implements IRecipe { if (inputs == null) { return Collections.emptyList(); } - List res = new ArrayList(inputs.length); + List res = new ArrayList<>(inputs.length); for (int i = 0; i < inputs.length; i++) { RecipeInput in = inputs[i]; if (in != null && in.getFluidInput() != null) { diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java index d740fcf3..ff36e502 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java @@ -112,7 +112,7 @@ public class RecipeConfig { private boolean dumpOreDictionary = false; private boolean enabled = true; - private Map recipeGroups = new HashMap(); + private Map recipeGroups = new HashMap<>(); public RecipeConfig() {} @@ -187,7 +187,7 @@ public class RecipeConfig { } public List getRecipes(boolean isRecipePerInput) { - List result = new ArrayList(32); + List result = new ArrayList<>(32); for (RecipeGroup rg : recipeGroups.values()) { if (rg.isEnabled() && rg.isValid()) { result.addAll(rg.createRecipes(isRecipePerInput)); @@ -212,7 +212,7 @@ public class RecipeConfig { private final String name; - private Map recipes = new LinkedHashMap(); + private final Map recipes = new LinkedHashMap<>(); private boolean enabled = true; @@ -247,7 +247,7 @@ public class RecipeConfig { } public List createRecipes(boolean isRecipePerInput) { - List result = new ArrayList(recipes.size()); + List result = new ArrayList<>(recipes.size()); for (RecipeElement recipe : recipes.values()) { if (recipe.isValid()) { result.addAll(recipe.createRecipes(isRecipePerInput)); @@ -272,15 +272,15 @@ public class RecipeConfig { public static class RecipeElement { - private List inputs = new ArrayList(); + private final List inputs = new ArrayList<>(); - private List outputs = new ArrayList(); + private final List outputs = new ArrayList<>(); private int energyRequired; private RecipeBonusType bonusType = RecipeBonusType.MULTIPLY_OUTPUT; - private String name; + private final String name; private boolean allowMissing = false; private boolean invalidated = false; @@ -305,7 +305,7 @@ public class RecipeConfig { RecipeOutput[] outputArr = outputs.toArray(new RecipeOutput[outputs.size()]); RecipeInput[] inputArr = inputs.toArray(new RecipeInput[inputs.size()]); - List result = new ArrayList(); + List result = new ArrayList<>(); if (isRecipePerInput) { for (RecipeInput input : inputs) { result.add(new Recipe(input, energyRequired, bonusType, outputArr)); diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java index bd579133..52988288 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java @@ -108,7 +108,7 @@ public class RecipeConfigParser extends DefaultHandler { private boolean outputTagOpen = false; private boolean inputTagOpen = false; - private boolean debug = false; + private static final boolean debug = false; private boolean inCustomHandler = false; diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeOutput.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeOutput.java index 923271b9..971f8de9 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeOutput.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeOutput.java @@ -10,7 +10,7 @@ public class RecipeOutput { private final FluidStack outputFluid; private final ItemStack output; private final float chance; - private float exp; + private final float exp; public RecipeOutput(Block output) { this(new ItemStack(output), 1); diff --git a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java index 78839132..c1a60b3c 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java @@ -50,7 +50,7 @@ public class BlockReservoir extends BlockEio implements IResourceTooltipProvider } } - private IIcon[] mbIcons = new IIcon[8]; + private final IIcon[] mbIcons = new IIcon[8]; IIcon switchIcon; private BlockReservoir() { diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index 29a1de6b..6e047599 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -217,7 +217,7 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank private void doUpdateTankNeighbours() { if (tankNeighbours == null) { - tankNeighbours = new ArrayList(); + tankNeighbours = new ArrayList<>(); } tankNeighbours.clear(); for (BlockCoord bc : multiblock) { diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java index 4c62bd37..d7b17119 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java @@ -92,8 +92,8 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity { Capacitors.ENDERGISED_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_TEN); - private final int axeIndex = 6; - private final int shearsIndex = 7; + private static final int axeIndex = 6; + private static final int shearsIndex = 7; private EntityLivingBase fakePlayer; public TileSliceAndSplice() { diff --git a/src/main/java/crazypants/enderio/machine/solar/SolarPanelNetwork.java b/src/main/java/crazypants/enderio/machine/solar/SolarPanelNetwork.java index 3cfc1871..59d4ccfc 100644 --- a/src/main/java/crazypants/enderio/machine/solar/SolarPanelNetwork.java +++ b/src/main/java/crazypants/enderio/machine/solar/SolarPanelNetwork.java @@ -14,10 +14,10 @@ import crazypants.enderio.config.Config; public class SolarPanelNetwork { - private List panels; + private final List panels; private boolean empty = true; - private EnergyStorage energy; + private final EnergyStorage energy; private boolean hasAppliedMaxEnergyConfig = false; public static final int ENERGY_PER = 10000; diff --git a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java index 299ab0cd..cff73c5e 100644 --- a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java @@ -26,7 +26,7 @@ import crazypants.enderio.waila.IWailaNBTProvider; public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowerProvider, IWailaNBTProvider { - private final List receptors = new ArrayList(); + private final List receptors = new ArrayList<>(); private ListIterator receptorIterator = receptors.listIterator(); private boolean receptorsDirty = true; diff --git a/src/main/java/crazypants/enderio/machine/soul/AbstractSoulBinderRecipe.java b/src/main/java/crazypants/enderio/machine/soul/AbstractSoulBinderRecipe.java index 224c0863..2b3e765a 100644 --- a/src/main/java/crazypants/enderio/machine/soul/AbstractSoulBinderRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/AbstractSoulBinderRecipe.java @@ -118,7 +118,7 @@ public abstract class AbstractSoulBinderRecipe implements IMachineRecipe, ISoulB @Override public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { - List result = new ArrayList(inputs.length); + List result = new ArrayList<>(inputs.length); for (MachineRecipeInput input : inputs) { if (input != null && input.item != null) { ItemStack resStack = input.item.copy(); diff --git a/src/main/java/crazypants/enderio/machine/soul/BasicSoulBinderRecipe.java b/src/main/java/crazypants/enderio/machine/soul/BasicSoulBinderRecipe.java index fb71134a..f0620f60 100644 --- a/src/main/java/crazypants/enderio/machine/soul/BasicSoulBinderRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/BasicSoulBinderRecipe.java @@ -4,8 +4,8 @@ import net.minecraft.item.ItemStack; public class BasicSoulBinderRecipe extends AbstractSoulBinderRecipe { - private ItemStack inputStack; - private ItemStack outputStack; + private final ItemStack inputStack; + private final ItemStack outputStack; public BasicSoulBinderRecipe(ItemStack inputStack, ItemStack outputStack, int energyRequired, int xpRequired, String uid, String... entityNames) { diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java index 75016d4f..d52d2d01 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java @@ -24,9 +24,9 @@ import crazypants.util.ForgeDirections; @ThreadSafeISBRH(perThread = true) public class SoulBinderRenderer implements ISimpleBlockRenderingHandler { - private float skullScale = 0.5f; - private BoundingBox scaledBB = BoundingBox.UNIT_CUBE.scale(skullScale, skullScale, skullScale); - private IIcon[] icons = new IIcon[6]; + private static final float skullScale = 0.5f; + private final BoundingBox scaledBB = BoundingBox.UNIT_CUBE.scale(skullScale, skullScale, skullScale); + private final IIcon[] icons = new IIcon[6]; private IIcon override = null; @Override diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java index 9db47be2..ad564ec4 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java @@ -119,7 +119,7 @@ public class SoulBinderSpawnerRecipe implements IMachineRecipe, ISoulBinderRecip @Override public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { - List result = new ArrayList(inputs.length); + List result = new ArrayList<>(inputs.length); for (MachineRecipeInput input : inputs) { if (input != null && input.item != null) { ItemStack resStack = input.item.copy(); diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index f70b02d6..2170f477 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -93,7 +93,7 @@ public class BlockPoweredSpawner extends AbstractMachineBlock toolBlackList = new ArrayList(); + private final List toolBlackList = new ArrayList<>(); private Field fieldpersistenceRequired; @@ -121,7 +121,7 @@ public class BlockPoweredSpawner extends AbstractMachineBlock dropCache = new HashMap(); + private final Map dropCache = new HashMap<>(); public boolean isBlackListed(String entityId) { return PoweredSpawnerConfig.getInstance().isBlackListed(entityId); diff --git a/src/main/java/crazypants/enderio/machine/spawner/PoweredSpawnerConfig.java b/src/main/java/crazypants/enderio/machine/spawner/PoweredSpawnerConfig.java index 3a0371b6..0605ce9b 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/PoweredSpawnerConfig.java +++ b/src/main/java/crazypants/enderio/machine/spawner/PoweredSpawnerConfig.java @@ -29,9 +29,9 @@ public class PoweredSpawnerConfig { return instance; } - private final Map costs = new HashMap(); + private final Map costs = new HashMap<>(); - private final List blackList = new ArrayList(); + private final List blackList = new ArrayList<>(); public double getCostMultiplierFor(String entity) { Double val = costs.get(entity); diff --git a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java index 54104c85..05d26ad8 100644 --- a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java @@ -52,7 +52,7 @@ public class GuiTank extends GuiMachineBase { } } - private CycleButton voidBut; + private final CycleButton voidBut; public GuiTank(InventoryPlayer par1InventoryPlayer, TileTank te) { super(te, new ContainerTank(par1InventoryPlayer, te), "tank"); @@ -78,7 +78,7 @@ public class GuiTank extends GuiMachineBase { } }); - voidBut = new CycleButton(this, 123, 155, 43, VoidMode.class); + voidBut = new CycleButton<>(this, 123, 155, 43, VoidMode.class); } @Override diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index d077c62e..5e1cd035 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -31,7 +31,7 @@ import crazypants.enderio.tool.SmartTank; public class TileTank extends AbstractMachineEntity implements IFluidHandler, ITankAccess, IComparatorOutput { - private static int IO_MB_TICK = 100; + private static final int IO_MB_TICK = 100; protected SmartTank tank; // = new FluidTankEio(16000); protected int lastUpdateLevel = -1; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java index 031afb54..f70165e3 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java @@ -20,7 +20,7 @@ public class PacketChannelList implements IMessage, IMessageHandler(); + channels = new ArrayList<>(); for (ChannelType type : ChannelType.values()) { for (Channel channel : register.getChannelsForType(type)) { channels.add(channel); @@ -45,7 +45,7 @@ public class PacketChannelList implements IMessage, IMessageHandler(); + channels = new ArrayList<>(); for (int i = 0; i < tagList.tagCount(); i++) { NBTTagCompound tag = tagList.getCompoundTagAt(i); Channel chan = Channel.readFromNBT(tag); diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java index 8e645a2c..6395e7ed 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java @@ -205,8 +205,8 @@ public class ServerChannelRegister extends ChannelRegister { // ----------------------------------------------------------------------------------------------- - private final List transceivers = new ArrayList(); - private Map> iterators = new HashMap>(); + private final List transceivers = new ArrayList<>(); + private final Map> iterators = new HashMap<>(); private ServerChannelRegister() {} @@ -245,7 +245,7 @@ public class ServerChannelRegister extends ChannelRegister { public RoundRobinIterator getIterator(Channel channel) { RoundRobinIterator res = iterators.get(channel); if (res == null) { - res = new RoundRobinIterator(transceivers); + res = new RoundRobinIterator<>(transceivers); iterators.put(channel, res); } return res; @@ -271,7 +271,7 @@ public class ServerChannelRegister extends ChannelRegister { // Fluid public FluidTankInfo[] getTankInfoForChannels(TileTransceiver tileTransceiver, Set channels) { - List infos = new ArrayList(); + List infos = new ArrayList<>(); for (TileTransceiver tran : transceivers) { if (tran != tileTransceiver) { tran.getRecieveTankInfo(infos, channels); @@ -396,7 +396,7 @@ public class ServerChannelRegister extends ChannelRegister { private static class SaveRunnable implements Runnable { - private ListMultimap chans; + private final ListMultimap chans; public SaveRunnable(ListMultimap chans) { this.chans = chans; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java index 80acbaa1..885d554c 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java @@ -146,7 +146,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity } private void removeUnregsiteredChannels(SetMultimap chans) { - List toRemove = new ArrayList(); + List toRemove = new ArrayList<>(); for (Channel chan : chans.values()) { if (!ServerChannelRegister.instance.getChannelsForType(chan.getType()).contains(chan)) { toRemove.add(chan); diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java index 552b91e3..720123d3 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java @@ -89,7 +89,7 @@ public class ChannelTab implements ITabPanel { deleteChannelB = new IconButton(parent, DELETE_CHANNEL_BUTTON_ID, x + w - 20, y + h + 4, IconEIO.MINUS); deleteChannelB.setToolTip(EnderIO.lang.localize("gui.trans.deleteChannel")); - Predicate predicate = new Predicate() { + Predicate predicate = new Predicate<>() { @Override public boolean apply(@Nullable Channel input) { @@ -116,7 +116,7 @@ public class ChannelTab implements ITabPanel { recieveB = new IconButton(parent, RECIEVE_BUTTON_ID, x - 24, y + h / 2 - 9, IconEIO.ARROWS); - selectionListener = new ListSelectionListener() { + selectionListener = new ListSelectionListener<>() { @Override public void selectionChanged(GuiScrollableList list, int selectedIndex) { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java index 55fe4972..d0dcbfd2 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java @@ -27,8 +27,8 @@ public class GuiTransceiver extends GuiPoweredMachineBase { private static final int TAB_HEIGHT = 24; private int activeTab = 0; - private final List tabs = new ArrayList(); - private final int tabYOffset = 4; + private final List tabs = new ArrayList<>(); + private static final int tabYOffset = 4; GeneralTab generalTab; public GuiTransceiver(InventoryPlayer par1InventoryPlayer, TileTransceiver te) { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java index c7e08b5c..1fe59bb3 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java @@ -18,7 +18,7 @@ public class TransceiverModel extends ModelBase implements IModel { private static final String TEXTURE = "enderio:models/transceiver.png"; private static final String MODEL = "enderio:models/transceiver.obj"; - private IModelCustom model; + private final IModelCustom model; public TransceiverModel() { model = AdvancedModelLoader.loadModel(new ResourceLocation(MODEL)); diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java index fefd2337..5b6da7fe 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java @@ -28,10 +28,8 @@ import crazypants.enderio.machine.transceiver.TileTransceiver; @SideOnly(Side.CLIENT) public class TransceiverRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private IModel model; - - private BoundingBox bb; - + private final IModel model; + private final BoundingBox bb; private boolean adjustForItem = false; public TransceiverRenderer() { diff --git a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java index 01894b84..517bd472 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.vacuum; -import java.awt.Color; import java.awt.Rectangle; import java.util.List; @@ -16,7 +15,6 @@ import com.enderio.core.client.gui.button.MultiIconButton; import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GhostSlot; import com.enderio.core.client.gui.widget.GuiToolTip; -import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.EnderWidget; import com.enderio.core.common.util.BlockCoord; import com.google.common.collect.Lists; @@ -27,6 +25,7 @@ import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.network.PacketHandler; +import crazypants.util.ColorUtils; public class GuiVacuumChest extends GuiContainerBaseEIO { @@ -215,7 +214,11 @@ public class GuiVacuumChest extends GuiContainerBaseEIO { IconEIO.map.render(EnderWidget.BUTTON_DOWN, sx + RANGE_LEFT, sy + RANGE_TOP, RANGE_WIDTH, 16, 0, true); String str = Integer.toString((int) te.getRange().x); int sw = fr.getStringWidth(str); - fr.drawString(str, sx + RANGE_LEFT + RANGE_WIDTH - sw - 5, sy + RANGE_TOP + 5, ColorUtil.getRGB(Color.black)); + fr.drawString( + str, + sx + RANGE_LEFT + RANGE_WIDTH - sw - 5, + sy + RANGE_TOP + 5, + ColorUtils.suctionString.getColor()); super.drawGuiContainerBackgroundLayer(par1, mouseX, mouseY); } diff --git a/src/main/java/crazypants/enderio/machine/vat/TileVat.java b/src/main/java/crazypants/enderio/machine/vat/TileVat.java index 907eae3e..fb95afdb 100644 --- a/src/main/java/crazypants/enderio/machine/vat/TileVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/TileVat.java @@ -28,7 +28,7 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler, final FluidTank inputTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 8); final FluidTank outputTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 8); - private static int IO_MB_TICK = 100; + private static final int IO_MB_TICK = 100; boolean tanksDirty = false; diff --git a/src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java b/src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java index fec7b40f..dec19ce0 100644 --- a/src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java @@ -39,7 +39,7 @@ public class VatMachineRecipe extends AbstractMachineRecipe { @Override public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { - List result = new ArrayList(); + List result = new ArrayList<>(); VatRecipe rec = (VatRecipe) getRecipeForInputs(inputs); FluidStack inputFluidStack = rec.getRequiredFluidInput(inputs); diff --git a/src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java b/src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java index cd1e5d88..fe9e9e14 100644 --- a/src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java @@ -28,7 +28,7 @@ public class VatRecipeManager { return instance; } - private final List recipes = new ArrayList(); + private final List recipes = new ArrayList<>(); public VatRecipeManager() {} diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java index 9fbf5706..fafaca1e 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java @@ -21,7 +21,7 @@ public class WirelessChargerController { private static final int RANGE = Config.wirelessChargerRange; private static final int RANGE_SQ = RANGE * RANGE; - private final Map> perWorldChargers = new HashMap>(); + private final Map> perWorldChargers = new HashMap<>(); private int changeCount; @SubscribeEvent diff --git a/src/main/java/crazypants/enderio/material/Alloy.java b/src/main/java/crazypants/enderio/material/Alloy.java index 76e41c0d..f604b6e9 100644 --- a/src/main/java/crazypants/enderio/material/Alloy.java +++ b/src/main/java/crazypants/enderio/material/Alloy.java @@ -27,8 +27,8 @@ public enum Alloy { public static final Alloy[] VALUES = values(); public final String unlocalisedName; public final String iconKey; - private final List oreIngots = new ArrayList(); - private final List oreBlocks = new ArrayList(); + private final List oreIngots = new ArrayList<>(); + private final List oreBlocks = new ArrayList<>(); private final float hardness; Alloy(String baseName, float hardness, String oreDictName) { diff --git a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java index f4b13516..fb9c045a 100644 --- a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java +++ b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java @@ -26,9 +26,7 @@ import crazypants.enderio.machine.painter.TileEntityPaintedBlock; @ThreadSafeISBRH(perThread = false) public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler { - static int renderPass; - - private ConnectedTextureRenderer connectedTextureRenderer = new ConnectedTextureRenderer() { + private final ConnectedTextureRenderer connectedTextureRenderer = new ConnectedTextureRenderer() { @Override public boolean matchesMetadata(int meta1, int meta2) { diff --git a/src/main/java/crazypants/enderio/material/ItemFusedQuartzFrame.java b/src/main/java/crazypants/enderio/material/ItemFusedQuartzFrame.java index fe77d699..797c6ae6 100644 --- a/src/main/java/crazypants/enderio/material/ItemFusedQuartzFrame.java +++ b/src/main/java/crazypants/enderio/material/ItemFusedQuartzFrame.java @@ -87,9 +87,9 @@ public class ItemFusedQuartzFrame extends Item { list.add(PainterUtil.getTooltTipText(item)); } - public final class FramePainterRecipe extends BasicPainterTemplate { + public static final class FramePainterRecipe extends BasicPainterTemplate { - private ItemFusedQuartzFrame i; + private final ItemFusedQuartzFrame i; public FramePainterRecipe(ItemFusedQuartzFrame itemFusedQuartzFrame) { i = itemFusedQuartzFrame; diff --git a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java b/src/main/java/crazypants/enderio/material/MachinePartRenderer.java index fd8a5608..d52d782c 100644 --- a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java +++ b/src/main/java/crazypants/enderio/material/MachinePartRenderer.java @@ -15,8 +15,8 @@ import crazypants.enderio.Log; public class MachinePartRenderer implements IItemRenderer { - private ItemRenderer itemRenderer = new ItemRenderer(Minecraft.getMinecraft()); - private RenderItem renderItem = new RenderItem(); + private final ItemRenderer itemRenderer = new ItemRenderer(Minecraft.getMinecraft()); + private final RenderItem renderItem = new RenderItem(); private boolean loggedError = false; public MachinePartRenderer() {} diff --git a/src/main/java/crazypants/enderio/material/OreDictionaryPreferenceParser.java b/src/main/java/crazypants/enderio/material/OreDictionaryPreferenceParser.java index b3cd4ebe..1d6f8f86 100644 --- a/src/main/java/crazypants/enderio/material/OreDictionaryPreferenceParser.java +++ b/src/main/java/crazypants/enderio/material/OreDictionaryPreferenceParser.java @@ -93,7 +93,7 @@ public final class OreDictionaryPreferenceParser extends DefaultHandler { public static final String AT_ITEM_NAME = "itemName"; public static final String AT_MOD_ID = "modID"; - private OreDictionaryPreferences prefs; + private final OreDictionaryPreferences prefs; private String oreDictName; private ItemStack prefStack; diff --git a/src/main/java/crazypants/enderio/material/OreDictionaryPreferences.java b/src/main/java/crazypants/enderio/material/OreDictionaryPreferences.java index 7726f2e1..f2ce3af3 100644 --- a/src/main/java/crazypants/enderio/material/OreDictionaryPreferences.java +++ b/src/main/java/crazypants/enderio/material/OreDictionaryPreferences.java @@ -18,8 +18,8 @@ public final class OreDictionaryPreferences { OreDictionaryPreferenceParser.loadConfig(); } - private Map preferences = new HashMap(); - private Map stackCache = new HashMap(); + private final Map preferences = new HashMap<>(); + private final Map stackCache = new HashMap<>(); public void setPreference(String oreDictName, ItemStack stack) { if (oreDictName == null || stack == null) { diff --git a/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java b/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java index 94b2d8e2..610a21e6 100644 --- a/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java +++ b/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java @@ -25,8 +25,8 @@ public enum AlloyEndergy { public static final AlloyEndergy[] VALUES = values(); public final String unlocalisedName; public final String iconKey; - private final List oreIngots = new ArrayList(); - private final List oreBlocks = new ArrayList(); + private final List oreIngots = new ArrayList<>(); + private final List oreBlocks = new ArrayList<>(); private final float hardness; AlloyEndergy(String baseName, float hardness, String oreDictName) { diff --git a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java index d5243c71..78998486 100644 --- a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java @@ -22,6 +22,7 @@ import crazypants.enderio.machine.alloy.GuiAlloySmelter; import crazypants.enderio.machine.recipe.IRecipe; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.power.PowerDisplayUtil; +import crazypants.util.ColorUtils; public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { @@ -61,7 +62,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { return; } - List recipes = new ArrayList(AlloyRecipeManager.getInstance().getRecipes()); + List recipes = new ArrayList<>(AlloyRecipeManager.getInstance().getRecipes()); recipes.addAll(AlloyRecipeManager.getInstance().getVanillaRecipe().getAllRecipes()); for (IRecipe recipe : recipes) { ItemStack output = recipe.getOutputs()[0].getOutput(); @@ -75,7 +76,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { @Override public void loadCraftingRecipes(String outputId, Object... results) { if (outputId.equals("EnderIOAlloySmelter") && getClass() == AlloySmelterRecipeHandler.class) { - List recipes = new ArrayList(AlloyRecipeManager.getInstance().getRecipes()); + List recipes = new ArrayList<>(AlloyRecipeManager.getInstance().getRecipes()); recipes.addAll(AlloyRecipeManager.getInstance().getVanillaRecipe().getAllRecipes()); for (IRecipe recipe : recipes) { ItemStack output = recipe.getOutputs()[0].getOutput(); @@ -89,7 +90,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { @Override public void loadUsageRecipes(ItemStack ingredient) { - List recipes = new ArrayList(AlloyRecipeManager.getInstance().getRecipes()); + List recipes = new ArrayList<>(AlloyRecipeManager.getInstance().getRecipes()); recipes.addAll(AlloyRecipeManager.getInstance().getVanillaRecipe().getAllRecipes()); for (IRecipe recipe : recipes) { if (recipe.isValidInput(0, ingredient)) { @@ -114,11 +115,11 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { drawProgressBar(99, 31, 166, 0, 22, 13, 48, 3); AlloySmelterRecipe recipe = (AlloySmelterRecipe) arecipes.get(recipeIndex); String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); - GuiDraw.drawString(energyString, 100, 52, 0x808080, false); + GuiDraw.drawString(energyString, 100, 52, ColorUtils.neiEnergyString.getColor(), false); } public List getInputs(RecipeInput input) { - List result = new ArrayList(); + List result = new ArrayList<>(); result.add(input.getInput()); ItemStack[] equivs = input.getEquivelentInputs(); if (equivs != null) { @@ -140,7 +141,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { result.add(item.copy()); } } - List result2 = new ArrayList(); + List result2 = new ArrayList<>(); for (ItemStack candidate : result) { boolean skip = false; for (ItemStack existing : result2) { @@ -159,9 +160,9 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { public class AlloySmelterRecipe extends TemplateRecipeHandler.CachedRecipe { - private ArrayList input; + private final ArrayList input; private PositionedStack output; - private int energy; + private final int energy; public int getEnergy() { return energy; @@ -179,7 +180,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { public AlloySmelterRecipe(int energy, RecipeInput[] ingredients, ItemStack result) { int recipeSize = ingredients.length; - this.input = new ArrayList(); + this.input = new ArrayList<>(); if (recipeSize > 0) { this.input.add(new PositionedStack(getInputs(ingredients[0]), 50, 13)); } diff --git a/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java index 7d4713b2..2cf28d3c 100644 --- a/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java @@ -24,6 +24,7 @@ import crazypants.enderio.machine.enchanter.EnchanterRecipeManager; import crazypants.enderio.machine.enchanter.GuiEnchanter; import crazypants.enderio.machine.enchanter.TileEnchanter; import crazypants.enderio.machine.recipe.RecipeInput; +import crazypants.util.ColorUtils; public class EnchanterRecipeHandler extends TemplateRecipeHandler { @@ -113,7 +114,7 @@ public class EnchanterRecipeHandler extends TemplateRecipeHandler { public void drawExtras(int recipeIndex) { EnchanterRecipeNEI recipe = (EnchanterRecipeNEI) arecipes.get(recipeIndex); - GuiDraw.drawStringC(recipe.getEnchantName(), 83, 10, 0x808080, false); + GuiDraw.drawStringC(recipe.getEnchantName(), 83, 10, ColorUtils.neiEnchantString.getColor(), false); int level = 1; List ingredients = recipe.getIngredients(); @@ -131,7 +132,7 @@ public class EnchanterRecipeHandler extends TemplateRecipeHandler { } public List getInputs(RecipeInput input) { - List result = new ArrayList(); + List result = new ArrayList<>(); result.add(input.getInput()); ItemStack[] equivs = input.getEquivelentInputs(); if (equivs != null && equivs.length > 0) { @@ -177,7 +178,7 @@ public class EnchanterRecipeHandler extends TemplateRecipeHandler { public EnchanterRecipeNEI(EnchanterRecipe recipe) { this.recipe = recipe; - input = new ArrayList(); + input = new ArrayList<>(); input.add(new PositionedStack(new ItemStack(Items.writable_book), 22, 24)); input.add(new PositionedStack(getInputs(recipe.getInput()), 71, 24)); diff --git a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java index e5dd5ecd..6f1df9a1 100644 --- a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java @@ -25,10 +25,11 @@ import crazypants.enderio.machine.recipe.Recipe; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.recipe.RecipeOutput; import crazypants.enderio.power.PowerDisplayUtil; +import crazypants.util.ColorUtils; public class SagMillRecipeHandler extends TemplateRecipeHandler { - private RecipeComparator comparator = new RecipeComparator(); + private final RecipeComparator comparator = new RecipeComparator(); @Override public String getRecipeName() { @@ -67,7 +68,7 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { public void loadCraftingRecipes(final ItemStack result) { List recipes = CrusherRecipeManager.getInstance().getRecipes(); - List toAdd = new ArrayList(); + List toAdd = new ArrayList<>(); for (Recipe recipe : recipes) { if (recipe.hasOuput(result)) { MillRecipe res = new MillRecipe( @@ -123,7 +124,7 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { MillRecipe recipe = (MillRecipe) arecipes.get(recipeIndex); String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); - GuiDraw.drawString(energyString, 96, 33, 0x808080, false); + GuiDraw.drawString(energyString, 96, 33, ColorUtils.neiEnergyString.getColor(), false); } @Override @@ -140,7 +141,7 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { } public List getInputs(RecipeInput input) { - List result = new ArrayList(); + List result = new ArrayList<>(); result.add(input.getInput()); ItemStack[] eq = input.getEquivelentInputs(); if (eq != null) { @@ -155,11 +156,11 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { protected int numTargetOuput; protected int indexOfTargetOutput; - private List input; - private PositionedStack output; - private ArrayList otherOutputs; - private float[] outputChance; - private int energy; + private final List input; + private final PositionedStack output; + private final ArrayList otherOutputs; + private final float[] outputChance; + private final int energy; public int getEnergy() { return energy; @@ -203,13 +204,13 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { public MillRecipe(ItemStack targetedResult, int energy, RecipeInput ingredient, RecipeOutput[] outputs) { this.energy = energy; - input = new ArrayList(2); + input = new ArrayList<>(2); input.add(new PositionedStack(getInputs(ingredient), 74, 2)); input.add(new PositionedStack(getBalls(), 116, 12)); output = new PositionedStack(outputs[0].getOutput(), 43, 46); - otherOutputs = new ArrayList(); + otherOutputs = new ArrayList<>(); if (outputs.length > 1) { otherOutputs.add(new PositionedStack(outputs[1].getOutput(), 64, 46)); } @@ -234,7 +235,7 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { private List getBalls() { List daBalls = CrusherRecipeManager.getInstance().getBalls(); - List res = new ArrayList(); + List res = new ArrayList<>(); for (GrindingBall ball : daBalls) { res.add(ball.getInput()); } diff --git a/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java index 68507031..9ba5a6fc 100644 --- a/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java @@ -22,6 +22,7 @@ import crazypants.enderio.machine.slicensplice.ContainerSliceAndSplice; import crazypants.enderio.machine.slicensplice.GuiSliceAndSplice; import crazypants.enderio.machine.slicensplice.SliceAndSpliceRecipeManager; import crazypants.enderio.power.PowerDisplayUtil; +import crazypants.util.ColorUtils; public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler { @@ -61,7 +62,7 @@ public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler { return; } - List recipes = new ArrayList(SliceAndSpliceRecipeManager.getInstance().getRecipes()); + List recipes = new ArrayList<>(SliceAndSpliceRecipeManager.getInstance().getRecipes()); for (IRecipe recipe : recipes) { ItemStack output = recipe.getOutputs()[0].getOutput(); if (result.getItem() == output.getItem() && result.getItemDamage() == output.getItemDamage()) { @@ -74,7 +75,7 @@ public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler { @Override public void loadCraftingRecipes(String outputId, Object... results) { if (outputId.equals("EnderIOSliceAndSplice") && getClass() == SliceAndSpliceRecipeHandler.class) { - List recipes = new ArrayList(SliceAndSpliceRecipeManager.getInstance().getRecipes()); + List recipes = new ArrayList<>(SliceAndSpliceRecipeManager.getInstance().getRecipes()); for (IRecipe recipe : recipes) { SliceAndSpliceRecipe res = new SliceAndSpliceRecipe(recipe); arecipes.add(res); @@ -86,7 +87,7 @@ public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler { @Override public void loadUsageRecipes(ItemStack ingredient) { - List recipes = new ArrayList(SliceAndSpliceRecipeManager.getInstance().getRecipes()); + List recipes = new ArrayList<>(SliceAndSpliceRecipeManager.getInstance().getRecipes()); for (IRecipe recipe : recipes) { if (recipe.isValidInput(0, ingredient)) { SliceAndSpliceRecipe res = new SliceAndSpliceRecipe(recipe); @@ -109,11 +110,11 @@ public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler { SliceAndSpliceRecipe recipe = (SliceAndSpliceRecipe) arecipes.get(recipeIndex); String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); - GuiDraw.drawString(energyString, 100, 57, 0x808080, false); + GuiDraw.drawString(energyString, 100, 57, ColorUtils.neiEnergyString.getColor(), false); } public List getInputs(RecipeInput input) { - List result = new ArrayList(); + List result = new ArrayList<>(); result.add(input.getInput()); ItemStack[] equivs = input.getEquivelentInputs(); if (equivs != null) { @@ -126,9 +127,9 @@ public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler { public class SliceAndSpliceRecipe extends TemplateRecipeHandler.CachedRecipe { - private ArrayList input; + private final ArrayList input; private PositionedStack output; - private int energy; + private final int energy; public int getEnergy() { return energy; @@ -145,7 +146,7 @@ public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler { } public SliceAndSpliceRecipe(IRecipe recipe) { - input = new ArrayList(); + input = new ArrayList<>(); int yOff = 11; int xOff = 13; diff --git a/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java index e0a6b75f..cd2adab7 100644 --- a/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java @@ -24,6 +24,7 @@ import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.soul.GuiSoulBinder; import crazypants.enderio.machine.soul.ISoulBinderRecipe; import crazypants.enderio.power.PowerDisplayUtil; +import crazypants.util.ColorUtils; public class SoulBinderRecipeHandler extends TemplateRecipeHandler { @@ -132,7 +133,7 @@ public class SoulBinderRecipeHandler extends TemplateRecipeHandler { SoulBinderRecipeNEI recipe = (SoulBinderRecipeNEI) arecipes.get(recipeIndex); String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); - GuiDraw.drawStringC(energyString, 83, 45, 0x808080, false); + GuiDraw.drawStringC(energyString, 83, 45, ColorUtils.neiEnergyString.getColor(), false); int cost = recipe.getExperience(); if (cost > 0) { @@ -141,7 +142,7 @@ public class SoulBinderRecipeHandler extends TemplateRecipeHandler { } } - private static final ArrayList EMPTY_VIAL_OUTPUT = new ArrayList(); + private static final ArrayList EMPTY_VIAL_OUTPUT = new ArrayList<>(); static { EMPTY_VIAL_OUTPUT.add(new PositionedStack(new ItemStack(EnderIO.itemSoulVessel), 101, 23)); @@ -149,10 +150,10 @@ public class SoulBinderRecipeHandler extends TemplateRecipeHandler { public class SoulBinderRecipeNEI extends TemplateRecipeHandler.CachedRecipe { - private final ArrayList input = new ArrayList(); + private final ArrayList input = new ArrayList<>(); private final PositionedStack output; - private int energy; - private int experience; + private final int energy; + private final int experience; public int getEnergy() { return energy; @@ -201,7 +202,7 @@ public class SoulBinderRecipeHandler extends TemplateRecipeHandler { } private List getSoulVialInputs(List mobs) { - List result = new ArrayList(mobs.size()); + List result = new ArrayList<>(mobs.size()); for (String mobName : mobs) { ItemStack sv = new ItemStack(EnderIO.itemSoulVessel); sv.stackTagCompound = new NBTTagCompound(); diff --git a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java index 4b548499..1777fd5d 100644 --- a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java @@ -34,11 +34,12 @@ import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.vat.GuiVat; import crazypants.enderio.machine.vat.VatRecipeManager; import crazypants.enderio.power.PowerDisplayUtil; +import crazypants.util.ColorUtils; public class VatRecipeHandler extends TemplateRecipeHandler { - private Rectangle inTankBounds = new Rectangle(25, 1, 15, 47); - private Rectangle outTankBounds = new Rectangle(127, 1, 15, 47); + private final Rectangle inTankBounds = new Rectangle(25, 1, 15, 47); + private final Rectangle outTankBounds = new Rectangle(127, 1, 15, 47); public VatRecipeHandler() {} @@ -183,7 +184,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler { } String energyString = PowerDisplayUtil.formatPower(rec.energy) + " " + PowerDisplayUtil.abrevation(); - GuiDraw.drawStringC(energyString, 86, 54, 0x808080, false); + GuiDraw.drawStringC(energyString, 86, 54, ColorUtils.neiEnergyString.getColor(), false); Fluid outputFluid = rec.result.getFluid(); List stacks = rec.getIngredients(); @@ -191,7 +192,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler { float mult = VatRecipeManager.getInstance() .getMultiplierForInput(rec.inFluid.getFluid(), ps.item, outputFluid); String str = "x" + mult; - GuiDraw.drawStringC(str, ps.relx + 8, ps.rely + 19, 0x808080, false); + GuiDraw.drawStringC(str, ps.relx + 8, ps.rely + 19, ColorUtils.neiMultiplierString.getColor(), false); } } @@ -264,7 +265,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler { } public List getInputs(RecipeInput input) { - List result = new ArrayList(); + List result = new ArrayList<>(); result.add(input.getInput()); ItemStack[] eq = input.getEquivelentInputs(); if (eq != null) { @@ -277,12 +278,12 @@ public class VatRecipeHandler extends TemplateRecipeHandler { public class InnerVatRecipe extends TemplateRecipeHandler.CachedRecipe { - private List inputs = new ArrayList<>(); - private ItemStackMap firstItemMultiplier = new ItemStackMap(); - private ItemStackMap secondItemMultiplier = new ItemStackMap(); - private Map fluidMultiplier = new HashMap<>(); - private int energy; - private FluidStack result; + private final List inputs = new ArrayList<>(); + private final ItemStackMap firstItemMultiplier = new ItemStackMap(); + private final ItemStackMap secondItemMultiplier = new ItemStackMap(); + private final Map fluidMultiplier = new HashMap<>(); + private final int energy; + private final FluidStack result; private FluidStack inFluid; public int getEnergy() { diff --git a/src/main/java/crazypants/enderio/power/EnergyConnectionPI.java b/src/main/java/crazypants/enderio/power/EnergyConnectionPI.java index b0941a55..ad666ef0 100644 --- a/src/main/java/crazypants/enderio/power/EnergyConnectionPI.java +++ b/src/main/java/crazypants/enderio/power/EnergyConnectionPI.java @@ -6,7 +6,7 @@ import cofh.api.energy.IEnergyConnection; public class EnergyConnectionPI implements IPowerInterface { - private IEnergyConnection delegate; + private final IEnergyConnection delegate; public EnergyConnectionPI(IEnergyConnection delegate) { this.delegate = delegate; diff --git a/src/main/java/crazypants/enderio/power/EnergyProviderPI.java b/src/main/java/crazypants/enderio/power/EnergyProviderPI.java index 3353f9e9..4176b781 100644 --- a/src/main/java/crazypants/enderio/power/EnergyProviderPI.java +++ b/src/main/java/crazypants/enderio/power/EnergyProviderPI.java @@ -6,7 +6,7 @@ import cofh.api.energy.IEnergyProvider; public class EnergyProviderPI implements IPowerInterface { - private IEnergyProvider rfPower; + private final IEnergyProvider rfPower; public EnergyProviderPI(IEnergyProvider powerReceptor) { rfPower = powerReceptor; diff --git a/src/main/java/crazypants/enderio/power/EnergyReceiverPI.java b/src/main/java/crazypants/enderio/power/EnergyReceiverPI.java index 9adb728f..058bab45 100644 --- a/src/main/java/crazypants/enderio/power/EnergyReceiverPI.java +++ b/src/main/java/crazypants/enderio/power/EnergyReceiverPI.java @@ -6,7 +6,7 @@ import cofh.api.energy.IEnergyReceiver; public class EnergyReceiverPI implements IPowerInterface { - private IEnergyReceiver rfPower; + private final IEnergyReceiver rfPower; public EnergyReceiverPI(IEnergyReceiver powerReceptor) { rfPower = powerReceptor; diff --git a/src/main/java/crazypants/enderio/power/PowerDistributor.java b/src/main/java/crazypants/enderio/power/PowerDistributor.java index 150a6813..9e1565b0 100644 --- a/src/main/java/crazypants/enderio/power/PowerDistributor.java +++ b/src/main/java/crazypants/enderio/power/PowerDistributor.java @@ -14,7 +14,7 @@ import crazypants.enderio.machine.AbstractMachineEntity; public class PowerDistributor { - private final List receptors = new ArrayList(); + private final List receptors = new ArrayList<>(); private ListIterator receptorIterator = receptors.listIterator(); private boolean receptorsDirty = true; diff --git a/src/main/java/crazypants/enderio/rail/BlockEnderRail.java b/src/main/java/crazypants/enderio/rail/BlockEnderRail.java index 96fe7409..da5dd45d 100644 --- a/src/main/java/crazypants/enderio/rail/BlockEnderRail.java +++ b/src/main/java/crazypants/enderio/rail/BlockEnderRail.java @@ -283,8 +283,8 @@ public class BlockEnderRail extends BlockRail implements IResourceTooltipProvide CartLinkUtil.instance.updateCartLinks(world, cart); } - List> toTeleport = new ArrayList>(allCarts.size()); - List toDespawn = new ArrayList(allCarts.size()); + List> toTeleport = new ArrayList<>(allCarts.size()); + List toDespawn = new ArrayList<>(allCarts.size()); EntityPlayerMP playerToTP = null; EntityMinecart playerToMount = null; for (EntityMinecart cartInTrain : allCarts) { diff --git a/src/main/java/crazypants/enderio/rail/EnderRailController.java b/src/main/java/crazypants/enderio/rail/EnderRailController.java index 339d798a..6967782e 100644 --- a/src/main/java/crazypants/enderio/rail/EnderRailController.java +++ b/src/main/java/crazypants/enderio/rail/EnderRailController.java @@ -35,10 +35,10 @@ import crazypants.enderio.machine.transceiver.TileTransceiver; public class EnderRailController { // keep track of which carts we have received have left the track as they can't be teleported again until they have - private final Set newlySpawnedCarts = new HashSet(); + private final Set newlySpawnedCarts = new HashSet<>(); - private final LinkedList> cartsToSpawn = new LinkedList>(); - private final List playersToRemount = new ArrayList(); + private final LinkedList> cartsToSpawn = new LinkedList<>(); + private final List playersToRemount = new ArrayList<>(); private int ticksFailedToSpawn = 0; @@ -60,7 +60,7 @@ public class EnderRailController { spawnRecievedCart(); List carts = getMinecartsOnTrack(); - List toRemove = new ArrayList(); + List toRemove = new ArrayList<>(); // any cart in the newly spawned list no longer on the track needs to be removed for (UUID recievedCartUID : newlySpawnedCarts) { @@ -179,7 +179,7 @@ public class EnderRailController { List entities = world.getEntitiesWithinAABB( EntityMinecart.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1)); - List carts = new ArrayList(); + List carts = new ArrayList<>(); for (Object o : entities) { EntityMinecart cart = (EntityMinecart) o; if (!cart.isDead) { @@ -193,7 +193,7 @@ public class EnderRailController { World worldObj = transciever.getWorldObj(); while (cartList.tagCount() > 0) { NBTTagList entityList = (NBTTagList) cartList.removeTag(0); - List ents = new ArrayList(entityList.tagCount()); + List ents = new ArrayList<>(entityList.tagCount()); for (int i = 0; i < entityList.tagCount(); i++) { NBTTagCompound entityRoot = entityList.getCompoundTagAt(i); Entity entity = EntityList.createEntityFromNBT(entityRoot, worldObj); diff --git a/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java b/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java index ce835bba..682d0169 100644 --- a/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java +++ b/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java @@ -19,7 +19,7 @@ public class PlayerTeleportHandler { public static final PlayerTeleportHandler instance = new PlayerTeleportHandler(); - List queue = new ArrayList(); + List queue = new ArrayList<>(); @SubscribeEvent public void onServerTick(TickEvent.ServerTickEvent event) { diff --git a/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java b/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java index a933f989..13b6d192 100644 --- a/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java +++ b/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java @@ -173,7 +173,7 @@ public class RailcraftLinkUtil implements ICartLinkUtil { if (cart == null) { Collections.emptyList(); } - List result = new ArrayList(); + List result = new ArrayList<>(); ILinkageManager linkMan = CartTools.getLinkageManager(cart.worldObj); if (linkMan == null) { result.add(cart); @@ -214,8 +214,6 @@ public class RailcraftLinkUtil implements ICartLinkUtil { private final Vector3d refPoint = new Vector3d(); private final Vector3d loc1 = new Vector3d(); private final Vector3d loc2 = new Vector3d(); - private double d1; - private double d2; TrainOrderComparator(EntityMinecart head) { set(refPoint, head); @@ -225,8 +223,8 @@ public class RailcraftLinkUtil implements ICartLinkUtil { public int compare(EntityMinecart o1, EntityMinecart o2) { set(loc1, o1); set(loc2, o2); - d1 = refPoint.distanceSquared(loc1); - d2 = refPoint.distanceSquared(loc2); + double d1 = refPoint.distanceSquared(loc1); + double d2 = refPoint.distanceSquared(loc2); return Double.compare(d1, d2); } diff --git a/src/main/java/crazypants/enderio/rail/TeleportUtil.java b/src/main/java/crazypants/enderio/rail/TeleportUtil.java index ef98ddff..902d296a 100644 --- a/src/main/java/crazypants/enderio/rail/TeleportUtil.java +++ b/src/main/java/crazypants/enderio/rail/TeleportUtil.java @@ -42,7 +42,7 @@ public class TeleportUtil { newCart.setLocationAndAngles(toX + 0.5, toY, toZ + 0.5, cart.rotationYaw, cart.rotationPitch); newCart.isDead = false; - List result = new ArrayList(); + List result = new ArrayList<>(); result.add(newCart); Entity passenger = cart.riddenByEntity; diff --git a/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java index e3a457ea..bf5bc490 100644 --- a/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java @@ -62,7 +62,7 @@ public class ContainerTravelAccessable extends ContainerEnder implem private static class CtaGhostSlot extends GhostSlot { - private ITravelAccessable ta; + private final ITravelAccessable ta; boolean isAuth; public CtaGhostSlot(ITravelAccessable ta, int slotIndex, int x, int y, boolean isAuth) { diff --git a/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java b/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java index 217ab4d3..f655fa92 100644 --- a/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java @@ -129,7 +129,7 @@ public class ContainerTravelAuth extends ContainerEnder implement private static class AuthGhostSlot extends GhostSlot { - private AuthInventory inv; + private final AuthInventory inv; public AuthGhostSlot(AuthInventory ta, int slotIndex, int x, int y) { this.slot = slotIndex; diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java index 736555ec..b62b1583 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java @@ -43,13 +43,10 @@ public class GuiTravelAccessable extends GuiContainerBaseEIO { private final String publicStr; private final String privateStr; private final String protectedStr; - private final String visibleStr; - private final String visibleDesc1Str; - private final String visibleDesc2Str; private final ITravelAccessable te; - private int col0x; - private int col1x; + private final int col0x; + private final int col1x; private int col2x; protected World world; @@ -66,9 +63,9 @@ public class GuiTravelAccessable extends GuiContainerBaseEIO { publicStr = EnderIO.lang.localize("gui.travelAccessable.public"); privateStr = EnderIO.lang.localize("gui.travelAccessable.private"); protectedStr = EnderIO.lang.localize("gui.travelAccessable.protected"); - visibleStr = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible"); - visibleDesc1Str = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible.desc1"); - visibleDesc2Str = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible.desc2"); + String visibleStr = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible"); + String visibleDesc1Str = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible.desc1"); + String visibleDesc2Str = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible.desc2"); FontRenderer fr = Minecraft.getMinecraft().fontRenderer; diff --git a/src/main/java/crazypants/enderio/teleport/TravelController.java b/src/main/java/crazypants/enderio/teleport/TravelController.java index 14c1c30f..40699793 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelController.java +++ b/src/main/java/crazypants/enderio/teleport/TravelController.java @@ -84,7 +84,7 @@ public class TravelController { */ public SetMultimap travelDestinations = MultimapBuilder.hashKeys().hashSetValues().build(); - private Random rand = new Random(); + private final Random rand = new Random(); private boolean wasJumping = false; @@ -92,11 +92,7 @@ public class TravelController { private int delayTimer = 0; - private final int timer = Config.travelAnchorCooldown; - - private boolean tempJump; - - private boolean tempSneak; + private static final int timer = Config.travelAnchorCooldown; private boolean showTargets = false; @@ -108,15 +104,13 @@ public class TravelController { Camera currentView = new Camera(); - private final HashMap candidates = new HashMap(); + private final HashMap candidates = new HashMap<>(); private boolean selectionEnabled = true; - private double fovRad; - private double tanFovRad; - private final List blackList = new ArrayList(); + private final List blackList = new ArrayList<>(); private TravelController() { String[] blackListNames = Config.travelStaffBlinkBlackList; @@ -425,7 +419,7 @@ public class TravelController { currentView.setViewMatrix(mv); currentView.setViewport(0, 0, mc.displayWidth, mc.displayHeight); - fovRad = Math.toRadians(fov); + double fovRad = Math.toRadians(fov); tanFovRad = Math.tanh(fovRad); } @@ -446,8 +440,8 @@ public class TravelController { selectedCoord = null; } MovementInput input = player.movementInput; - tempJump = input.jump; - tempSneak = input.sneak; + boolean tempJump = input.jump; + boolean tempSneak = input.sneak; // Handles teleportation if a target is selected if ((input.jump && !wasJumping && onBlock && selectedCoord != null && delayTimer == 0) diff --git a/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java index f34e2d71..1b7f2200 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java @@ -41,7 +41,7 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable private @Nonnull UserIdent owner = UserIdent.nobody; - private List authorisedUsers = new ArrayList(); + private final List authorisedUsers = new ArrayList<>(); private boolean visible = true; diff --git a/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java b/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java index 9ca54b65..415e1e3b 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java @@ -161,11 +161,16 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer { GL11.glScalef(2, 2, 2); if (ei == null) { - ei = new EntityItem(tileentity.getWorldObj(), x, y, z, itemLabel); + ei = new EntityItem(null, x, y, z, itemLabel); } else { ei.setEntityItemStack(itemLabel); } - RenderUtil.render3DItem(ei, false); + try { + ei.setWorld(tileentity.getWorldObj()); + RenderUtil.render3DItem(ei, false); + } finally { + ei.setWorld(null); + } GL11.glPopMatrix(); } GL11.glPopMatrix(); diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java index 90d06523..a0fb4377 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java @@ -35,18 +35,21 @@ public class GuiTelePad extends GuiContainerBaseEIO implements IToggleableGui { ToggleTravelButton switchButton; GuiButton teleportButton; - private World world; - private TileTelePad te; + private final World world; + private final TileTelePad te; - private TextFieldEnder xTF, yTF, zTF, dimTF; + private final TextFieldEnder xTF; + private final TextFieldEnder yTF; + private final TextFieldEnder zTF; + private final TextFieldEnder dimTF; - private int powerX = 8; - private int powerY = 9; - private int powerScale = 100; + private static final int powerX = 8; + private static final int powerY = 9; + private static final int powerScale = 100; - private int progressX = 26; - private int progressY = 90; - private int progressScale = 124; + private static final int progressX = 26; + private static final int progressY = 90; + private static final int progressScale = 124; public static int SWITCH_X = 155, SWITCH_Y = 5; diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java index 48915472..09612613 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java @@ -24,24 +24,19 @@ import crazypants.enderio.teleport.anchor.TravelEntitySpecialRenderer; public class TelePadSpecialRenderer extends TravelEntitySpecialRenderer { - private final Map fullModel; - - private final GroupObject blade1; - private final GroupObject blade2; - private final GroupObject blade3; // Reverse order for top to bottom private final List blades; private final GroupObject glass; - private static Random rand = new Random(); + private static final Random rand = new Random(); public TelePadSpecialRenderer(TelePadRenderer telePadRenderer) { super(); - fullModel = telePadRenderer.getFullModel(); - blade1 = fullModel.get("blade1"); - blade2 = fullModel.get("blade2"); - blade3 = fullModel.get("blade3"); + Map fullModel = telePadRenderer.getFullModel(); + GroupObject blade1 = fullModel.get("blade1"); + GroupObject blade2 = fullModel.get("blade2"); + GroupObject blade3 = fullModel.get("blade3"); blades = Lists.newArrayList(blade3, blade2, blade1); glass = fullModel.get("glass"); diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index 9fe6b0ed..83b1b220 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -53,7 +53,7 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei private boolean inNetwork; private boolean isMaster; - private EnergyStorage energy = new EnergyStorage( + private final EnergyStorage energy = new EnergyStorage( Config.telepadPowerStorageRF, Config.telepadPowerPerTickRF, Config.telepadPowerPerTickRF); @@ -69,7 +69,7 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei private int lastSyncPowerStored; - private Queue toTeleport = Queues.newArrayDeque(); + private final Queue toTeleport = Queues.newArrayDeque(); private int powerUsed; private int maxPower; diff --git a/src/main/java/crazypants/enderio/thaumcraft/GogglesOfRevealingUpgrade.java b/src/main/java/crazypants/enderio/thaumcraft/GogglesOfRevealingUpgrade.java index ec967664..62694679 100644 --- a/src/main/java/crazypants/enderio/thaumcraft/GogglesOfRevealingUpgrade.java +++ b/src/main/java/crazypants/enderio/thaumcraft/GogglesOfRevealingUpgrade.java @@ -12,7 +12,7 @@ import crazypants.enderio.item.darksteel.upgrade.AbstractUpgrade; public class GogglesOfRevealingUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "gogglesRevealing"; + private static final String UPGRADE_NAME = "gogglesRevealing"; public static final GogglesOfRevealingUpgrade INSTANCE = new GogglesOfRevealingUpgrade(); diff --git a/src/main/java/crazypants/enderio/tool/AEToolProvider.java b/src/main/java/crazypants/enderio/tool/AEToolProvider.java index 0bfc57c9..e6a8f406 100644 --- a/src/main/java/crazypants/enderio/tool/AEToolProvider.java +++ b/src/main/java/crazypants/enderio/tool/AEToolProvider.java @@ -10,7 +10,7 @@ import crazypants.enderio.api.tool.ITool; public class AEToolProvider implements IToolProvider, IToolImpl { - private AETool aeTool = new AETool(); + private final AETool aeTool = new AETool(); public AEToolProvider() throws Exception { // Do a check for so we throw an exception in the constructor if we dont have the diff --git a/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java b/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java index bb3cd14c..d375ea7e 100644 --- a/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java +++ b/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java @@ -10,7 +10,7 @@ import crazypants.enderio.api.tool.ITool; public class BuildCraftToolProvider implements IToolProvider, IToolImpl { - private BCWrench wrench = new BCWrench(); + private final BCWrench wrench = new BCWrench(); public BuildCraftToolProvider() throws Exception { // Do a check for so we throw an exception in the constructor if we dont have the diff --git a/src/main/java/crazypants/enderio/tool/EnderIOCrashCallable.java b/src/main/java/crazypants/enderio/tool/EnderIOCrashCallable.java index ffe9c068..822cc83e 100644 --- a/src/main/java/crazypants/enderio/tool/EnderIOCrashCallable.java +++ b/src/main/java/crazypants/enderio/tool/EnderIOCrashCallable.java @@ -20,7 +20,7 @@ public class EnderIOCrashCallable implements ICrashCallable { } private List collectData() { - List result = new ArrayList(); + List result = new ArrayList<>(); if (FMLCommonHandler.instance().getSide() == Side.CLIENT && FMLClientHandler.instance().hasOptifine()) { result.add(" * Optifine is installed. This is NOT supported."); } diff --git a/src/main/java/crazypants/enderio/tool/MpsUtil.java b/src/main/java/crazypants/enderio/tool/MpsUtil.java index 7423fe44..f86c70a1 100644 --- a/src/main/java/crazypants/enderio/tool/MpsUtil.java +++ b/src/main/java/crazypants/enderio/tool/MpsUtil.java @@ -9,7 +9,7 @@ public class MpsUtil { public static final MpsUtil instance = new MpsUtil(); - private static String WRENCH_MODUL_NAME = "Prototype OmniWrench"; + private static final String WRENCH_MODUL_NAME = "Prototype OmniWrench"; private boolean isMpsInstalled; diff --git a/src/main/java/crazypants/enderio/tool/TEToolProvider.java b/src/main/java/crazypants/enderio/tool/TEToolProvider.java index f569af56..1f4eec9f 100644 --- a/src/main/java/crazypants/enderio/tool/TEToolProvider.java +++ b/src/main/java/crazypants/enderio/tool/TEToolProvider.java @@ -13,7 +13,7 @@ import crazypants.enderio.api.tool.ITool; public class TEToolProvider implements IToolProvider, IToolImpl { - private TEHammer wrench = new TEHammer(); + private final TEHammer wrench = new TEHammer(); @Override public ITool getTool(ItemStack stack) { diff --git a/src/main/java/crazypants/enderio/tool/ToolUtil.java b/src/main/java/crazypants/enderio/tool/ToolUtil.java index 57952866..0a27050c 100644 --- a/src/main/java/crazypants/enderio/tool/ToolUtil.java +++ b/src/main/java/crazypants/enderio/tool/ToolUtil.java @@ -55,8 +55,8 @@ public class ToolUtil { return instance; } - private final List toolProviders = new ArrayList(); - private final List toolImpls = new ArrayList(); + private final List toolProviders = new ArrayList<>(); + private final List toolImpls = new ArrayList<>(); private ToolUtil() { @@ -132,12 +132,12 @@ public class ToolUtil { public static class YetaWrenchProxy implements MethodInterceptor { - private ItemYetaWrench item; - private Map, IToolImpl> impls; + private final ItemYetaWrench item; + private final Map, IToolImpl> impls; private YetaWrenchProxy(ItemYetaWrench item, List toolImpls) { this.item = item; - impls = new HashMap, IToolImpl>(); + impls = new HashMap<>(); for (IToolImpl tool : toolImpls) { impls.put(tool.getInterface(), tool); } diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index f5a30e3e..53476ef4 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -54,7 +54,7 @@ import mcp.mobius.waila.api.impl.ConfigHandler; public class WailaCompat implements IWailaDataProvider { - private class WailaWorldWrapper extends World { + private static class WailaWorldWrapper extends World { private final World wrapped; diff --git a/src/main/java/crazypants/enderio/xp/PacketExperianceContainer.java b/src/main/java/crazypants/enderio/xp/PacketExperianceContainer.java index 84dfa521..38510c3d 100644 --- a/src/main/java/crazypants/enderio/xp/PacketExperianceContainer.java +++ b/src/main/java/crazypants/enderio/xp/PacketExperianceContainer.java @@ -29,7 +29,7 @@ public class PacketExperianceContainer extends MessageTileEntity } } - private ExperienceContainer xpCon; + private final ExperienceContainer xpCon; public PacketExperianceContainer() { xpCon = new ExperienceContainer(); diff --git a/src/main/java/crazypants/util/ColorUtils.java b/src/main/java/crazypants/util/ColorUtils.java new file mode 100644 index 00000000..48630994 --- /dev/null +++ b/src/main/java/crazypants/util/ColorUtils.java @@ -0,0 +1,17 @@ +package crazypants.util; + +import com.gtnewhorizon.gtnhlib.color.ColorResource; + +public class ColorUtils { + + private static final ColorResource.Factory color = new ColorResource.Factory("enderio"); + + public static final ColorResource + // spotless:off + priorityString = color.rgb("priorityString", "0x000000"), + suctionString = color.rgb("suctionString", "0x000000"), + neiMultiplierString = color.rgb("neiMultiplierString", "0x808080"), + neiEnchantString = color.rgb("neiEnchantString", "0x808080"), + neiEnergyString = color.rgb("neiEnergyString", "0x808080"); + // spotless:on +} diff --git a/src/main/java/crazypants/util/EE3Util.java b/src/main/java/crazypants/util/EE3Util.java index 17f86b93..febf485b 100644 --- a/src/main/java/crazypants/util/EE3Util.java +++ b/src/main/java/crazypants/util/EE3Util.java @@ -179,7 +179,7 @@ public class EE3Util { public static void registerBasicToManyRecipe(Recipe recipe) { if (IS_EE3_LOADED) { - List in = new ArrayList(); + List in = new ArrayList<>(); for (RecipeInput r0 : recipe.getInputs()) { in.add(r0.getInput().copy()); } diff --git a/src/main/resources/assets/enderio/lang/en_US.lang b/src/main/resources/assets/enderio/lang/en_US.lang index 46a720ee..667b5736 100644 --- a/src/main/resources/assets/enderio/lang/en_US.lang +++ b/src/main/resources/assets/enderio/lang/en_US.lang @@ -523,6 +523,9 @@ tile.blockEnchanter.name=Enchanter tile.blockEnchanter.tooltip.detailed.line1=Uses XP to combine items tile.blockEnchanter.tooltip.detailed.line2=and a book and quill to tile.blockEnchanter.tooltip.detailed.line3=created enchanted books +tile.blockEnchanter.tooltip.detailed.line4=Outputs a comparator signal +tile.blockEnchanter.tooltip.detailed.line5=based on the second slot's +tile.blockEnchanter.tooltip.detailed.line6=count, and works with hoppers tile.blockCombustionGenerator.name=Combustion Generator tile.blockCombustionGenerator.tooltip.detailed.line1=Burns liquid fuel to generate power @@ -648,7 +651,7 @@ tile.blockWeatherObelisk.tooltip.detailed.line4=Liquid Sunshine: Sun tile.blockWeatherObelisk.tooltip.detailed.line5=Cloud Seed: Rain tile.blockWeatherObelisk.tooltip.detailed.line6=Concentrated Cloud Seed: Thunder -tile.blockBuffer.name=Buffer +tile.blockBuffer.name=Buffer tile.blockBuffer.item.name=Item Buffer tile.blockBuffer.power.name=Power Buffer tile.blockBuffer.omni.name=Omni Buffer @@ -1197,6 +1200,13 @@ enderio.stirlingGenerator.upgradeslot=Upgrade slot enderio.stirlingGenerator.upgrades={0} gives {2}{1,number,#.#}x{3} efficiency enderio.stirlingGenerator.remaining=Remaining {0,number,percent}|{1,choice,0#|0<{1}m }{2,number}s|{3,number,#,###} RF +# Block buffers +enderio.gui.blockBuffer.name=Buffer +enderio.gui.blockBuffer.item.name=Item Buffer +enderio.gui.blockBuffer.power.name=Power Buffer +enderio.gui.blockBuffer.omni.name=Omni Buffer +enderio.gui.blockBuffer.creative.name=Creative Buffer + #Travel Blocks enderio.gui.travelAccessable.privateBlock1=Only enderio.gui.travelAccessable.privateBlock2=may change this blocks settings.