From 34e81bb65d49e11d228b1335996d63f2912e9d62 Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Sat, 5 Aug 2017 19:48:12 +0200 Subject: [PATCH] Remove ~350 unsave casts --- src/main/java/mekanism/api/Coord4D.java | 2 +- src/main/java/mekanism/api/gas/GasRegistry.java | 2 +- .../transmitters/TransmitterNetworkRegistry.java | 4 ++-- .../client/gui/GuiDigitalMinerConfig.java | 12 ++++++------ .../client/gui/GuiElectrolyticSeparator.java | 4 ++-- .../java/mekanism/client/gui/GuiFactory.java | 2 +- .../client/gui/GuiFormulaicAssemblicator.java | 12 ++++++------ .../java/mekanism/client/gui/GuiGasTank.java | 2 +- .../mekanism/client/gui/GuiLaserAmplifier.java | 6 +++--- .../mekanism/client/gui/GuiLogisticalSorter.java | 10 +++++----- .../client/gui/GuiMetallurgicInfuser.java | 2 +- .../client/gui/GuiQuantumEntangloporter.java | 4 ++-- .../mekanism/client/gui/GuiResistiveHeater.java | 2 +- .../client/gui/GuiRotaryCondensentrator.java | 2 +- .../java/mekanism/client/gui/GuiTeleporter.java | 4 ++-- .../client/gui/element/GuiAmplifierTab.java | 2 +- .../client/gui/element/GuiSortingTab.java | 2 +- .../java/mekanism/common/CommandMekanism.java | 4 ++-- src/main/java/mekanism/common/HashList.java | 2 +- src/main/java/mekanism/common/Mekanism.java | 3 +-- .../entangloporter/InventoryFrequency.java | 2 +- .../common/frequency/FrequencyManager.java | 2 +- .../common/item/ItemAtomicDisassembler.java | 4 ++-- .../java/mekanism/common/item/ItemBalloon.java | 2 +- .../common/item/ItemBlockEnergyCube.java | 2 +- .../mekanism/common/item/ItemBlockGlowPanel.java | 2 +- .../mekanism/common/item/ItemBlockMachine.java | 16 ++++++++-------- .../common/item/ItemBlockTransmitter.java | 2 +- .../mekanism/common/item/ItemConfigurator.java | 2 +- .../common/item/ItemCraftingFormula.java | 6 +++--- .../mekanism/common/item/ItemDictionary.java | 4 ++-- .../mekanism/common/item/ItemElectricBow.java | 4 ++-- .../mekanism/common/item/ItemGaugeDropper.java | 4 ++-- .../common/item/ItemPortableTeleporter.java | 2 +- .../mekanism/common/item/ItemSeismicReader.java | 6 +++--- .../mekanism/common/item/ItemWalkieTalkie.java | 4 ++-- .../network/PacketConfigurationUpdate.java | 4 ++-- .../common/network/PacketDigitalMinerGui.java | 2 +- .../common/network/PacketEditFilter.java | 8 ++++---- .../mekanism/common/network/PacketNewFilter.java | 8 ++++---- .../network/PacketOredictionificatorGui.java | 2 +- .../common/network/PacketPortableTeleporter.java | 2 +- .../common/security/SecurityFrequency.java | 2 +- .../java/mekanism/common/tile/TileEntityBin.java | 2 +- .../common/tile/TileEntityBoilerCasing.java | 2 +- .../common/tile/TileEntityBoundingBlock.java | 4 ++-- .../tile/TileEntityChemicalInjectionChamber.java | 3 ++- .../mekanism/common/tile/TileEntityCombiner.java | 3 ++- .../mekanism/common/tile/TileEntityCrusher.java | 3 ++- .../common/tile/TileEntityDigitalMiner.java | 6 +++--- .../common/tile/TileEntityDynamicTank.java | 4 ++-- .../common/tile/TileEntityEnergyCube.java | 4 ++-- .../common/tile/TileEntityEnrichmentChamber.java | 3 ++- .../mekanism/common/tile/TileEntityFactory.java | 2 +- .../common/tile/TileEntityFluidTank.java | 4 ++-- .../tile/TileEntityFormulaicAssemblicator.java | 2 +- .../mekanism/common/tile/TileEntityGasTank.java | 2 +- .../common/tile/TileEntityLogisticalSorter.java | 8 ++++---- .../tile/TileEntityOredictionificator.java | 6 +++--- .../common/tile/TileEntityOsmiumCompressor.java | 3 ++- .../java/mekanism/common/tile/TileEntityPRC.java | 2 +- .../tile/TileEntityPurificationChamber.java | 3 ++- .../common/tile/TileEntityResistiveHeater.java | 4 ++-- .../tile/TileEntitySolarNeutronActivator.java | 2 +- .../common/tile/TileEntityTeleporter.java | 8 ++++---- .../TileEntityThermalEvaporationController.java | 2 +- .../common/tile/prefab/TileEntityMachine.java | 4 ++-- .../tile/transmitter/TileEntitySidedPipe.java | 2 +- .../TileEntityThermodynamicConductor.java | 4 ++-- .../mekanism/common/voice/VoiceConnection.java | 2 +- .../client/gui/GuiIndustrialTurbine.java | 2 +- .../generators/client/gui/GuiReactorFuel.java | 2 +- .../client/gui/GuiReactorLogicAdapter.java | 4 ++-- .../client/render/RenderIndustrialTurbine.java | 6 +++--- .../client/render/RenderTurbineRotor.java | 6 +++--- .../generators/common/FusionReactor.java | 4 ++-- .../common/tile/TileEntityBioGenerator.java | 2 +- .../common/tile/TileEntityGasGenerator.java | 2 +- .../common/tile/TileEntityGenerator.java | 6 +++--- .../common/tile/TileEntityHeatGenerator.java | 2 +- .../common/tile/TileEntitySolarGenerator.java | 2 +- .../common/tile/TileEntityWindGenerator.java | 2 +- .../reactor/TileEntityReactorController.java | 4 ++-- .../reactor/TileEntityReactorLogicAdapter.java | 2 +- .../tile/reactor/TileEntityReactorPort.java | 4 ++-- .../tile/turbine/TileEntityTurbineCasing.java | 4 ++-- .../tile/turbine/TileEntityTurbineRotor.java | 8 ++++---- 87 files changed, 168 insertions(+), 163 deletions(-) diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 13a81d556..f1cbd7054 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -144,7 +144,7 @@ public class Coord4D * Writes this Coord4D's data to an ArrayList for packet transfer. * @param data - the ArrayList to add the data to */ - public void write(ArrayList data) + public void write(ArrayList data) { data.add(x); data.add(y); diff --git a/src/main/java/mekanism/api/gas/GasRegistry.java b/src/main/java/mekanism/api/gas/GasRegistry.java index 6b4bf3c96..071c9ccad 100644 --- a/src/main/java/mekanism/api/gas/GasRegistry.java +++ b/src/main/java/mekanism/api/gas/GasRegistry.java @@ -75,7 +75,7 @@ public class GasRegistry */ public static List getRegisteredGasses() { - return (List)registeredGasses.clone(); + return new ArrayList<>(registeredGasses); } /** diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 8da228fc1..219412166 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -134,7 +134,7 @@ public class TransmitterNetworkRegistry public void assignOrphans() { - orphanTransmitters = (HashMap)newOrphanTransmitters.clone(); + orphanTransmitters = new HashMap<>(newOrphanTransmitters); newOrphanTransmitters.clear(); if(MekanismAPI.debug && !orphanTransmitters.isEmpty()) @@ -142,7 +142,7 @@ public class TransmitterNetworkRegistry logger.info("Dealing with " + orphanTransmitters.size() + " orphan Transmitters"); } - for(IGridTransmitter orphanTransmitter : ((Map)orphanTransmitters.clone()).values()) + for(IGridTransmitter orphanTransmitter : (new HashMap<>(orphanTransmitters)).values()) { DynamicNetwork network = getNetworkFromOrphan(orphanTransmitter); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 10931b617..258f2c861 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -241,7 +241,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(xAxis >= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 14 && yAxis <= yStart + 20) { // Process up button click - final ArrayList data = new ArrayList(); + final ArrayList data = new ArrayList<>(); data.add(11); data.add(getFilterIndex() + i); @@ -257,7 +257,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(xAxis >= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 21 && yAxis <= yStart + 27) { // Process down button click - final ArrayList data = new ArrayList(); + final ArrayList data = new ArrayList<>(); data.add(12); data.add(getFilterIndex() + i); @@ -322,7 +322,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(xAxis >= 11 && xAxis <= 25 && yAxis >= 141 && yAxis <= 155) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(10); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -692,7 +692,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { int toUse = Math.max(0, Math.min(Integer.parseInt(radiusField.getText()), 32)); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(6); data.add(toUse); @@ -708,7 +708,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { int toUse = Math.max(0, Math.min(Integer.parseInt(minField.getText()), tileEntity.maxY)); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(7); data.add(toUse); @@ -724,7 +724,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { int toUse = Math.max(tileEntity.minY, Math.min(Integer.parseInt(maxField.getText()), 255)); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(8); data.add(toUse); diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index a3204945e..b5fe5ad88 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -84,7 +84,7 @@ public class GuiElectrolyticSeparator extends GuiMekanism if(xAxis > 8 && xAxis < 17 && yAxis > 73 && yAxis < 82) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add((byte)0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -92,7 +92,7 @@ public class GuiElectrolyticSeparator extends GuiMekanism } else if(xAxis > 160 && xAxis < 169 && yAxis > 73 && yAxis < 82) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add((byte)1); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index cc7df36f9..6a80f7823 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -167,7 +167,7 @@ public class GuiFactory extends GuiMekanism if(!stack.isEmpty() && stack.getItem() instanceof ItemGaugeDropper) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(1); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index 8e959016c..39672cb06 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -251,7 +251,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(4); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -265,7 +265,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(1); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -276,7 +276,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(2); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -286,7 +286,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(3); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -300,7 +300,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -310,7 +310,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(5); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index afc3db654..89a07706a 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -95,7 +95,7 @@ public class GuiGasTank extends GuiMekanism if(xAxis > 160 && xAxis < 169 && yAxis > 73 && yAxis < 82) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index d657bb392..b2f55c585 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -169,7 +169,7 @@ public class GuiLaserAmplifier extends GuiMekanism return; } - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(0); data.add(toUse); @@ -192,7 +192,7 @@ public class GuiLaserAmplifier extends GuiMekanism return; } - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(1); data.add(toUse); @@ -208,7 +208,7 @@ public class GuiLaserAmplifier extends GuiMekanism { int toUse = Math.max(0, Integer.parseInt(timerField.getText())); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(2); data.add(toUse); diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 7985f9c4b..276c063a3 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -261,7 +261,7 @@ public class GuiLogisticalSorter extends GuiMekanism if(xAxis >= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 14 && yAxis <= yStart + 20) { // Process up button click - final ArrayList data = new ArrayList(); + final ArrayList data = new ArrayList<>(); data.add(3); data.add(getFilterIndex() + i); @@ -277,7 +277,7 @@ public class GuiLogisticalSorter extends GuiMekanism if(xAxis >= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 21 && yAxis <= yStart + 27) { // Process down button click - final ArrayList data = new ArrayList(); + final ArrayList data = new ArrayList<>(); data.add(4); data.add(getFilterIndex() + i); @@ -317,7 +317,7 @@ public class GuiLogisticalSorter extends GuiMekanism // Check for auto eject button if(xAxis >= 12 && xAxis <= 26 && yAxis >= 110 && yAxis <= 124) { - final ArrayList data = new ArrayList(); + final ArrayList data = new ArrayList<>(); data.add(1); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -327,7 +327,7 @@ public class GuiLogisticalSorter extends GuiMekanism // Check for round robin button if(xAxis >= 12 && xAxis <= 26 && yAxis >= 84 && yAxis <= 98) { - final ArrayList data = new ArrayList(); + final ArrayList data = new ArrayList<>(); data.add(2); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -343,7 +343,7 @@ public class GuiLogisticalSorter extends GuiMekanism // Check for default colour button if(xAxis >= 13 && xAxis <= 29 && yAxis >= 137 && yAxis <= 153) { - final ArrayList data = new ArrayList(); + final ArrayList data = new ArrayList<>(); data.add(0); data.add(mouseBtn); diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 071e6e3ab..4ebb6dc2e 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -119,7 +119,7 @@ public class GuiMetallurgicInfuser extends GuiMekanism if(xAxis > 148 && xAxis < 168 && yAxis > 73 && yAxis < 82) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index 60d960c2d..8c1a39ec1 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -106,7 +106,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism return; } - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(0); data.add(freq); data.add(!privateMode); @@ -269,7 +269,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism { Frequency freq = privateMode ? tileEntity.privateCache.get(selection) : tileEntity.publicCache.get(selection); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(1); data.add(freq.name); data.add(freq.publicFreq); diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index 1b818aba5..f81689983 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -121,7 +121,7 @@ public class GuiResistiveHeater extends GuiMekanism { int toUse = Integer.parseInt(energyUsageField.getText()); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(toUse); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index 91132e014..e731eb89d 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -153,7 +153,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism if(xAxis >= 4 && xAxis <= 22 && yAxis >= 4 && yAxis <= 22) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 20c9a84cf..4723ba658 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -205,7 +205,7 @@ public class GuiTeleporter extends GuiMekanism if(tileEntity != null) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(0); data.add(freq); data.add(!privateMode); @@ -387,7 +387,7 @@ public class GuiTeleporter extends GuiMekanism if(tileEntity != null) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(1); data.add(freq.name); data.add(freq.publicFreq); diff --git a/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java b/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java index 900bad587..d9e7f7315 100644 --- a/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java @@ -78,7 +78,7 @@ public class GuiAmplifierTab extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 142 && yAxis <= 160) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(3); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java index 6fa856d8c..9bc3c33c8 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java @@ -77,7 +77,7 @@ public class GuiSortingTab extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 66 && yAxis <= 84) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index 6dcf31975..bfd4ea55c 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -35,9 +35,9 @@ public class CommandMekanism extends CommandBase } @Override - public List getAliases() + public List getAliases() { - return Arrays.asList(new String[] {"mekanism", "mek"}); + return Arrays.asList("mekanism", "mek"); } @Override diff --git a/src/main/java/mekanism/common/HashList.java b/src/main/java/mekanism/common/HashList.java index 5def109ef..63084c41a 100644 --- a/src/main/java/mekanism/common/HashList.java +++ b/src/main/java/mekanism/common/HashList.java @@ -101,7 +101,7 @@ public class HashList implements Iterable @Override public HashList clone() { - return new HashList((ArrayList)list.clone()); + return new HashList<>(new ArrayList<>(list)); } public void swap(int source, int target) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 88759b6c1..2b77e4114 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -645,9 +645,8 @@ public class Mekanism //Load cached furnace recipes Recipe.ENERGIZED_SMELTER.get().clear(); - for(Object obj : FurnaceRecipes.instance().getSmeltingList().entrySet()) + for(Map.Entry entry : FurnaceRecipes.instance().getSmeltingList().entrySet()) { - Map.Entry entry = (Map.Entry)obj; SmeltingRecipe recipe = new SmeltingRecipe(new ItemStackInput(entry.getKey()), new ItemStackOutput(entry.getValue())); Recipe.ENERGIZED_SMELTER.put(recipe); } diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index 1fc76337b..c22a2cec1 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -122,7 +122,7 @@ public class InventoryFrequency extends Frequency } @Override - public void write(ArrayList data) + public void write(ArrayList data) { super.write(data); diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index f0ce35873..af5204464 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -257,7 +257,7 @@ public class FrequencyManager } } - public void writeFrequencies(ArrayList data) + public void writeFrequencies(ArrayList data) { data.add(frequencies.size()); diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 71b4a9f1a..963e198f0 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -190,10 +190,10 @@ public class ItemAtomicDisassembler extends ItemEnergized entityplayer.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.modeToggle") + " " + EnumColor.INDIGO + getModeName(itemstack) + EnumColor.AQUA + " (" + getEfficiency(itemstack) + ")")); } - return new ActionResult(EnumActionResult.SUCCESS, itemstack); + return new ActionResult<>(EnumActionResult.SUCCESS, itemstack); } - return new ActionResult(EnumActionResult.PASS, itemstack); + return new ActionResult<>(EnumActionResult.PASS, itemstack); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index 9b94ed8e3..600c4bd1a 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -95,7 +95,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem itemstack.shrink(1); } - return new ActionResult(EnumActionResult.SUCCESS, itemstack); + return new ActionResult<>(EnumActionResult.SUCCESS, itemstack); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index bb7caea9f..2bda00263 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -164,7 +164,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS if(!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java index eefa01262..921227e85 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java +++ b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java @@ -60,7 +60,7 @@ public class ItemBlockGlowPanel extends ItemBlock if(!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index b6d1b517d..23978deb8 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -494,7 +494,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(pos == null) { - return new ActionResult(EnumActionResult.FAIL, itemstack); + return new ActionResult<>(EnumActionResult.FAIL, itemstack); } else { if(pos.typeOfHit == RayTraceResult.Type.BLOCK) @@ -503,14 +503,14 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(!world.provider.canMineBlock(entityplayer, coord.getPos())) { - return new ActionResult(EnumActionResult.FAIL, itemstack); + return new ActionResult<>(EnumActionResult.FAIL, itemstack); } if(!entityplayer.isSneaking()) { if(!entityplayer.canPlayerEdit(coord.getPos(), pos.sideHit, itemstack)) { - return new ActionResult(EnumActionResult.FAIL, itemstack); + return new ActionResult<>(EnumActionResult.FAIL, itemstack); } FluidStack fluid = MekanismUtils.getFluid(world, coord, false); @@ -521,7 +521,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(fluid.amount > needed) { - return new ActionResult(EnumActionResult.FAIL, itemstack); + return new ActionResult<>(EnumActionResult.FAIL, itemstack); } if(getFluidStack(itemstack) == null) @@ -542,14 +542,14 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(stored == null || stored.amount < Fluid.BUCKET_VOLUME) { - return new ActionResult(EnumActionResult.FAIL, itemstack); + return new ActionResult<>(EnumActionResult.FAIL, itemstack); } Coord4D trans = coord.offset(pos.sideHit); if(!entityplayer.canPlayerEdit(trans.getPos(), pos.sideHit, itemstack)) { - return new ActionResult(EnumActionResult.FAIL, itemstack); + return new ActionResult<>(EnumActionResult.FAIL, itemstack); } if(tryPlaceContainedLiquid(world, itemstack, trans.getPos()) && !entityplayer.capabilities.isCreativeMode) @@ -562,7 +562,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } - return new ActionResult(EnumActionResult.SUCCESS, itemstack); + return new ActionResult<>(EnumActionResult.SUCCESS, itemstack); } } else { @@ -570,7 +570,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } - return new ActionResult(EnumActionResult.PASS, itemstack); + return new ActionResult<>(EnumActionResult.PASS, itemstack); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java index b64e65a41..4a5231609 100644 --- a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java +++ b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java @@ -62,7 +62,7 @@ public class ItemBlockTransmitter extends ItemBlock implements ITierItem if(!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); } } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index ca736c834..9ef37d015 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -110,7 +110,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool if(config instanceof TileEntityBasicBlock) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)config; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); } } else { diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java index e03fd9162..eb59ff5a4 100644 --- a/src/main/java/mekanism/common/item/ItemCraftingFormula.java +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -45,7 +45,7 @@ public class ItemCraftingFormula extends ItemMekanism } } - private void addIngredientDetails(NonNullList inv, List list) + private void addIngredientDetails(NonNullList inv, List list) { List stacks = new ArrayList<>(); @@ -94,10 +94,10 @@ public class ItemCraftingFormula extends ItemMekanism ((EntityPlayerMP)player).sendContainerToPlayer(player.openContainer); } - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); } - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.PASS, stack); } @Override diff --git a/src/main/java/mekanism/common/item/ItemDictionary.java b/src/main/java/mekanism/common/item/ItemDictionary.java index 2ac05b19c..1f80189c4 100644 --- a/src/main/java/mekanism/common/item/ItemDictionary.java +++ b/src/main/java/mekanism/common/item/ItemDictionary.java @@ -72,9 +72,9 @@ public class ItemDictionary extends ItemMekanism if(entityplayer.isSneaking()) { entityplayer.openGui(Mekanism.instance, 0, world, 0, 0, 0); - return new ActionResult(EnumActionResult.SUCCESS, itemstack); + return new ActionResult<>(EnumActionResult.SUCCESS, itemstack); } - return new ActionResult(EnumActionResult.PASS, itemstack); + return new ActionResult<>(EnumActionResult.PASS, itemstack); } } diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index 7ea024f4e..e8ca24c6c 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -178,11 +178,11 @@ public class ItemElectricBow extends ItemEnergized implements IItemNetwork if(!playerIn.capabilities.isCreativeMode && !flag) { - return !flag ? new ActionResult(EnumActionResult.FAIL, itemStackIn) : new ActionResult(EnumActionResult.PASS, itemStackIn); + return !flag ? new ActionResult<>(EnumActionResult.FAIL, itemStackIn) : new ActionResult<>(EnumActionResult.PASS, itemStackIn); } else { playerIn.setActiveHand(hand); - return new ActionResult(EnumActionResult.SUCCESS, itemStackIn); + return new ActionResult<>(EnumActionResult.SUCCESS, itemStackIn); } } diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 6a8a51c4b..15ac8d24b 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -81,10 +81,10 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem ((EntityPlayerMP)player).sendContainerToPlayer(player.openContainer); - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); } - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.PASS, stack); } @Override diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 9b44673ad..268aa4320 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -72,7 +72,7 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem } } - return new ActionResult(EnumActionResult.SUCCESS, itemstack); + return new ActionResult<>(EnumActionResult.SUCCESS, itemstack); } public static double calculateEnergyCost(Entity entity, Coord4D coords) diff --git a/src/main/java/mekanism/common/item/ItemSeismicReader.java b/src/main/java/mekanism/common/item/ItemSeismicReader.java index d59371dfe..67c114622 100644 --- a/src/main/java/mekanism/common/item/ItemSeismicReader.java +++ b/src/main/java/mekanism/common/item/ItemSeismicReader.java @@ -41,7 +41,7 @@ public class ItemSeismicReader extends ItemEnergized entityplayer.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.seismicReader.needsEnergy"))); } - return new ActionResult(EnumActionResult.SUCCESS, itemstack); + return new ActionResult<>(EnumActionResult.SUCCESS, itemstack); } else if(!MekanismUtils.isChunkVibrated(chunk)) { @@ -50,7 +50,7 @@ public class ItemSeismicReader extends ItemEnergized entityplayer.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.seismicReader.noVibrations"))); } - return new ActionResult(EnumActionResult.SUCCESS, itemstack); + return new ActionResult<>(EnumActionResult.SUCCESS, itemstack); } if(!entityplayer.capabilities.isCreativeMode) @@ -60,6 +60,6 @@ public class ItemSeismicReader extends ItemEnergized entityplayer.openGui(Mekanism.instance, 38, world, hand.ordinal(), 0, 0); - return new ActionResult(EnumActionResult.PASS, itemstack); + return new ActionResult<>(EnumActionResult.PASS, itemstack); } } diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index 95694b078..2b6ea3a5c 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -60,10 +60,10 @@ public class ItemWalkieTalkie extends ItemMekanism implements IItemNetwork { setOn(itemStack, !getOn(itemStack)); - return new ActionResult(EnumActionResult.SUCCESS, itemStack); + return new ActionResult<>(EnumActionResult.SUCCESS, itemStack); } - return new ActionResult(EnumActionResult.PASS, itemStack); + return new ActionResult<>(EnumActionResult.PASS, itemStack); } @Override diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 2a8e53556..80efa6a91 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -62,7 +62,7 @@ public class PacketConfigurationUpdate implements IMessageHandler())), new Range4D(message.coord4D)); } else if(message.packetType == ConfigurationPacket.EJECT_COLOR) { @@ -103,7 +103,7 @@ public class PacketConfigurationUpdate implements IMessageHandler())), (EntityPlayerMP)p); } } }, player); diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index 2b5245f4c..340e3c641 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -160,7 +160,7 @@ public class PacketDigitalMinerGui implements IMessageHandler())), (EntityPlayerMP)player); } } } diff --git a/src/main/java/mekanism/common/network/PacketEditFilter.java b/src/main/java/mekanism/common/network/PacketEditFilter.java index 6e4512505..bf8544dd3 100644 --- a/src/main/java/mekanism/common/network/PacketEditFilter.java +++ b/src/main/java/mekanism/common/network/PacketEditFilter.java @@ -54,7 +54,7 @@ public class PacketEditFilter implements IMessageHandler())), (EntityPlayerMP)iterPlayer); } } else if(message.type == 1 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) @@ -77,7 +77,7 @@ public class PacketEditFilter implements IMessageHandler())), (EntityPlayerMP)iterPlayer); } } else if(message.type == 2 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityOredictionificator) @@ -100,7 +100,7 @@ public class PacketEditFilter implements IMessageHandler())), (EntityPlayerMP)iterPlayer); } } } @@ -177,7 +177,7 @@ public class PacketEditFilter implements IMessageHandler data = new ArrayList<>(); if(type == 0) { diff --git a/src/main/java/mekanism/common/network/PacketNewFilter.java b/src/main/java/mekanism/common/network/PacketNewFilter.java index 8ba5f4fcf..246ae4627 100644 --- a/src/main/java/mekanism/common/network/PacketNewFilter.java +++ b/src/main/java/mekanism/common/network/PacketNewFilter.java @@ -42,7 +42,7 @@ public class PacketNewFilter implements IMessageHandler())), (EntityPlayerMP)iterPlayer); } } else if(message.type == 1 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) @@ -53,7 +53,7 @@ public class PacketNewFilter implements IMessageHandler())), (EntityPlayerMP)iterPlayer); } } else if(message.type == 2 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityOredictionificator) @@ -64,7 +64,7 @@ public class PacketNewFilter implements IMessageHandler())), (EntityPlayerMP)iterPlayer); } } } @@ -115,7 +115,7 @@ public class PacketNewFilter implements IMessageHandler data = new ArrayList<>(); if(type == 0) { diff --git a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java index f5513f6d1..2cb6727cc 100644 --- a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java +++ b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java @@ -143,7 +143,7 @@ public class PacketOredictionificatorGui implements IMessageHandler())), (EntityPlayerMP)player); } } } diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index 219109905..850872b78 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -304,7 +304,7 @@ public class PacketPortableTeleporter implements IMessageHandler data = new ArrayList<>(); data.add(publicCache.size()); for(Frequency freq : publicCache) diff --git a/src/main/java/mekanism/common/security/SecurityFrequency.java b/src/main/java/mekanism/common/security/SecurityFrequency.java index a990820c0..8592a09e0 100644 --- a/src/main/java/mekanism/common/security/SecurityFrequency.java +++ b/src/main/java/mekanism/common/security/SecurityFrequency.java @@ -86,7 +86,7 @@ public class SecurityFrequency extends Frequency } @Override - public void write(ArrayList data) + public void write(ArrayList data) { super.write(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 196a56a05..164de9f55 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -84,7 +84,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento tier = BinTier.values()[upgradeTier.ordinal()]; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); markDirty(); return true; diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index d7acbde31..7a84436e3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -179,7 +179,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock())), new Range4D(Coord4D.get(this))); player.openGui(Mekanism.instance, 54, world, getPos().getX(), getPos().getY(), getPos().getZ()); return true; diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index 50e41d4c7..49e9c8abd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -35,7 +35,7 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork { mainPos = pos; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); } } @@ -71,7 +71,7 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork } prevPower = power; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java index 845175454..a1dc4dbcf 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java @@ -13,6 +13,7 @@ import mekanism.common.SideData; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.machines.InjectionRecipe; import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import mekanism.common.util.GasUtils; @@ -36,7 +37,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr } @Override - public Map getRecipes() + public Map getRecipes() { return Recipe.CHEMICAL_INJECTION_CHAMBER.get(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityCombiner.java b/src/main/java/mekanism/common/tile/TileEntityCombiner.java index 9a0fa53cc..78ec09054 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCombiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityCombiner.java @@ -8,6 +8,7 @@ import mekanism.common.MekanismFluids; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.machines.CombinerRecipe; import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import net.minecraft.block.Block; @@ -23,7 +24,7 @@ public class TileEntityCombiner extends TileEntityAdvancedElectricMachine getRecipes() { return Recipe.COMBINER.get(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityCrusher.java b/src/main/java/mekanism/common/tile/TileEntityCrusher.java index 2e2641214..bf47cf3cc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCrusher.java +++ b/src/main/java/mekanism/common/tile/TileEntityCrusher.java @@ -5,6 +5,7 @@ import java.util.Map; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.CrusherRecipe; import mekanism.common.tile.prefab.TileEntityElectricMachine; import net.minecraftforge.fml.relauncher.Side; @@ -18,7 +19,7 @@ public class TileEntityCrusher extends TileEntityElectricMachine } @Override - public Map getRecipes() + public Map getRecipes() { return Recipe.CRUSHER.get(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index f83909b50..ae0bc6f94 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -148,7 +148,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(getActive()) { - for(EntityPlayer player : (HashSet)playersUsing.clone()) + for(EntityPlayer player : new HashSet<>(playersUsing)) { if(player.openContainer instanceof ContainerNull || player.openContainer instanceof ContainerFilter) { @@ -645,7 +645,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(!world.isRemote) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), (EntityPlayerMP)player); } } @@ -1012,7 +1012,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I return data; } - public ArrayList getFilterPacket(ArrayList data) + public ArrayList getFilterPacket(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index ec0a0890a..8c47018ed 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -133,7 +133,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock())), new Range4D(Coord4D.get(this))); } } @@ -144,7 +144,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock())), new Range4D(Coord4D.get(this))); player.openGui(Mekanism.instance, 18, world, getPos().getX(), getPos().getY(), getPos().getZ()); } else { diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index e8a61181a..2d4b9c181 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -99,7 +99,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo if(newScale != prevScale) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); } prevScale = newScale; @@ -116,7 +116,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo tier = EnergyCubeTier.values()[upgradeTier.ordinal()]; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); markDirty(); return true; diff --git a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java index 898e98a95..6ede8a3b3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java @@ -5,6 +5,7 @@ import java.util.Map; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.EnrichmentRecipe; import mekanism.common.tile.prefab.TileEntityElectricMachine; import net.minecraftforge.fml.relauncher.Side; @@ -18,7 +19,7 @@ public class TileEntityEnrichmentChamber extends TileEntityElectricMachine getRecipes() { return Recipe.ENRICHMENT_CHAMBER.get(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 05d98ce3d..0ad8a8a4f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -230,7 +230,7 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt factory.upgraded = true; factory.markDirty(); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(factory), factory.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(factory))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(factory), factory.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(factory))); return true; } diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index d9bd68197..7f0aef24a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -97,7 +97,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc tier = FluidTankTier.values()[upgradeTier.ordinal()]; fluidTank.setCapacity(tier.storage); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); markDirty(); return true; @@ -182,7 +182,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc if(needsPacket) { - Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this).getTargetPoint(50)); + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), Coord4D.get(this).getTargetPoint(50)); } needsPacket = false; diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index b2535a43c..664e5acbf 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -714,7 +714,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index a807a6b74..472576b6a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -169,7 +169,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH tier = GasTankTier.values()[upgradeTier.ordinal()]; gasTank.setMaxGas(tier.storage); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); markDirty(); return true; diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 718b5ab60..0fc7981f8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -168,7 +168,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { for(EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new ArrayList())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new ArrayList<>())), (EntityPlayerMP)player); } } } @@ -401,7 +401,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen return data; } - public ArrayList getGenericPacket(ArrayList data) + public ArrayList getGenericPacket(ArrayList data) { super.getNetworkedData(data); @@ -425,7 +425,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } - public ArrayList getFilterPacket(ArrayList data) + public ArrayList getFilterPacket(ArrayList data) { super.getNetworkedData(data); @@ -787,7 +787,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } else if(method == 5) { - if(arguments.length != 2 || !(arguments[0] instanceof String) | !(arguments[1] instanceof String)) + if(arguments.length != 2 || !(arguments[0] instanceof String) || !(arguments[1] instanceof String)) { return new Object[] {"Invalid parameters."}; } diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index b45060322..3626a7608 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -67,7 +67,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple { for(EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new ArrayList())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new ArrayList<>())), (EntityPlayerMP)player); } } @@ -289,7 +289,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple return data; } - public ArrayList getGenericPacket(ArrayList data) + public ArrayList getGenericPacket(ArrayList data) { super.getNetworkedData(data); @@ -302,7 +302,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } - public ArrayList getFilterPacket(ArrayList data) + public ArrayList getFilterPacket(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java index 2fc6ab456..411264744 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java +++ b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java @@ -8,6 +8,7 @@ import mekanism.common.MekanismFluids; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.machines.OsmiumCompressorRecipe; import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import net.minecraft.item.ItemStack; @@ -21,7 +22,7 @@ public class TileEntityOsmiumCompressor extends TileEntityAdvancedElectricMachin } @Override - public Map getRecipes() + public Map getRecipes() { return Recipe.OSMIUM_COMPRESSOR.get(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 7d47287fa..fbfa264de 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -311,7 +311,7 @@ public class TileEntityPRC extends TileEntityBasicMachine getRecipes() { return null; } diff --git a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java index 8daa61641..1ab6bb6be 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java @@ -10,6 +10,7 @@ import mekanism.common.MekanismFluids; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.machines.PurificationRecipe; import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import mekanism.common.util.GasUtils; @@ -26,7 +27,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac } @Override - public Map getRecipes() + public Map getRecipes() { return Recipe.PURIFICATION_CHAMBER.get(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 8a55ed1c2..97253fac6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -118,7 +118,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements I if(packet) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); } } } @@ -201,7 +201,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements I } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index 880a32d41..1671ee8c9 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -99,7 +99,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im if(updateDelay == 0 && clientActive != isActive) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index ecd39f0c5..a51ec56c5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -145,7 +145,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo if(shouldRender != prevShouldRender) { - Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this).getTargetPoint(40D)); + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), Coord4D.get(this).getTargetPoint(40D)); } prevShouldRender = shouldRender; @@ -263,12 +263,12 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { List list = new ArrayList<>(); - for(Entity e : (List)world.getEntitiesWithinAABB(Entity.class, teleportBounds)) + for(Entity e : world.getEntitiesWithinAABB(Entity.class, teleportBounds)) { list.add(e.getPersistentID()); } - - Set teleportCopy = (Set)((HashSet)didTeleport).clone(); + + Set teleportCopy = new HashSet<>(didTeleport); for(UUID id : teleportCopy) { diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index a418adac2..f2e9a98f4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -197,7 +197,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva if(structured != clientStructured) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); clientStructured = structured; } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java index 8b97e3fda..2793c1316 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java @@ -73,7 +73,7 @@ public abstract class TileEntityMachine extends TileEntityNoisyBlock implements if(updateDelay == 0 && clientActive != isActive) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); } } } @@ -92,7 +92,7 @@ public abstract class TileEntityMachine extends TileEntityNoisyBlock implements if(clientActive != active && updateDelay == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); updateDelay = 10; clientActive = active; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java index d9e78a6fb..a87d4f63c 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java @@ -106,7 +106,7 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet if(sendDesc) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); sendDesc = false; } } diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java index 6155b1727..9ff6e4306 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java @@ -52,7 +52,7 @@ public class TileEntityThermodynamicConductor extends TileEntityTransmitter networks) { return new HeatNetwork(networks); } @@ -120,7 +120,7 @@ public class TileEntityThermodynamicConductor extends TileEntityTransmitter())), new Range4D(coord)); } @Override diff --git a/src/main/java/mekanism/common/voice/VoiceConnection.java b/src/main/java/mekanism/common/voice/VoiceConnection.java index 5d2626a6e..63f79a3fd 100644 --- a/src/main/java/mekanism/common/voice/VoiceConnection.java +++ b/src/main/java/mekanism/common/voice/VoiceConnection.java @@ -48,7 +48,7 @@ public class VoiceConnection extends Thread while(username == null && retryCount <= 100) { try { - List l = Collections.synchronizedList((List)((ArrayList)server.getPlayerList().getPlayers()).clone()); + List l = Collections.synchronizedList(new ArrayList<>(server.getPlayerList().getPlayers())); for(Object obj : l) { diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index 4fb1a8521..73d791324 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -178,7 +178,7 @@ public class GuiIndustrialTurbine extends GuiMekanism if(xAxis > 160 && xAxis < 169 && yAxis > 73 && yAxis < 82) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add((byte)0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index fd2b6057a..fc23687e8 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -162,7 +162,7 @@ public class GuiReactorFuel extends GuiMekanism int toUse = Math.max(0, Integer.parseInt(injectionRateField.getText())); toUse -= toUse%2; - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(0); data.add(toUse); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java index 95b5a3d47..f30feb88d 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java @@ -124,7 +124,7 @@ public class GuiReactorLogicAdapter extends GuiMekanism { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -140,7 +140,7 @@ public class GuiReactorLogicAdapter extends GuiMekanism { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(1); data.add(type.ordinal()); diff --git a/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java b/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java index 4ac1265ac..86932c439 100644 --- a/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java @@ -19,14 +19,14 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderIndustrialTurbine extends TileEntitySpecialRenderer +public class RenderIndustrialTurbine extends TileEntitySpecialRenderer { private Fluid STEAM = FluidRegistry.getFluid("steam"); @Override - public void render(TileEntity tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) + public void render(TileEntityTurbineCasing tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) { - renderAModelAt((TileEntityTurbineCasing)tileEntity, x, y, z, partialTick, destroyStage); + renderAModelAt(tileEntity, x, y, z, partialTick, destroyStage); } public void renderAModelAt(TileEntityTurbineCasing tileEntity, double x, double y, double z, float partialTick, int destroyStage) diff --git a/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java b/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java index 909cb7b61..1db49977e 100644 --- a/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java +++ b/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java @@ -15,7 +15,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderTurbineRotor extends TileEntitySpecialRenderer +public class RenderTurbineRotor extends TileEntitySpecialRenderer { public static boolean internalRender = false; @@ -24,9 +24,9 @@ public class RenderTurbineRotor extends TileEntitySpecialRenderer private static final float BASE_SPEED = 512F; @Override - public void render(TileEntity tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) + public void render(TileEntityTurbineRotor tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) { - renderAModelAt((TileEntityTurbineRotor)tileEntity, x, y, z, partialTick); + renderAModelAt(tileEntity, x, y, z, partialTick); } private void renderAModelAt(TileEntityTurbineRotor tileEntity, double x, double y, double z, float partialTick) diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index c1ba9c218..298f1a6e7 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -311,7 +311,7 @@ public class FusionReactor if(!controller.getWorld().isRemote) { - Mekanism.packetHandler.sendToDimension(new TileEntityMessage(Coord4D.get(controller), controller.getNetworkedData(new ArrayList())), controller.getWorld().provider.getDimension()); + Mekanism.packetHandler.sendToDimension(new TileEntityMessage(Coord4D.get(controller), controller.getNetworkedData(new ArrayList<>())), controller.getWorld().provider.getDimension()); } } @@ -348,7 +348,7 @@ public class FusionReactor if(!controller.getWorld().isRemote) { - Mekanism.packetHandler.sendToDimension(new TileEntityMessage(Coord4D.get(controller), controller.getNetworkedData(new ArrayList())), controller.getWorld().provider.getDimension()); + Mekanism.packetHandler.sendToDimension(new TileEntityMessage(Coord4D.get(controller), controller.getNetworkedData(new ArrayList<>())), controller.getWorld().provider.getDimension()); } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index c04f76689..b04c27a31 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -199,7 +199,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(bioFuelSlot.fluidStored); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index f22161c01..83197efba 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -258,7 +258,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 3b7ff0779..17676753f 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -86,7 +86,7 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement if(updateDelay == 0 && clientActive != isActive) { clientActive = isActive; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); } } @@ -145,7 +145,7 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement if(clientActive != active && updateDelay == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); updateDelay = general.UPDATE_DELAY; clientActive = active; @@ -178,7 +178,7 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 23c44ff2e..35cd304e7 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -258,7 +258,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 5b40148ba..627cb03d5 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -180,7 +180,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); data.add(seesSun); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index a8df3f4d0..8ee6b7433 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -70,7 +70,7 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index 1a1a78d57..2f998ff48 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -115,7 +115,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen if(!world.isRemote && (getReactor().isBurning() != clientBurning || Math.abs(getReactor().getPlasmaTemp() - clientTemp) > 1000000)) { - Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this).getTargetPoint(50D)); + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), Coord4D.get(this).getTargetPoint(50D)); clientBurning = getReactor().isBurning(); clientTemp = getReactor().getPlasmaTemp(); } @@ -263,7 +263,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen MekanismUtils.updateBlock(world, getPos()); } - ((FusionReactor)getReactor()).formed = true; + getReactor().formed = true; getReactor().setPlasmaTemp(dataStream.readDouble()); getReactor().setCaseTemp(dataStream.readDouble()); getReactor().setInjectionRate(dataStream.readInt()); diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java index 11bb06a2f..3f62af9fa 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -126,7 +126,7 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index b1e486901..4763bbd0c 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -450,7 +450,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); @@ -467,7 +467,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl fluidEject = !fluidEject; String modeText = " " + (fluidEject ? EnumColor.DARK_RED : EnumColor.DARK_GREEN) + LangUtils.transOutputInput(fluidEject) + "."; player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurator.reactorPortEject") + modeText)); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); markDirty(); } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index 035fb58aa..d8cd82b09 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -133,7 +133,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock())), new Range4D(Coord4D.get(this))); player.openGui(MekanismGenerators.instance, 6, world, getPos().getX(), getPos().getY(), getPos().getZ()); return true; @@ -175,7 +175,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock getNetworkedData(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java index 19e46f7be..5d6e8a23c 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java @@ -53,7 +53,7 @@ public class TileEntityTurbineRotor extends TileEntityBasicBlock } buildRotors(); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); } private void buildRotors() @@ -117,7 +117,7 @@ public class TileEntityTurbineRotor extends TileEntityBasicBlock rotor.hasComplex = false; } - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, rotor.getNetworkedData(new ArrayList())), new Range4D(coord)); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, rotor.getNetworkedData(new ArrayList<>())), new Range4D(coord)); } } @@ -151,7 +151,7 @@ public class TileEntityTurbineRotor extends TileEntityBasicBlock if(getHousedBlades() != prev) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); } } @@ -223,7 +223,7 @@ public class TileEntityTurbineRotor extends TileEntityBasicBlock } @Override - public ArrayList getNetworkedData(ArrayList data) + public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data);