diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index 9c66ec57b..7a882f69f 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -12,7 +12,7 @@ import net.minecraftforge.oredict.OreDictionary; public class MekanismAPI { //Add a BlockInfo value here if you don't want a certain block to be picked up by cardboard boxes - private static Set cardboardBoxIgnore = new HashSet(); + private static Set cardboardBoxIgnore = new HashSet<>(); /** Mekanism debug mode */ public static boolean debug = false; diff --git a/src/main/java/mekanism/api/Range4D.java b/src/main/java/mekanism/api/Range4D.java index f4b237e2e..dad219c81 100644 --- a/src/main/java/mekanism/api/Range4D.java +++ b/src/main/java/mekanism/api/Range4D.java @@ -83,7 +83,7 @@ public class Range4D public Set getIntersectingChunks() { - Set set = new HashSet(); + Set set = new HashSet<>(); for(int chunkX = xMin >> 4; chunkX <= xMax-1 >> 4; chunkX++) { diff --git a/src/main/java/mekanism/api/gas/GasRegistry.java b/src/main/java/mekanism/api/gas/GasRegistry.java index 25db9667e..6b4bf3c96 100644 --- a/src/main/java/mekanism/api/gas/GasRegistry.java +++ b/src/main/java/mekanism/api/gas/GasRegistry.java @@ -7,7 +7,7 @@ import net.minecraftforge.fluids.Fluid; public class GasRegistry { - private static ArrayList registeredGasses = new ArrayList(); + private static ArrayList registeredGasses = new ArrayList<>(); /** * Register a new gas into GasRegistry. diff --git a/src/main/java/mekanism/api/infuse/InfuseRegistry.java b/src/main/java/mekanism/api/infuse/InfuseRegistry.java index 62928ecf7..d95d11c82 100644 --- a/src/main/java/mekanism/api/infuse/InfuseRegistry.java +++ b/src/main/java/mekanism/api/infuse/InfuseRegistry.java @@ -13,10 +13,10 @@ import net.minecraft.item.ItemStack; public class InfuseRegistry { /** The (private) map of ItemStacks and their related InfuseObjects. */ - private static Map infuseObjects = new HashMap(); + private static Map infuseObjects = new HashMap<>(); /** The (private) map of infuse names and their corresponding InfuseTypes. */ - private static Map infuseTypes = new HashMap(); + private static Map infuseTypes = new HashMap<>(); /** * Registers an InfuseType into the registry. Call this in PreInit! diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 232d6b55c..3fad1b505 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -31,11 +31,11 @@ public abstract class DynamicNetwork> implemen public LinkedHashSet> transmittersToAdd = Sets.newLinkedHashSet(); public LinkedHashSet> transmittersAdded = Sets.newLinkedHashSet(); - public HashMap possibleAcceptors = new HashMap(); - public HashMap> acceptorDirections = new HashMap>(); + public HashMap possibleAcceptors = new HashMap<>(); + public HashMap> acceptorDirections = new HashMap<>(); public HashMap, EnumSet> changedAcceptors = Maps.newHashMap(); - private Set updateQueue = new LinkedHashSet(); + private Set updateQueue = new LinkedHashSet<>(); protected Range4D packetRange = null; @@ -148,15 +148,7 @@ public abstract class DynamicNetwork> implemen public void invalidate() { //Remove invalid transmitters first for share calculations - for(Iterator> iter = transmitters.iterator(); iter.hasNext();) - { - IGridTransmitter transmitter = iter.next(); - - if(!transmitter.isValid()) - { - iter.remove(); - } - } + transmitters.removeIf(transmitter -> !transmitter.isValid()); //Clamp the new buffer clampBuffer(); diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 92721b2bc..8da228fc1 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -160,7 +160,7 @@ public class TransmitterNetworkRegistry { if(startOrphan.isValid() && startOrphan.isOrphan()) { - OrphanPathFinder finder = new OrphanPathFinder(startOrphan); + OrphanPathFinder finder = new OrphanPathFinder<>(startOrphan); finder.start(); N network; diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 35c78708c..6e361d066 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -250,9 +250,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy { - public static Map machineResources = new HashMap(); - public static Map basicResources = new HashMap(); - public static Map transmitterResources = new HashMap(); + public static Map machineResources = new HashMap<>(); + public static Map basicResources = new HashMap<>(); + public static Map transmitterResources = new HashMap<>(); public static final String[] CUSTOM_RENDERS = new String[] {"fluid_tank", "bin_basic", "bin_advanced", "bin_elite", "bin_ultimate", "Jetpack", "FreeRunners", "AtomicDisassembler", "ScubaTank", "GasMask", "ArmoredJetpack", "Flamethrower", "personal_chest", @@ -317,16 +317,16 @@ public class ClientProxy extends CommonProxy @Override public void registerSpecialTileEntities() { - ClientRegistry.registerTileEntity(TileEntityEnrichmentChamber.class, "EnrichmentChamber", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityOsmiumCompressor.class, "OsmiumCompressor", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityCombiner.class, "Combiner", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityCrusher.class, "Crusher", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityFactory.class, "SmeltingFactory", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityAdvancedFactory.class, "AdvancedSmeltingFactory", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityEliteFactory.class, "UltimateSmeltingFactory", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityPurificationChamber.class, "PurificationChamber", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityEnergizedSmelter.class, "EnergizedSmelter", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityEnrichmentChamber.class, "EnrichmentChamber", new RenderConfigurableMachine<>()); + ClientRegistry.registerTileEntity(TileEntityOsmiumCompressor.class, "OsmiumCompressor", new RenderConfigurableMachine<>()); + ClientRegistry.registerTileEntity(TileEntityCombiner.class, "Combiner", new RenderConfigurableMachine<>()); + ClientRegistry.registerTileEntity(TileEntityCrusher.class, "Crusher", new RenderConfigurableMachine<>()); + ClientRegistry.registerTileEntity(TileEntityFactory.class, "SmeltingFactory", new RenderConfigurableMachine<>()); + ClientRegistry.registerTileEntity(TileEntityAdvancedFactory.class, "AdvancedSmeltingFactory", new RenderConfigurableMachine<>()); + ClientRegistry.registerTileEntity(TileEntityEliteFactory.class, "UltimateSmeltingFactory", new RenderConfigurableMachine<>()); + ClientRegistry.registerTileEntity(TileEntityPurificationChamber.class, "PurificationChamber", new RenderConfigurableMachine<>()); + ClientRegistry.registerTileEntity(TileEntityEnergizedSmelter.class, "EnergizedSmelter", new RenderConfigurableMachine<>()); + ClientRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser", new RenderConfigurableMachine<>()); ClientRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank", new RenderGasTank()); ClientRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube", new RenderEnergyCube()); ClientRegistry.registerTileEntity(TileEntityPersonalChest.class, "PersonalChest", new RenderPersonalChest()); @@ -337,15 +337,15 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityBin.class, "Bin", new RenderBin()); ClientRegistry.registerTileEntity(TileEntityDigitalMiner.class, "DigitalMiner", new RenderDigitalMiner()); ClientRegistry.registerTileEntity(TileEntityTeleporter.class, "MekanismTeleporter", new RenderTeleporter()); - ClientRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber", new RenderConfigurableMachine<>()); ClientRegistry.registerTileEntity(TileEntityThermalEvaporationController.class, "ThermalEvaporationController", new RenderThermalEvaporationController()); - ClientRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill", new RenderConfigurableMachine<>()); ClientRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer", new RenderChemicalCrystallizer()); ClientRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator", new RenderSeismicVibrator()); - ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderConfigurableMachine<>()); ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank", new RenderFluidTank()); ClientRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator", new RenderSolarNeutronActivator()); - ClientRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator", new RenderConfigurableMachine<>()); ClientRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater", new RenderResistiveHeater()); ClientRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing", new RenderThermoelectricBoiler()); ClientRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve", new RenderThermoelectricBoiler()); @@ -461,7 +461,7 @@ public class ClientProxy extends CommonProxy continue; } - List modelsToAdd = new ArrayList(); + List modelsToAdd = new ArrayList<>(); String resource = "mekanism:" + type.getName(); RecipeType recipePointer = null; @@ -475,7 +475,7 @@ public class ClientProxy extends CommonProxy { if(machineResources.get(resource) == null) { - List entries = new ArrayList(); + List entries = new ArrayList<>(); if(type.hasActiveTexture()) { @@ -529,7 +529,7 @@ public class ClientProxy extends CommonProxy for(BasicBlockType type : BasicBlockType.values()) { - List modelsToAdd = new ArrayList(); + List modelsToAdd = new ArrayList<>(); String resource = "mekanism:" + type.getName(); BaseTier tierPointer = null; @@ -543,7 +543,7 @@ public class ClientProxy extends CommonProxy { if(basicResources.get(resource) == null) { - List entries = new ArrayList(); + List entries = new ArrayList<>(); if(type.hasActiveTexture()) { @@ -601,7 +601,7 @@ public class ClientProxy extends CommonProxy for(TransmitterType type : TransmitterType.values()) { - List modelsToAdd = new ArrayList(); + List modelsToAdd = new ArrayList<>(); String resource = "mekanism:" + type.getName(); BaseTier tierPointer = null; @@ -658,135 +658,117 @@ public class ClientProxy extends CommonProxy ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName())); } - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.GasTank), new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - GasTankTier tier = GasTankTier.values()[((ItemBlockGasTank)stack.getItem()).getBaseTier(stack).ordinal()]; - ResourceLocation baseLocation = new ResourceLocation("mekanism", "GasTank"); - - return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); - } - }); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.GasTank), stack -> + { + GasTankTier tier = GasTankTier.values()[((ItemBlockGasTank)stack.getItem()).getBaseTier(stack).ordinal()]; + ResourceLocation baseLocation = new ResourceLocation("mekanism", "GasTank"); + + return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); + }); - ItemMeshDefinition machineMesher = new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - MachineType type = MachineType.get(stack); - - if(type != null) - { - String resource = "mekanism:" + type.getName(); - - if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) - { - RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)]; - resource = "mekanism:" + type.getName() + "_" + recipe.getName(); - } - - return machineResources.get(resource); - } - - return null; - } - }; + ItemMeshDefinition machineMesher = stack -> + { + MachineType type = MachineType.get(stack); + + if(type != null) + { + String resource = "mekanism:" + type.getName(); + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)]; + resource = "mekanism:" + type.getName() + "_" + recipe.getName(); + } + + return machineResources.get(resource); + } + + return null; + }; ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock), machineMesher); ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), machineMesher); ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), machineMesher); - ItemMeshDefinition basicMesher = new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - BasicBlockType type = BasicBlockType.get(stack); - - if(type != null) - { - String resource = "mekanism:" + type.getName(); - - if(type.tiers) - { - BaseTier tier = ((ItemBlockBasic)stack.getItem()).getBaseTier(stack); - resource = "mekanism:" + type.getName() + "_" + tier.getName(); - } - - return basicResources.get(resource); - } - - return null; - } - }; + ItemMeshDefinition basicMesher = stack -> + { + BasicBlockType type = BasicBlockType.get(stack); + + if(type != null) + { + String resource = "mekanism:" + type.getName(); + + if(type.tiers) + { + BaseTier tier = ((ItemBlockBasic)stack.getItem()).getBaseTier(stack); + resource = "mekanism:" + type.getName() + "_" + tier.getName(); + } + + return basicResources.get(resource); + } + + return null; + }; ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock), basicMesher); ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), basicMesher); - ItemMeshDefinition transmitterMesher = new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - TransmitterType type = TransmitterType.get(stack.getItemDamage()); - - if(type != null) - { - String resource = "mekanism:" + type.getName(); - - if(type.hasTiers()) - { - BaseTier tier = ((ItemBlockTransmitter)stack.getItem()).getBaseTier(stack); - resource = "mekanism:" + type.getName() + "_" + tier.getName(); - } - - return transmitterResources.get(resource); - } - - return null; - } - }; + ItemMeshDefinition transmitterMesher = stack -> + { + TransmitterType type = TransmitterType.get(stack.getItemDamage()); + + if(type != null) + { + String resource = "mekanism:" + type.getName(); + + if(type.hasTiers()) + { + BaseTier tier = ((ItemBlockTransmitter)stack.getItem()).getBaseTier(stack); + resource = "mekanism:" + type.getName() + "_" + tier.getName(); + } + + return transmitterResources.get(resource); + } + + return null; + }; ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.Transmitter), transmitterMesher); //Walkie Talkie dynamic texture - ModelLoader.setCustomMeshDefinition(MekanismItems.WalkieTalkie, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - if(!stack.isEmpty() && stack.getItem() instanceof ItemWalkieTalkie) - { - ItemWalkieTalkie item = (ItemWalkieTalkie)stack.getItem(); + ModelLoader.setCustomMeshDefinition(MekanismItems.WalkieTalkie, stack -> + { + if(!stack.isEmpty() && stack.getItem() instanceof ItemWalkieTalkie) + { + ItemWalkieTalkie item = (ItemWalkieTalkie)stack.getItem(); - if(item.getOn(stack)) - { - return ItemWalkieTalkie.CHANNEL_MODELS.get(item.getChannel(stack)); - } - } + if(item.getOn(stack)) + { + return ItemWalkieTalkie.CHANNEL_MODELS.get(item.getChannel(stack)); + } + } - return ItemWalkieTalkie.OFF_MODEL; - } - }); + return ItemWalkieTalkie.OFF_MODEL; + }); //Crafting Formula dynamic texture - ModelLoader.setCustomMeshDefinition(MekanismItems.CraftingFormula, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - if(!stack.isEmpty() && stack.getItem() instanceof ItemCraftingFormula) - { - ItemCraftingFormula item = (ItemCraftingFormula)stack.getItem(); + ModelLoader.setCustomMeshDefinition(MekanismItems.CraftingFormula, stack -> + { + if(!stack.isEmpty() && stack.getItem() instanceof ItemCraftingFormula) + { + ItemCraftingFormula item = (ItemCraftingFormula)stack.getItem(); - if(item.getInventory(stack) == null) - { - return ItemCraftingFormula.MODEL; - } - else { - return item.isInvalid(stack) ? ItemCraftingFormula.INVALID_MODEL : ItemCraftingFormula.ENCODED_MODEL; - } - } + if(item.getInventory(stack) == null) + { + return ItemCraftingFormula.MODEL; + } + else { + return item.isInvalid(stack) ? ItemCraftingFormula.INVALID_MODEL : ItemCraftingFormula.ENCODED_MODEL; + } + } - return ItemCraftingFormula.MODEL; - } - }); + return ItemCraftingFormula.MODEL; + }); OBJLoader.INSTANCE.addDomain("mekanism"); } @@ -1002,13 +984,7 @@ public class ClientProxy extends CommonProxy @Override public void doMultiblockSparkle(final TileEntityMultiblock tileEntity) { - new SparkleAnimation(tileEntity, new INodeChecker() { - @Override - public boolean isNode(TileEntity tile) - { - return MultiblockManager.areEqual(tile, tileEntity); - } - }).run(); + new SparkleAnimation(tileEntity, tile -> MultiblockManager.areEqual(tile, tileEntity)).run(); } @Override @@ -1016,67 +992,52 @@ public class ClientProxy extends CommonProxy { super.init(); - Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler(new IBlockColor() { - @Override - public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) - { - BlockMachine machine = (BlockMachine)state.getBlock(); - - if(state.getValue(machine.getMachineBlock().getProperty()) == MachineType.FLUID_TANK) + Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler((state, worldIn, pos, tintIndex) -> + { + BlockMachine machine = (BlockMachine)state.getBlock(); + + if(state.getValue(machine.getMachineBlock().getProperty()) == MachineType.FLUID_TANK) + { + EnumColor color = state.getValue(BlockStateMachine.tierProperty).getColor(); + + return (int)(color.getColor(0)*255) << 16 | (int)(color.getColor(1)*255) << 8 | (int)(color.getColor(2)*255); + } + + return -1; + }, MekanismBlocks.MachineBlock, MekanismBlocks.MachineBlock2, MekanismBlocks.MachineBlock3); + Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler((state, worldIn, pos, tintIndex) -> { - EnumColor color = state.getValue(BlockStateMachine.tierProperty).getColor(); - - return (int)(color.getColor(0)*255) << 16 | (int)(color.getColor(1)*255) << 8 | (int)(color.getColor(2)*255); - } - - return -1; - } - }, MekanismBlocks.MachineBlock, MekanismBlocks.MachineBlock2, MekanismBlocks.MachineBlock3); - Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler(new IBlockColor() { - @Override - public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) - { - EnumDyeColor color = state.getValue(colorProperty); - EnumColor dye = EnumColor.DYES[color.getDyeDamage()]; - - return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); - } - }, MekanismBlocks.PlasticBlock, MekanismBlocks.GlowPlasticBlock, MekanismBlocks.RoadPlasticBlock, MekanismBlocks.ReinforcedPlasticBlock, + EnumDyeColor color = state.getValue(colorProperty); + EnumColor dye = EnumColor.DYES[color.getDyeDamage()]; + + return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); + }, MekanismBlocks.PlasticBlock, MekanismBlocks.GlowPlasticBlock, MekanismBlocks.RoadPlasticBlock, MekanismBlocks.ReinforcedPlasticBlock, MekanismBlocks.SlickPlasticBlock, MekanismBlocks.PlasticFence); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() { - @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex) - { - if(MachineType.get(stack) == MachineType.FLUID_TANK) + Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> + { + if(MachineType.get(stack) == MachineType.FLUID_TANK) + { + EnumColor color = ((ItemBlockMachine)stack.getItem()).getBaseTier(stack).getColor(); + + return (int)(color.getColor(0)*255) << 16 | (int)(color.getColor(1)*255) << 8 | (int)(color.getColor(2)*255); + } + + return -1; + }, MekanismBlocks.MachineBlock, MekanismBlocks.MachineBlock2, MekanismBlocks.MachineBlock3); + Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> { - EnumColor color = ((ItemBlockMachine)stack.getItem()).getBaseTier(stack).getColor(); - - return (int)(color.getColor(0)*255) << 16 | (int)(color.getColor(1)*255) << 8 | (int)(color.getColor(2)*255); - } - - return -1; - } - }, MekanismBlocks.MachineBlock, MekanismBlocks.MachineBlock2, MekanismBlocks.MachineBlock3); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() { - @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex) - { - EnumDyeColor dyeColor = EnumDyeColor.byDyeDamage(stack.getItemDamage()&15); - EnumColor dye = EnumColor.DYES[dyeColor.getDyeDamage()]; - - return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); - } - }, MekanismBlocks.PlasticBlock, MekanismBlocks.GlowPlasticBlock, MekanismBlocks.RoadPlasticBlock, MekanismBlocks.ReinforcedPlasticBlock, + EnumDyeColor dyeColor = EnumDyeColor.byDyeDamage(stack.getItemDamage()&15); + EnumColor dye = EnumColor.DYES[dyeColor.getDyeDamage()]; + + return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); + }, MekanismBlocks.PlasticBlock, MekanismBlocks.GlowPlasticBlock, MekanismBlocks.RoadPlasticBlock, MekanismBlocks.ReinforcedPlasticBlock, MekanismBlocks.SlickPlasticBlock, MekanismBlocks.PlasticFence); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() { - @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex) - { - EnumColor dye = EnumColor.DYES[stack.getItemDamage()]; - - return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); - } - }, MekanismItems.Balloon); + Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> + { + EnumColor dye = EnumColor.DYES[stack.getItemDamage()]; + + return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); + }, MekanismItems.Balloon); MinecraftForge.EVENT_BUS.register(new ClientConnectionHandler()); MinecraftForge.EVENT_BUS.register(new ClientPlayerTracker()); @@ -1114,41 +1075,11 @@ public class ClientProxy extends CommonProxy MinecraftForge.EVENT_BUS.register(MekanismOBJLoader.INSTANCE); //Register entity rendering handlers - RenderingRegistry.registerEntityRenderingHandler(EntityObsidianTNT.class, new IRenderFactory() { - @Override - public Render createRenderFor(RenderManager manager) - { - return new RenderObsidianTNTPrimed(manager); - } - }); - RenderingRegistry.registerEntityRenderingHandler(EntityRobit.class, new IRenderFactory() { - @Override - public Render createRenderFor(RenderManager manager) - { - return new RenderRobit(manager); - } - }); - RenderingRegistry.registerEntityRenderingHandler(EntityBalloon.class, new IRenderFactory() { - @Override - public Render createRenderFor(RenderManager manager) - { - return new RenderBalloon(manager); - } - }); - RenderingRegistry.registerEntityRenderingHandler(EntityBabySkeleton.class, new IRenderFactory() { - @Override - public Render createRenderFor(RenderManager manager) - { - return new RenderSkeleton(manager); - } - }); - RenderingRegistry.registerEntityRenderingHandler(EntityFlame.class, new IRenderFactory() { - @Override - public Render createRenderFor(RenderManager manager) - { - return new RenderFlame(manager); - } - }); + RenderingRegistry.registerEntityRenderingHandler(EntityObsidianTNT.class, RenderObsidianTNTPrimed::new); + RenderingRegistry.registerEntityRenderingHandler(EntityRobit.class, RenderRobit::new); + RenderingRegistry.registerEntityRenderingHandler(EntityBalloon.class, RenderBalloon::new); + RenderingRegistry.registerEntityRenderingHandler(EntityBabySkeleton.class, RenderSkeleton::new); + RenderingRegistry.registerEntityRenderingHandler(EntityFlame.class, RenderFlame::new); } @Override diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 4a284ffba..8844c0274 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -91,11 +91,11 @@ public class ClientTickHandler public static final String DONATE_CAPE = "https://dl.dropboxusercontent.com/u/90411166/donate.png"; public static final String AIDAN_CAPE = "https://dl.dropboxusercontent.com/u/90411166/aidan.png"; - private Map mikeDownload = new HashMap(); - private Map donateDownload = new HashMap(); - private Map aidanDownload = new HashMap(); + private Map mikeDownload = new HashMap<>(); + private Map donateDownload = new HashMap<>(); + private Map aidanDownload = new HashMap<>(); - public static Set tickingSet = new HashSet(); + public static Set tickingSet = new HashSet<>(); public static Map portableTeleports = new HashMap<>(); public static int wheelStatus = 0; @@ -499,13 +499,7 @@ public class ClientTickHandler public static void killDeadNetworks() { - for(Iterator iter = tickingSet.iterator(); iter.hasNext();) - { - if(!iter.next().needsTicks()) - { - iter.remove(); - } - } + tickingSet.removeIf(iClientTicker -> !iClientTicker.needsTicks()); } public static boolean isJetpackOn(EntityPlayer player) diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index eed3bca90..5ac7a79f1 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -17,8 +17,8 @@ public final class HolidayManager private static Calendar calendar = Calendar.getInstance(); private static Minecraft mc = Minecraft.getMinecraft(); - public static List holidays = new ArrayList(); - private static List holidaysNotified = new ArrayList(); + public static List holidays = new ArrayList<>(); + private static List holidaysNotified = new ArrayList<>(); public static void init() { diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index dcbf3beb6..600a41e43 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -21,8 +21,8 @@ import net.minecraftforge.common.MinecraftForge; public class MekanismClient extends Mekanism { - public static Map clientSecurityMap = new HashMap(); - public static Map clientUUIDMap = new HashMap(); + public static Map clientSecurityMap = new HashMap<>(); + public static Map clientUUIDMap = new HashMap<>(); public static VoiceClient voiceClient; diff --git a/src/main/java/mekanism/client/SparkleAnimation.java b/src/main/java/mekanism/client/SparkleAnimation.java index 5511a7537..395157389 100644 --- a/src/main/java/mekanism/client/SparkleAnimation.java +++ b/src/main/java/mekanism/client/SparkleAnimation.java @@ -22,7 +22,7 @@ public class SparkleAnimation public Random random = new Random(); - public Set iteratedNodes = new HashSet(); + public Set iteratedNodes = new HashSet<>(); public INodeChecker nodeChecker; @@ -44,26 +44,23 @@ public class SparkleAnimation } catch(Exception e) {} try { - new Thread() { - @Override - public void run() - { - World world = pointer.getWorld(); - - for(Coord4D coord : iteratedNodes) - { - for(int i = 0; i < 6; i++) - { - world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + random.nextDouble(), coord.y + -.01, coord.z + random.nextDouble(), 0, 0, 0); - world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + random.nextDouble(), coord.y + 1.01, coord.z + random.nextDouble(), 0, 0, 0); - world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + random.nextDouble(), coord.y + random.nextDouble(), coord.z + -.01, 0, 0, 0); - world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + random.nextDouble(), coord.y + random.nextDouble(), coord.z + 1.01, 0, 0, 0); - world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + -.01, coord.y + random.nextDouble(), coord.z + random.nextDouble(), 0, 0, 0); - world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + 1.01, coord.y + random.nextDouble(), coord.z + random.nextDouble(), 0, 0, 0); - } - } - } - }.start(); + new Thread(() -> + { + World world = pointer.getWorld(); + + for(Coord4D coord : iteratedNodes) + { + for(int i = 0; i < 6; i++) + { + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + random.nextDouble(), coord.y + -.01, coord.z + random.nextDouble(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + random.nextDouble(), coord.y + 1.01, coord.z + random.nextDouble(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + random.nextDouble(), coord.y + random.nextDouble(), coord.z + -.01, 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + random.nextDouble(), coord.y + random.nextDouble(), coord.z + 1.01, 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + -.01, coord.y + random.nextDouble(), coord.z + random.nextDouble(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.x + 1.01, coord.y + random.nextDouble(), coord.z + random.nextDouble(), 0, 0, 0); + } + } + }).start(); } catch(Exception e) {} } diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index fdf213e07..796fb0ec2 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -45,14 +45,11 @@ public class GuiAdvancedElectricMachine extends GuiMekanism guiElements.add(new GuiSideConfigurationTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiPowerBar(this, tileEntity, tileEntity.guiLocation, 164, 15)); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, tileEntity.guiLocation)); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, tileEntity.guiLocation)); guiElements.add(new GuiSlot(SlotType.INPUT, this, tileEntity.guiLocation, 55, 16)); guiElements.add(new GuiSlot(SlotType.POWER, this, tileEntity.guiLocation, 30, 34).with(SlotOverlay.POWER)); @@ -124,4 +121,4 @@ public class GuiAdvancedElectricMachine extends GuiMekanism mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, gas.getGas().getSprite(), sizeX, sizeY); } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java b/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java index e4fdb89ff..71a48f2e7 100644 --- a/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java +++ b/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java @@ -22,13 +22,7 @@ public class GuiAmbientAccumulator extends GuiMekanism super(tile, new ContainerNull(player, tile)); tileEntity = tile; - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.collectedGas; - } - }, Type.WIDE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 26, 16)); + guiElements.add(new GuiGasGauge(() -> tileEntity.collectedGas, Type.WIDE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 26, 16)); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java index 03cb08630..845f606d3 100644 --- a/src/main/java/mekanism/client/gui/GuiBoilerStats.java +++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java @@ -37,29 +37,14 @@ public class GuiBoilerStats extends GuiMekanism super(tentity, new ContainerNull(inventory.player, tentity)); tileEntity = tentity; guiElements.add(new GuiBoilerTab(this, tileEntity, BoilerTab.MAIN, 6, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"))); - guiElements.add(new GuiHeatInfo(new IInfoHandler() { - @Override - public List getInfo() - { - TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; - String environment = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss*unit.intervalSize, false, unit); - return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"))); - guiElements.add(boilGraph = new GuiGraph(this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"), 8, 83, 160, 36, new GraphDataHandler() { - @Override - public String getDataDisplay(int data) - { - return LangUtils.localize("gui.boilRate") + ": " + data + " mB/t"; - } - })); - guiElements.add(maxGraph = new GuiGraph(this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"), 8, 122, 160, 36, new GraphDataHandler() { - @Override - public String getDataDisplay(int data) - { - return LangUtils.localize("gui.maxBoil") + ": " + data + " mB/t"; - } - })); + guiElements.add(new GuiHeatInfo(() -> + { + TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; + String environment = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss*unit.intervalSize, false, unit); + return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"))); + guiElements.add(boilGraph = new GuiGraph(this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"), 8, 83, 160, 36, data -> LangUtils.localize("gui.boilRate") + ": " + data + " mB/t")); + guiElements.add(maxGraph = new GuiGraph(this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"), 8, 122, 160, 36, data -> LangUtils.localize("gui.maxBoil") + ": " + data + " mB/t")); maxGraph.enableFixedScale((int)((tentity.structure.superheatingElements*general.superheatingHeatTransfer)/SynchronizedBoilerData.getHeatEnthalpy())); } diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index 91d2e414b..4c7f62b12 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -43,14 +43,11 @@ public class GuiChanceMachine extends GuiMekanism guiElements.add(new GuiSideConfigurationTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiPowerBar(this, tileEntity, tileEntity.guiLocation, 164, 15)); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, tileEntity.guiLocation)); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, tileEntity.guiLocation)); guiElements.add(new GuiSlot(SlotType.INPUT, this, tileEntity.guiLocation, 55, 16)); guiElements.add(new GuiSlot(SlotType.POWER, this, tileEntity.guiLocation, 55, 52).with(SlotOverlay.POWER)); diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index a2c26dbb4..fcc80eb85 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -54,7 +54,7 @@ public class GuiChemicalCrystallizer extends GuiMekanism public int stackIndex = 0; - public List iterStacks = new ArrayList(); + public List iterStacks = new ArrayList<>(); public GuiChemicalCrystallizer(InventoryPlayer inventory, TileEntityChemicalCrystallizer tentity) { @@ -67,21 +67,12 @@ public class GuiChemicalCrystallizer extends GuiMekanism guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"), 160, 23)); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.inputTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"), 5, 4)); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); + guiElements.add(new GuiGasGauge(() -> tileEntity.inputTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"), 5, 4)); guiElements.add(new GuiSlot(SlotType.EXTRA, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"), 5, 64).with(SlotOverlay.PLUS)); guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"), 154, 4).with(SlotOverlay.POWER)); guiElements.add(new GuiSlot(SlotType.OUTPUT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"), 130, 56)); @@ -220,13 +211,13 @@ public class GuiChemicalCrystallizer extends GuiMekanism { if(iterStacks == null) { - iterStacks = new ArrayList(); + iterStacks = new ArrayList<>(); } else { iterStacks.clear(); } - List keys = new ArrayList(); + List keys = new ArrayList<>(); for(String s : OreDictionary.getOreNames()) { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index dd7460cc1..dc86903c4 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -42,28 +42,13 @@ public class GuiChemicalDissolutionChamber extends GuiMekanism guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"))); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.injectTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"), 5, 4)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.outputTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"), 133, 13)); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"))); + guiElements.add(new GuiGasGauge(() -> tileEntity.injectTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"), 5, 4)); + guiElements.add(new GuiGasGauge(() -> tileEntity.outputTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"), 133, 13)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"), 154, 4).with(SlotOverlay.POWER)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"), 25, 35)); diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index 96cf203af..a37e63096 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -42,35 +42,14 @@ public class GuiChemicalInfuser extends GuiMekanism guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + usage + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.leftTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 25, 13)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.centerTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 79, 4)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.rightTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 133, 13)); + guiElements.add(new GuiEnergyInfo(() -> + { + String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + usage + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); + guiElements.add(new GuiGasGauge(() -> tileEntity.leftTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 25, 13)); + guiElements.add(new GuiGasGauge(() -> tileEntity.centerTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 79, 4)); + guiElements.add(new GuiGasGauge(() -> tileEntity.rightTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 133, 13)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 154, 4).with(SlotOverlay.POWER)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 154, 55).with(SlotOverlay.MINUS)); diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index 4bc0f393e..2c8b7b502 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -42,21 +42,12 @@ public class GuiChemicalOxidizer extends GuiMekanism guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.gasTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 133, 13)); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); + guiElements.add(new GuiGasGauge(() -> tileEntity.gasTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 133, 13)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 154, 4).with(SlotOverlay.POWER)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 25, 35)); diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index 63d657f18..90c78c0a0 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -48,36 +48,14 @@ public class GuiChemicalWasher extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); guiElements.add(new GuiBucketIO(this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + usage + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); - guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() - { - @Override - public FluidTank getTank() - { - return tileEntity.fluidTank; - } - }, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"), 5, 4)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.inputTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"), 26, 13)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.outputTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"), 133, 13)); + guiElements.add(new GuiEnergyInfo(() -> + { + String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + usage + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); + guiElements.add(new GuiFluidGauge(() -> tileEntity.fluidTank, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"), 5, 4)); + guiElements.add(new GuiGasGauge(() -> tileEntity.inputTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"), 26, 13)); + guiElements.add(new GuiGasGauge(() -> tileEntity.outputTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"), 133, 13)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"), 154, 4).with(SlotOverlay.POWER)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"), 154, 55).with(SlotOverlay.MINUS)); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index 11ef91c66..8fcbb3ba8 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -59,14 +59,11 @@ public class GuiDigitalMiner extends GuiMekanism guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"), 163, 23)); guiElements.add(new GuiVisualsTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.getPerTick()); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.getPerTick()); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"), 151, 5).with(SlotOverlay.POWER)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"), 143, 26)); @@ -116,14 +113,14 @@ public class GuiDigitalMiner extends GuiMekanism if(guibutton.id == 0) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(3); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); } else if(guibutton.id == 1) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(4); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -308,7 +305,7 @@ public class GuiDigitalMiner 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)); @@ -318,7 +315,7 @@ public class GuiDigitalMiner 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)); @@ -328,7 +325,7 @@ public class GuiDigitalMiner 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)); @@ -338,7 +335,7 @@ public class GuiDigitalMiner extends GuiMekanism { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(9); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 25fd0a5d3..10931b617 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -66,8 +66,8 @@ public class GuiDigitalMinerConfig extends GuiMekanism public int stackSwitch = 0; - public Map oreDictStacks = new HashMap(); - public Map modIDStacks = new HashMap(); + public Map oreDictStacks = new HashMap<>(); + public Map modIDStacks = new HashMap<>(); public float scroll; @@ -167,8 +167,8 @@ public class GuiDigitalMinerConfig extends GuiMekanism } } - Set oreDictFilters = new HashSet(); - Set modIDFilters = new HashSet(); + Set oreDictFilters = new HashSet<>(); + Set modIDFilters = new HashSet<>(); for(int i = 0; i < 4; i++) { diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 6da4b4b4a..a874e79ce 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -43,14 +43,11 @@ public class GuiElectricMachine extends GuiMekanism guiElements.add(new GuiSideConfigurationTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiPowerBar(this, tileEntity, tileEntity.guiLocation, 164, 15)); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, tileEntity.guiLocation)); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, tileEntity.guiLocation)); guiElements.add(new GuiSlot(SlotType.INPUT, this, tileEntity.guiLocation, 55, 16)); guiElements.add(new GuiSlot(SlotType.POWER, this, tileEntity.guiLocation, 55, 52).with(SlotOverlay.POWER)); @@ -91,4 +88,4 @@ public class GuiElectricMachine extends GuiMekanism super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index b5d573196..4931cd0bc 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -44,21 +44,12 @@ public class GuiElectricPump extends GuiMekanism guiElements.add(new GuiSlot(SlotType.NORMAL, this, guiLocation, 27, 50)); guiElements.add(new GuiSlot(SlotType.POWER, this, guiLocation, 142, 34).with(SlotOverlay.POWER)); guiElements.add(new GuiPowerBar(this, tileEntity, guiLocation, 164, 15)); - guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { - @Override - public FluidTank getTank() - { - return tileEntity.fluidTank; - } - }, GuiGauge.Type.STANDARD, this, guiLocation, 6, 13)); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, guiLocation)); + guiElements.add(new GuiFluidGauge(() -> tileEntity.fluidTank, GuiGauge.Type.STANDARD, this, guiLocation, 6, 13)); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, guiLocation)); guiElements.add(new GuiSecurityTab(this, tileEntity, guiLocation)); guiElements.add(new GuiRedstoneControl(this, tileEntity, guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, guiLocation)); diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index d524ee56a..762df0fc1 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -54,35 +54,14 @@ public class GuiElectrolyticSeparator extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + usage + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"))); - guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { - @Override - public FluidTank getTank() - { - return tileEntity.fluidTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 5, 10)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.leftTank; - } - }, GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 18)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.rightTank; - } - }, GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 18)); + guiElements.add(new GuiEnergyInfo(() -> + { + String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + usage + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"))); + guiElements.add(new GuiFluidGauge(() -> tileEntity.fluidTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 5, 10)); + guiElements.add(new GuiGasGauge(() -> tileEntity.leftTank, GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 18)); + guiElements.add(new GuiGasGauge(() -> tileEntity.rightTank, GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 18)); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 164, 15)); guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"))); diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index 35288cb02..2e6ffa270 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -39,24 +39,10 @@ public class GuiEnergyCube extends GuiMekanism guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); - guiElements.add(new GuiEnergyGauge(new IEnergyInfoHandler() - { - @Override - public IStrictEnergyStorage getEnergyStorage() - { - return tileEntity; - } - }, GuiEnergyGauge.Type.WIDE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"), 55, 18)); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() - { - @Override - public List getInfo() - { - return ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), - LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); + guiElements.add(new GuiEnergyGauge(() -> tileEntity, GuiEnergyGauge.Type.WIDE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"), 55, 18)); + guiElements.add(new GuiEnergyInfo(() -> ListUtils.asList( + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), + LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"), this, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"), 16, 34).with(SlotOverlay.MINUS)); guiElements.add(new GuiSlot(SlotType.OUTPUT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"), 142, 34).with(SlotOverlay.PLUS)); } diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index db833d915..3f582b49e 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -55,14 +55,11 @@ public class GuiFactory extends GuiMekanism guiElements.add(new GuiSideConfigurationTab(this, tileEntity, tileEntity.tier.guiLocation)); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, tileEntity.tier.guiLocation)); guiElements.add(new GuiSortingTab(this, tileEntity, tileEntity.tier.guiLocation)); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.lastUsage); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, tileEntity.tier.guiLocation)); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.lastUsage); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, tileEntity.tier.guiLocation)); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiFluidTank.java b/src/main/java/mekanism/client/gui/GuiFluidTank.java index e50226cc2..46de832b6 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidTank.java +++ b/src/main/java/mekanism/client/gui/GuiFluidTank.java @@ -30,14 +30,7 @@ public class GuiFluidTank extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiContainerEditMode(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); - guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() - { - @Override - public FluidTank getTank() - { - return tileEntity.fluidTank; - } - }, GuiFluidGauge.Type.WIDE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 48, 18)); + guiElements.add(new GuiFluidGauge(() -> tileEntity.fluidTank, GuiFluidGauge.Type.WIDE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 48, 18)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 145, 18).with(SlotOverlay.INPUT)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 145, 50).with(SlotOverlay.OUTPUT)); } diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index 6466a762f..cb2c1ade3 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -44,21 +44,12 @@ public class GuiFluidicPlenisher extends GuiMekanism guiElements.add(new GuiSlot(SlotType.NORMAL, this, guiLocation, 27, 50)); guiElements.add(new GuiSlot(SlotType.POWER, this, guiLocation, 142, 34).with(SlotOverlay.POWER)); guiElements.add(new GuiPowerBar(this, tileEntity, guiLocation, 164, 15)); - guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { - @Override - public FluidTank getTank() - { - return tileEntity.fluidTank; - } - }, GuiGauge.Type.STANDARD, this, guiLocation, 6, 13)); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, guiLocation)); + guiElements.add(new GuiFluidGauge(() -> tileEntity.fluidTank, GuiGauge.Type.STANDARD, this, guiLocation, 6, 13)); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, guiLocation)); guiElements.add(new GuiSecurityTab(this, tileEntity, guiLocation)); guiElements.add(new GuiRedstoneControl(this, tileEntity, guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, guiLocation)); diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index f3c16f145..f3136efd4 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -56,14 +56,11 @@ public class GuiFormulaicAssemblicator extends GuiMekanism guiElements.add(new GuiSideConfigurationTab(this, tileEntity, guiLocation)); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, guiLocation)); guiElements.add(new GuiPowerBar(this, tileEntity, guiLocation, 159, 15)); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, guiLocation)); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, guiLocation)); guiElements.add(new GuiSlot(SlotType.POWER, this, guiLocation, 151, 75).with(SlotOverlay.POWER)); ySize+=64; diff --git a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java index 6e84da134..a5b49ff4d 100644 --- a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java +++ b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java @@ -34,15 +34,12 @@ public class GuiFuelwoodHeater extends GuiMekanism guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png"), 14, 28)); guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png"))); - guiElements.add(new GuiHeatInfo(new IInfoHandler() { - @Override - public List getInfo() - { - TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; - String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss*unit.intervalSize, false, unit); - return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png"))); + guiElements.add(new GuiHeatInfo(() -> + { + TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; + String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss*unit.intervalSize, false, unit); + return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png"))); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index e40c9a411..fc6c15667 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -29,17 +29,10 @@ public class GuiInductionMatrix extends GuiMekanism super(tentity, new ContainerInductionMatrix(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiMatrixTab(this, tileEntity, MatrixTab.STAT, 6, MekanismUtils.getResource(ResourceType.GUI, "GuiInductionMatrix.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() - { - @Override - public List getInfo() - { - return ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), - LangUtils.localize("gui.input") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/t", - LangUtils.localize("gui.output") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiInductionMatrix.png"))); + guiElements.add(new GuiEnergyInfo(() -> ListUtils.asList( + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), + LangUtils.localize("gui.input") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/t", + LangUtils.localize("gui.output") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t"), this, MekanismUtils.getResource(ResourceType.GUI, "GuiInductionMatrix.png"))); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 69bd06d87..7985f9c4b 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -82,9 +82,9 @@ public class GuiLogisticalSorter extends GuiMekanism public int stackSwitch = 0; - public Map oreDictStacks = new HashMap(); + public Map oreDictStacks = new HashMap<>(); - public Map modIDStacks = new HashMap(); + public Map modIDStacks = new HashMap<>(); public GuiLogisticalSorter(EntityPlayer player, TileEntityLogisticalSorter entity) { @@ -186,8 +186,8 @@ public class GuiLogisticalSorter extends GuiMekanism } } - final Set oreDictFilters = new HashSet(); - final Set modIDFilters = new HashSet(); + final Set oreDictFilters = new HashSet<>(); + final Set modIDFilters = new HashSet<>(); for(int i = 0; i < 4; i++) { @@ -736,4 +736,4 @@ public class GuiLogisticalSorter extends GuiMekanism { return tileEntity.filters.size() > 4; } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java index a6e02fa4d..fecb2e060 100644 --- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java +++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java @@ -33,14 +33,7 @@ public class GuiMatrixStats extends GuiMekanism super(tentity, new ContainerNull(inventory.player, tentity)); tileEntity = tentity; guiElements.add(new GuiMatrixTab(this, tileEntity, MatrixTab.MAIN, 6, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); - guiElements.add(new GuiEnergyGauge(new IEnergyInfoHandler() - { - @Override - public IStrictEnergyStorage getEnergyStorage() - { - return tileEntity; - } - }, GuiEnergyGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"), 6, 13)); + guiElements.add(new GuiEnergyGauge(() -> tileEntity, GuiEnergyGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"), 6, 13)); guiElements.add(new GuiRateBar(this, new IRateInfoHandler() { @Override @@ -69,17 +62,10 @@ public class GuiMatrixStats extends GuiMekanism return tileEntity.structure.lastOutput/tileEntity.structure.transferCap; } }, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"), 38, 13)); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() - { - @Override - public List getInfo() - { - return ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), - LangUtils.localize("gui.input") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/t", - LangUtils.localize("gui.output") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); + guiElements.add(new GuiEnergyInfo(() -> ListUtils.asList( + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), + LangUtils.localize("gui.input") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastInput) + "/t", + LangUtils.localize("gui.output") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t"), this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index 444dc3aef..15836d6e6 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -25,7 +25,7 @@ import org.lwjgl.input.Mouse; public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper { - public Set guiElements = new HashSet(); + public Set guiElements = new HashSet<>(); private TileEntityContainerBlock tileEntity; diff --git a/src/main/java/mekanism/client/gui/GuiMekanismConfig.java b/src/main/java/mekanism/client/gui/GuiMekanismConfig.java index f6df2e751..cf1d884e4 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanismConfig.java +++ b/src/main/java/mekanism/client/gui/GuiMekanismConfig.java @@ -23,7 +23,7 @@ public class GuiMekanismConfig extends GuiConfig private static List getConfigElements() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.general"), "mekanism.configgui.ctgy.general", GeneralEntry.class)); list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.machines"), "mekanism.configgui.ctgy.machines", MachinesEntry.class)); list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.tier"), "mekanism.configgui.ctgy.tier", TierEntry.class)); diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 4bfa14f46..d46e09e16 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -52,14 +52,11 @@ public class GuiMetallurgicInfuser extends GuiMekanism guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"), 164, 15)); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiSlot(SlotType.EXTRA, this, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"), 16, 34)); guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"), 50, 42)); diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index b719aaba3..3b5be03ff 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -42,7 +42,7 @@ public class GuiOredictionificator extends GuiMekanism { public TileEntityOredictionificator tileEntity; - public Map renderStacks = new HashMap(); + public Map renderStacks = new HashMap<>(); public boolean isDragging = false; diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 91229b321..aa0139cf9 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -50,36 +50,15 @@ public class GuiPRC extends GuiMekanism guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - double extra = tileEntity.getRecipe() != null ? tileEntity.getRecipe().extraEnergy : 0; - String multiplier = MekanismUtils.getEnergyDisplay(MekanismUtils.getEnergyPerTick(tileEntity, tileEntity.BASE_ENERGY_PER_TICK + extra)); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); - guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { - @Override - public FluidTank getTank() - { - return tileEntity.inputFluidTank; - } - }, GuiGauge.Type.STANDARD_YELLOW, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 5, 10)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.inputGasTank; - } - }, GuiGauge.Type.STANDARD_RED, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 28, 10)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.outputGasTank; - } - }, GuiGauge.Type.SMALL_BLUE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 140, 40)); + guiElements.add(new GuiEnergyInfo(() -> + { + double extra = tileEntity.getRecipe() != null ? tileEntity.getRecipe().extraEnergy : 0; + String multiplier = MekanismUtils.getEnergyDisplay(MekanismUtils.getEnergyPerTick(tileEntity, tileEntity.BASE_ENERGY_PER_TICK + extra)); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); + guiElements.add(new GuiFluidGauge(() -> tileEntity.inputFluidTank, GuiGauge.Type.STANDARD_YELLOW, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 5, 10)); + guiElements.add(new GuiGasGauge(() -> tileEntity.inputGasTank, GuiGauge.Type.STANDARD_RED, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 28, 10)); + guiElements.add(new GuiGasGauge(() -> tileEntity.outputGasTank, GuiGauge.Type.SMALL_BLUE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 140, 40)); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 164, 15)); guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 53, 34)); diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index fafabff57..60d960c2d 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -126,7 +126,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism return; } - List text = new ArrayList(); + List text = new ArrayList<>(); if(privateMode) { diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index 49cf13407..91d5cbb81 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -51,23 +51,17 @@ public class GuiResistiveHeater extends GuiMekanism guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"), 14, 34).with(SlotOverlay.POWER)); guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyUsage); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); - guiElements.add(new GuiHeatInfo(new IInfoHandler() { - @Override - public List getInfo() - { - TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; - String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss*unit.intervalSize, false, unit); - return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyUsage); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); + guiElements.add(new GuiHeatInfo(() -> + { + TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; + String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss*unit.intervalSize, false, unit); + return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index caec36d78..d2d57bfd1 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -60,28 +60,13 @@ public class GuiRotaryCondensentrator extends GuiMekanism guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 154, 4).with(SlotOverlay.POWER)); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + usage + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"))); - guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { - @Override - public FluidTank getTank() - { - return tileEntity.fluidTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 133, 13)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.gasTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 25, 13)); + guiElements.add(new GuiEnergyInfo(() -> + { + String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + usage + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"))); + guiElements.add(new GuiFluidGauge(() -> tileEntity.fluidTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 133, 13)); + guiElements.add(new GuiGasGauge(() -> tileEntity.gasTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 25, 13)); guiElements.add(new GuiProgress(new IProgressInfoHandler() { diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java index 30afbec7a..52d9f3fea 100644 --- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -87,7 +87,7 @@ public class GuiSecurityDesk extends GuiMekanism return; } - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(0); data.add(trusted); @@ -101,7 +101,7 @@ public class GuiSecurityDesk extends GuiMekanism return; } - List text = new ArrayList(); + List text = new ArrayList<>(); if(tileEntity.frequency != null) { @@ -155,7 +155,7 @@ public class GuiSecurityDesk extends GuiMekanism SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); if(xAxis >= 146 && xAxis <= 162 && yAxis >= 59 && yAxis <= 75) { @@ -235,7 +235,7 @@ public class GuiSecurityDesk extends GuiMekanism { if(tileEntity != null) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); data.add(1); data.add(tileEntity.frequency.trusted.get(selection)); diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index 2fd657896..fe49e5d01 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -30,7 +30,7 @@ public class GuiSeismicReader extends GuiScreen public ItemStack itemStack; - private ArrayList> blockList = new ArrayList>(); + private ArrayList> blockList = new ArrayList<>(); public Coord4D pos; diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index a886b1ba4..5504d4c38 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -36,14 +36,11 @@ public class GuiSeismicVibrator extends GuiMekanism guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"), 164, 15)); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - String multiplier = MekanismUtils.getEnergyDisplay(usage.seismicVibratorUsage); - return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"))); + guiElements.add(new GuiEnergyInfo(() -> + { + String multiplier = MekanismUtils.getEnergyDisplay(usage.seismicVibratorUsage); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"))); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"), 142, 34).with(SlotOverlay.POWER)); } diff --git a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java index e323334b9..e587b6d48 100644 --- a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java @@ -37,13 +37,13 @@ import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiSideConfiguration extends GuiMekanism { - public Map slotPosMap = new HashMap(); + public Map slotPosMap = new HashMap<>(); public ISideConfiguration configurable; public TransmissionType currentType; - public List configTabs = new ArrayList(); + public List configTabs = new ArrayList<>(); public GuiSideConfiguration(EntityPlayer player, ISideConfiguration tile) { diff --git a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java index 05e3cda87..afc12f333 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java @@ -40,20 +40,8 @@ public class GuiSolarNeutronActivator extends GuiMekanism guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 4, 55).with(SlotOverlay.MINUS)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 154, 55).with(SlotOverlay.PLUS)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.inputTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 25, 13)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.outputTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 133, 13)); + guiElements.add(new GuiGasGauge(() -> tileEntity.inputTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 25, 13)); + guiElements.add(new GuiGasGauge(() -> tileEntity.outputTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 133, 13)); guiElements.add(new GuiProgress(new IProgressInfoHandler() { diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 8b04ae12d..20c9a84cf 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -75,8 +75,8 @@ public class GuiTeleporter extends GuiMekanism public Frequency clientFreq; public byte clientStatus; - public List clientPublicCache = new ArrayList(); - public List clientPrivateCache = new ArrayList(); + public List clientPublicCache = new ArrayList<>(); + public List clientPrivateCache = new ArrayList<>(); public boolean isInit = true; @@ -231,7 +231,7 @@ public class GuiTeleporter extends GuiMekanism return; } - List text = new ArrayList(); + List text = new ArrayList<>(); if(privateMode) { diff --git a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java index f7cd0b98a..749c8b319 100644 --- a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java +++ b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java @@ -33,29 +33,14 @@ public class GuiThermalEvaporationController extends GuiMekanism super(tentity, new ContainerThermalEvaporationController(inventory, tentity)); tileEntity = tentity; - guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { - @Override - public FluidTank getTank() - { - return tileEntity.inputTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png"), 6, 13)); - guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { - @Override - public FluidTank getTank() - { - return tileEntity.outputTank; - } - }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png"), 152, 13)); - guiElements.add(new GuiHeatInfo(new IInfoHandler() { - @Override - public List getInfo() - { - TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; - String environment = UnitDisplayUtils.getDisplayShort(tileEntity.totalLoss*unit.intervalSize, false, unit); - return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png"))); + guiElements.add(new GuiFluidGauge(() -> tileEntity.inputTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png"), 6, 13)); + guiElements.add(new GuiFluidGauge(() -> tileEntity.outputTank, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png"), 152, 13)); + guiElements.add(new GuiHeatInfo(() -> + { + TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; + String environment = UnitDisplayUtils.getDisplayShort(tileEntity.totalLoss*unit.intervalSize, false, unit); + return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png"))); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java index 09bbd4746..5e5f8d3f4 100644 --- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -66,15 +66,12 @@ public class GuiThermoelectricBoiler extends GuiMekanism return (double)tileEntity.structure.lastMaxBoil/cap; } }, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"), 144, 13)); - guiElements.add(new GuiHeatInfo(new IInfoHandler() { - @Override - public List getInfo() - { - TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; - String environment = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss*unit.intervalSize, false, unit); - return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"))); + guiElements.add(new GuiHeatInfo(() -> + { + TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; + String environment = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss*unit.intervalSize, false, unit); + return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"))); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index d31005eb3..9ef70872e 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -36,7 +36,7 @@ import org.lwjgl.opengl.GL12; @SideOnly(Side.CLIENT) public class GuiTransporterConfig extends GuiMekanism { - public Map slotPosMap = new HashMap(); + public Map slotPosMap = new HashMap<>(); public ISideConfiguration configurable; diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java index 075c77a4f..314a75aac 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java @@ -47,7 +47,7 @@ public class GuiEnergyInfo extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 142 && yAxis <= 160) { - List info = new ArrayList(); + List info = new ArrayList<>(); for(String s : infoHandler.getInfo()) { diff --git a/src/main/java/mekanism/client/gui/element/GuiGraph.java b/src/main/java/mekanism/client/gui/element/GuiGraph.java index 13c59436a..af041c98f 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGraph.java +++ b/src/main/java/mekanism/client/gui/element/GuiGraph.java @@ -25,7 +25,7 @@ public class GuiGraph extends GuiElement public int currentScale = 10; public boolean fixedScale = false; - public List graphData = new ArrayList(); + public List graphData = new ArrayList<>(); public GraphDataHandler dataHandler; diff --git a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java index 48dbab9b7..f8a75490a 100644 --- a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java @@ -46,7 +46,7 @@ public class GuiHeatInfo extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 116 && yAxis <= 134) { - List info = new ArrayList(); + List info = new ArrayList<>(); for(String s : infoHandler.getInfo()) { diff --git a/src/main/java/mekanism/client/gui/element/GuiScrollList.java b/src/main/java/mekanism/client/gui/element/GuiScrollList.java index 8fc599681..107a6603b 100644 --- a/src/main/java/mekanism/client/gui/element/GuiScrollList.java +++ b/src/main/java/mekanism/client/gui/element/GuiScrollList.java @@ -21,7 +21,7 @@ public class GuiScrollList extends GuiElement public int xPosition; public int yPosition; - public List textEntries = new ArrayList(); + public List textEntries = new ArrayList<>(); public int dragOffset = 0; diff --git a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java index 3773b0ae9..90693b648 100644 --- a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java @@ -171,7 +171,7 @@ public abstract class BaseRecipeCategory implements IRecipeCategory, IGuiWrapper Minecraft.getMinecraft().renderEngine.bindTexture(texture); } - public Set guiElements = new HashSet(); + public Set guiElements = new HashSet<>(); public void addGuiElements() {} diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index adc3a52ed..4b86e26dd 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -206,7 +206,7 @@ public class MekanismJEI implements IModPlugin registry.addRecipeHandlers(new BaseRecipeHandler(prcCategory, PRCRecipeWrapper.class)); addRecipes(registry, Recipe.PRESSURIZED_REACTION_CHAMBER, prcCategory, PressurizedRecipe.class, PRCRecipeCategory.class, PRCRecipeWrapper.class); - List condensentratorRecipes = new ArrayList(); + List condensentratorRecipes = new ArrayList<>(); RotaryCondensentratorRecipeCategory rotaryCondensentratorCategory = new RotaryCondensentratorRecipeCategory(registry.getJeiHelpers().getGuiHelper()); registry.addRecipeCategories(rotaryCondensentratorCategory); diff --git a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java index 56c95a857..f803095d5 100644 --- a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java @@ -34,7 +34,7 @@ public abstract class AdvancedMachineRecipeWrapper extends BaseRecipeWrapper @Override public List getTooltipStrings(int mouseX, int mouseY) { - List currenttip = new ArrayList(); + List currenttip = new ArrayList<>(); if(mouseX >= 33 && mouseX <= 39 && mouseY >= 22 && mouseY <= 34) { diff --git a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java index 2a61f1433..4c39c8119 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java @@ -26,7 +26,7 @@ public class ChemicalInjectionChamberRecipeWrapper extends AdvancedMachineRecipe { if(gasType == MekanismFluids.SulfuricAcid) { - List fuels = new ArrayList(); + List fuels = new ArrayList<>(); fuels.addAll(OreDictionary.getOres("dustSulfur")); fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, MekanismFluids.SulfuricAcid)); @@ -38,13 +38,13 @@ public class ChemicalInjectionChamberRecipeWrapper extends AdvancedMachineRecipe } else if(gasType == MekanismFluids.HydrogenChloride) { - List fuels = new ArrayList(); + List fuels = new ArrayList<>(); fuels.addAll(OreDictionary.getOres("dustSalt")); fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, MekanismFluids.HydrogenChloride)); return fuels; } - return new ArrayList(); + return new ArrayList<>(); } } diff --git a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java index 36ed28d0b..7ceead752 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java @@ -29,6 +29,6 @@ public class PurificationChamberRecipeWrapper extends AdvancedMachineRecipeWrapp return ListUtils.asList(new ItemStack(Items.FLINT), MekanismUtils.getFullGasTank(GasTankTier.BASIC, MekanismFluids.Oxygen)); } - return new ArrayList(); + return new ArrayList<>(); } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java index c0a2f9c6b..54f000ed9 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java @@ -34,7 +34,7 @@ public class ChemicalCrystallizerRecipeWrapper extends BaseRecipeWrapper @Override public List getTooltipStrings(int mouseX, int mouseY) { - List currenttip = new ArrayList(); + List currenttip = new ArrayList<>(); if(mouseX >= 1 && mouseX <= 17 && mouseY >= 5-3 && mouseY <= 63-3) { diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java index 0513d6af8..9f22407ea 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java @@ -36,7 +36,7 @@ public class ChemicalDissolutionChamberRecipeWrapper extends BaseRecipeWrapper @Override public List getTooltipStrings(int mouseX, int mouseY) { - List currenttip = new ArrayList(); + List currenttip = new ArrayList<>(); if(mouseX >= 6-3 && mouseX <= 22-3 && mouseY >= 5-3 && mouseY <= 63-3) { diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java index 7d4a67469..072783044 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java @@ -34,7 +34,7 @@ public class ChemicalInfuserRecipeWrapper extends BaseRecipeWrapper @Override public List getTooltipStrings(int mouseX, int mouseY) { - List currenttip = new ArrayList(); + List currenttip = new ArrayList<>(); if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-3 && mouseY <= 72-3) { diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java index cd0ee2111..5a9a9b66c 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java @@ -34,7 +34,7 @@ public class ChemicalOxidizerRecipeWrapper extends BaseRecipeWrapper @Override public List getTooltipStrings(int mouseX, int mouseY) { - List currenttip = new ArrayList(); + List currenttip = new ArrayList<>(); if(mouseX >= 134-20 && mouseX <= 150-20 && mouseY >= 14-12 && mouseY <= 72-12) { diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java index bd7e9e479..3bb6bf7e7 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java @@ -78,13 +78,6 @@ public class ChemicalWasherRecipeCategory extends BaseRecipeCategory fluidStacks.init(0, true, 6-xOffset, 5-yOffset, 16, 58, 1000, false, fluidOverlay); fluidStacks.set(0, ingredients.getInputs(FluidStack.class).get(0)); - fluidStacks.addTooltipCallback(new ITooltipCallback() { - - @Override - public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) - { - tooltip.remove(1); - } - }); + fluidStacks.addTooltipCallback((slotIndex, input, ingredient, tooltip) -> tooltip.remove(1)); } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java index 723daf92d..1ffc2f75f 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java @@ -36,7 +36,7 @@ public class ChemicalWasherRecipeWrapper extends BaseRecipeWrapper @Override public List getTooltipStrings(int mouseX, int mouseY) { - List currenttip = new ArrayList(); + List currenttip = new ArrayList<>(); if(mouseX >= 27-3 && mouseX <= 43-3 && mouseY >= 14-3 && mouseY <= 72-3) { diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java index b4671305d..c9480d864 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java @@ -125,13 +125,6 @@ public class ElectrolyticSeparatorRecipeCategory extends BaseRecipeCategory fluidStacks.init(0, true, 2, 2, 16, 58, tempRecipe.getInput().ingredient.amount, false, fluidOverlay); fluidStacks.set(0, ingredients.getInputs(FluidStack.class).get(0)); - fluidStacks.addTooltipCallback(new ITooltipCallback() { - - @Override - public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) - { - tooltip.remove(1); - } - }); + fluidStacks.addTooltipCallback((slotIndex, input, ingredient, tooltip) -> tooltip.remove(1)); } } diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java index 4080f3734..caab33043 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java @@ -34,7 +34,7 @@ public class ElectrolyticSeparatorRecipeWrapper extends BaseRecipeWrapper @Override public List getTooltipStrings(int mouseX, int mouseY) { - List currenttip = new ArrayList(); + List currenttip = new ArrayList<>(); if(mouseX >= 59-4 && mouseX <= 75-4 && mouseY >= 19-9 && mouseY <= 47-9) { diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java index 7490d5b6e..c5dd3add0 100644 --- a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java @@ -81,7 +81,7 @@ public class MetallurgicInfuserRecipeCategory extends BaseRecipeCategory public static List getInfuseStacks(InfuseType type) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); for(Map.Entry obj : InfuseRegistry.getObjectMap().entrySet()) { diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java index d9965ec04..16490b03d 100644 --- a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java @@ -131,12 +131,6 @@ public class PRCRecipeCategory extends BaseRecipeCategory fluidStacks.init(0, true, 3, 0, 16, 58, tempRecipe.getInput().getFluid().amount, false, fluidOverlay); fluidStacks.set(0, tempRecipe.recipeInput.getFluid()); - fluidStacks.addTooltipCallback(new ITooltipCallback() { - @Override - public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) - { - tooltip.remove(1); - } - }); + fluidStacks.addTooltipCallback((slotIndex, input, ingredient, tooltip) -> tooltip.remove(1)); } } diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java index 446d52888..dc36d00e8 100644 --- a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java @@ -38,7 +38,7 @@ public class PRCRecipeWrapper extends BaseRecipeWrapper @Override public List getTooltipStrings(int mouseX, int mouseY) { - List currenttip = new ArrayList(); + List currenttip = new ArrayList<>(); if(mouseX >= 29-3 && mouseX <= 45-3 && mouseY >= 11-12 && mouseY <= 69-12) { diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java index 9c87b1ea5..4c686ac93 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java @@ -58,7 +58,7 @@ public class RotaryCondensentratorRecipeWrapper extends BaseRecipeWrapper @Override public List getTooltipStrings(int mouseX, int mouseY) { - List currenttip = new ArrayList(); + List currenttip = new ArrayList<>(); if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-12 && mouseY <= 72-12) { diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java index 38f4cd42f..c49f9f145 100644 --- a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java @@ -33,7 +33,7 @@ public class SolarNeutronRecipeWrapper extends BaseRecipeWrapper @Override public List getTooltipStrings(int mouseX, int mouseY) { - List currenttip = new ArrayList(); + List currenttip = new ArrayList<>(); if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-12 && mouseY <= 72-12) { diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java index 89accc077..f1c34106f 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java @@ -72,12 +72,6 @@ public class ThermalEvaporationRecipeCategory extends BaseRecipeCategory fluidStacks.set(0, tempRecipe.recipeInput.ingredient); fluidStacks.set(1, tempRecipe.recipeOutput.output); - fluidStacks.addTooltipCallback(new ITooltipCallback() { - @Override - public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) - { - tooltip.remove(1); - } - }); + fluidStacks.addTooltipCallback((slotIndex, input, ingredient, tooltip) -> tooltip.remove(1)); } } diff --git a/src/main/java/mekanism/client/render/ColourTemperature.java b/src/main/java/mekanism/client/render/ColourTemperature.java index 273448376..ae4bde472 100644 --- a/src/main/java/mekanism/client/render/ColourTemperature.java +++ b/src/main/java/mekanism/client/render/ColourTemperature.java @@ -7,7 +7,7 @@ import mekanism.common.ColourRGBA; public class ColourTemperature extends ColourRGBA { - public static HashMap cache = new HashMap(); + public static HashMap cache = new HashMap<>(); public double temp; diff --git a/src/main/java/mekanism/client/render/FluidRenderer.java b/src/main/java/mekanism/client/render/FluidRenderer.java index 57e2f5484..ee0a50cea 100644 --- a/src/main/java/mekanism/client/render/FluidRenderer.java +++ b/src/main/java/mekanism/client/render/FluidRenderer.java @@ -20,8 +20,8 @@ public final class FluidRenderer { private static final int BLOCK_STAGES = 1000; - private static Map cachedCenterFluids = new HashMap(); - private static Map cachedValveFluids = new HashMap(); + private static Map cachedCenterFluids = new HashMap<>(); + private static Map cachedValveFluids = new HashMap<>(); public static void translateToOrigin(Coord4D origin) { diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 24a5e592a..c79a9b983 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -68,7 +68,7 @@ public class MekanismRenderer public static float GAS_RENDER_BASE = 0.2F; - public static Map overlays = new HashMap(); + public static Map overlays = new HashMap<>(); private static float lightmapLastX; private static float lightmapLastY; @@ -87,7 +87,7 @@ public class MekanismRenderer public static TextureAtlasSprite missingIcon; - public static Map> textureMap = new HashMap>(); + public static Map> textureMap = new HashMap<>(); @SubscribeEvent public void onStitch(TextureStitchEvent.Pre event) @@ -144,7 +144,7 @@ public class MekanismRenderer if(item instanceof IMetaItem) { IMetaItem metaItem = (IMetaItem)item; - List variants = new ArrayList(); + List variants = new ArrayList<>(); for(int i = 0; i < metaItem.getVariants(); i++) { @@ -174,7 +174,7 @@ public class MekanismRenderer for(FluidType type : FluidType.values()) { - textureMap.put(type, new HashMap()); + textureMap.put(type, new HashMap<>()); } for(Fluid fluid : FluidRegistry.getRegisteredFluids().values()) @@ -222,7 +222,7 @@ public class MekanismRenderer Map map = textureMap.get(type); - return map.containsKey(fluid) ? map.get(fluid) : missingIcon; + return map.getOrDefault(fluid, missingIcon); } private static VertexFormat prevFormat = null; diff --git a/src/main/java/mekanism/client/render/MinerVisualRenderer.java b/src/main/java/mekanism/client/render/MinerVisualRenderer.java index baa4ea45f..f49791b1f 100644 --- a/src/main/java/mekanism/client/render/MinerVisualRenderer.java +++ b/src/main/java/mekanism/client/render/MinerVisualRenderer.java @@ -21,7 +21,7 @@ public final class MinerVisualRenderer { private static Minecraft mc = Minecraft.getMinecraft(); - private static Map cachedVisuals = new HashMap(); + private static Map cachedVisuals = new HashMap<>(); private static final double offset = 0.01; @@ -51,7 +51,7 @@ public final class MinerVisualRenderer DisplayInteger display = DisplayInteger.createAndStart(); cachedVisuals.put(data, display); - List models = new ArrayList(); + List models = new ArrayList<>(); for(int x = -data.radius; x <= data.radius; x++) { diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index d2b014c13..b94e4ee66 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -406,7 +406,7 @@ public class BakedCustomItemModel implements IBakedModel { if(side != null) { - List faceQuads = new LinkedList(); + List faceQuads = new LinkedList<>(); if(Block.getBlockFromItem(stack.getItem()) != null) { @@ -425,7 +425,7 @@ public class BakedCustomItemModel implements IBakedModel } Tessellator tessellator = Tessellator.getInstance(); - List generalQuads = new LinkedList(); + List generalQuads = new LinkedList<>(); //Test if the current thread has a Context loaded (we don't use it so no need to import its type) Object contextCapabilities; diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java index 1714769e1..32e678ccf 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java @@ -36,7 +36,7 @@ public class MekanismOBJLoader implements ICustomModelLoader { public static final MekanismOBJLoader INSTANCE = new MekanismOBJLoader(); - private final Map modelCache = new HashMap(); + private final Map modelCache = new HashMap<>(); public static final ImmutableMap flipData = ImmutableMap.of("flip-v", String.valueOf(true)); @@ -62,13 +62,7 @@ public class MekanismOBJLoader implements ICustomModelLoader public OBJBakedModel createBakedObjItemModel(IBakedModel existingModel, String name, IModelState state, VertexFormat format) { try { - Function textureGetter = new Function() { - @Override - public TextureAtlasSprite apply(ResourceLocation location) - { - return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString()); - } - }; + Function textureGetter = location -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString()); ResourceLocation modelLocation = new ResourceLocation(name); OBJModel objModel = (OBJModel)OBJLoader.INSTANCE.loadModel(modelLocation); @@ -91,7 +85,7 @@ public class MekanismOBJLoader implements ICustomModelLoader builder.put("missingno", missing); - return new GlowPanelModel(existingModel, objModel, state, format, builder.build(), new HashMap()); + return new GlowPanelModel(existingModel, objModel, state, format, builder.build(), new HashMap<>()); } catch(Exception e) { e.printStackTrace(); } diff --git a/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java b/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java index 8405637fa..02abf3568 100644 --- a/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java +++ b/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java @@ -49,7 +49,7 @@ public abstract class OBJBakedModelBase extends OBJBakedModel protected ImmutableMap textureMap; - protected HashMap transformationMap = new HashMap(); + protected HashMap transformationMap = new HashMap<>(); public OBJBakedModelBase(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) { @@ -73,11 +73,11 @@ public abstract class OBJBakedModelBase extends OBJBakedModel return ImmutableList.of(); } - List bakedQuads = new ArrayList(); + List bakedQuads = new ArrayList<>(); Set faces = Collections.synchronizedSet(new LinkedHashSet()); Optional transform = Optional.empty(); - Map groupNameMap = new HashMap(); + Map groupNameMap = new HashMap<>(); for(Group g : getModel().getMatLib().getGroups().values()) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index db77bd5eb..7305dbd24 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -32,7 +32,7 @@ public class RenderConfigurableMachine> cachedOverlays = new HashMap>(); + private HashMap> cachedOverlays = new HashMap<>(); public RenderConfigurableMachine() { @@ -119,7 +119,7 @@ public class RenderConfigurableMachine map = new HashMap(); + HashMap map = new HashMap<>(); map.put(type, display); cachedOverlays.put(side, map); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index eb98396ea..83348d75d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -30,7 +30,7 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer resources = new HashMap(); + public static Map resources = new HashMap<>(); public static ResourceLocation baseTexture = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube.png"); public static ResourceLocation coreTexture = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png"); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java index e431a94ee..43f8ce6bd 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java @@ -21,8 +21,8 @@ import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class RenderFluidTank extends TileEntitySpecialRenderer { - private static Map cachedCenterFluids = new HashMap(); - private static Map cachedValveFluids = new HashMap(); + private static Map cachedCenterFluids = new HashMap<>(); + private static Map cachedValveFluids = new HashMap<>(); private static int stages = 1400; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java index 08c9df390..f6bbb38cc 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; public class RenderTeleporter extends TileEntitySpecialRenderer { - private HashMap cachedOverlays = new HashMap(); + private HashMap cachedOverlays = new HashMap<>(); @Override public void render(TileEntityTeleporter tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java index 1b6fb9a2a..ead3bf507 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java @@ -24,7 +24,7 @@ import java.util.Arrays; @SideOnly(Side.CLIENT) public class RenderThermalEvaporationController extends TileEntitySpecialRenderer { - private static HashMap cachedCenterFluids = new HashMap(); + private static HashMap cachedCenterFluids = new HashMap<>(); private static final int LEVELS = 16; private static final int ALL_LEVELS = LEVELS + 2; private static final int RING_INDEX = ALL_LEVELS-2; @@ -167,4 +167,4 @@ public class RenderThermalEvaporationController extends TileEntitySpecialRendere { cachedCenterFluids.clear(); } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java index cefb9622f..321e5301e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -22,9 +22,9 @@ import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer { - private static Map cachedLowerFluids = new HashMap(); - private static Map cachedUpperFluids = new HashMap(); - private static Map cachedValveFluids = new HashMap(); + private static Map cachedLowerFluids = new HashMap<>(); + private static Map cachedUpperFluids = new HashMap<>(); + private static Map cachedValveFluids = new HashMap<>(); private Fluid STEAM = FluidRegistry.getFluid("steam"); private Fluid WATER = FluidRegistry.WATER; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java index 581addaa9..4a8d88f3e 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java @@ -38,7 +38,7 @@ public class RenderLogisticalTransporter extends RenderTransmitterBase renderer = (Render)Minecraft.getMinecraft().getRenderManager().getEntityClassRenderObject(EntityItem.class); - private static HashMap> cachedOverlays = new HashMap>(); + private static HashMap> cachedOverlays = new HashMap<>(); private static TextureAtlasSprite gunpowderIcon; private static TextureAtlasSprite torchOffIcon; @@ -163,7 +163,7 @@ public class RenderLogisticalTransporter extends RenderTransmitterBase map = new HashMap(); + HashMap map = new HashMap<>(); map.put(mode, display); cachedOverlays.put(side, map); } diff --git a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java index f0b91c75c..2396548d5 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java @@ -21,7 +21,7 @@ import org.lwjgl.opengl.GL11; public class RenderMechanicalPipe extends RenderTransmitterBase { - private static HashMap> cachedLiquids = new HashMap>(); + private static HashMap> cachedLiquids = new HashMap<>(); private static final int stages = 100; private static final double height = 0.45; @@ -167,7 +167,7 @@ public class RenderMechanicalPipe extends RenderTransmitterBase map = new HashMap(); + HashMap map = new HashMap<>(); map.put(fluid, displays); cachedLiquids.put(sideOrdinal, map); } diff --git a/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java b/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java index bd20f1eee..5f61a6e51 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java @@ -30,7 +30,7 @@ import com.google.common.collect.ImmutableList; public abstract class RenderTransmitterBase extends TileEntitySpecialRenderer { private static OBJModel contentsModel; - private static Map contentsMap = new HashMap(); + private static Map contentsMap = new HashMap<>(); protected Minecraft mc = Minecraft.getMinecraft(); @@ -88,7 +88,7 @@ public abstract class RenderTransmitterBase ext public static HashMap buildModelMap(OBJModel objModel) { - HashMap modelParts = new HashMap(); + HashMap modelParts = new HashMap<>(); if(!objModel.getMatLib().getGroups().keySet().isEmpty()) { @@ -116,14 +116,7 @@ public abstract class RenderTransmitterBase ext } /* Credit to Eternal Energy */ - public static Function textureGetterFlipV = new Function() - { - @Override - public TextureAtlasSprite apply(ResourceLocation location) - { - return DummyAtlasTextureFlipV.instance; - } - }; + public static Function textureGetterFlipV = location -> DummyAtlasTextureFlipV.instance; private static class DummyAtlasTextureFlipV extends TextureAtlasSprite { diff --git a/src/main/java/mekanism/client/sound/SoundHandler.java b/src/main/java/mekanism/client/sound/SoundHandler.java index 3985f819e..095f12ad7 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -25,7 +25,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class SoundHandler { - public static Map> soundMaps = new HashMap>(); + public static Map> soundMaps = new HashMap<>(); public static Map invPlayingSounds; @@ -105,13 +105,7 @@ public class SoundHandler public static Map getMap(String name) { - Map map = soundMaps.get(name); - - if(map == null) - { - map = new HashMap(); - soundMaps.put(name, map); - } + Map map = soundMaps.computeIfAbsent(name, k -> new HashMap<>()); return map; } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 22c964a41..9fdc10891 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -147,7 +147,7 @@ import net.minecraftforge.fml.relauncher.FMLInjectionData; */ public class CommonProxy implements IGuiProvider { - protected static WeakReference dummyPlayer = new WeakReference(null); + protected static WeakReference dummyPlayer = new WeakReference<>(null); /** * Register tile entities that have special models. Overwritten in client to register TESRs. @@ -623,7 +623,7 @@ public class CommonProxy implements IGuiProvider { EntityPlayer player = FakePlayerFactory.get(world, Mekanism.gameProfile); - return new WeakReference(player); + return new WeakReference<>(player); } private WeakReference createNewPlayer(WorldServer world, double x, double y, double z) @@ -634,7 +634,7 @@ public class CommonProxy implements IGuiProvider player.posY = y; player.posZ = z; - return new WeakReference(player); + return new WeakReference<>(player); } public final WeakReference getDummyPlayer(WorldServer world) diff --git a/src/main/java/mekanism/common/CommonWorldTickHandler.java b/src/main/java/mekanism/common/CommonWorldTickHandler.java index a84cb0ecb..8712319d8 100644 --- a/src/main/java/mekanism/common/CommonWorldTickHandler.java +++ b/src/main/java/mekanism/common/CommonWorldTickHandler.java @@ -25,12 +25,12 @@ public class CommonWorldTickHandler { if(chunkRegenMap == null) { - chunkRegenMap = new HashMap>(); + chunkRegenMap = new HashMap<>(); } if(!chunkRegenMap.containsKey(dimensionId)) { - LinkedList list = new LinkedList(); + LinkedList list = new LinkedList<>(); list.add(chunkCoord); chunkRegenMap.put(dimensionId, list); } diff --git a/src/main/java/mekanism/common/FuelHandler.java b/src/main/java/mekanism/common/FuelHandler.java index 5f984b3ce..f15fb0148 100644 --- a/src/main/java/mekanism/common/FuelHandler.java +++ b/src/main/java/mekanism/common/FuelHandler.java @@ -14,7 +14,7 @@ import buildcraft.api.fuels.IFuel; public class FuelHandler { - public static HashMap fuels = new HashMap(); + public static HashMap fuels = new HashMap<>(); public static void addGas(Gas gas, int burnTicks, double energyPerMilliBucket) { diff --git a/src/main/java/mekanism/common/HashList.java b/src/main/java/mekanism/common/HashList.java index 2040eb8d4..5def109ef 100644 --- a/src/main/java/mekanism/common/HashList.java +++ b/src/main/java/mekanism/common/HashList.java @@ -5,7 +5,7 @@ import java.util.Iterator; public class HashList implements Iterable { - private ArrayList list = new ArrayList(256); + private ArrayList list = new ArrayList<>(256); private HashList(ArrayList newList) { diff --git a/src/main/java/mekanism/common/KeySync.java b/src/main/java/mekanism/common/KeySync.java index 9d9a39ad0..4ca9b4752 100644 --- a/src/main/java/mekanism/common/KeySync.java +++ b/src/main/java/mekanism/common/KeySync.java @@ -12,11 +12,11 @@ public class KeySync public static int ASCEND = 0; public static int DESCEND = 1; - public Map keys = new HashMap(); + public Map keys = new HashMap<>(); public static class KeySet { - public Set keysActive = new HashSet(); + public Set keysActive = new HashSet<>(); public KeySet(int key) { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 3626e1ff9..f712935f4 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -189,16 +189,16 @@ public class Mekanism public static Version versionNumber = new Version(9, 3, 4); /** MultiblockManagers for various structrures */ - public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); - public static MultiblockManager matrixManager = new MultiblockManager("inductionMatrix"); - public static MultiblockManager boilerManager = new MultiblockManager("thermoelectricBoiler"); + public static MultiblockManager tankManager = new MultiblockManager<>("dynamicTank"); + public static MultiblockManager matrixManager = new MultiblockManager<>("inductionMatrix"); + public static MultiblockManager boilerManager = new MultiblockManager<>("thermoelectricBoiler"); /** FrequencyManagers for various networks */ public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class, Frequency.TELEPORTER); - public static Map privateTeleporters = new HashMap(); + public static Map privateTeleporters = new HashMap<>(); public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class, InventoryFrequency.ENTANGLOPORTER); - public static Map privateEntangloporters = new HashMap(); + public static Map privateEntangloporters = new HashMap<>(); public static FrequencyManager securityFrequencies = new FrequencyManager(SecurityFrequency.class, SecurityFrequency.SECURITY); @@ -206,7 +206,7 @@ public class Mekanism public static CreativeTabMekanism tabMekanism = new CreativeTabMekanism(); /** List of Mekanism modules loaded */ - public static List modulesLoaded = new ArrayList(); + public static List modulesLoaded = new ArrayList<>(); /** The latest version number which is received from the Mekanism server */ public static String latestVersionNumber; @@ -218,7 +218,7 @@ public class Mekanism public static VoiceServerManager voiceManager; /** A list of the usernames of players who have donated to Mekanism. */ - public static List donators = new ArrayList(); + public static List donators = new ArrayList<>(); /** The server's world tick handler. */ public static CommonWorldTickHandler worldTickHandler = new CommonWorldTickHandler(); @@ -496,18 +496,15 @@ public class Mekanism InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.CompressedObsidian), new InfuseObject(InfuseRegistry.get("OBSIDIAN"), 80)); //Fuels - GameRegistry.registerFuelHandler(new IFuelHandler() { - @Override - public int getBurnTime(ItemStack fuel) - { - if(fuel.isItemEqual(new ItemStack(MekanismBlocks.BasicBlock, 1, 3))) - { - return 200*8*9; - } - - return 0; - } - }); + GameRegistry.registerFuelHandler(fuel -> + { + if(fuel.isItemEqual(new ItemStack(MekanismBlocks.BasicBlock, 1, 3))) + { + return 200*8*9; + } + + return 0; + }); //Fuel Gases FuelHandler.addGas(MekanismFluids.Hydrogen, 1, general.FROM_H2); diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java index 78abaa3f4..fd0de197c 100644 --- a/src/main/java/mekanism/common/OreDictCache.java +++ b/src/main/java/mekanism/common/OreDictCache.java @@ -12,15 +12,15 @@ import net.minecraftforge.oredict.OreDictionary; public final class OreDictCache { - public static HashMap> cachedKeys = new HashMap>(); - public static HashMap> oreDictStacks = new HashMap>(); - public static HashMap> modIDStacks = new HashMap>(); + public static HashMap> cachedKeys = new HashMap<>(); + public static HashMap> oreDictStacks = new HashMap<>(); + public static HashMap> modIDStacks = new HashMap<>(); public static List getOreDictName(ItemStack check) { if(check.isEmpty()) { - return new ArrayList(); + return new ArrayList<>(); } ItemInfo info = ItemInfo.get(check); @@ -33,7 +33,7 @@ public final class OreDictCache int[] idsFound = OreDictionary.getOreIDs(check); - List ret = new ArrayList(); + List ret = new ArrayList<>(); for(Integer id : idsFound) { @@ -52,7 +52,7 @@ public final class OreDictCache return oreDictStacks.get(oreName); } - List keys = new ArrayList(); + List keys = new ArrayList<>(); for(String s : OreDictionary.getOreNames()) { @@ -88,7 +88,7 @@ public final class OreDictCache } } - List stacks = new ArrayList(); + List stacks = new ArrayList<>(); for(String key : keys) { @@ -115,7 +115,7 @@ public final class OreDictCache return modIDStacks.get(modName); } - List stacks = new ArrayList(); + List stacks = new ArrayList<>(); for(String key : OreDictionary.getOreNames()) { diff --git a/src/main/java/mekanism/common/SideData.java b/src/main/java/mekanism/common/SideData.java index c860fbb3d..e555d3914 100644 --- a/src/main/java/mekanism/common/SideData.java +++ b/src/main/java/mekanism/common/SideData.java @@ -62,7 +62,7 @@ public class SideData public FluidTankInfo[] getFluidTankInfo(ITankManager manager) { Object[] tanks = manager.getTanks(); - List infos = new ArrayList(); + List infos = new ArrayList<>(); if(tanks == null) { diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 11b92362f..e4faa83cb 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -18,7 +18,7 @@ import net.minecraft.util.ResourceLocation; */ public final class Tier { - private static List tierTypes = new ArrayList(); + private static List tierTypes = new ArrayList<>(); private static boolean initiated = false; diff --git a/src/main/java/mekanism/common/Upgrade.java b/src/main/java/mekanism/common/Upgrade.java index db339e52c..14145fa45 100644 --- a/src/main/java/mekanism/common/Upgrade.java +++ b/src/main/java/mekanism/common/Upgrade.java @@ -83,7 +83,7 @@ public enum Upgrade public List getInfo(TileEntity tile) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); if(tile instanceof IUpgradeTile) { @@ -101,7 +101,7 @@ public enum Upgrade public List getMultScaledInfo(IUpgradeTile tile) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); if(canMultiply()) { @@ -115,7 +115,7 @@ public enum Upgrade public List getExpScaledInfo(IUpgradeTile tile) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); if(canMultiply()) { @@ -129,7 +129,7 @@ public enum Upgrade public static Map buildMap(NBTTagCompound nbtTags) { - Map upgrades = new HashMap(); + Map upgrades = new HashMap<>(); if(nbtTags != null) { diff --git a/src/main/java/mekanism/common/capabilities/CapabilityWrapperManager.java b/src/main/java/mekanism/common/capabilities/CapabilityWrapperManager.java index 7a8059e67..4193e8eb2 100644 --- a/src/main/java/mekanism/common/capabilities/CapabilityWrapperManager.java +++ b/src/main/java/mekanism/common/capabilities/CapabilityWrapperManager.java @@ -7,7 +7,7 @@ import net.minecraft.util.EnumFacing; public class CapabilityWrapperManager { - public Map wrappers = new HashMap(); + public Map wrappers = new HashMap<>(); public Class typeClass; public Class wrapperClass; diff --git a/src/main/java/mekanism/common/capabilities/DefaultConfigCardAccess.java b/src/main/java/mekanism/common/capabilities/DefaultConfigCardAccess.java index 94d9f4716..f8e5a5f1e 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultConfigCardAccess.java +++ b/src/main/java/mekanism/common/capabilities/DefaultConfigCardAccess.java @@ -8,6 +8,6 @@ public class DefaultConfigCardAccess implements IConfigCardAccess { public static void register() { - CapabilityManager.INSTANCE.register(IConfigCardAccess.class, new NullStorage(), DefaultConfigCardAccess.class); + CapabilityManager.INSTANCE.register(IConfigCardAccess.class, new NullStorage<>(), DefaultConfigCardAccess.class); } } diff --git a/src/main/java/mekanism/common/capabilities/DefaultConfigurable.java b/src/main/java/mekanism/common/capabilities/DefaultConfigurable.java index 8e066098d..acc77160b 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultConfigurable.java +++ b/src/main/java/mekanism/common/capabilities/DefaultConfigurable.java @@ -26,6 +26,6 @@ public class DefaultConfigurable implements IConfigurable public static void register() { - CapabilityManager.INSTANCE.register(IConfigurable.class, new NullStorage(), DefaultConfigurable.class); + CapabilityManager.INSTANCE.register(IConfigurable.class, new NullStorage<>(), DefaultConfigurable.class); } } diff --git a/src/main/java/mekanism/common/capabilities/DefaultEvaporationSolar.java b/src/main/java/mekanism/common/capabilities/DefaultEvaporationSolar.java index 80561ad31..64c4f8bf7 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultEvaporationSolar.java +++ b/src/main/java/mekanism/common/capabilities/DefaultEvaporationSolar.java @@ -14,6 +14,6 @@ public class DefaultEvaporationSolar implements IEvaporationSolar public static void register() { - CapabilityManager.INSTANCE.register(IEvaporationSolar.class, new NullStorage(), DefaultEvaporationSolar.class); + CapabilityManager.INSTANCE.register(IEvaporationSolar.class, new NullStorage<>(), DefaultEvaporationSolar.class); } } diff --git a/src/main/java/mekanism/common/capabilities/DefaultLaserReceptor.java b/src/main/java/mekanism/common/capabilities/DefaultLaserReceptor.java index a0fe1024f..2e4fc62e1 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultLaserReceptor.java +++ b/src/main/java/mekanism/common/capabilities/DefaultLaserReceptor.java @@ -21,6 +21,6 @@ public class DefaultLaserReceptor implements ILaserReceptor public static void register() { - CapabilityManager.INSTANCE.register(ILaserReceptor.class, new NullStorage(), DefaultLaserReceptor.class); + CapabilityManager.INSTANCE.register(ILaserReceptor.class, new NullStorage<>(), DefaultLaserReceptor.class); } } diff --git a/src/main/java/mekanism/common/capabilities/DefaultSpecialConfigData.java b/src/main/java/mekanism/common/capabilities/DefaultSpecialConfigData.java index 870d21d0b..5cff0f912 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultSpecialConfigData.java +++ b/src/main/java/mekanism/common/capabilities/DefaultSpecialConfigData.java @@ -27,6 +27,6 @@ public class DefaultSpecialConfigData extends DefaultConfigCardAccess implements public static void register() { - CapabilityManager.INSTANCE.register(ISpecialConfigData.class, new NullStorage(), DefaultSpecialConfigData.class); + CapabilityManager.INSTANCE.register(ISpecialConfigData.class, new NullStorage<>(), DefaultSpecialConfigData.class); } } diff --git a/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java b/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java index 13739ef2e..5146b4a0c 100644 --- a/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java +++ b/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java @@ -10,7 +10,7 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider; public class ItemCapabilityWrapper implements ICapabilityProvider { - private List capabilities = new ArrayList(); + private List capabilities = new ArrayList<>(); protected final ItemStack itemStack; diff --git a/src/main/java/mekanism/common/config/TypeConfigManager.java b/src/main/java/mekanism/common/config/TypeConfigManager.java index 0fa88c9fc..727d7445a 100644 --- a/src/main/java/mekanism/common/config/TypeConfigManager.java +++ b/src/main/java/mekanism/common/config/TypeConfigManager.java @@ -9,7 +9,7 @@ import net.minecraft.item.crafting.CraftingManager; public class TypeConfigManager { - private Map config = new HashMap(); + private Map config = new HashMap<>(); public boolean isEnabled(String type) { diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index cada8e5b6..15dd7a8a5 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -53,8 +53,8 @@ public class BoilerUpdateProtocol extends UpdateProtocol { if(structure.volHeight >= 3) { - Set dispersers = new HashSet(); - Set elements = new HashSet(); + Set dispersers = new HashSet<>(); + Set elements = new HashSet<>(); for(Coord4D coord : innerNodes) { diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index 0445fffca..d8ca40dff 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -18,7 +18,7 @@ import net.minecraftforge.fluids.FluidStack; public class SynchronizedBoilerData extends SynchronizedData implements IHeatTransfer { - public static Map clientHotMap = new HashMap(); + public static Map clientHotMap = new HashMap<>(); public static double CASING_INSULATION_COEFFICIENT = 1; public static double CASING_INVERSE_CONDUCTION_COEFFICIENT = 1; @@ -52,7 +52,7 @@ public class SynchronizedBoilerData extends SynchronizedData valves = new HashSet(); + public Set valves = new HashSet<>(); /** * @return how much heat energy is needed to convert one unit of water into steam diff --git a/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java b/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java index 59b04442b..dee62bde5 100644 --- a/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java +++ b/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java @@ -15,9 +15,9 @@ public class SynchronizedMatrixData extends SynchronizedData inventory = NonNullList.withSize(2, ItemStack.EMPTY); - public Set cells = new HashSet(); + public Set cells = new HashSet<>(); - public Set providers = new HashSet(); + public Set providers = new HashSet<>(); public double remainingInput; public double lastInput; @@ -70,4 +70,4 @@ public class SynchronizedMatrixData extends SynchronizedData oresToMine = new HashMap(); - public Map replaceMap = new HashMap(); + public Map oresToMine = new HashMap<>(); + public Map replaceMap = new HashMap<>(); - public Map acceptedItems = new HashMap(); + public Map acceptedItems = new HashMap<>(); public int found = 0; @@ -140,11 +140,8 @@ public class ThreadMinerSearch extends Thread public void set(int i, Coord4D location) { Chunk3D chunk = new Chunk3D(location); - - if(oresToMine.get(chunk) == null) - { - oresToMine.put(chunk, new BitSet()); - } + + oresToMine.computeIfAbsent(chunk, k -> new BitSet()); oresToMine.get(chunk).set(i); } diff --git a/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java b/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java index 7e45ddb1a..989763384 100644 --- a/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java +++ b/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java @@ -23,7 +23,7 @@ public class SynchronizedTankData extends SynchronizedData public NonNullList inventory = NonNullList.withSize(2, ItemStack.EMPTY); - public Set valves = new HashSet(); + public Set valves = new HashSet<>(); public boolean needsRenderUpdate() { diff --git a/src/main/java/mekanism/common/content/transporter/InvStack.java b/src/main/java/mekanism/common/content/transporter/InvStack.java index e8bdd8bff..67598d19d 100644 --- a/src/main/java/mekanism/common/content/transporter/InvStack.java +++ b/src/main/java/mekanism/common/content/transporter/InvStack.java @@ -19,16 +19,16 @@ public final class InvStack public InvStack(TileEntity inv, EnumFacing facing) { tileEntity = inv; - itemStacks = new ArrayList(); - slotIDs = new ArrayList(); + itemStacks = new ArrayList<>(); + slotIDs = new ArrayList<>(); side = facing; } public InvStack(TileEntity inv, int id, ItemStack stack, EnumFacing facing) { tileEntity = inv; - itemStacks = new ArrayList(); - slotIDs = new ArrayList(); + itemStacks = new ArrayList<>(); + slotIDs = new ArrayList<>(); side = facing; appendStack(id, stack); diff --git a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java index 6d897158c..cb3cf7ccc 100644 --- a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java +++ b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java @@ -10,7 +10,7 @@ import net.minecraft.util.EnumFacing; public class PathfinderCache { - public static Map> cachedPaths = new HashMap>(); + public static Map> cachedPaths = new HashMap<>(); public static void onChanged(Coord4D location) { @@ -75,4 +75,4 @@ public class PathfinderCache return code; } } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index 9609b648b..1f849c35a 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -28,7 +28,7 @@ import net.minecraftforge.items.IItemHandler; public class TransporterManager { - public static Map> flowingStacks = new HashMap>(); + public static Map> flowingStacks = new HashMap<>(); public static void reset() { @@ -37,7 +37,7 @@ public class TransporterManager public static void add(TransporterStack stack) { - Set set = new HashSet(); + Set set = new HashSet<>(); set.add(stack); if(flowingStacks.get(stack.getDest()) == null) @@ -59,7 +59,7 @@ public class TransporterManager public static List getStacksToDest(Coord4D dest) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); if(flowingStacks.containsKey(dest)) { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index cac5bb129..d98691657 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -47,7 +47,7 @@ public final class TransporterPathfinder public Destination find() { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); ret.add(start); if(transportStack.idleDir == null) @@ -233,7 +233,7 @@ public final class TransporterPathfinder public static List getPaths(ILogisticalTransporter start, TransporterStack stack, TransitRequest request, int min) { - List paths = new ArrayList(); + List paths = new ArrayList<>(); InventoryNetwork network = start.getTransmitterNetwork(); if(network == null) @@ -329,7 +329,7 @@ public final class TransporterPathfinder { List paths = getPaths(start, stack, request, min); - Map destPaths = new HashMap(); + Map destPaths = new HashMap<>(); for(Destination d : paths) { @@ -339,7 +339,7 @@ public final class TransporterPathfinder } } - List dests = new ArrayList(); + List dests = new ArrayList<>(); dests.addAll(destPaths.values()); Collections.sort(dests); @@ -409,15 +409,15 @@ public final class TransporterPathfinder transportStack = stack; - openSet = new HashSet(); - closedSet = new HashSet(); + openSet = new HashSet<>(); + closedSet = new HashSet<>(); - navMap = new HashMap(); + navMap = new HashMap<>(); - gScore = new HashMap(); - fScore = new HashMap(); + gScore = new HashMap<>(); + fScore = new HashMap<>(); - results = new ArrayList(); + results = new ArrayList<>(); find(start); } @@ -532,7 +532,7 @@ public final class TransporterPathfinder private ArrayList reconstructPath(HashMap naviMap, Coord4D currentNode) { - ArrayList path = new ArrayList(); + ArrayList path = new ArrayList<>(); path.add(currentNode); @@ -548,7 +548,7 @@ public final class TransporterPathfinder public ArrayList getPath() { - ArrayList path = new ArrayList(); + ArrayList path = new ArrayList<>(); path.add(finalNode); path.addAll(results); diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index 87a7370d5..4c3434138 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -35,7 +35,7 @@ public class TransporterStack public EnumFacing idleDir = null; - private List pathToTarget = new ArrayList(); + private List pathToTarget = new ArrayList<>(); public Coord4D originalLocation; public Coord4D homeLocation; diff --git a/src/main/java/mekanism/common/frequency/Frequency.java b/src/main/java/mekanism/common/frequency/Frequency.java index 059b80db7..af9692b5b 100644 --- a/src/main/java/mekanism/common/frequency/Frequency.java +++ b/src/main/java/mekanism/common/frequency/Frequency.java @@ -25,7 +25,7 @@ public class Frequency public boolean publicFreq; - public Set activeCoords = new HashSet(); + public Set activeCoords = new HashSet<>(); public Frequency(String n, UUID uuid) { @@ -147,4 +147,4 @@ public class Frequency return obj instanceof Frequency && ((Frequency)obj).name.equals(name) && ((Frequency)obj).ownerUUID.equals(ownerUUID) && ((Frequency)obj).publicFreq == publicFreq; } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index d1119cc65..f0ce35873 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -27,9 +27,9 @@ public class FrequencyManager public static boolean loaded; - private static Set managers = new HashSet(); + private static Set managers = new HashSet<>(); - private Set frequencies = new HashSet(); + private Set frequencies = new HashSet<>(); private FrequencyDataHandler dataHandler; @@ -269,7 +269,7 @@ public class FrequencyManager public Set readFrequencies(ByteBuf dataStream) { - Set ret = new HashSet(); + Set ret = new HashSet<>(); int size = dataStream.readInt(); try { @@ -341,7 +341,7 @@ public class FrequencyManager NBTTagList list = nbtTags.getTagList("freqList", NBT.TAG_COMPOUND); - loadedFrequencies = new HashSet(); + loadedFrequencies = new HashSet<>(); for(int i = 0; i < list.tagCount(); i++) { diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java index 765e2135d..07159cbbd 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java @@ -115,7 +115,7 @@ public class MultipartTileNetworkJoiner implements ITileNetwork for(IPartSlot slot : container.getParts().keySet()) { TileEntity part = container.getPartTile(slot) - .map(multiPartTile -> multiPartTile.getTileEntity()) + .map(IMultipartTile::getTileEntity) .orElse(null); if(part instanceof ITileNetwork) diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 2a4cb10ae..71b4a9f1a 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -367,9 +367,9 @@ public class ItemAtomicDisassembler extends ItemEnergized public Coord4D location; - public Set found = new HashSet(); + public Set found = new HashSet<>(); - public static Map> ignoreBlocks = new HashMap>(); + public static Map> ignoreBlocks = new HashMap<>(); public Finder(World w, ItemStack s, Coord4D loc) { diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index d1e9e0c16..801ea7549 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -258,7 +258,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt 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))); } } else if(type == BasicBlockType.INDUCTION_PROVIDER) @@ -268,7 +268,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt 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/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 66035ac86..d5c761c76 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -123,7 +123,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI 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 f652cc2da..b6d1b517d 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -396,7 +396,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec factory.setRecipeType(recipeType); world.notifyNeighborsOfStateChange(pos, tileEntity.getBlockType(), true); - 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))); } if(tileEntity instanceof ISustainedTank) @@ -966,7 +966,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } @Override - public void handlePacketData(ItemStack stack, ByteBuf dataStream) throws Exception + public void handlePacketData(ItemStack stack, ByteBuf dataStream) { if(FMLCommonHandler.instance().getEffectiveSide().isServer()) { diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 5afd872f6..d3403ce9f 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -344,7 +344,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool } @Override - public void handlePacketData(ItemStack stack, ByteBuf dataStream) throws Exception + public void handlePacketData(ItemStack stack, ByteBuf dataStream) { if(FMLCommonHandler.instance().getEffectiveSide().isServer()) { diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java index e5362ebcd..e03fd9162 100644 --- a/src/main/java/mekanism/common/item/ItemCraftingFormula.java +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -47,7 +47,7 @@ public class ItemCraftingFormula extends ItemMekanism private void addIngredientDetails(NonNullList inv, List list) { - List stacks = new ArrayList(); + List stacks = new ArrayList<>(); for(ItemStack stack : inv) { diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index 61e8b69fd..3e8308131 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -204,7 +204,7 @@ public class ItemElectricBow extends ItemEnergized implements IItemNetwork } @Override - public void handlePacketData(ItemStack stack, ByteBuf dataStream) throws Exception + public void handlePacketData(ItemStack stack, ByteBuf dataStream) { if(FMLCommonHandler.instance().getEffectiveSide().isServer()) { diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index 33cd7aed0..ef1687215 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -27,7 +27,7 @@ public class ItemWalkieTalkie extends ItemMekanism implements IItemNetwork { public static ModelResourceLocation OFF_MODEL = new ModelResourceLocation("mekanism:WalkieTalkie", "inventory"); - public static Map CHANNEL_MODELS = new HashMap(); + public static Map CHANNEL_MODELS = new HashMap<>(); public ItemWalkieTalkie() { @@ -47,10 +47,7 @@ public class ItemWalkieTalkie extends ItemMekanism implements IItemNetwork public static ModelResourceLocation getModel(int channel) { - if(CHANNEL_MODELS.get(channel) == null) - { - CHANNEL_MODELS.put(channel, new ModelResourceLocation("mekanism:WalkieTalkie_ch" + channel, "inventory")); - } + CHANNEL_MODELS.computeIfAbsent(channel, c -> new ModelResourceLocation("mekanism:WalkieTalkie_ch" + c, "inventory")); return CHANNEL_MODELS.get(channel); } @@ -105,7 +102,7 @@ public class ItemWalkieTalkie extends ItemMekanism implements IItemNetwork } @Override - public void handlePacketData(ItemStack stack, ByteBuf dataStream) throws Exception + public void handlePacketData(ItemStack stack, ByteBuf dataStream) { if(FMLCommonHandler.instance().getEffectiveSide().isServer()) { diff --git a/src/main/java/mekanism/common/multiblock/MultiblockCache.java b/src/main/java/mekanism/common/multiblock/MultiblockCache.java index 09a636ba3..0dd87c096 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockCache.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockCache.java @@ -7,7 +7,7 @@ import net.minecraft.nbt.NBTTagCompound; public abstract class MultiblockCache> { - public HashSet locations = new HashSet(); + public HashSet locations = new HashSet<>(); public abstract void apply(T data); diff --git a/src/main/java/mekanism/common/multiblock/MultiblockManager.java b/src/main/java/mekanism/common/multiblock/MultiblockManager.java index 2b8f14e06..33e9759b8 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockManager.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockManager.java @@ -14,12 +14,12 @@ import net.minecraft.world.World; public class MultiblockManager> { - private static Set managers = new HashSet(); + private static Set managers = new HashSet<>(); public String name; /** A map containing references to all multiblock inventory caches. */ - public Map> inventories = new HashMap>(); + public Map> inventories = new HashMap<>(); public MultiblockManager(String s) { @@ -72,8 +72,8 @@ public class MultiblockManager> public void tickSelf(World world) { - ArrayList idsToKill = new ArrayList(); - HashMap> tilesToKill = new HashMap>(); + ArrayList idsToKill = new ArrayList<>(); + HashMap> tilesToKill = new HashMap<>(); for(Map.Entry> entry : inventories.entrySet()) { @@ -89,7 +89,7 @@ public class MultiblockManager> { if(!tilesToKill.containsKey(inventoryID)) { - tilesToKill.put(inventoryID, new HashSet()); + tilesToKill.put(inventoryID, new HashSet<>()); } tilesToKill.get(inventoryID).add(obj); diff --git a/src/main/java/mekanism/common/multiblock/SynchronizedData.java b/src/main/java/mekanism/common/multiblock/SynchronizedData.java index 0508c2629..a934a2ad0 100644 --- a/src/main/java/mekanism/common/multiblock/SynchronizedData.java +++ b/src/main/java/mekanism/common/multiblock/SynchronizedData.java @@ -9,7 +9,7 @@ import net.minecraft.util.NonNullList; public abstract class SynchronizedData> { - public Set locations = new HashSet(); + public Set locations = new HashSet<>(); public int volLength; @@ -32,7 +32,7 @@ public abstract class SynchronizedData> public boolean destroyed; - public Set internalLocations = new HashSet(); + public Set internalLocations = new HashSet<>(); public NonNullList getInventory() { diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index a40a550c4..b58a24cf4 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -16,9 +16,9 @@ import net.minecraft.world.World; public abstract class UpdateProtocol> { /** The multiblock nodes that have already been iterated over. */ - public Set iteratedNodes = new HashSet(); + public Set iteratedNodes = new HashSet<>(); - public Set innerNodes = new HashSet(); + public Set innerNodes = new HashSet<>(); /** The structures found, all connected by some nodes to the pointer. */ public T structureFound = null; @@ -46,7 +46,7 @@ public abstract class UpdateProtocol> boolean rightBlocks = true; boolean rightFrame = true; - Set locations = new HashSet(); + Set locations = new HashSet<>(); int xmin = 0, xmax = 0, ymin = 0, ymax = 0, zmin = 0, zmax = 0; @@ -497,7 +497,7 @@ public abstract class UpdateProtocol> } } - List idsFound = new ArrayList(); + List idsFound = new ArrayList<>(); String idToUse = null; for(Coord4D obj : structureFound.locations) @@ -511,7 +511,7 @@ public abstract class UpdateProtocol> } MultiblockCache cache = getNewCache(); - List rejectedItems = new ArrayList(); + List rejectedItems = new ArrayList<>(); if(!idsFound.isEmpty()) { @@ -544,7 +544,7 @@ public abstract class UpdateProtocol> onFormed(); - List structures = new ArrayList(); + List structures = new ArrayList<>(); Coord4D toUse = null; for(Coord4D obj : structureFound.locations) @@ -605,7 +605,7 @@ public abstract class UpdateProtocol> public class NodeCounter { - public Set iterated = new HashSet(); + public Set iterated = new HashSet<>(); public NodeChecker checker; diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 52254501c..2a8e53556 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -33,83 +33,80 @@ public class PacketConfigurationUpdate implements IMessageHandler + { + TileEntity tile = message.coord4D.getTileEntity(player.world); + ITileNetwork network = CapabilityUtils.getCapability(tile, Capabilities.TILE_NETWORK_CAPABILITY, null); + + if(tile instanceof ISideConfiguration) + { + ISideConfiguration config = (ISideConfiguration)tile; + + if(message.packetType == ConfigurationPacket.EJECT) + { + config.getConfig().setEjecting(message.transmission, !config.getConfig().isEjecting(message.transmission)); + } + else if(message.packetType == ConfigurationPacket.SIDE_DATA) + { + if(message.clickType == 0) + { + MekanismUtils.incrementOutput((ISideConfiguration)tile, message.transmission, message.configIndex); + } + else if(message.clickType == 1) + { + MekanismUtils.decrementOutput((ISideConfiguration)tile, message.transmission, message.configIndex); + } + else if(message.clickType == 2) + { + ((ISideConfiguration)tile).getConfig().getConfig(message.transmission).set(message.configIndex, (byte) 0); + } + + tile.markDirty(); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(message.coord4D, network.getNetworkedData(new ArrayList())), new Range4D(message.coord4D)); + } + else if(message.packetType == ConfigurationPacket.EJECT_COLOR) + { + if(message.clickType == 0) + { + config.getEjector().setOutputColor(TransporterUtils.increment(config.getEjector().getOutputColor())); + } + else if(message.clickType == 1) + { + config.getEjector().setOutputColor(TransporterUtils.decrement(config.getEjector().getOutputColor())); + } + else if(message.clickType == 2) + { + config.getEjector().setOutputColor(null); + } + } + else if(message.packetType == ConfigurationPacket.INPUT_COLOR) + { + EnumFacing side = EnumFacing.getFront(message.inputSide); + + if(message.clickType == 0) + { + config.getEjector().setInputColor(side, TransporterUtils.increment(config.getEjector().getInputColor(side))); + } + else if(message.clickType == 1) + { + config.getEjector().setInputColor(side, TransporterUtils.decrement(config.getEjector().getInputColor(side))); + } + else if(message.clickType == 2) + { + config.getEjector().setInputColor(side, null); + } + } + else if(message.packetType == ConfigurationPacket.STRICT_INPUT) + { + config.getEjector().setStrictInput(!config.getEjector().hasStrictInput()); + } + + for(EntityPlayer p : ((TileEntityBasicBlock)config).playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(message.coord4D, network.getNetworkedData(new ArrayList())), (EntityPlayerMP)p); + } + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketContainerEditMode.java b/src/main/java/mekanism/common/network/PacketContainerEditMode.java index c3dbc9798..59655e870 100644 --- a/src/main/java/mekanism/common/network/PacketContainerEditMode.java +++ b/src/main/java/mekanism/common/network/PacketContainerEditMode.java @@ -19,18 +19,15 @@ public class PacketContainerEditMode implements IMessageHandler + { + TileEntity tileEntity = message.coord4D.getTileEntity(player.world); + + if(tileEntity instanceof IFluidContainerManager) + { + ((IFluidContainerManager)tileEntity).setContainerEditMode(message.value); + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index 0a7b7872e..4bd642b10 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -30,41 +30,38 @@ public class PacketDataRequest implements IMessageHandler())), (EntityPlayerMP)player); - } - } - } - }, player); + PacketHandler.handlePacket(() -> + { + World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(message.coord4D.dimensionId); + TileEntity tileEntity = message.coord4D.getTileEntity(worldServer); + + if(worldServer != null) + { + if(tileEntity instanceof TileEntityMultiblock) + { + ((TileEntityMultiblock)tileEntity).sendStructure = true; + } + + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) + { + IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); + + transmitter.setRequestsUpdate(); + + if(transmitter.hasTransmitterNetwork()) + { + transmitter.getTransmitterNetwork().addUpdate(player); + } + } + + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.TILE_NETWORK_CAPABILITY, null)) + { + ITileNetwork network = CapabilityUtils.getCapability(tileEntity, Capabilities.TILE_NETWORK_CAPABILITY, null); + + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), network.getNetworkedData(new ArrayList<>())), (EntityPlayerMP)player); + } + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index 5f7249044..2b5245f4c 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -41,40 +41,37 @@ public class PacketDigitalMinerGui implements IMessageHandler + { + if(!player.world.isRemote) + { + World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(message.coord4D.dimensionId); + + if(worldServer != null && message.coord4D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) + { + DigitalMinerGuiMessage.openServerGui(message.packetType, message.guiType, worldServer, (EntityPlayerMP)player, message.coord4D, message.index); + } + } + else { + if(message.coord4D.getTileEntity(player.world) instanceof TileEntityDigitalMiner) + { + try { + if(message.packetType == MinerGuiPacket.CLIENT) + { + FMLCommonHandler.instance().showGuiScreen(DigitalMinerGuiMessage.getGui(message.packetType, message.guiType, player, player.world, message.coord4D.getPos(), -1)); + } + else if(message.packetType == MinerGuiPacket.CLIENT_INDEX) + { + FMLCommonHandler.instance().showGuiScreen(DigitalMinerGuiMessage.getGui(message.packetType, message.guiType, player, player.world, message.coord4D.getPos(), message.index)); + } + + player.openContainer.windowId = message.windowId; + } catch(Exception e) { + e.printStackTrace(); + } + } + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketDropperUse.java b/src/main/java/mekanism/common/network/PacketDropperUse.java index 39b57f74a..5189c2b39 100644 --- a/src/main/java/mekanism/common/network/PacketDropperUse.java +++ b/src/main/java/mekanism/common/network/PacketDropperUse.java @@ -19,27 +19,24 @@ public class PacketDropperUse implements IMessageHandler + { + TileEntity tileEntity = message.coord4D.getTileEntity(player.world); + + if(tileEntity instanceof ITankManager) + { + try { + Object tank = ((ITankManager)tileEntity).getTanks()[message.tankId]; + + if(tank != null) + { + DropperHandler.useDropper(player, tank, message.mouseButton); + } + } catch(Exception e) { + e.printStackTrace(); + } + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketEditFilter.java b/src/main/java/mekanism/common/network/PacketEditFilter.java index b474704ad..6e4512505 100644 --- a/src/main/java/mekanism/common/network/PacketEditFilter.java +++ b/src/main/java/mekanism/common/network/PacketEditFilter.java @@ -30,84 +30,81 @@ public class PacketEditFilter implements IMessageHandler + { + if(worldServer != null) + { + if(message.type == 0 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) + { + TileEntityLogisticalSorter sorter = (TileEntityLogisticalSorter) message.coord4D.getTileEntity(worldServer); + + if(!sorter.filters.contains(message.tFilter)) + { + return; + } + + int index = sorter.filters.indexOf(message.tFilter); + + sorter.filters.remove(index); + + if(!message.delete) + { + sorter.filters.add(index, message.tEdited); + } + + for(EntityPlayer iterPlayer : sorter.playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(sorter), sorter.getFilterPacket(new ArrayList())), (EntityPlayerMP)iterPlayer); + } + } + else if(message.type == 1 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) + { + TileEntityDigitalMiner miner = (TileEntityDigitalMiner)message.coord4D.getTileEntity(worldServer); + + if(!miner.filters.contains(message.mFilter)) + { + return; + } + + int index = miner.filters.indexOf(message.mFilter); + + miner.filters.remove(index); + + if(!message.delete) + { + miner.filters.add(index, message.mEdited); + } + + for(EntityPlayer iterPlayer : miner.playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(miner), miner.getFilterPacket(new ArrayList())), (EntityPlayerMP)iterPlayer); + } + } + else if(message.type == 2 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityOredictionificator) + { + TileEntityOredictionificator oredictionificator = (TileEntityOredictionificator)message.coord4D.getTileEntity(worldServer); + + if(!oredictionificator.filters.contains(message.oFilter)) + { + return; + } + + int index = oredictionificator.filters.indexOf(message.oFilter); + + oredictionificator.filters.remove(index); + + if(!message.delete) + { + oredictionificator.filters.add(index, message.oEdited); + } + + for(EntityPlayer iterPlayer : oredictionificator.playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(oredictionificator), oredictionificator.getFilterPacket(new ArrayList())), (EntityPlayerMP)iterPlayer); + } + } + } + }); return null; } diff --git a/src/main/java/mekanism/common/network/PacketEntityMove.java b/src/main/java/mekanism/common/network/PacketEntityMove.java index f38862b36..84ac1b523 100644 --- a/src/main/java/mekanism/common/network/PacketEntityMove.java +++ b/src/main/java/mekanism/common/network/PacketEntityMove.java @@ -17,18 +17,15 @@ public class PacketEntityMove implements IMessageHandler + { + Entity entity = player.world.getEntityByID(message.entityId); + + if(entity != null) + { + entity.setLocationAndAngles(message.pos.x, message.pos.y, message.pos.z, entity.rotationYaw, entity.rotationPitch); + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketFlamethrowerData.java b/src/main/java/mekanism/common/network/PacketFlamethrowerData.java index 974716e93..2802f3156 100644 --- a/src/main/java/mekanism/common/network/PacketFlamethrowerData.java +++ b/src/main/java/mekanism/common/network/PacketFlamethrowerData.java @@ -19,36 +19,33 @@ public class PacketFlamethrowerData implements IMessageHandler + { +if(message.packetType == FlamethrowerPacket.UPDATE) +{ +if(message.value) +{ +Mekanism.flamethrowerActive.add(message.username); +} +else { +Mekanism.flamethrowerActive.remove(message.username); +} + +if(!player.world.isRemote) +{ +Mekanism.packetHandler.sendToDimension(new FlamethrowerDataMessage(FlamethrowerPacket.UPDATE, message.currentHand, message.username, message.value), player.world.provider.getDimension()); +} +} +else if(message.packetType == FlamethrowerPacket.MODE) +{ +ItemStack stack = player.getHeldItem(message.currentHand); + +if(!stack.isEmpty() && stack.getItem() instanceof ItemFlamethrower) +{ +((ItemFlamethrower)stack.getItem()).incrementMode(stack); +} +} + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketItemStack.java b/src/main/java/mekanism/common/network/PacketItemStack.java index ed2ebf849..782e0cea0 100644 --- a/src/main/java/mekanism/common/network/PacketItemStack.java +++ b/src/main/java/mekanism/common/network/PacketItemStack.java @@ -28,26 +28,23 @@ public class PacketItemStack implements IMessageHandler + { + ItemStack stack = player.getHeldItem(message.currentHand); + + if(!stack.isEmpty() && stack.getItem() instanceof IItemNetwork) + { + IItemNetwork network = (IItemNetwork)stack.getItem(); + + try { + network.handlePacketData(stack, message.storedBuffer); + } catch(Exception e) { + e.printStackTrace(); + } + + message.storedBuffer.release(); + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketJetpackData.java b/src/main/java/mekanism/common/network/PacketJetpackData.java index 3b13986b7..b89c7b446 100644 --- a/src/main/java/mekanism/common/network/PacketJetpackData.java +++ b/src/main/java/mekanism/common/network/PacketJetpackData.java @@ -20,42 +20,39 @@ public class PacketJetpackData implements IMessageHandler + { + if(message.packetType == JetpackPacket.UPDATE) + { + if(message.value) + { + Mekanism.jetpackOn.add(message.username); + } + else { + Mekanism.jetpackOn.remove(message.username); + } + + if(!player.world.isRemote) + { + Mekanism.packetHandler.sendToDimension(new JetpackDataMessage(JetpackPacket.UPDATE, message.username, message.value), player.world.provider.getDimension()); + } + } + else if(message.packetType == JetpackPacket.MODE) + { + ItemStack stack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + + if(!stack.isEmpty() && stack.getItem() instanceof ItemJetpack) + { + if(!message.value) + { + ((ItemJetpack)stack.getItem()).incrementMode(stack); + } + else { + ((ItemJetpack)stack.getItem()).setMode(stack, JetpackMode.DISABLED); + } + } + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java index b08b494a8..932d603d6 100644 --- a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java @@ -35,40 +35,37 @@ public class PacketLogisticalSorterGui implements IMessageHandler + { + if(!player.world.isRemote) + { + World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(message.coord4D.dimensionId); + + if(worldServer != null && message.coord4D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) + { + LogisticalSorterGuiMessage.openServerGui(message.packetType, message.guiType, worldServer, (EntityPlayerMP)player, message.coord4D, message.index); + } + } + else { + if(message.coord4D.getTileEntity(player.world) instanceof TileEntityLogisticalSorter) + { + try { + if(message.packetType == SorterGuiPacket.CLIENT) + { + FMLCommonHandler.instance().showGuiScreen(LogisticalSorterGuiMessage.getGui(message.packetType, message.guiType, player, player.world, message.coord4D.getPos(), -1)); + } + else if(message.packetType == SorterGuiPacket.CLIENT_INDEX) + { + FMLCommonHandler.instance().showGuiScreen(LogisticalSorterGuiMessage.getGui(message.packetType, message.guiType, player, player.world, message.coord4D.getPos(), message.index)); + } + + player.openContainer.windowId = message.windowId; + } catch(Exception e) { + e.printStackTrace(); + } + } + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketNewFilter.java b/src/main/java/mekanism/common/network/PacketNewFilter.java index 9dab18f22..8ba5f4fcf 100644 --- a/src/main/java/mekanism/common/network/PacketNewFilter.java +++ b/src/main/java/mekanism/common/network/PacketNewFilter.java @@ -30,48 +30,45 @@ public class PacketNewFilter implements IMessageHandler + { + if(worldServer != null) + { + if(message.type == 0 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) + { + TileEntityLogisticalSorter sorter = (TileEntityLogisticalSorter)message.coord4D.getTileEntity(worldServer); + + sorter.filters.add(message.tFilter); + + for(EntityPlayer iterPlayer : sorter.playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(sorter), sorter.getFilterPacket(new ArrayList())), (EntityPlayerMP)iterPlayer); + } + } + else if(message.type == 1 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) + { + TileEntityDigitalMiner miner = (TileEntityDigitalMiner)message.coord4D.getTileEntity(worldServer); + + miner.filters.add(message.mFilter); + + for(EntityPlayer iterPlayer : miner.playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(miner), miner.getFilterPacket(new ArrayList())), (EntityPlayerMP)iterPlayer); + } + } + else if(message.type == 2 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityOredictionificator) + { + TileEntityOredictionificator oredictionificator = (TileEntityOredictionificator)message.coord4D.getTileEntity(worldServer); + + oredictionificator.filters.add(message.oFilter); + + for(EntityPlayer iterPlayer : oredictionificator.playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(oredictionificator), oredictionificator.getFilterPacket(new ArrayList())), (EntityPlayerMP)iterPlayer); + } + } + } + }); return null; } diff --git a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java index 719c5cd88..f5513f6d1 100644 --- a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java +++ b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java @@ -35,40 +35,37 @@ public class PacketOredictionificatorGui implements IMessageHandler + { + if(!player.world.isRemote) + { + World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(message.coord4D.dimensionId); + + if(worldServer != null && message.coord4D.getTileEntity(worldServer) instanceof TileEntityOredictionificator) + { + OredictionificatorGuiMessage.openServerGui(message.packetType, message.guiType, worldServer, (EntityPlayerMP)player, message.coord4D, message.index); + } + } + else { + if(message.coord4D.getTileEntity(player.world) instanceof TileEntityOredictionificator) + { + try { + if(message.packetType == OredictionificatorGuiPacket.CLIENT) + { + FMLCommonHandler.instance().showGuiScreen(OredictionificatorGuiMessage.getGui(message.packetType, message.guiType, player, player.world, message.coord4D.getPos(), -1)); + } + else if(message.packetType == OredictionificatorGuiPacket.CLIENT_INDEX) + { + FMLCommonHandler.instance().showGuiScreen(OredictionificatorGuiMessage.getGui(message.packetType, message.guiType, player, player.world, message.coord4D.getPos(), message.index)); + } + + player.openContainer.windowId = message.windowId; + } catch(Exception e) { + e.printStackTrace(); + } + } + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketPersonalChest.java b/src/main/java/mekanism/common/network/PacketPersonalChest.java index 8f534cfaf..347d6ee91 100644 --- a/src/main/java/mekanism/common/network/PacketPersonalChest.java +++ b/src/main/java/mekanism/common/network/PacketPersonalChest.java @@ -25,43 +25,40 @@ public class PacketPersonalChest implements IMessageHandler + { + if(message.packetType == PersonalChestPacketType.SERVER_OPEN) + { + try { + if(message.isBlock) + { + TileEntityPersonalChest tileEntity = (TileEntityPersonalChest)message.coord4D.getTileEntity(player.world); + MekanismUtils.openPersonalChestGui((EntityPlayerMP)player, tileEntity, null, true); + } + else { + ItemStack stack = player.getHeldItem(message.currentHand); + + if(MachineType.get(stack) == MachineType.PERSONAL_CHEST) + { + InventoryPersonalChest inventory = new InventoryPersonalChest(player, message.currentHand); + MekanismUtils.openPersonalChestGui((EntityPlayerMP)player, null, inventory, false); + } + } + } catch(Exception e) { + Mekanism.logger.error("Error while handling electric chest open packet."); + e.printStackTrace(); + } + } + else if(message.packetType == PersonalChestPacketType.CLIENT_OPEN) + { + try { + Mekanism.proxy.openPersonalChest(player, message.guiType, message.windowId, message.isBlock, message.coord4D == null ? BlockPos.ORIGIN : message.coord4D.getPos(), message.currentHand); + } catch(Exception e) { + Mekanism.logger.error("Error while handling electric chest open packet."); + e.printStackTrace(); + } + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index c55f48bec..cf643a6e8 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -38,127 +38,124 @@ public class PacketPortableTeleporter implements IMessageHandler + { + ItemStack itemstack = player.getHeldItem(message.currentHand); + World world = player.world; + + if(!itemstack.isEmpty() && itemstack.getItem() instanceof ItemPortableTeleporter) + { + ItemPortableTeleporter item = (ItemPortableTeleporter)itemstack.getItem(); + + switch(message.packetType) + { + case DATA_REQUEST: + sendDataResponse(message.frequency, world, player, item, itemstack, message.currentHand); + break; + case DATA_RESPONSE: + Mekanism.proxy.handleTeleporterUpdate(message); + break; + case SET_FREQ: + FrequencyManager manager1 = getManager(message.frequency.isPublic() ? null : player.getUniqueID(), world); + Frequency toUse = null; + + for(Frequency freq : manager1.getFrequencies()) + { + if(freq.name.equals(message.frequency.name)) + { + toUse = freq; + break; + } + } + + if(toUse == null) + { + toUse = new Frequency(message.frequency.name, player.getPersistentID()).setPublic(message.frequency.isPublic()); + manager1.addFrequency(toUse); + } + + item.setFrequency(itemstack, toUse.name); + item.setPrivateMode(itemstack, !toUse.publicFreq); + + sendDataResponse(toUse, world, player, item, itemstack, message.currentHand); + + break; + case DEL_FREQ: + FrequencyManager manager = getManager(message.frequency.isPublic() ? null : player.getUniqueID(), world); + manager.remove(message.frequency.name, player.getUniqueID()); + + item.setFrequency(itemstack, null); + item.setPrivateMode(itemstack, false); + + break; + case TELEPORT: + FrequencyManager manager2 = getManager(message.frequency.isPublic() ? null : player.getUniqueID(), world); + Frequency found = null; + + for(Frequency freq : manager2.getFrequencies()) + { + if(message.frequency.name.equals(freq.name)) + { + found = freq; + break; + } + } + + if(found == null) + { + break; + } + + Coord4D coords = found.getClosestCoords(new Coord4D(player)); + + if(coords != null) + { + World teleWorld = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(coords.dimensionId); + TileEntityTeleporter teleporter = (TileEntityTeleporter)coords.getTileEntity(teleWorld); + + if(teleporter != null) + { + try { + teleporter.didTeleport.add(player.getPersistentID()); + teleporter.teleDelay = 5; + + item.setEnergy(itemstack, item.getEnergy(itemstack) - ItemPortableTeleporter.calculateEnergyCost(player, coords)); + + if(player instanceof EntityPlayerMP) + { + ReflectionUtils.setPrivateValue(((EntityPlayerMP)player).connection, 0, NetHandlerPlayServer.class, ObfuscatedNames.NetHandlerPlayServer_floatingTickCount); + } + + player.closeScreen(); + + Mekanism.packetHandler.sendToAllAround(new PortalFXMessage(new Coord4D(player)), coords.getTargetPoint(40D)); + TileEntityTeleporter.teleportPlayerTo((EntityPlayerMP)player, coords, teleporter); + TileEntityTeleporter.alignPlayer((EntityPlayerMP)player, coords); + + world.playSound(player, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.PLAYERS, 1.0F, 1.0F); + Mekanism.packetHandler.sendToReceivers(new PortalFXMessage(coords), new Range4D(coords)); + } catch(Exception e) {} + } + } + + break; + } + } + }, player); return null; } public void sendDataResponse(Frequency given, World world, EntityPlayer player, ItemPortableTeleporter item, ItemStack itemstack, EnumHand hand) { - List publicFreqs = new ArrayList(); + List publicFreqs = new ArrayList<>(); for(Frequency f : getManager(null, world).getFrequencies()) { publicFreqs.add(f); } - List privateFreqs = new ArrayList(); + List privateFreqs = new ArrayList<>(); for(Frequency f : getManager(player.getUniqueID(), world).getFrequencies()) { @@ -238,8 +235,8 @@ public class PacketPortableTeleporter implements IMessageHandler publicCache = new ArrayList(); - public List privateCache = new ArrayList(); + public List publicCache = new ArrayList<>(); + public List privateCache = new ArrayList<>(); public PortableTeleporterMessage() {} diff --git a/src/main/java/mekanism/common/network/PacketPortalFX.java b/src/main/java/mekanism/common/network/PacketPortalFX.java index 8401c4510..fe269e4b4 100644 --- a/src/main/java/mekanism/common/network/PacketPortalFX.java +++ b/src/main/java/mekanism/common/network/PacketPortalFX.java @@ -20,19 +20,16 @@ public class PacketPortalFX implements IMessageHandler + { + Random random = new Random(); + + for(int i = 0; i < 50; i++) + { + player.world.spawnParticle(EnumParticleTypes.PORTAL, message.coord4D.x + random.nextFloat(), message.coord4D.y + random.nextFloat(), message.coord4D.z + random.nextFloat(), 0.0F, 0.0F, 0.0F); + player.world.spawnParticle(EnumParticleTypes.PORTAL, message.coord4D.x + random.nextFloat(), message.coord4D.y + 1 + random.nextFloat(), message.coord4D.z + random.nextFloat(), 0.0F, 0.0F, 0.0F); + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketRedstoneControl.java b/src/main/java/mekanism/common/network/PacketRedstoneControl.java index 2aefd433e..f447aa716 100644 --- a/src/main/java/mekanism/common/network/PacketRedstoneControl.java +++ b/src/main/java/mekanism/common/network/PacketRedstoneControl.java @@ -19,18 +19,15 @@ public class PacketRedstoneControl implements IMessageHandler + { + TileEntity tileEntity = message.coord4D.getTileEntity(player.world); + + if(tileEntity instanceof IRedstoneControl) + { + ((IRedstoneControl)tileEntity).setControlType(message.value); + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java index d4538f8b7..b0563fa29 100644 --- a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java +++ b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java @@ -20,27 +20,24 @@ public class PacketRemoveUpgrade implements IMessageHandler 0) - { - if(player.inventory.addItemStackToInventory(upgrade.getStack())) - { - upgradeTile.getComponent().removeUpgrade(upgrade); - } - } - } - } - }, player); + PacketHandler.handlePacket(() -> + { + TileEntity tileEntity = message.coord4D.getTileEntity(player.world); + + if(tileEntity instanceof IUpgradeTile && tileEntity instanceof TileEntityBasicBlock) + { + IUpgradeTile upgradeTile = (IUpgradeTile)tileEntity; + Upgrade upgrade = Upgrade.values()[message.upgradeType]; + + if(upgradeTile.getComponent().getUpgrades(upgrade) > 0) + { + if(player.inventory.addItemStackToInventory(upgrade.getStack())) + { + upgradeTile.getComponent().removeUpgrade(upgrade); + } + } + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketRobit.java b/src/main/java/mekanism/common/network/PacketRobit.java index 34f6263b3..25625364a 100644 --- a/src/main/java/mekanism/common/network/PacketRobit.java +++ b/src/main/java/mekanism/common/network/PacketRobit.java @@ -17,71 +17,68 @@ public class PacketRobit implements IMessageHandler { EntityPlayer player = PacketHandler.getPlayer(context); - PacketHandler.handlePacket(new Runnable() { - @Override - public void run() - { - if(message.activeType == RobitPacketType.GUI) - { - if(message.guiType == 0) - { - player.openGui(Mekanism.instance, 21, player.world, message.entityId, 0, 0); - } - else if(message.guiType == 1) - { - player.openGui(Mekanism.instance, 22, player.world, message.entityId, 0, 0); - } - else if(message.guiType == 2) - { - player.openGui(Mekanism.instance, 23, player.world, message.entityId, 0, 0); - } - else if(message.guiType == 3) - { - player.openGui(Mekanism.instance, 24, player.world, message.entityId, 0, 0); - } - else if(message.guiType == 4) - { - player.openGui(Mekanism.instance, 25, player.world, message.entityId, 0, 0); - } - } - else if(message.activeType == RobitPacketType.FOLLOW) - { - EntityRobit robit = (EntityRobit)player.world.getEntityByID(message.entityId); - - if(robit != null) - { - robit.setFollowing(!robit.getFollowing()); - } - } - else if(message.activeType == RobitPacketType.NAME) - { - EntityRobit robit = (EntityRobit)player.world.getEntityByID(message.entityId); - - if(robit != null) - { - robit.setCustomNameTag(message.name); - } - } - else if(message.activeType == RobitPacketType.GO_HOME) - { - EntityRobit robit = (EntityRobit)player.world.getEntityByID(message.entityId); - - if(robit != null) - { - robit.goHome(); - } - } - else if(message.activeType == RobitPacketType.DROP_PICKUP) - { - EntityRobit robit = (EntityRobit)player.world.getEntityByID(message.entityId); - - if(robit != null) - { - robit.setDropPickup(!robit.getDropPickup()); - } - } - } - }, player); + PacketHandler.handlePacket(() -> + { + if(message.activeType == RobitPacketType.GUI) + { + if(message.guiType == 0) + { + player.openGui(Mekanism.instance, 21, player.world, message.entityId, 0, 0); + } + else if(message.guiType == 1) + { + player.openGui(Mekanism.instance, 22, player.world, message.entityId, 0, 0); + } + else if(message.guiType == 2) + { + player.openGui(Mekanism.instance, 23, player.world, message.entityId, 0, 0); + } + else if(message.guiType == 3) + { + player.openGui(Mekanism.instance, 24, player.world, message.entityId, 0, 0); + } + else if(message.guiType == 4) + { + player.openGui(Mekanism.instance, 25, player.world, message.entityId, 0, 0); + } + } + else if(message.activeType == RobitPacketType.FOLLOW) + { + EntityRobit robit = (EntityRobit)player.world.getEntityByID(message.entityId); + + if(robit != null) + { + robit.setFollowing(!robit.getFollowing()); + } + } + else if(message.activeType == RobitPacketType.NAME) + { + EntityRobit robit = (EntityRobit)player.world.getEntityByID(message.entityId); + + if(robit != null) + { + robit.setCustomNameTag(message.name); + } + } + else if(message.activeType == RobitPacketType.GO_HOME) + { + EntityRobit robit = (EntityRobit)player.world.getEntityByID(message.entityId); + + if(robit != null) + { + robit.goHome(); + } + } + else if(message.activeType == RobitPacketType.DROP_PICKUP) + { + EntityRobit robit = (EntityRobit)player.world.getEntityByID(message.entityId); + + if(robit != null) + { + robit.setDropPickup(!robit.getDropPickup()); + } + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketSecurityMode.java b/src/main/java/mekanism/common/network/PacketSecurityMode.java index ec80bd3d4..94ca37f35 100644 --- a/src/main/java/mekanism/common/network/PacketSecurityMode.java +++ b/src/main/java/mekanism/common/network/PacketSecurityMode.java @@ -25,34 +25,31 @@ public class PacketSecurityMode implements IMessageHandler + { + if(message.packetType == SecurityPacketType.BLOCK) + { + TileEntity tileEntity = message.coord4D.getTileEntity(player.world); + + if(tileEntity instanceof ISecurityTile) + { + UUID owner = ((ISecurityTile)tileEntity).getSecurity().getOwnerUUID(); + + if(owner != null && player.getUniqueID().equals(owner)) + { + ((ISecurityTile)tileEntity).getSecurity().setMode(message.value); + } + } + } + else { + ItemStack stack = player.getHeldItem(message.currentHand); + + if(stack.getItem() instanceof ISecurityItem) + { + ((ISecurityItem)stack.getItem()).setSecurity(stack, message.value); + } + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketSecurityUpdate.java b/src/main/java/mekanism/common/network/PacketSecurityUpdate.java index aa82fea54..98f883228 100644 --- a/src/main/java/mekanism/common/network/PacketSecurityUpdate.java +++ b/src/main/java/mekanism/common/network/PacketSecurityUpdate.java @@ -78,7 +78,7 @@ public class PacketSecurityUpdate implements IMessageHandler frequencies = new ArrayList(); + List frequencies = new ArrayList<>(); for(Frequency frequency : Mekanism.securityFrequencies.getFrequencies()) { diff --git a/src/main/java/mekanism/common/network/PacketSimpleGui.java b/src/main/java/mekanism/common/network/PacketSimpleGui.java index a8a431d44..f65325f2a 100644 --- a/src/main/java/mekanism/common/network/PacketSimpleGui.java +++ b/src/main/java/mekanism/common/network/PacketSimpleGui.java @@ -24,37 +24,34 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class PacketSimpleGui implements IMessageHandler { - public static List handlers = new ArrayList(); + public static List handlers = new ArrayList<>(); @Override public IMessage onMessage(SimpleGuiMessage message, MessageContext context) { EntityPlayer player = PacketHandler.getPlayer(context); - PacketHandler.handlePacket(new Runnable() { - @Override - public void run() - { - if(!player.world.isRemote) - { - World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(message.coord4D.dimensionId); - - if(worldServer != null && message.coord4D.getTileEntity(worldServer) instanceof TileEntityBasicBlock) - { - if(message.guiId == -1) - { - return; - } - - SimpleGuiMessage.openServerGui(message.guiHandler, message.guiId, (EntityPlayerMP)player, player.world, message.coord4D); - } - } - else { - FMLCommonHandler.instance().showGuiScreen(SimpleGuiMessage.getGui(message.guiHandler, message.guiId, player, player.world, message.coord4D)); - player.openContainer.windowId = message.windowId; - } - } - }, player); + PacketHandler.handlePacket(() -> + { + if(!player.world.isRemote) + { + World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(message.coord4D.dimensionId); + + if(worldServer != null && message.coord4D.getTileEntity(worldServer) instanceof TileEntityBasicBlock) + { + if(message.guiId == -1) + { + return; + } + + SimpleGuiMessage.openServerGui(message.guiHandler, message.guiId, (EntityPlayerMP)player, player.world, message.coord4D); + } + } + else { + FMLCommonHandler.instance().showGuiScreen(SimpleGuiMessage.getGui(message.guiHandler, message.guiId, player, player.world, message.coord4D)); + player.openContainer.windowId = message.windowId; + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketTileEntity.java b/src/main/java/mekanism/common/network/PacketTileEntity.java index 6354adf83..cfe99f918 100644 --- a/src/main/java/mekanism/common/network/PacketTileEntity.java +++ b/src/main/java/mekanism/common/network/PacketTileEntity.java @@ -31,26 +31,23 @@ public class PacketTileEntity implements IMessageHandler + { + TileEntity tileEntity = message.coord4D.getTileEntity(player.world); + + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.TILE_NETWORK_CAPABILITY, null)) + { + ITileNetwork network = CapabilityUtils.getCapability(tileEntity, Capabilities.TILE_NETWORK_CAPABILITY, null); + + try { + network.handlePacketData(message.storedBuffer); + } catch(Exception e) { + e.printStackTrace(); + } + + message.storedBuffer.release(); + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java index d182d1b3c..56d2a572e 100644 --- a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java +++ b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java @@ -44,100 +44,97 @@ public class PacketTransmitterUpdate implements IMessageHandler + { + if(message.packetType == PacketType.UPDATE) + { + TileEntity tileEntity = message.coord4D.getTileEntity(player.world); - if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) - { - IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); - DynamicNetwork network = transmitter.hasTransmitterNetwork() && !message.newNetwork ? transmitter.getTransmitterNetwork() : transmitter.createEmptyNetwork(); - network.register(); - transmitter.setTransmitterNetwork(network); - - for(Coord4D coord : message.transmitterCoords) - { - TileEntity tile = coord.getTileEntity(player.world); + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) + { + IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); + DynamicNetwork network = transmitter.hasTransmitterNetwork() && !message.newNetwork ? transmitter.getTransmitterNetwork() : transmitter.createEmptyNetwork(); + network.register(); + transmitter.setTransmitterNetwork(network); - if(CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) - { - CapabilityUtils.getCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null).setTransmitterNetwork(network); - } - } - - network.updateCapacity(); - } - } - - if(client.opaqueTransmitters || message.coord4D == null || player == null) - { - return; - } - - if(message.packetType == PacketType.ENERGY) - { - TileEntity tileEntity = message.coord4D.getTileEntity(player.world); - - if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) - { - IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); - - if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.ENERGY) - { - ((IGridTransmitter)transmitter).getTransmitterNetwork().clientEnergyScale = message.power; - } - } - } - else if(message.packetType == PacketType.GAS) - { - TileEntity tileEntity = message.coord4D.getTileEntity(player.world); + for(Coord4D coord : message.transmitterCoords) + { + TileEntity tile = coord.getTileEntity(player.world); - if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) - { - IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); - - if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.GAS) - { - GasNetwork net = ((IGridTransmitter)transmitter).getTransmitterNetwork(); + if(CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) + { + CapabilityUtils.getCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null).setTransmitterNetwork(network); + } + } - if(message.gasType != null) - { - net.refGas = message.gasType; - } + network.updateCapacity(); + } + } - net.buffer = message.gasStack; - net.didTransfer = message.didGasTransfer; - } - } - } - else if(message.packetType == PacketType.FLUID) - { - TileEntity tileEntity = message.coord4D.getTileEntity(player.world); + if(client.opaqueTransmitters || message.coord4D == null || player == null) + { + return; + } - if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) - { - IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); - - if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.FLUID) - { - FluidNetwork net = ((IGridTransmitter)transmitter).getTransmitterNetwork(); + if(message.packetType == PacketType.ENERGY) + { + TileEntity tileEntity = message.coord4D.getTileEntity(player.world); - if(message.fluidType != null) - { - net.refFluid = message.fluidType; - } + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) + { + IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); - net.buffer = message.fluidStack; - net.didTransfer = message.didFluidTransfer; - } - } - } - } - }, player); + if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.ENERGY) + { + ((IGridTransmitter)transmitter).getTransmitterNetwork().clientEnergyScale = message.power; + } + } + } + else if(message.packetType == PacketType.GAS) + { + TileEntity tileEntity = message.coord4D.getTileEntity(player.world); + + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) + { + IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); + + if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.GAS) + { + GasNetwork net = ((IGridTransmitter)transmitter).getTransmitterNetwork(); + + if(message.gasType != null) + { + net.refGas = message.gasType; + } + + net.buffer = message.gasStack; + net.didTransfer = message.didGasTransfer; + } + } + } + else if(message.packetType == PacketType.FLUID) + { + TileEntity tileEntity = message.coord4D.getTileEntity(player.world); + + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) + { + IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); + + if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.FLUID) + { + FluidNetwork net = ((IGridTransmitter)transmitter).getTransmitterNetwork(); + + if(message.fluidType != null) + { + net.refFluid = message.fluidType; + } + + net.buffer = message.fluidStack; + net.didTransfer = message.didFluidTransfer; + } + } + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/security/SecurityFrequency.java b/src/main/java/mekanism/common/security/SecurityFrequency.java index 1b2ecf242..29af68d08 100644 --- a/src/main/java/mekanism/common/security/SecurityFrequency.java +++ b/src/main/java/mekanism/common/security/SecurityFrequency.java @@ -29,7 +29,7 @@ public class SecurityFrequency extends Frequency { super("Security", uuid); - trusted = new HashList(); + trusted = new HashList<>(); securityMode = SecurityMode.PUBLIC; } @@ -69,7 +69,7 @@ public class SecurityFrequency extends Frequency { super.read(nbtTags); - trusted = new HashList(); + trusted = new HashList<>(); securityMode = SecurityMode.PUBLIC; override = nbtTags.getBoolean("override"); @@ -107,7 +107,7 @@ public class SecurityFrequency extends Frequency { super.read(dataStream); - trusted = new HashList(); + trusted = new HashList<>(); securityMode = SecurityMode.PUBLIC; override = dataStream.readBoolean(); diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 524e47488..74878afe6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -466,7 +466,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento if(!world.isRemote) { MekanismUtils.saveChunk(this); - 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))); prevCount = getItemCount(); sortStacks(); } @@ -611,7 +611,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento if(clientActive != active) { - 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))); clientActive = active; } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 6a05310a3..d7acbde31 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -33,7 +33,7 @@ import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityBoilerCasing extends TileEntityMultiblock implements IHeatTransfer { /** A client-sided set of valves on this tank's structure that are currently active, used on the client for rendering fluids. */ - public Set valveViewing = new HashSet(); + public Set valveViewing = new HashSet<>(); /** The capacity this tank has on the client-side. */ public int clientWaterCapacity; @@ -253,7 +253,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock toSend = new HashSet(); + Set toSend = new HashSet<>(); for(ValveData valveData : structure.valves) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 88055b803..7055b46ec 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -188,7 +188,7 @@ public class TileEntityChargepad extends TileEntityNoisyBlock if(clientActive != active) { - 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))); } clientActive = active; diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index c21be3138..6359c3e3e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -78,10 +78,10 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I { public static int[] EJECT_INV; - public Map oresToMine = new HashMap(); - public Map replaceMap = new HashMap(); + public Map oresToMine = new HashMap<>(); + public Map replaceMap = new HashMap<>(); - public HashList filters = new HashList(); + public HashList filters = new HashList<>(); public ThreadMinerSearch searcher = new ThreadMinerSearch(this); @@ -331,7 +331,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I { for(EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getSmallPacket(new ArrayList())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getSmallPacket(new ArrayList<>())), (EntityPlayerMP)player); } } @@ -790,7 +790,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I 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); } return; @@ -1094,7 +1094,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(clientActive != active) { - 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))); clientActive = active; } @@ -1415,7 +1415,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I 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); } return null; @@ -1600,6 +1600,6 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I @Override public Set getChunkSet() { - return new Range4D(Coord4D.get(this)).expandFromCenter(radius).getIntersectingChunks().stream().map(t -> t.getPos()).collect(Collectors.toSet()); + return new Range4D(Coord4D.get(this)).expandFromCenter(radius).getIntersectingChunks().stream().map(Chunk3D::getPos).collect(Collectors.toSet()); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 130f02fa5..ec0a0890a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -32,7 +32,7 @@ import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityDynamicTank extends TileEntityMultiblock implements IFluidContainerManager { /** A client-sided set of valves on this tank's structure that are currently active, used on the client for rendering fluids. */ - public Set valveViewing = new HashSet(); + public Set valveViewing = new HashSet<>(); /** The capacity this tank has on the client-side. */ public int clientCapacity; @@ -204,7 +204,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock toSend = new HashSet(); + Set toSend = new HashSet<>(); for(ValveData valveData : structure.valves) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 5df71925d..62541d509 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -81,7 +81,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I public int operatingTicks; /** The nodes that have full sources near them or in them */ - public Set recurringNodes = new HashSet(); + public Set recurringNodes = new HashSet<>(); /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 12cc53ddc..af2aad448 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -403,7 +403,7 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt int[] inputSlots = null; - List invStacks = new ArrayList(); + List invStacks = new ArrayList<>(); if(tier == FactoryTier.BASIC) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 1c182c82e..d9bd68197 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -439,7 +439,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc 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/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 468b93207..a07c5dd8f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -170,7 +170,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } } - Set toRemove = new HashSet(); + Set toRemove = new HashSet<>(); for(Coord4D coord : activeNodes) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java index b9b501fef..9f8a2202e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java @@ -76,7 +76,7 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement 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))); } } @@ -201,7 +201,7 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock 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 = 10; clientActive = active; diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 42407d8a4..a807a6b74 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -285,7 +285,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH for(EntityPlayer player : playersUsing) { - 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); } return; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index b02c921bc..5cfd1bcaa 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -67,7 +67,7 @@ public class TileEntityInductionCasing extends TileEntityMultiblock())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); player.openGui(Mekanism.instance, 49, world, getPos().getX(), getPos().getY(), getPos().getZ()); return true; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 92fb404bd..69d37c701 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -461,7 +461,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement String modeText = " " + (mode ? EnumColor.DARK_RED : EnumColor.DARK_GREEN) + LangUtils.transOutputInput(mode) + "."; player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurator.inductionPortMode") + 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/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 31094747e..d0ca936fd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -131,7 +131,7 @@ public class TileEntityLaser extends TileEntityNoisyBlock implements IActiveStat if(clientActive != active) { - 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))); clientActive = active; } } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 090d65a54..2754fb35f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -131,7 +131,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement { on = true; lastFired = firing; - 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)); } LaserInfo info = LaserManager.fireLaser(this, facing, firing, world); @@ -169,7 +169,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement { on = false; diggingProgress = 0; - 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)); } if(outputMode != RedstoneOutput.ENTITY_DETECTION) diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index a679ef391..b13b6cf35 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -105,7 +105,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme { on = true; lastFired = firing; - 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)); } LaserInfo info = LaserManager.fireLaser(this, facing, firing, world); @@ -142,7 +142,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme { on = false; diggingProgress = 0; - 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)); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 463cbfe5a..e2dd8d22b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -55,7 +55,7 @@ import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, ISpecialConfigData, ISustainedData, ISecurityTile, IComputerIntegration { - public HashList filters = new HashList(); + public HashList filters = new HashList<>(); public RedstoneControl controlType = RedstoneControl.DISABLED; @@ -494,7 +494,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { if(!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getFilterPacket(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getFilterPacket(new ArrayList<>())), new Range4D(Coord4D.get(this))); } } @@ -523,7 +523,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen if(clientActive != active) { - 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))); if(active && client.enableMachineSounds) { @@ -830,7 +830,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); } return null; diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index f6aa6186d..422e07137 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -122,7 +122,7 @@ public abstract class TileEntityMultiblock> extend } } - 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))); } prevStructure = structure != null; @@ -165,7 +165,7 @@ public abstract class TileEntityMultiblock> extend if(tileEntity != null && tileEntity.isRendering) { - 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/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index 54fa60fd4..b45060322 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -40,7 +40,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple { public static final int MAX_LENGTH = 24; - public HashList filters = new HashList(); + public HashList filters = new HashList<>(); public static List possibleFilters = Arrays.asList("ingot", "ore", "dust", "nugget"); @@ -323,7 +323,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple { if(!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getFilterPacket(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getFilterPacket(new ArrayList<>())), new Range4D(Coord4D.get(this))); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 62ca851d4..3afdbe38f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -58,8 +58,8 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp public double lastTransferLoss; public double lastEnvironmentLoss; - public List publicCache = new ArrayList(); - public List privateCache = new ArrayList(); + public List publicCache = new ArrayList<>(); + public List privateCache = new ArrayList<>(); public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 0a9060de7..483fbaf46 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -300,7 +300,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements I 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/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 8b7a5ada1..c65b5f543 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -197,7 +197,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityMachine implement for(EntityPlayer player : playersUsing) { - 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); } return; diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index af8e62f5d..f14779ff3 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -80,7 +80,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement 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))); } } @@ -170,7 +170,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock 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 = 10; clientActive = active; diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index bf650a07d..880a32d41 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -401,7 +401,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im 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/TileEntityStructuralGlass.java b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java index 960a107e6..c10353301 100644 --- a/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java +++ b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java @@ -76,7 +76,7 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural { public IMultiblock found; - public Set iterated = new HashSet(); + public Set iterated = new HashSet<>(); public void loop(Coord4D pos) { diff --git a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java index 5b73f70ad..7914dadad 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java +++ b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java @@ -40,7 +40,7 @@ public class TileEntitySuperheatingElement extends TileEntityInternalMultiblock if(packet && !world.isRemote) { - 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 4f03ffce1..0bcda6ad3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -65,7 +65,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public AxisAlignedBB teleportBounds = null; - public Set didTeleport = new HashSet(); + public Set didTeleport = new HashSet<>(); public int teleDelay = 0; @@ -75,8 +75,8 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public Frequency frequency; - public List publicCache = new ArrayList(); - public List privateCache = new ArrayList(); + public List publicCache = new ArrayList<>(); + public List privateCache = new ArrayList<>(); /** This teleporter's current status. */ public byte status = 0; @@ -261,7 +261,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public void cleanTeleportCache() { - List list = new ArrayList(); + List list = new ArrayList<>(); for(Entity e : (List)world.getEntitiesWithinAABB(Entity.class, teleportBounds)) { @@ -502,7 +502,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public List getToTeleport() { List entities = world.getEntitiesWithinAABB(Entity.class, teleportBounds); - List ret = new ArrayList(); + List ret = new ArrayList<>(); for(Entity entity : entities) { @@ -775,7 +775,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo @Override public Set getChunkSet() { - Set ret = new HashSet(); + Set ret = new HashSet<>(); ret.add(new Chunk3D(Coord4D.get(this)).getPos()); diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java index a454d35c4..057485e6d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java @@ -120,7 +120,7 @@ public class TileEntityThermalEvaporationBlock extends TileEntityContainerBlock { public TileEntityThermalEvaporationController found; - public Set iterated = new HashSet(); + public Set iterated = new HashSet<>(); public void loop(Coord4D pos) { diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index d22a49ff3..57abcd40e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -50,7 +50,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva public FluidTank inputTank = new FluidTank(0); public FluidTank outputTank = new FluidTank(MAX_OUTPUT); - public Set tankParts = new HashSet(); + public Set tankParts = new HashSet<>(); public IEvaporationSolar[] solars = new IEvaporationSolar[4]; public boolean temperatureSet = false; @@ -149,7 +149,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva { if(Math.abs((float)inputTank.getFluidAmount()/inputTank.getCapacity()-prevScale) > 0.01) { - 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 = (float)inputTank.getFluidAmount()/inputTank.getCapacity(); } } @@ -594,13 +594,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva if(structured) { - Mekanism.proxy.doGenericSparkle(this, new INodeChecker() { - @Override - public boolean isNode(TileEntity tile) - { - return tile instanceof TileEntityThermalEvaporationBlock; - } - }); + Mekanism.proxy.doGenericSparkle(this, tile -> tile instanceof TileEntityThermalEvaporationBlock); } clientStructured = structured; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java b/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java index 9839be78c..08bed654e 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java @@ -29,7 +29,7 @@ public class TileComponentChunkLoader implements ITileComponent public Ticket chunkTicket; - public Set chunkSet = new HashSet(); + public Set chunkSet = new HashSet<>(); public Coord4D prevCoord; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index 6d49e2873..9d29e5b62 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -45,9 +45,9 @@ public class TileComponentEjector implements ITileComponent public int tickDelay = 0; - public Map sideData = new HashMap(); + public Map sideData = new HashMap<>(); - public Map trackers = new HashMap(); + public Map trackers = new HashMap<>(); public static final int GAS_OUTPUT = 256; public static final int FLUID_OUTPUT = 256; @@ -78,7 +78,7 @@ public class TileComponentEjector implements ITileComponent private List getTrackedOutputs(TransmissionType type, int index, List dirs) { - List sides = new ArrayList(); + List sides = new ArrayList<>(); for(int i = trackers.get(type)[index]+1; i <= trackers.get(type)[index]+6; i++) { @@ -150,7 +150,7 @@ public class TileComponentEjector implements ITileComponent public List getOutputSides(TransmissionType type, SideData data) { - List outputSides = new ArrayList(); + List outputSides = new ArrayList<>(); ISideConfiguration configurable = (ISideConfiguration)tileEntity; SideConfig sideConfig = configurable.getConfig().getConfig(type); diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index d61665133..6e522771f 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -23,9 +23,9 @@ public class TileComponentUpgrade implements ITileComponent /** How long it takes this machine to install an upgrade. */ public static int UPGRADE_TICKS_REQUIRED = 40; - private Map upgrades = new HashMap(); + private Map upgrades = new HashMap<>(); - private Set supported = new HashSet(); + private Set supported = new HashSet<>(); /** The inventory slot the upgrade slot of this component occupies. */ private int upgradeSlot; @@ -77,7 +77,7 @@ public class TileComponentUpgrade implements ITileComponent tileEntity.inventory.get(upgradeSlot).shrink(1); - 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))); tileEntity.markDirty(); } } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java index 75910b8e1..e180e56ac 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java @@ -44,7 +44,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe public EnumFacing clientFacing = facing; /** The players currently using this block. */ - public HashSet playersUsing = new HashSet(); + public HashSet playersUsing = new HashSet<>(); /** A timer used to send packets to clients. */ public int ticker; @@ -54,7 +54,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe public boolean doAutoSync = true; - public List components = new ArrayList(); + public List components = new ArrayList<>(); @Override public void update() @@ -84,7 +84,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe { for(EntityPlayer player : playersUsing) { - 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); } } } @@ -241,7 +241,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe if(!(facing == clientFacing || world.isRemote)) { - 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(); clientFacing = facing; } @@ -284,7 +284,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe if(redstone != power) { redstone = power; - 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))); onPowerChange(); } diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java index 96663cc75..7477e018d 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java @@ -128,7 +128,7 @@ public class TileEntityDiversionTransporter extends TileEntityLogisticalTranspor notifyTileChange(); player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.configurator.toggleDiverter") + ": " + EnumColor.RED + description)); Coord4D coord = new Coord4D(getPos(), getWorld()); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, getNetworkedData(new ArrayList())), new Range4D(coord)); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, getNetworkedData(new ArrayList<>())), new Range4D(coord)); return EnumActionResult.SUCCESS; } diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java index b1eafdea8..6af5ee0c2 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java @@ -271,7 +271,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter getSyncPacket(TransporterStack stack, boolean kill) { - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); if(Mekanism.hooks.MCMPLoaded) { diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java index f72f4a99b..d9e78a6fb 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java @@ -576,7 +576,7 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet public List getConnections(ConnectionType type) { - List sides = new ArrayList(); + List sides = new ArrayList<>(); for(EnumFacing side : EnumFacing.values()) { diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java index b3f4bc1f1..28ad3fb7f 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java @@ -145,24 +145,20 @@ public abstract class TileEntityTransmitter> e int upgraded = 0; Object[] array = ((LinkedHashSet)getTransmitter().getTransmitterNetwork().transmitters.clone()).toArray(); - Arrays.sort(array, new Comparator() { - @Override - public int compare(Object o1, Object o2) - { - if(o1 instanceof IGridTransmitter && o2 instanceof IGridTransmitter) - { - Coord4D thisCoord = new Coord4D(getPos(), getWorld()); - - Coord4D o1Coord = ((IGridTransmitter)o1).coord(); - Coord4D o2Coord = ((IGridTransmitter)o2).coord(); - - return o1Coord.distanceTo(thisCoord) > o2Coord.distanceTo(thisCoord) ? 1 : - (o1Coord.distanceTo(thisCoord) < o2Coord.distanceTo(thisCoord) ? -1 : 0); - } - - return 0; - } - }); + Arrays.sort(array, (o1, o2) -> + { + if(o1 instanceof IGridTransmitter && o2 instanceof IGridTransmitter) + { + Coord4D thisCoord = new Coord4D(getPos(), getWorld()); + + Coord4D o1Coord = ((IGridTransmitter)o1).coord(); + Coord4D o2Coord = ((IGridTransmitter)o2).coord(); + + return Integer.compare(o1Coord.distanceTo(thisCoord), o2Coord.distanceTo(thisCoord)); + } + + return 0; + }); for(Object iter : array) { diff --git a/src/main/java/mekanism/common/transmitters/TransporterImpl.java b/src/main/java/mekanism/common/transmitters/TransporterImpl.java index 054b6e63b..eebca471c 100644 --- a/src/main/java/mekanism/common/transmitters/TransporterImpl.java +++ b/src/main/java/mekanism/common/transmitters/TransporterImpl.java @@ -59,7 +59,7 @@ public class TransporterImpl extends TransmitterImpl remove = new HashSet(); + Set remove = new HashSet<>(); getTileEntity().pullItems(); diff --git a/src/main/java/mekanism/common/transmitters/grid/InventoryNetwork.java b/src/main/java/mekanism/common/transmitters/grid/InventoryNetwork.java index b4bf26ba8..6aa277bee 100644 --- a/src/main/java/mekanism/common/transmitters/grid/InventoryNetwork.java +++ b/src/main/java/mekanism/common/transmitters/grid/InventoryNetwork.java @@ -41,7 +41,7 @@ public class InventoryNetwork extends DynamicNetwork calculateAcceptors(TransitRequest request, EnumColor color) { - List toReturn = new ArrayList(); + List toReturn = new ArrayList<>(); for(Coord4D coord : possibleAcceptors.keySet()) { diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 9d5f31776..fb78c05b9 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -191,7 +191,7 @@ public final class CableUtils if(energyToSend > 0) { List outputtingSides = new LinkedList<>(); - boolean[] connectable = getConnections((TileEntity)emitter, side -> emitter.sideIsOutput(side)); + boolean[] connectable = getConnections((TileEntity)emitter, emitter::sideIsOutput); for(EnumFacing side : EnumFacing.values()) { diff --git a/src/main/java/mekanism/common/util/GasUtils.java b/src/main/java/mekanism/common/util/GasUtils.java index 0e34bba32..54159d684 100644 --- a/src/main/java/mekanism/common/util/GasUtils.java +++ b/src/main/java/mekanism/common/util/GasUtils.java @@ -136,7 +136,7 @@ public final class GasUtils return 0; } - List availableAcceptors = new ArrayList(); + List availableAcceptors = new ArrayList<>(); IGasHandler[] possibleAcceptors = getConnectedAcceptors(from, sides); for(int i = 0; i < possibleAcceptors.length; i++) diff --git a/src/main/java/mekanism/common/util/ItemRegistryUtils.java b/src/main/java/mekanism/common/util/ItemRegistryUtils.java index d5b92dfb5..e1251e8d9 100644 --- a/src/main/java/mekanism/common/util/ItemRegistryUtils.java +++ b/src/main/java/mekanism/common/util/ItemRegistryUtils.java @@ -14,7 +14,7 @@ import org.apache.commons.lang3.text.WordUtils; public final class ItemRegistryUtils { - private static final Map modIDMap = new HashMap(); + private static final Map modIDMap = new HashMap<>(); private static void populateMap() { @@ -46,14 +46,8 @@ public final class ItemRegistryUtils String modId = itemResourceLocation.getResourceDomain(); String lowercaseModId = modId.toLowerCase(Locale.ENGLISH); - String modName = modIDMap.get(lowercaseModId); - - if(modName == null) - { - modName = WordUtils.capitalize(modId); - modIDMap.put(lowercaseModId, modName); - } - + String modName = modIDMap.computeIfAbsent(lowercaseModId, k -> WordUtils.capitalize(modId)); + return modName; } } diff --git a/src/main/java/mekanism/common/util/ListUtils.java b/src/main/java/mekanism/common/util/ListUtils.java index 8259d034d..2a9e3d8f4 100644 --- a/src/main/java/mekanism/common/util/ListUtils.java +++ b/src/main/java/mekanism/common/util/ListUtils.java @@ -9,7 +9,7 @@ public class ListUtils { public static List inverse(List list) { - List toReturn = new ArrayList(); + List toReturn = new ArrayList<>(); for(int i = list.size() - 1; i >= 0; i--) { @@ -21,7 +21,7 @@ public class ListUtils public static List cap(List list, int cap) { - List toReturn = new ArrayList(); + List toReturn = new ArrayList<>(); if(list.size() <= cap) { @@ -48,7 +48,7 @@ public class ListUtils public static List copy(List list) { - List toReturn = new ArrayList(); + List toReturn = new ArrayList<>(); for(V obj : list) { @@ -60,7 +60,7 @@ public class ListUtils public static List merge(List listOne, List listTwo) { - List newList = new ArrayList(); + List newList = new ArrayList<>(); for(V obj : listOne) { @@ -77,7 +77,7 @@ public class ListUtils public static List capRemains(List list, int cap) { - List toReturn = new ArrayList(); + List toReturn = new ArrayList<>(); if(list.size() <= cap) { @@ -110,16 +110,16 @@ public class ListUtils int remain = list.size() % divide; int size = (list.size() - remain) / divide; - ArrayList> toReturn = new ArrayList>(); + ArrayList> toReturn = new ArrayList<>(); for(int i = 0; i < divide; i++) { - toReturn.add(i, new ArrayList()); + toReturn.add(i, new ArrayList<>()); } for(List iterSet : toReturn) { - List removed = new ArrayList(); + List removed = new ArrayList<>(); int toAdd = size; diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 1b22f9cc7..240839d68 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -103,7 +103,7 @@ public final class MekanismUtils { public static final EnumFacing[] SIDE_DIRS = new EnumFacing[] {EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.WEST, EnumFacing.EAST}; - public static final Map> classesFound = new HashMap>(); + public static final Map> classesFound = new HashMap<>(); private static final List warnedFails = new ArrayList<>(); @@ -117,7 +117,7 @@ public final class MekanismUtils { if(!Mekanism.latestVersionNumber.equals("null")) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for(IModule module : Mekanism.modulesLoaded) { @@ -180,7 +180,7 @@ public final class MekanismUtils public static List getHTML(String urlToRead) { String line; - List result = new ArrayList(); + List result = new ArrayList<>(); try { URL url = new URL(urlToRead); @@ -1258,8 +1258,8 @@ public final class MekanismUtils renderer = stack.getItem().getFontRenderer(stack); } - List words = new ArrayList(); - List lines = new ArrayList(); + List words = new ArrayList<>(); + List lines = new ArrayList<>(); String currentWord = ""; @@ -1309,7 +1309,7 @@ public final class MekanismUtils t.printStackTrace(); } - return new ArrayList(); + return new ArrayList<>(); } /** diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index 036a96c9e..d1cce3031 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -31,7 +31,7 @@ public final class MinerUtils return block.getDrops(world, obj.getPos(), state, 0); } else { - List ret = new ArrayList(); + List ret = new ArrayList<>(); Item item = Item.getItemFromBlock(block); int meta = item.getHasSubtypes() ? block.getMetaFromState(state) : 0; ret.add(new ItemStack(item, 1, meta)); diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index c4c4e1b5b..d9fb6d997 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -93,7 +93,7 @@ public final class PipeUtils return 0; } - List availableAcceptors = new ArrayList(); + List availableAcceptors = new ArrayList<>(); IFluidHandler[] possibleAcceptors = getConnectedAcceptors(from); for (IFluidHandler handler : possibleAcceptors) diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index 56b6f82c6..606f652bc 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -228,7 +228,7 @@ public class RecipeUtils if(BlockStateMachine.MachineType.get(toReturn) != null && BlockStateMachine.MachineType.get(toReturn).supportsUpgrades) { - Map upgrades = new HashMap(); + Map upgrades = new HashMap<>(); for(int i = 0; i < 9; i++) { diff --git a/src/main/java/mekanism/common/util/StackUtils.java b/src/main/java/mekanism/common/util/StackUtils.java index de037dfb3..c69ed2dde 100644 --- a/src/main/java/mekanism/common/util/StackUtils.java +++ b/src/main/java/mekanism/common/util/StackUtils.java @@ -17,7 +17,7 @@ public final class StackUtils return null; } - List ret = new ArrayList(); + List ret = new ArrayList<>(); if(stack.getCount() == 1) { @@ -78,7 +78,7 @@ public final class StackUtils public static List even(ItemStack stack1, ItemStack stack2) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); if(getSize(stack1) == getSize(stack2) || Math.abs(getSize(stack1)-getSize(stack2)) == 1) { @@ -168,7 +168,7 @@ public final class StackUtils public static List getMergeRejects(NonNullList orig, NonNullList toAdd) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); for(int i = 0; i < toAdd.size(); i++) { diff --git a/src/main/java/mekanism/common/voice/VoiceConnection.java b/src/main/java/mekanism/common/voice/VoiceConnection.java index 008bfdd2e..5d2626a6e 100644 --- a/src/main/java/mekanism/common/voice/VoiceConnection.java +++ b/src/main/java/mekanism/common/voice/VoiceConnection.java @@ -93,33 +93,29 @@ public class VoiceConnection extends Thread } //Main client listen thread - new Thread(new Runnable() - { - @Override - public void run() - { - while(open) - { - try { - short byteCount = VoiceConnection.this.input.readShort(); - byte[] audioData = new byte[byteCount]; - VoiceConnection.this.input.readFully(audioData); + new Thread(() -> + { + while(open) + { + try { + short byteCount = VoiceConnection.this.input.readShort(); + byte[] audioData = new byte[byteCount]; + VoiceConnection.this.input.readFully(audioData); - if(byteCount > 0) - { - Mekanism.voiceManager.sendToPlayers(byteCount, audioData, VoiceConnection.this); - } - } catch(Exception e) { - open = false; - } - } + if(byteCount > 0) + { + Mekanism.voiceManager.sendToPlayers(byteCount, audioData, VoiceConnection.this); + } + } catch(Exception e) { + open = false; + } + } - if(!open) - { - kill(); - } - } - }).start(); + if(!open) + { + kill(); + } + }).start(); } public void kill() diff --git a/src/main/java/mekanism/common/voice/VoiceServerManager.java b/src/main/java/mekanism/common/voice/VoiceServerManager.java index cc4453492..2a1ee4220 100644 --- a/src/main/java/mekanism/common/voice/VoiceServerManager.java +++ b/src/main/java/mekanism/common/voice/VoiceServerManager.java @@ -11,7 +11,7 @@ import mekanism.common.config.MekanismConfig.general; public class VoiceServerManager { - public Set connections = new HashSet(); + public Set connections = new HashSet<>(); public ServerSocket serverSocket; @@ -100,9 +100,9 @@ public class VoiceServerManager connections.add(connection); Mekanism.logger.info("VoiceServer: Accepted new connection."); - } catch(SocketException e) { - } catch(NullPointerException e) { - } catch(Exception e) { + } catch(SocketException | NullPointerException e) { + } + catch(Exception e) { Mekanism.logger.error("VoiceServer: Error while accepting connection."); e.printStackTrace(); } diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java index cc59f6fb9..c17141ae4 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java @@ -35,16 +35,9 @@ public class GuiBioGenerator extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"))); guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() - { - @Override - public List getInfo() - { - return ListUtils.asList( - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.bioGeneration : 0) + "/t", - LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"))); + guiElements.add(new GuiEnergyInfo(() -> ListUtils.asList( + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.bioGeneration : 0) + "/t", + LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"), this, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"), 164, 15)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"), 16, 34)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"), 142, 34).with(SlotOverlay.POWER)); diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index 79aff3f27..83908275b 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -38,22 +38,10 @@ public class GuiGasGenerator extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"))); guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() { - @Override - public List getInfo() - { - return ListUtils.asList( - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.generationRate*tileEntity.clientUsed) + "/t", - LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"))); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() { - @Override - public GasTank getTank() - { - return tileEntity.fuelTank; - } - }, Type.WIDE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"), 55, 18)); + guiElements.add(new GuiEnergyInfo(() -> ListUtils.asList( + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.generationRate*tileEntity.clientUsed) + "/t", + LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"), this, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"))); + guiElements.add(new GuiGasGauge(() -> tileEntity.fuelTank, Type.WIDE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"), 55, 18)); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"), 164, 15)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"), 16, 34).with(SlotOverlay.MINUS)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"), 142, 34).with(SlotOverlay.POWER)); diff --git a/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java b/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java index ea5648260..226e079d8 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java @@ -26,7 +26,7 @@ public class GuiGeneratorsConfig extends GuiConfig private static List getConfigElements() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.generators.general"), "mekanism.configgui.ctgy.generators.general", GeneralEntry.class)); list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.generators.generators"), "mekanism.configgui.ctgy.generators.generators", GeneratorsEntry.class)); list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.generators.generation"), "mekanism.configgui.ctgy.generators.generation", GenerationEntry.class)); diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index 5bdb65af4..9bd271dfd 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -42,36 +42,20 @@ public class GuiHeatGenerator extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() - { - @Override - public List getInfo() - { - return ListUtils.asList( - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.producingEnergy) + "/t", - LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); - guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { - @Override - public FluidTank getTank() - { - return tileEntity.lavaTank; - } - }, Type.WIDE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"), 55, 18)); + guiElements.add(new GuiEnergyInfo(() -> ListUtils.asList( + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.producingEnergy) + "/t", + LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"), this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); + guiElements.add(new GuiFluidGauge(() -> tileEntity.lavaTank, Type.WIDE, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"), 55, 18)); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"), 164, 15)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"), 16, 34)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"), 142, 34).with(SlotOverlay.POWER)); - guiElements.add(new GuiHeatInfo(new IInfoHandler() { - @Override - public List getInfo() - { - TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; - String transfer = UnitDisplayUtils.getDisplayShort(tileEntity.lastTransferLoss, false, unit); - String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss, false, unit); - return ListUtils.asList(LangUtils.localize("gui.transferred") + ": " + transfer + "/t", LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); + guiElements.add(new GuiHeatInfo(() -> + { + TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; + String transfer = UnitDisplayUtils.getDisplayShort(tileEntity.lastTransferLoss, false, unit); + String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss, false, unit); + return ListUtils.asList(LangUtils.localize("gui.transferred") + ": " + transfer + "/t", LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); } @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index 0a3cc0444..21a680f47 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -69,18 +69,14 @@ public class GuiIndustrialTurbine extends GuiMekanism return (double)tileEntity.structure.lastSteamInput/rate; } }, MekanismUtils.getResource(ResourceType.GUI, "GuiIndustrialTurbine.png"), 40, 13)); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() - { - @Override - public List getInfo() - { - double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); - - return ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier) + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiIndustrialTurbine.png"))); + guiElements.add(new GuiEnergyInfo(() -> + { + double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + + return ListUtils.asList( + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier) + "/t"); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiIndustrialTurbine.png"))); } @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index 90dfeb0b2..53badc2e6 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -35,16 +35,9 @@ public class GuiReactorController extends GuiMekanism if(tileEntity.isFormed()) { - guiElements.add(new GuiEnergyInfo(new IInfoHandler() - { - @Override - public List getInfo() - { - return tileEntity.isFormed() ? ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); + guiElements.add(new GuiEnergyInfo(() -> tileEntity.isFormed() ? ListUtils.asList( + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 79, 38)); guiElements.add(new GuiHeatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiFuelTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index 5a4ab1a40..42cbe229a 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -47,40 +47,12 @@ public class GuiReactorFuel extends GuiMekanism { super(new ContainerNull(inventory.player, tentity)); tileEntity = tentity; - guiElements.add(new GuiEnergyInfo(new IInfoHandler() - { - @Override - public List getInfo() - { - return tileEntity.isFormed() ? ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() - { - @Override - public GasTank getTank() - { - return tentity.deuteriumTank; - } - }, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 25, 64)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() - { - @Override - public GasTank getTank() - { - return tentity.fuelTank; - } - }, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 79, 50)); - guiElements.add(new GuiGasGauge(new IGasInfoHandler() - { - @Override - public GasTank getTank() - { - return tentity.tritiumTank; - } - }, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 133, 64)); + guiElements.add(new GuiEnergyInfo(() -> tileEntity.isFormed() ? ListUtils.asList( + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); + guiElements.add(new GuiGasGauge(() -> tentity.deuteriumTank, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 25, 64)); + guiElements.add(new GuiGasGauge(() -> tentity.fuelTank, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 79, 50)); + guiElements.add(new GuiGasGauge(() -> tentity.tritiumTank, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 133, 64)); guiElements.add(new GuiProgress(new IProgressInfoHandler() { @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index fdae5c8f0..88b8f7e97 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -52,16 +52,9 @@ public class GuiReactorHeat extends GuiMekanism { super(new ContainerNull(inventory.player, tentity)); tileEntity = tentity; - guiElements.add(new GuiEnergyInfo(new IInfoHandler() - { - @Override - public List getInfo() - { - return tileEntity.isFormed() ? ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); + guiElements.add(new GuiEnergyInfo(() -> tileEntity.isFormed() ? ListUtils.asList( + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); guiElements.add(new GuiNumberGauge(new INumberInfoHandler() { @Override @@ -138,30 +131,9 @@ public class GuiReactorHeat extends GuiMekanism return (tileEntity.getCaseTemp() > 0 && tileEntity.waterTank.getFluidAmount() > 0 && tileEntity.steamTank.getFluidAmount() < tileEntity.steamTank.getCapacity()) ? 1 : 0; } }, ProgressBar.SMALL_RIGHT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 81, 90)); - guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() - { - @Override - public FluidTank getTank() - { - return tentity.waterTank; - } - }, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 115, 84)); - guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() - { - @Override - public FluidTank getTank() - { - return tentity.steamTank; - } - }, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 151, 84)); - guiElements.add(new GuiEnergyGauge(new IEnergyInfoHandler() - { - @Override - public IStrictEnergyStorage getEnergyStorage() - { - return tileEntity; - } - }, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 115, 46)); + guiElements.add(new GuiFluidGauge(() -> tentity.waterTank, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 115, 84)); + guiElements.add(new GuiFluidGauge(() -> tentity.steamTank, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 151, 84)); + guiElements.add(new GuiEnergyGauge(() -> tileEntity, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 115, 46)); guiElements.add(new GuiFuelTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); guiElements.add(new GuiStatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); } diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java index 7174a3089..addb9f6f2 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -39,16 +39,9 @@ public class GuiReactorStats extends GuiMekanism { super(new ContainerNull(inventory.player, tentity)); tileEntity = tentity; - guiElements.add(new GuiEnergyInfo(new IInfoHandler() - { - @Override - public List getInfo() - { - return tileEntity.isFormed() ? ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); + guiElements.add(new GuiEnergyInfo(() -> tileEntity.isFormed() ? ListUtils.asList( + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(), this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); guiElements.add(new GuiHeatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); guiElements.add(new GuiFuelTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); } diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index 49fc6d7a3..93d7661a8 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -34,16 +34,9 @@ public class GuiSolarGenerator extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"))); guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() - { - @Override - public List getInfo() - { - return ListUtils.asList( - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? tileEntity.getProduction() : 0) + "/t", - LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"))); + guiElements.add(new GuiEnergyInfo(() -> ListUtils.asList( + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? tileEntity.getProduction() : 0) + "/t", + LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"), this, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"), 164, 15)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"), 142, 34).with(SlotOverlay.POWER)); } diff --git a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java index ad0e041b9..58d3a88e5 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java @@ -33,18 +33,14 @@ public class GuiTurbineStats extends GuiMekanism super(tentity, new ContainerNull(inventory.player, tentity)); tileEntity = tentity; guiElements.add(new GuiTurbineTab(this, tileEntity, TurbineTab.MAIN, 6, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() - { - @Override - public List getInfo() - { - double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); - - return ListUtils.asList( - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier) + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); + guiElements.add(new GuiEnergyInfo(() -> + { + double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + + return ListUtils.asList( + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy(), tileEntity.getMaxEnergy()), + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier) + "/t"); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); } @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java index abd9f816a..2ca611d94 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java @@ -39,16 +39,9 @@ public class GuiWindGenerator extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"))); guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"))); - guiElements.add(new GuiEnergyInfo(new IInfoHandler() - { - @Override - public List getInfo() - { - return ListUtils.asList( - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.windGenerationMin*tileEntity.currentMultiplier : 0) + "/t", - LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); - } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"))); + guiElements.add(new GuiEnergyInfo(() -> ListUtils.asList( + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.windGenerationMin*tileEntity.currentMultiplier : 0) + "/t", + LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"), this, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"), 164, 15)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"), 142, 34).with(SlotOverlay.POWER)); } diff --git a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java index 9735ad237..9656eca73 100644 --- a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java @@ -24,7 +24,7 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer energyDisplays = new HashMap(); + private Map energyDisplays = new HashMap<>(); private static final int stages = 40; diff --git a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java index e32efcdb7..a4de829aa 100644 --- a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java +++ b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java @@ -133,7 +133,7 @@ public class BakedGeneratorItemModel implements IBakedModel MekanismRenderer.pauseRenderer(tessellator); - List generalQuads = new LinkedList(); + List generalQuads = new LinkedList<>(); GlStateManager.pushMatrix(); GlStateManager.translate(0.5F, 0.5F, 0.5F); diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 4cd72baa9..c1ba9c218 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -37,8 +37,8 @@ import net.minecraftforge.fluids.FluidTank; public class FusionReactor { public TileEntityReactorController controller; - public Set reactorBlocks = new HashSet(); - public Set heatTransfers = new HashSet(); + public Set reactorBlocks = new HashSet<>(); + public Set heatTransfers = new HashSet<>(); //Current stores of temperature - internally uses ambient-relative kelvin units public double plasmaTemperature; diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 16a9dc853..a1e8a9da4 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -57,7 +57,7 @@ public class MekanismGenerators implements IModule /** MekanismGenerators version number */ public static Version versionNumber = new Version(9, 3, 4); - public static MultiblockManager turbineManager = new MultiblockManager("industrialTurbine"); + public static MultiblockManager turbineManager = new MultiblockManager<>("industrialTurbine"); @SubscribeEvent public static void registerBlocks(RegistryEvent.Register event) diff --git a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java index 1415544ad..546dde772 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java @@ -140,7 +140,7 @@ public class BlockStateGenerator extends ExtendedBlockState public static List getGeneratorsForConfig() { - List ret = new ArrayList(); + List ret = new ArrayList<>(); for(GeneratorType type : GeneratorType.values()) { diff --git a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java index 906e67cbc..3aef19f34 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java +++ b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java @@ -10,7 +10,7 @@ import net.minecraftforge.fluids.FluidStack; public class SynchronizedTurbineData extends SynchronizedData { - public static Map clientRotationMap = new HashMap(); + public static Map clientRotationMap = new HashMap<>(); public static final float ROTATION_THRESHOLD = 0.001F; diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java index 20e0a43a1..251a2f179 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -68,10 +68,10 @@ public class TurbineUpdateProtocol extends UpdateProtocol turbines = new HashSet(); - Set dispersers = new HashSet(); - Set coils = new HashSet(); - Set condensers = new HashSet(); + Set turbines = new HashSet<>(); + Set dispersers = new HashSet<>(); + Set coils = new HashSet<>(); + Set condensers = new HashSet<>(); //Scan for complex for(Coord4D coord : innerNodes) diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java index d703724f6..8e636ca52 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -133,7 +133,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock { public TileEntityReactorController found; - public Set iterated = new HashSet(); + public Set iterated = new HashSet<>(); public void loop(Coord4D pos) { 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 222c02668..f95d8da4d 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -257,13 +257,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen { if(getReactor() == null || !((FusionReactor)getReactor()).formed) { - Mekanism.proxy.doGenericSparkle(this, new INodeChecker() { - @Override - public boolean isNode(TileEntity tile) - { - return tile instanceof TileEntityReactorBlock; - } - }); + Mekanism.proxy.doGenericSparkle(this, tile -> tile instanceof TileEntityReactorBlock); } if(getReactor() == null) 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 6dcf25102..19e46f7be 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java @@ -21,7 +21,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityTurbineRotor extends TileEntityBasicBlock { - public List rotors = new ArrayList(); + public List rotors = new ArrayList<>(); public boolean hasComplex; @@ -58,7 +58,7 @@ public class TileEntityTurbineRotor extends TileEntityBasicBlock private void buildRotors() { - List newRotors = new ArrayList(); + List newRotors = new ArrayList<>(); int newBlades = 0; boolean complex = false; String id = null; diff --git a/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java b/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java index 7a60a0f15..358b082f1 100644 --- a/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java +++ b/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java @@ -27,7 +27,7 @@ public class GuiToolsConfig extends GuiConfig private static List getConfigElements() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.tools.general"), "mekanism.configgui.ctgy.tools.general", GeneralEntry.class)); list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.tools.armor"), "mekanism.configgui.ctgy.tools.armor", ArmorEntry.class)); list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.tools.tools"), "mekanism.configgui.ctgy.tools.tools", ToolsEntry.class)); diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 36806c682..45ba4bba1 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -67,8 +67,8 @@ public class MekanismTools implements IModule public static ArmorMaterial armorGLOWSTONE; public static ArmorMaterial armorSTEEL; - public static Map AXE_DAMAGE = new HashMap(); - public static Map AXE_SPEED = new HashMap(); + public static Map AXE_DAMAGE = new HashMap<>(); + public static Map AXE_SPEED = new HashMap<>(); @SubscribeEvent public static void registerItems(RegistryEvent.Register event) diff --git a/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java b/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java index 7f2bde899..e087bf75a 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java @@ -12,7 +12,7 @@ public class ItemMekanismPaxel extends ItemMekanismTool { public ItemMekanismPaxel(ToolMaterial toolMaterial) { - super(4, -2.4F, toolMaterial, new HashSet()); + super(4, -2.4F, toolMaterial, new HashSet<>()); } @Override