From 5dd3dbb8a994d806d71038bb8707c5ea772c0e3e Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Sun, 6 Aug 2017 13:38:32 +0200 Subject: [PATCH] Code cleanup Redundent assignments Wrong comparison of string with MRL Unneeded reflection Try with resources Metallurgy compat deleted (was outcommented) not updated since MC 1.7.10 --- src/main/java/mekanism/api/Pos3D.java | 10 +- .../TransmitterNetworkRegistry.java | 1 - .../mekanism/client/ClientPlayerTracker.java | 8 +- .../java/mekanism/client/HolidayManager.java | 14 +-- .../mekanism/client/gui/GuiDynamicTank.java | 2 +- .../client/gui/GuiInductionMatrix.java | 2 +- .../mekanism/client/gui/GuiSeismicReader.java | 4 +- .../client/gui/GuiThermoelectricBoiler.java | 2 +- .../client/gui/GuiUpgradeManagement.java | 2 +- .../mekanism/client/gui/element/GuiGauge.java | 2 +- .../client/jei/BaseRecipeCategory.java | 2 +- .../client/render/MekanismRenderer.java | 8 +- .../client/render/RenderResizableCuboid.java | 2 +- .../mekanism/common/BoxBlacklistParser.java | 91 ++++++++++--------- .../java/mekanism/common/ObfuscatedNames.java | 4 +- .../content/miner/ThreadMinerSearch.java | 2 +- .../transporter/TransporterManager.java | 2 +- .../mekanism/common/entity/EntityFlame.java | 2 +- .../common/integration/MekanismHooks.java | 60 ------------ .../multipart/MultipartTileNetworkJoiner.java | 13 ++- .../mekanism/common/item/ItemBlockOre.java | 2 +- .../common/multiblock/MultiblockManager.java | 3 +- .../common/multiblock/UpdateProtocol.java | 8 -- .../common/network/PacketDigitalMinerGui.java | 2 +- .../mekanism/common/recipe/BinRecipe.java | 1 - .../MekanismRecipeEnabledCondition.java | 1 - .../recipe/generation/RecipeGenerator.java | 1 - .../tile/TileEntityElectrolyticSeparator.java | 2 +- .../tile/TileEntityQuantumEntangloporter.java | 2 +- .../common/transmitters/TransmitterImpl.java | 2 +- .../client/gui/GuiIndustrialTurbine.java | 2 +- .../client/render/RenderTurbineRotor.java | 1 - .../generators/common/MekanismGenerators.java | 2 - .../common/tile/TileEntityBioGenerator.java | 2 +- .../common/tile/TileEntityGasGenerator.java | 2 +- .../common/tile/TileEntitySolarGenerator.java | 4 +- .../mekanism/tools/common/MekanismTools.java | 1 - 37 files changed, 94 insertions(+), 177 deletions(-) diff --git a/src/main/java/mekanism/api/Pos3D.java b/src/main/java/mekanism/api/Pos3D.java index 960ab86ce..3362cb14c 100644 --- a/src/main/java/mekanism/api/Pos3D.java +++ b/src/main/java/mekanism/api/Pos3D.java @@ -233,13 +233,9 @@ public class Pos3D extends Vec3d double pitchRadians = Math.toRadians(pitch); double rollRadians = Math.toRadians(roll); - double xPos = x; - double yPos = y; - double zPos = z; - - xPos = x * Math.cos(yawRadians) * Math.cos(pitchRadians) + z * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) - Math.sin(yawRadians) * Math.cos(rollRadians)) + y * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) + Math.sin(yawRadians) * Math.sin(rollRadians)); - zPos = x * Math.sin(yawRadians) * Math.cos(pitchRadians) + z * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) + Math.cos(yawRadians) * Math.cos(rollRadians)) + y * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) - Math.cos(yawRadians) * Math.sin(rollRadians)); - yPos = -x * Math.sin(pitchRadians) + z * Math.cos(pitchRadians) * Math.sin(rollRadians) + y * Math.cos(pitchRadians) * Math.cos(rollRadians); + double xPos = x * Math.cos(yawRadians) * Math.cos(pitchRadians) + z * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) - Math.sin(yawRadians) * Math.cos(rollRadians)) + y * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) + Math.sin(yawRadians) * Math.sin(rollRadians)); + double zPos = x * Math.sin(yawRadians) * Math.cos(pitchRadians) + z * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) + Math.cos(yawRadians) * Math.cos(rollRadians)) + y * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) - Math.cos(yawRadians) * Math.sin(rollRadians)); + double yPos = -x * Math.sin(pitchRadians) + z * Math.cos(pitchRadians) * Math.sin(rollRadians) + y * Math.cos(pitchRadians) * Math.cos(rollRadians); return new Pos3D(xPos, yPos, zPos); } diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 219412166..b54f77cd7 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -2,7 +2,6 @@ package mekanism.api.transmitters; import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.MekanismAPI; diff --git a/src/main/java/mekanism/client/ClientPlayerTracker.java b/src/main/java/mekanism/client/ClientPlayerTracker.java index c0e7cc6da..09d46d364 100644 --- a/src/main/java/mekanism/client/ClientPlayerTracker.java +++ b/src/main/java/mekanism/client/ClientPlayerTracker.java @@ -12,9 +12,9 @@ public class ClientPlayerTracker @SubscribeEvent public void onPlayerChangedDimension(PlayerChangedDimensionEvent event) { - Mekanism.jetpackOn.remove(event.player); - Mekanism.gasmaskOn.remove(event.player); - Mekanism.flamethrowerActive.remove(event.player); - Mekanism.freeRunnerOn.remove(event.player); + Mekanism.jetpackOn.remove(event.player.getName()); + Mekanism.gasmaskOn.remove(event.player.getName()); + Mekanism.flamethrowerActive.remove(event.player.getName()); + Mekanism.freeRunnerOn.remove(event.player.getName()); } } diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index 75b614ef0..a4cb88c7d 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -17,7 +17,7 @@ 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 holidays = new ArrayList<>(); private static List holidaysNotified = new ArrayList<>(); public static void init() @@ -115,23 +115,25 @@ public final class HolidayManager @Override public ResourceLocation filterSound(ResourceLocation sound) { - if(sound.toString().contains("machine.enrichment")) + String soundResourceLocationString = sound.toString(); + + if(soundResourceLocationString.contains("machine.enrichment")) { return new ResourceLocation(sound.toString().replace("machine.enrichment", nutcracker[0])); } - else if(sound.equals("machine.metalinfuser")) + else if(soundResourceLocationString.contains("machine.metalinfuser")) { return new ResourceLocation(sound.toString().replace("machine.metalinfuser", nutcracker[1])); } - else if(sound.equals("machine.purification")) + else if(soundResourceLocationString.contains("machine.purification")) { return new ResourceLocation(sound.toString().replace("machine.purification", nutcracker[2])); } - else if(sound.equals("machine.smelter")) + else if(soundResourceLocationString.contains("machine.smelter")) { return new ResourceLocation(sound.toString().replace("machine.smelter", nutcracker[3])); } - else if(sound.equals("machine.dissolution")) + else if(soundResourceLocationString.contains("machine.dissolution")) { return new ResourceLocation(sound.toString().replace("machine.dissolution", nutcracker[4])); } diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index 8b0d675f8..086e6ae95 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -84,7 +84,7 @@ public class GuiDynamicTank extends GuiMekanism while(true) { - int renderRemaining = 0; + int renderRemaining; if(scale > 16) { diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index f594fa5fe..0101ac3f4 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -80,7 +80,7 @@ public class GuiInductionMatrix extends GuiMekanism while(true) { - int renderRemaining = 0; + int renderRemaining; if(scale > 16) { diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index fe49e5d01..cc2db1d25 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -156,10 +156,8 @@ public class GuiSeismicReader extends GuiScreen } String capitalised = renderString.substring(0, 1).toUpperCase() + renderString.substring(1); - float renderScale = 1.0f; int lengthX = fontRenderer.getStringWidth(capitalised); - - renderScale = lengthX > 53 ? 53f / lengthX : 1.0f; + float renderScale = lengthX > 53 ? 53f / lengthX : 1.0f; GlStateManager.pushMatrix(); GlStateManager.translate(guiWidth + 72, guiHeight + 16, 0); diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java index 61cc7169d..adc8349e7 100644 --- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -133,7 +133,7 @@ public class GuiThermoelectricBoiler extends GuiMekanism while(true) { - int renderRemaining = 0; + int renderRemaining; if(scale > 16) { diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index 4dcac3ee5..5e2b1a2bd 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -210,7 +210,7 @@ public class GuiUpgradeManagement extends GuiMekanism int xPos = 25; int yPos = 7 + (i*12); - int yRender = 0; + int yRender; if(upgrade == selectedType) { diff --git a/src/main/java/mekanism/client/gui/element/GuiGauge.java b/src/main/java/mekanism/client/gui/element/GuiGauge.java index b174ceb75..84bbe2ddd 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGauge.java @@ -88,7 +88,7 @@ public abstract class GuiGauge extends GuiElement while(scale > 0) { - int renderRemaining = 0; + int renderRemaining; if(scale > 16) { diff --git a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java index 90693b648..4ad3f08b0 100644 --- a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java @@ -115,7 +115,7 @@ public abstract class BaseRecipeCategory implements IRecipeCategory, IGuiWrapper while(true) { - int renderRemaining = 0; + int renderRemaining; if(scale > 16) { diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index c79a9b983..aa6c186a7 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -39,7 +39,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Timer; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; @@ -539,12 +538,7 @@ public class MekanismRenderer public static float getPartialTick() { - try { - Timer t = (Timer)ReflectionUtils.getPrivateValue(Minecraft.getMinecraft(), Minecraft.class, ObfuscatedNames.Minecraft_timer); - return t.renderPartialTicks; - } catch(Exception e) {} - - return 0; + return Minecraft.getMinecraft().getRenderPartialTicks(); } public static ResourceLocation getBlocksTexture() diff --git a/src/main/java/mekanism/client/render/RenderResizableCuboid.java b/src/main/java/mekanism/client/render/RenderResizableCuboid.java index 0a093b7dc..d431b6eaf 100644 --- a/src/main/java/mekanism/client/render/RenderResizableCuboid.java +++ b/src/main/java/mekanism/client/render/RenderResizableCuboid.java @@ -489,7 +489,7 @@ public class RenderResizableCuboid { double[] arr = points[i]; for (int j = 0; j < arr.length; j++) { double d = arr[j]; - int used = 0; + int used; if (j == 3 || j == 6) {// Shade or unused used = (int) d; } else { diff --git a/src/main/java/mekanism/common/BoxBlacklistParser.java b/src/main/java/mekanism/common/BoxBlacklistParser.java index 0a18aafe7..28e61d57e 100644 --- a/src/main/java/mekanism/common/BoxBlacklistParser.java +++ b/src/main/java/mekanism/common/BoxBlacklistParser.java @@ -12,8 +12,10 @@ import net.minecraft.block.Block; public final class BoxBlacklistParser { - public static File mekanismDir = new File(Mekanism.proxy.getMinecraftDir(), "config/mekanism"); - public static File boxBlacklistFile = new File(mekanismDir, "BoxBlacklist.txt"); + private static File mekanismDir = new File(Mekanism.proxy.getMinecraftDir(), "config/mekanism"); + private static File boxBlacklistFile = new File(mekanismDir, "BoxBlacklist.txt"); + + private BoxBlacklistParser() {} public static void load() { @@ -21,7 +23,7 @@ public final class BoxBlacklistParser generateFiles(); readBlacklist(); } catch(Exception e) { - e.printStackTrace(); + Mekanism.logger.warn("Couldn't load Cardboard Box blacklist", e); } } @@ -49,61 +51,60 @@ public final class BoxBlacklistParser private static void readBlacklist() throws IOException { - BufferedReader reader = new BufferedReader(new FileReader(boxBlacklistFile)); - int entries = 0; - - String readingLine; - int line = 0; - - while((readingLine = reader.readLine()) != null) + try(BufferedReader reader = new BufferedReader(new FileReader((boxBlacklistFile)))) { - line++; + int entries = 0; - if(readingLine.startsWith("#") || readingLine.trim().isEmpty()) + String readingLine; + int line = 0; + + while((readingLine = reader.readLine()) != null) { - continue; - } + line++; - String[] split = readingLine.split(" "); + if(readingLine.startsWith("#") || readingLine.trim().isEmpty()) + { + continue; + } - if(split.length != 2 || !isInteger(split[split.length-1])) - { - Mekanism.logger.error("BoxBlacklist.txt: Couldn't parse blacklist data on line " + line); - continue; - } - - String blockName = split[0].trim(); - - Block block = Block.getBlockFromName(blockName); - - if(block == null) - { - Mekanism.logger.error("BoxBlacklist.txt: Couldn't find specified block on line " + line); - continue; - } + String[] split = readingLine.split(" "); - MekanismAPI.addBoxBlacklist(block, Integer.parseInt(split[split.length-1])); - entries++; + if(split.length != 2 || !isInteger(split[split.length-1])) + { + Mekanism.logger.error("BoxBlacklist.txt: Couldn't parse blacklist data on line " + line); + continue; + } + + String blockName = split[0].trim(); + + Block block = Block.getBlockFromName(blockName); + + if(block == null) + { + Mekanism.logger.error("BoxBlacklist.txt: Couldn't find specified block on line " + line); + continue; + } + + MekanismAPI.addBoxBlacklist(block, Integer.parseInt(split[split.length-1])); + entries++; + + Mekanism.logger.info("Finished loading Cardboard Box blacklist (loaded " + entries + " entries)"); + } } - - reader.close(); - - Mekanism.logger.info("Finished loading Cardboard Box blacklist (loaded " + entries + " entries)"); } private static void writeExamples() throws IOException { - BufferedWriter writer = new BufferedWriter(new FileWriter(boxBlacklistFile)); + try(BufferedWriter writer = new BufferedWriter(new FileWriter(boxBlacklistFile))) + { - writer.append("# Use this file to tell Mekanism which blocks should not be picked up by a cardboard box."); - writer.newLine(); + writer.append("# Use this file to tell Mekanism which blocks should not be picked up by a cardboard box."); + writer.newLine(); - writer.append("# Proper syntax is \"NAME META\". Example (for stone):"); - writer.newLine(); + writer.append("# Proper syntax is \"NAME META\". Example (for stone):"); + writer.newLine(); - writer.append("# minecraft:stone 0"); - - writer.flush(); - writer.close(); + writer.append("# minecraft:stone 0"); + } } } diff --git a/src/main/java/mekanism/common/ObfuscatedNames.java b/src/main/java/mekanism/common/ObfuscatedNames.java index ce4fcb920..4ac0711f4 100644 --- a/src/main/java/mekanism/common/ObfuscatedNames.java +++ b/src/main/java/mekanism/common/ObfuscatedNames.java @@ -2,17 +2,15 @@ package mekanism.common; public final class ObfuscatedNames { - public static String[] Minecraft_timer = new String[] {"timer", "field_71428_T"}; public static String[] GuiContainer_xSize = new String[] {"xSize", "field_146999_f"}; public static String[] GuiContainer_ySize = new String[] {"ySize", "field_147000_g"}; public static String[] GuiContainer_guiLeft = new String[] {"guiLeft", "field_147003_i"}; public static String[] GuiContainer_guiTop = new String[] {"guiTop", "field_147009_r"}; public static String[] NetHandlerPlayServer_floatingTickCount = new String[] {"floatingTickCount", "field_147365_f"}; public static String[] SoundHandler_sndManager = new String[] {"sndManager", "field_147694_f"}; - public static String[] SoundManager_sndSystem = new String[] {"sndSystem", "field_148620_e"}; public static String[] SoundManager_invPlayingSounds = new String[] {"invPlayingSounds", "field_148630_i"}; public static String[] AbstractClientPlayer_getPlayerInfo = new String[] {"getPlayerInfo", "func_175155_b"}; public static String[] NetworkPlayerInfo_playerTextures = new String[] {"playerTextures", "field_187107_a"}; public static String[] Entity_copyDataFromOld = new String[] {"copyDataFromOld", "func_180432_n"}; public static String[] VertexBuffer_isDrawing = new String[] {"isDrawing", "field_179010_r"}; -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java index 36ae5237f..a7e3ab7b6 100644 --- a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java +++ b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java @@ -92,7 +92,7 @@ public class ThreadMinerSearch extends Thread if(info.block != null && !tileEntity.getWorld().isAirBlock(new BlockPos(x, y, z)) && state.getBlockHardness(tileEntity.getWorld(), new BlockPos(x, y, z)) >= 0) { MinerFilter filterFound = null; - boolean canFilter = false; + boolean canFilter; if(acceptedItems.containsKey(info)) { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index c9df9f772..ece317cf1 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -461,7 +461,7 @@ public class TransporterManager } int amountRemaining = ((TileEntityBin)tileEntity).getMaxStoredCount()-copy.binAmount; - ItemStack ret = null; + ItemStack ret; if(toInsert.getCount() <= amountRemaining) { diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index ddffca92a..02a57d48b 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -238,7 +238,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData return false; } - ItemStack result = ItemStack.EMPTY; + ItemStack result; try { result = FurnaceRecipes.instance().getSmeltingResult(block.getStack(world)); diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 5ddfd2cee..916a4e030 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -76,11 +76,6 @@ public final class MekanismHooks { loadCCPeripheralProviders(); } - - if(MetallurgyCoreLoaded) - { - //loadMettallurgy(); - } } @Method(modid = IC2Integration.MODID) @@ -181,59 +176,4 @@ public final class MekanismHooks } } - - /*public void loadMetallurgy() - { - try - { - String[] setNames = {"base", "precious", "nether", "fantasy", "ender", "utility"}; - - for (String setName : setNames) - { - for (IOreInfo oreInfo : MetallurgyAPI.getMetalSet(setName).getOreList().values()) - { - switch (oreInfo.getType()) - { - case ALLOY: - if (oreInfo.getIngot() != null && oreInfo.getDust() != null) - { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(oreInfo.getIngot(), 1), MekanismUtils.size(oreInfo.getDust(), 1)); - } - - break; - case DROP: - ItemStack ore = oreInfo.getOre(); - ItemStack drop = oreInfo.getDrop(); - - if (drop != null && ore != null) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), MekanismUtils.size(drop, 12)); - } - - break; - default: - ItemStack ore = oreInfo.getOre(); - ItemStack dust = oreInfo.getDust(); - ItemStack ingot = oreInfo.getIngot(); - - if (ore != null && dust != null) - { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), MekanismUtils.size(dust, 2)); - RecipeHandler.addCombinerRecipe(MekanismUtils.size(dust, 8), MekanismUtils.size(ore, 1)); - } - - if (ingot != null && dust != null) - { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ingot, 1), MekanismUtils.size(dust, 1)); - } - - break; - } - } - } - } - catch (Exception e) - { - } - }*/ } diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java index 07159cbbd..a7f9c298d 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java @@ -3,6 +3,7 @@ package mekanism.common.integration.multipart; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Optional; import io.netty.buffer.ByteBuf; import mcmultipart.api.container.IMultipartContainer; @@ -58,11 +59,15 @@ public class MultipartTileNetworkJoiner implements ITileNetwork { for(IPartSlot slot : container.getParts().keySet()) { - int tileIndex = tileList.indexOf(container.getPartTile(slot).get().getTileEntity()); - if(tileIndex >= 0) + Optional partTile = container.getPartTile(slot); + if(partTile.isPresent()) { - byte slotValue = slot instanceof EnumFaceSlot ? (byte)((EnumFaceSlot)slot).ordinal() : 6; - tileSideMap.put(slotValue, tileList.get(tileIndex)); + int tileIndex = tileList.indexOf(partTile.get().getTileEntity()); + if (tileIndex >= 0) + { + byte slotValue = slot instanceof EnumFaceSlot ? (byte) ((EnumFaceSlot) slot).ordinal() : 6; + tileSideMap.put(slotValue, tileList.get(tileIndex)); + } } } } diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index 8df4c2e0e..3d72c4d8a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -57,7 +57,7 @@ public class ItemBlockOre extends ItemBlock @Override public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; + String name; switch(itemstack.getItemDamage()) { diff --git a/src/main/java/mekanism/common/multiblock/MultiblockManager.java b/src/main/java/mekanism/common/multiblock/MultiblockManager.java index 33e9759b8..6bb9bb129 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockManager.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockManager.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.UUID; @@ -85,7 +86,7 @@ public class MultiblockManager> { TileEntity tileEntity = obj.getTileEntity(world); - if(!(tileEntity instanceof TileEntityMultiblock) || ((TileEntityMultiblock)tileEntity).getManager() != this || (getStructureId(((TileEntityMultiblock)tileEntity)) != null && getStructureId(((TileEntityMultiblock)tileEntity)) != inventoryID)) + if(!(tileEntity instanceof TileEntityMultiblock) || ((TileEntityMultiblock)tileEntity).getManager() != this || (getStructureId(((TileEntityMultiblock)tileEntity)) != null && !Objects.equals(getStructureId(((TileEntityMultiblock) tileEntity)), inventoryID))) { if(!tilesToKill.containsKey(inventoryID)) { diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index a1aba2bf1..09530899a 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -37,8 +37,6 @@ public abstract class UpdateProtocol> */ public void loopThrough(Coord4D coord) { - World world = pointer.getWorld(); - int origX = coord.x, origY = coord.y, origZ = coord.z; boolean isCorner = true; @@ -52,8 +50,6 @@ public abstract class UpdateProtocol> int x = 0, y = 0, z = 0; - int volume = 0; - if((isViableNode(origX + 1, origY, origZ) && isViableNode(origX - 1, origY, origZ)) || (isViableNode(origX, origY + 1, origZ) && isViableNode(origX, origY - 1, origZ)) || (isViableNode(origX, origY, origZ + 1) && isViableNode(origX, origY, origZ - 1))) @@ -163,8 +159,6 @@ public abstract class UpdateProtocol> innerNodes.add(new Coord4D(origX+x, origY+y, origZ+z, pointer.getWorld().provider.getDimension())); } } - - volume++; } } @@ -181,8 +175,6 @@ public abstract class UpdateProtocol> } } - volume += locations.size(); - if(Math.abs(xmax-xmin)+1 <= 18 && Math.abs(ymax-ymin)+1 <= 18 && Math.abs(zmax-zmin)+1 <= 18) { if(rightBlocks && rightFrame && isHollow && isCorner) diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index 340e3c641..0b778c06b 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -114,7 +114,7 @@ public class PacketDigitalMinerGui implements IMessageHandler 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/transmitters/TransmitterImpl.java b/src/main/java/mekanism/common/transmitters/TransmitterImpl.java index d7ea725f6..420a99b8d 100644 --- a/src/main/java/mekanism/common/transmitters/TransmitterImpl.java +++ b/src/main/java/mekanism/common/transmitters/TransmitterImpl.java @@ -99,7 +99,7 @@ public class TransmitterImpl> extends Transmitt { IGridTransmitter transmitter = CapabilityUtils.getCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); - if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType())); + if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType())) { return ((IGridTransmitter)transmitter).getTransmitterNetwork(); } diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index 73d791324..894e8b7b0 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -142,7 +142,7 @@ public class GuiIndustrialTurbine extends GuiMekanism while(true) { - int renderRemaining = 0; + int renderRemaining; if(scale > 16) { diff --git a/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java b/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java index 1db49977e..e67dcce08 100644 --- a/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java +++ b/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java @@ -8,7 +8,6 @@ import mekanism.generators.common.content.turbine.SynchronizedTurbineData; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 6193f5b32..28000cc69 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -3,8 +3,6 @@ package mekanism.generators.common; import buildcraft.api.mj.MjAPI; import io.netty.buffer.ByteBuf; -import java.io.IOException; - import mekanism.api.MekanismAPI; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index b04c27a31..08fd9bb8c 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -243,7 +243,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui { if(resource.getFluid() == FluidRegistry.getFluid("bioethanol")) { - int fuelTransfer = 0; + int fuelTransfer; int fuelNeeded = bioFuelSlot.MAX_FLUID - bioFuelSlot.fluidStored; int attemptTransfer = resource.amount; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 83197efba..983fb473a 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -93,7 +93,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH { setActive(true); - FuelGas fuel = null; + FuelGas fuel; if(fuelTank.getStored() != 0) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 627cb03d5..dfcb5b7f8 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -118,11 +118,9 @@ public class TileEntitySolarGenerator extends TileEntityGenerator public double getProduction() { - double ret = 0; - if(seesSun) { - ret = GENERATION_RATE; + double ret = GENERATION_RATE; if(MekanismUtils.existsAndInstance(world.provider, "micdoodle8.mods.galacticraft.api.world.ISolarLevel")) { diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 6465f78ae..0669fc7c7 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -2,7 +2,6 @@ package mekanism.tools.common; import io.netty.buffer.ByteBuf; -import java.io.IOException; import java.util.HashMap; import java.util.Map;