From 510f969c94ac552c36cb41adca076a7747e29bbc Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 3 Apr 2016 14:34:39 +0100 Subject: [PATCH] Auto remove un needed things in the code --- .../techreborn/api/RollingMachineRecipe.java | 10 +++++----- .../java/techreborn/api/gui/SlotUpgrade.java | 5 +---- .../reactor/FusionReactorRecipeHelper.java | 2 +- .../techreborn/api/recipe/RecipeHandler.java | 15 +++++++------- .../recipe/machines/BlastFurnaceRecipe.java | 1 - .../machines/IndustrialGrinderRecipe.java | 1 - .../machines/IndustrialSawmillRecipe.java | 1 - .../recipe/machines/VacuumFreezerRecipe.java | 1 - .../api/recipe/recipeConfig/RecipeConfig.java | 4 ++-- .../recipeConfig/RecipeConfigManager.java | 2 +- .../techreborn/blocks/BlockMachineCasing.java | 6 +++--- .../java/techreborn/blocks/BlockNuke.java | 2 +- src/main/java/techreborn/blocks/BlockOre.java | 3 +-- .../blocks/BlockPlayerDetector.java | 2 +- .../techreborn/blocks/BlockRubberLeaves.java | 18 ++++++++--------- .../techreborn/blocks/BlockRubberLog.java | 2 +- .../techreborn/blocks/BlockRubberSapling.java | 2 +- .../java/techreborn/blocks/BlockStorage2.java | 2 +- .../blocks/generator/BlockSolarPanel.java | 4 ++-- .../iron_machines/BlockAlloyFurnace.java | 2 +- .../iron_machines/BlockIronFurnace.java | 4 ++-- .../blocks/storage/BlockBatBox.java | 4 ---- .../blocks/storage/BlockEnergyStorage.java | 6 +++--- .../blocks/storage/BlockLESUStorage.java | 4 ++-- .../techreborn/blocks/storage/BlockMFE.java | 4 ---- .../techreborn/blocks/storage/BlockMFSU.java | 3 --- .../blocks/transformers/BlockTransformer.java | 6 +++--- .../client/container/ContainerAESU.java | 2 +- .../container/ContainerAlloyFurnace.java | 2 +- .../client/container/ContainerBatbox.java | 2 +- .../container/ContainerBlastFurnace.java | 2 +- .../client/container/ContainerCrafting.java | 2 +- .../container/ContainerDieselGenerator.java | 2 +- .../container/ContainerFusionReactor.java | 2 +- .../client/container/ContainerGenerator.java | 2 +- .../client/container/ContainerIDSU.java | 2 +- .../ContainerImplosionCompressor.java | 2 +- .../container/ContainerIndustrialGrinder.java | 2 +- .../client/container/ContainerLESU.java | 2 +- .../client/container/ContainerMFE.java | 2 +- .../client/container/ContainerMFSU.java | 2 +- .../container/ContainerMatterFabricator.java | 2 +- .../container/ContainerRollingMachine.java | 2 +- .../container/ContainerVacuumFreezer.java | 2 +- .../client/container/SlotScrapbox.java | 6 +----- .../client/gui/GuiIndustrialSawmill.java | 2 +- .../client/render/parts/RenderCablePart.java | 2 +- .../CasingConnectedTextureGenerator.java | 2 +- .../LesuConnectedTextureGenerator.java | 2 +- .../java/techreborn/compat/CompatManager.java | 6 +++--- .../config/TechRebornConfigGui.java | 2 +- .../java/techreborn/events/OreUnifier.java | 2 +- src/main/java/techreborn/init/ModParts.java | 2 +- src/main/java/techreborn/init/ModRecipes.java | 1 - .../items/tools/ItemJackhammer.java | 6 +----- .../techreborn/items/tools/ItemNanosaber.java | 6 +----- .../techreborn/items/tools/ItemTreeTap.java | 6 +----- .../techreborn/items/tools/ItemWrench.java | 2 +- src/main/java/techreborn/lib/Key.java | 2 +- .../manual/pages/CraftingInfoPage.java | 4 ++-- .../manual/pages/DescriptionPage.java | 2 +- .../multiblocks/MultiBlockCasing.java | 1 - .../java/techreborn/parts/CableMultipart.java | 5 +---- src/main/java/techreborn/tiles/TileAesu.java | 6 +----- .../techreborn/tiles/TileAlloyFurnace.java | 6 +----- .../techreborn/tiles/TileAlloySmelter.java | 6 +----- .../tiles/TileAssemblingMachine.java | 6 +----- .../techreborn/tiles/TileBlastFurnace.java | 6 +----- .../java/techreborn/tiles/TileCentrifuge.java | 6 +----- .../techreborn/tiles/TileChargeBench.java | 6 +----- .../techreborn/tiles/TileChemicalReactor.java | 6 +----- .../techreborn/tiles/TileChunkLoader.java | 6 +----- .../techreborn/tiles/TileDigitalChest.java | 6 +----- .../tiles/TileImplosionCompressor.java | 6 +----- .../tiles/TileIndustrialElectrolyzer.java | 6 +----- .../tiles/TileIndustrialGrinder.java | 13 ++---------- .../tiles/TileIndustrialSawmill.java | 12 ++--------- .../techreborn/tiles/TileIronFurnace.java | 2 +- .../tiles/TileMatterFabricator.java | 7 +------ .../techreborn/tiles/TileQuantumChest.java | 6 +----- .../techreborn/tiles/TileQuantumTank.java | 6 +----- .../techreborn/tiles/TileRollingMachine.java | 12 ++--------- .../techreborn/tiles/TileScrapboxinator.java | 12 ++--------- .../techreborn/tiles/TileVacuumFreezer.java | 6 +----- .../TileEntityFusionController.java | 20 ++++++------------- .../tiles/generator/TileDieselGenerator.java | 6 +----- .../generator/TileDragonEggSiphoner.java | 6 +----- .../tiles/generator/TileGasTurbine.java | 8 ++------ .../tiles/generator/TileGenerator.java | 6 +----- .../tiles/generator/TileHeatGenerator.java | 6 +----- .../generator/TileSemifluidGenerator.java | 8 ++------ .../tiles/generator/TileThermalGenerator.java | 6 +----- .../techreborn/tiles/idsu/IDSUManager.java | 4 ++-- .../techreborn/tiles/lesu/LesuNetwork.java | 4 ++-- .../java/techreborn/tiles/lesu/TileLesu.java | 2 +- .../tiles/storage/TileEnergyStorage.java | 6 +----- .../tiles/teir1/TileCompressor.java | 6 +----- .../tiles/teir1/TileElectricFurnace.java | 6 +----- .../techreborn/tiles/teir1/TileExtractor.java | 6 +----- .../techreborn/tiles/teir1/TileGrinder.java | 6 +----- .../techreborn/tiles/teir1/TileRecycler.java | 12 ++--------- .../tiles/transformers/TileTransformer.java | 6 +----- .../java/techreborn/utils/RecipeCrafter.java | 2 +- .../utils/upgrade/UpgradeHandler.java | 2 +- .../techreborn/world/TechRebornRetroGen.java | 2 +- 105 files changed, 141 insertions(+), 348 deletions(-) diff --git a/src/main/java/techreborn/api/RollingMachineRecipe.java b/src/main/java/techreborn/api/RollingMachineRecipe.java index d6c892997..1ac9ce755 100644 --- a/src/main/java/techreborn/api/RollingMachineRecipe.java +++ b/src/main/java/techreborn/api/RollingMachineRecipe.java @@ -18,7 +18,7 @@ import java.util.List; public class RollingMachineRecipe { public static final RollingMachineRecipe instance = new RollingMachineRecipe(); - private final List recipes = new ArrayList(); + private final List recipes = new ArrayList<>(); public void addShapedOreRecipe(ItemStack outputItemStack, Object... objectInputs) { recipes.add(new ShapedOreRecipe(outputItemStack, objectInputs)); @@ -66,8 +66,8 @@ public class RollingMachineRecipe { ItemStack recipeArray[] = new ItemStack[j * k]; for (int i1 = 0; i1 < j * k; i1++) { char c = s.charAt(i1); - if (hashmap.containsKey(Character.valueOf(c))) { - recipeArray[i1] = ((ItemStack) hashmap.get(Character.valueOf(c))).copy(); + if (hashmap.containsKey(c)) { + recipeArray[i1] = ((ItemStack) hashmap.get(c)).copy(); } else { recipeArray[i1] = null; } @@ -77,7 +77,7 @@ public class RollingMachineRecipe { } public void addShapelessRecipe(ItemStack output, Object... components) { - List ingredients = new ArrayList(); + List ingredients = new ArrayList<>(); for (int j = 0; j < components.length; j++) { Object obj = components[j]; if (obj instanceof ItemStack) { @@ -100,7 +100,7 @@ public class RollingMachineRecipe { public ItemStack findMatchingRecipe(InventoryCrafting inv, World world) { for (int k = 0; k < recipes.size(); k++) { - IRecipe irecipe = (IRecipe) recipes.get(k); + IRecipe irecipe = recipes.get(k); if (irecipe.matches(inv, world)) { return irecipe.getCraftingResult(inv); } diff --git a/src/main/java/techreborn/api/gui/SlotUpgrade.java b/src/main/java/techreborn/api/gui/SlotUpgrade.java index f3d48b1ed..5a5862819 100644 --- a/src/main/java/techreborn/api/gui/SlotUpgrade.java +++ b/src/main/java/techreborn/api/gui/SlotUpgrade.java @@ -13,9 +13,6 @@ public class SlotUpgrade extends Slot { @Override public boolean isItemValid(ItemStack stack) { - if (stack.getItem() instanceof IMachineUpgrade) { - return true; - } else - return false; + return stack.getItem() instanceof IMachineUpgrade; } } diff --git a/src/main/java/techreborn/api/reactor/FusionReactorRecipeHelper.java b/src/main/java/techreborn/api/reactor/FusionReactorRecipeHelper.java index 3f591c98b..8777d25af 100644 --- a/src/main/java/techreborn/api/reactor/FusionReactorRecipeHelper.java +++ b/src/main/java/techreborn/api/reactor/FusionReactorRecipeHelper.java @@ -7,7 +7,7 @@ public class FusionReactorRecipeHelper { /** * This is the list of all the recipes */ - public static ArrayList reactorRecipes = new ArrayList(); + public static ArrayList reactorRecipes = new ArrayList<>(); /** * Register your reactor recipe here diff --git a/src/main/java/techreborn/api/recipe/RecipeHandler.java b/src/main/java/techreborn/api/recipe/RecipeHandler.java index 446639330..f3596f309 100644 --- a/src/main/java/techreborn/api/recipe/RecipeHandler.java +++ b/src/main/java/techreborn/api/recipe/RecipeHandler.java @@ -14,13 +14,13 @@ public class RecipeHandler { /** * This is the array list of all of the recipes for all of the machines */ - public static final ArrayList recipeList = new ArrayList(); + public static final ArrayList recipeList = new ArrayList<>(); - public static HashMap stackMap = new HashMap(); + public static HashMap stackMap = new HashMap<>(); /** * This is a list of all the registered machine names. */ - public static ArrayList machineNames = new ArrayList(); + public static ArrayList machineNames = new ArrayList<>(); /** * Use this to get all of the recipes form a recipe name @@ -29,7 +29,7 @@ public class RecipeHandler { * @return A list of all the recipes of a given name. */ public static List getRecipeClassFromName(String name) { - List baseRecipeList = new ArrayList(); + List baseRecipeList = new ArrayList<>(); for (IBaseRecipeType baseRecipe : recipeList) { if (baseRecipe.getRecipeName().equals(name)) { baseRecipeList.add(baseRecipe); @@ -66,7 +66,7 @@ public class RecipeHandler { machineNames.add(recipe.getRecipeName()); } recipeList.add(recipe); - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); for (StackTraceElement ste : Thread.currentThread().getStackTrace()) { buffer.append(ste); } @@ -82,10 +82,9 @@ public class RecipeHandler { for (int i = 0; i < baseRecipeType.getInputs().size(); i++) { if (ItemUtils.isItemEqual(baseRecipeType.getInputs().get(i), recipe.getInputs().get(i), true, false, false)) { - StringBuffer itemInfo = new StringBuffer(); + StringBuilder itemInfo = new StringBuilder(); for (ItemStack inputs : baseRecipeType.getInputs()) { - itemInfo.append(":" + inputs.getItem().getUnlocalizedName() + "," - + inputs.getDisplayName() + "," + inputs.stackSize); + itemInfo.append(":").append(inputs.getItem().getUnlocalizedName()).append(",").append(inputs.getDisplayName()).append(",").append(inputs.stackSize); } Core.logHelper.all(stackMap.get(baseRecipeType)); // throw new Exception("Found a duplicate recipe for diff --git a/src/main/java/techreborn/api/recipe/machines/BlastFurnaceRecipe.java b/src/main/java/techreborn/api/recipe/machines/BlastFurnaceRecipe.java index f2a70e808..510df1165 100644 --- a/src/main/java/techreborn/api/recipe/machines/BlastFurnaceRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/BlastFurnaceRecipe.java @@ -1,7 +1,6 @@ package techreborn.api.recipe.machines; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import techreborn.api.Reference; import techreborn.api.recipe.BaseRecipe; diff --git a/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java b/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java index 249da2a31..816ea92ae 100644 --- a/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java @@ -1,7 +1,6 @@ package techreborn.api.recipe.machines; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; import techreborn.api.Reference; import techreborn.api.recipe.BaseRecipe; diff --git a/src/main/java/techreborn/api/recipe/machines/IndustrialSawmillRecipe.java b/src/main/java/techreborn/api/recipe/machines/IndustrialSawmillRecipe.java index d00f2067d..6792c0093 100644 --- a/src/main/java/techreborn/api/recipe/machines/IndustrialSawmillRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/IndustrialSawmillRecipe.java @@ -1,7 +1,6 @@ package techreborn.api.recipe.machines; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; import techreborn.api.Reference; import techreborn.api.recipe.BaseRecipe; diff --git a/src/main/java/techreborn/api/recipe/machines/VacuumFreezerRecipe.java b/src/main/java/techreborn/api/recipe/machines/VacuumFreezerRecipe.java index f9627f0e2..9a3410499 100644 --- a/src/main/java/techreborn/api/recipe/machines/VacuumFreezerRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/VacuumFreezerRecipe.java @@ -1,7 +1,6 @@ package techreborn.api.recipe.machines; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import techreborn.api.Reference; import techreborn.api.recipe.BaseRecipe; diff --git a/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfig.java b/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfig.java index 2b25c88d6..7fc59750b 100644 --- a/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfig.java +++ b/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfig.java @@ -46,14 +46,14 @@ public class RecipeConfig { public void addInputs(ConfigItem item) { if (inputs == null) { - inputs = new ArrayList(); + inputs = new ArrayList<>(); } inputs.add(item); } public void addOutputs(ConfigItem item) { if (outputs == null) { - outputs = new ArrayList(); + outputs = new ArrayList<>(); } outputs.add(item); } diff --git a/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java b/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java index 9133ba89f..ea22fcf3b 100644 --- a/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java +++ b/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java @@ -12,7 +12,7 @@ import java.util.ArrayList; public class RecipeConfigManager { - public static ArrayList configs = new ArrayList(); + public static ArrayList configs = new ArrayList<>(); static File configFile = null; diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index eaef7daae..49830604f 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -47,7 +47,7 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured @Override public int getMetaFromState(IBlockState state) { - return (Integer) state.getValue(METADATA); + return state.getValue(METADATA); } protected BlockStateContainer createBlockState() @@ -104,12 +104,12 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess worldIn, BlockPos pos, EnumFacing side) { Block b = worldIn.getBlockState(pos).getBlock(); - return b == (Block) this ? false : super.shouldSideBeRendered(blockState, worldIn, pos, side); + return b != (Block) this && super.shouldSideBeRendered(blockState, worldIn, pos, side); } public boolean shouldConnectToBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta) { - return block == (Block) this; + return block == this; } @Override diff --git a/src/main/java/techreborn/blocks/BlockNuke.java b/src/main/java/techreborn/blocks/BlockNuke.java index 99b6b8477..4dc7e7641 100644 --- a/src/main/java/techreborn/blocks/BlockNuke.java +++ b/src/main/java/techreborn/blocks/BlockNuke.java @@ -128,7 +128,7 @@ public class BlockNuke extends BaseBlock implements ITexturedBlock public IBlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(OVERLAY, Boolean.valueOf((meta & 1) > 0)); + return this.getDefaultState().withProperty(OVERLAY, (meta & 1) > 0); } protected BlockStateContainer createBlockState() diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index 9ab3e4757..827cd54a3 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -1,6 +1,5 @@ package techreborn.blocks; -import java.security.InvalidParameterException; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -149,7 +148,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi return set.drop(fortune, random); } - ArrayList block = new ArrayList(); + ArrayList block = new ArrayList<>(); block.add(new ItemStack(Item.getItemFromBlock(this), 1, metadata)); return block; } diff --git a/src/main/java/techreborn/blocks/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/BlockPlayerDetector.java index f7d457636..93c4b9d21 100644 --- a/src/main/java/techreborn/blocks/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/BlockPlayerDetector.java @@ -153,7 +153,7 @@ public class BlockPlayerDetector extends BlockMachineBase implements ITexturedBl @Override public int getMetaFromState(IBlockState state) { - return (Integer) state.getValue(METADATA); + return state.getValue(METADATA); } protected BlockStateContainer createBlockState() diff --git a/src/main/java/techreborn/blocks/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/BlockRubberLeaves.java index 667f1a19c..2631af063 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/BlockRubberLeaves.java @@ -35,8 +35,8 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO setUnlocalizedName("techreborn.rubberleaves"); setCreativeTab(TechRebornCreativeTabMisc.instance); RebornCore.jsonDestroyer.registerObject(this); - this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, Boolean.valueOf(true)) - .withProperty(DECAYABLE, Boolean.valueOf(true))); + this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true) + .withProperty(DECAYABLE, true)); } @Override @@ -48,7 +48,7 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO @Override public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { - List list = new java.util.ArrayList(); + List list = new java.util.ArrayList<>(); list.add(new ItemStack(this, 1, 0)); return list; } @@ -73,8 +73,8 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO @Override protected ItemStack createStackedBlock(IBlockState state) { - IBlockState newState = state.withProperty(CHECK_DECAY, Boolean.valueOf(false)).withProperty(DECAYABLE, - Boolean.valueOf(false)); + IBlockState newState = state.withProperty(CHECK_DECAY, false).withProperty(DECAYABLE, + false); return super.createStackedBlock(newState); } @@ -100,19 +100,19 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO @Override public IBlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(DECAYABLE, Boolean.valueOf((meta & 1) == 0)) - .withProperty(CHECK_DECAY, Boolean.valueOf((meta & 2) > 0)); + return this.getDefaultState().withProperty(DECAYABLE, (meta & 1) == 0) + .withProperty(CHECK_DECAY, (meta & 2) > 0); } @Override public int getMetaFromState(IBlockState state) { int meta = 0; - if (!((Boolean) state.getValue(DECAYABLE)).booleanValue()) + if (!(Boolean) state.getValue(DECAYABLE)) { meta |= 1; } - if (((Boolean) state.getValue(CHECK_DECAY)).booleanValue()) + if ((Boolean) state.getValue(CHECK_DECAY)) { meta |= 2; } diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index 02ecae67c..e04256d87 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -204,7 +204,7 @@ public class BlockRubberLog extends Block implements ITexturedBlock @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - List drops = new ArrayList(); + List drops = new ArrayList<>(); drops.add(new ItemStack(this)); if (state.getValue(HAS_SAP)) { diff --git a/src/main/java/techreborn/blocks/BlockRubberSapling.java b/src/main/java/techreborn/blocks/BlockRubberSapling.java index 63e408a53..5f8211a79 100644 --- a/src/main/java/techreborn/blocks/BlockRubberSapling.java +++ b/src/main/java/techreborn/blocks/BlockRubberSapling.java @@ -23,7 +23,7 @@ public class BlockRubberSapling extends BlockSapling { setUnlocalizedName("techreborn.rubbersapling"); setCreativeTab(TechRebornCreativeTabMisc.instance); - this.setDefaultState(this.getDefaultState().withProperty(STAGE, Integer.valueOf(0))); + this.setDefaultState(this.getDefaultState().withProperty(STAGE, 0)); } @Override diff --git a/src/main/java/techreborn/blocks/BlockStorage2.java b/src/main/java/techreborn/blocks/BlockStorage2.java index 399c92273..f0eed62d9 100644 --- a/src/main/java/techreborn/blocks/BlockStorage2.java +++ b/src/main/java/techreborn/blocks/BlockStorage2.java @@ -91,7 +91,7 @@ public class BlockStorage2 extends BaseBlock implements ITexturedBlock @Override public int getMetaFromState(IBlockState state) { - return (Integer) state.getValue(METADATA); + return state.getValue(METADATA); } protected BlockStateContainer createBlockState() diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index 2910fe153..d160770a2 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -42,13 +42,13 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(ACTIVE, meta == 0 ? false : true); + return getDefaultState().withProperty(ACTIVE, meta != 0); } @Override public int getMetaFromState(IBlockState state) { - return state.getValue(ACTIVE) == true ? 1 : 0; + return state.getValue(ACTIVE) ? 1 : 0; } @Override diff --git a/src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java b/src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java index e405863e0..35b61ea80 100644 --- a/src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java @@ -48,7 +48,7 @@ public class BlockAlloyFurnace extends BlockMachineBase implements IRotationText @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - List items = new ArrayList(); + List items = new ArrayList<>(); items.add(new ItemStack(this)); return items; } diff --git a/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java b/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java index 49c6fe731..536038702 100644 --- a/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java @@ -52,7 +52,7 @@ public class BlockIronFurnace extends BlockMachineBase implements IRotationTextu @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - List items = new ArrayList(); + List items = new ArrayList<>(); items.add(new ItemStack(this)); return items; } @@ -63,7 +63,7 @@ public class BlockIronFurnace extends BlockMachineBase implements IRotationTextu { if (this.isActive(state)) { - EnumFacing enumfacing = (EnumFacing) state.getValue(FACING); + EnumFacing enumfacing = state.getValue(FACING); double d0 = (double) pos.getX() + 0.5D; double d1 = (double) pos.getY() + rand.nextDouble() * 6.0D / 16.0D; double d2 = (double) pos.getZ() + 0.5D; diff --git a/src/main/java/techreborn/blocks/storage/BlockBatBox.java b/src/main/java/techreborn/blocks/storage/BlockBatBox.java index c18082aa0..c86d9d22c 100644 --- a/src/main/java/techreborn/blocks/storage/BlockBatBox.java +++ b/src/main/java/techreborn/blocks/storage/BlockBatBox.java @@ -1,20 +1,16 @@ package techreborn.blocks.storage; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.client.GuiHandler; -import techreborn.init.ModBlocks; import techreborn.tiles.storage.TileBatBox; import java.util.ArrayList; import java.util.List; -import java.util.Random; /** * Created by modmuss50 on 14/03/2016. diff --git a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java index a63287393..2fee05d7f 100644 --- a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java @@ -88,7 +88,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat Block block2 = state2.getBlock(); IBlockState state3 = worldIn.getBlockState(pos.east()); Block block3 = state3.getBlock(); - EnumFacing enumfacing = (EnumFacing) state.getValue(FACING); + EnumFacing enumfacing = state.getValue(FACING); if (enumfacing == EnumFacing.NORTH && block.isFullBlock(state) && !block1.isFullBlock(state1)) { @@ -141,7 +141,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat IInventory inventory = (IInventory) tileEntity; - List items = new ArrayList(); + List items = new ArrayList<>(); for (int i = 0; i < inventory.getSizeInventory(); i++) { @@ -274,7 +274,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat { if (this instanceof IRotationTexture) { - IRotationTexture rotationTexture = (IRotationTexture) this; + IRotationTexture rotationTexture = this; if (getFacing(blockState) == facing) { return rotationTexture.getFrontOff(); diff --git a/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java b/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java index 2a4bed318..0b818afc7 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java @@ -52,7 +52,7 @@ public class BlockLESUStorage extends BlockMachineBase implements IAdvancedRotat @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - List items = new ArrayList(); + List items = new ArrayList<>(); items.add(new ItemStack(this)); return items; } @@ -65,7 +65,7 @@ public class BlockLESUStorage extends BlockMachineBase implements IAdvancedRotat public boolean shouldConnectToBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta) { - return block == (Block) this; + return block == this; } @Override diff --git a/src/main/java/techreborn/blocks/storage/BlockMFE.java b/src/main/java/techreborn/blocks/storage/BlockMFE.java index beb0409f3..ad583fe62 100644 --- a/src/main/java/techreborn/blocks/storage/BlockMFE.java +++ b/src/main/java/techreborn/blocks/storage/BlockMFE.java @@ -1,9 +1,7 @@ package techreborn.blocks.storage; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -12,10 +10,8 @@ import techreborn.client.GuiHandler; import techreborn.init.ModBlocks; import techreborn.tiles.storage.TileMFE; -import java.lang.reflect.Array; import java.util.ArrayList; import java.util.List; -import java.util.Random; /** * Created by modmuss50 on 14/03/2016. diff --git a/src/main/java/techreborn/blocks/storage/BlockMFSU.java b/src/main/java/techreborn/blocks/storage/BlockMFSU.java index c7db862d7..2f540265b 100644 --- a/src/main/java/techreborn/blocks/storage/BlockMFSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockMFSU.java @@ -1,9 +1,7 @@ package techreborn.blocks.storage; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -14,7 +12,6 @@ import techreborn.tiles.storage.TileMFSU; import java.util.ArrayList; import java.util.List; -import java.util.Random; /** * Created by modmuss50 on 14/03/2016. diff --git a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java index c89f2cc08..225f2c10f 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java @@ -72,7 +72,7 @@ public abstract class BlockTransformer extends BaseTileBlock implements IRotatio Block block2 = state2.getBlock(); IBlockState state3 = worldIn.getBlockState(pos.east()); Block block3 = state3.getBlock(); - EnumFacing enumfacing = (EnumFacing) state.getValue(FACING); + EnumFacing enumfacing = state.getValue(FACING); if (enumfacing == EnumFacing.NORTH && block.isFullBlock(state) && !block1.isFullBlock(state1)) { @@ -128,7 +128,7 @@ public abstract class BlockTransformer extends BaseTileBlock implements IRotatio IInventory inventory = (IInventory) tileEntity; - List items = new ArrayList(); + List items = new ArrayList<>(); for (int i = 0; i < inventory.getSizeInventory(); i++) { @@ -262,7 +262,7 @@ public abstract class BlockTransformer extends BaseTileBlock implements IRotatio { if (this instanceof IRotationTexture) { - IRotationTexture rotationTexture = (IRotationTexture) this; + IRotationTexture rotationTexture = this; if (getFacing(blockState) == facing) { return rotationTexture.getFrontOff(); diff --git a/src/main/java/techreborn/client/container/ContainerAESU.java b/src/main/java/techreborn/client/container/ContainerAESU.java index 13ea2fec2..4c32baeed 100644 --- a/src/main/java/techreborn/client/container/ContainerAESU.java +++ b/src/main/java/techreborn/client/container/ContainerAESU.java @@ -42,7 +42,7 @@ public class ContainerAESU extends RebornContainer { public void detectAndSendChanges() { super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.euOut != tile.getMaxOutput()) { icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput()); } diff --git a/src/main/java/techreborn/client/container/ContainerAlloyFurnace.java b/src/main/java/techreborn/client/container/ContainerAlloyFurnace.java index f571191ec..f808b8765 100644 --- a/src/main/java/techreborn/client/container/ContainerAlloyFurnace.java +++ b/src/main/java/techreborn/client/container/ContainerAlloyFurnace.java @@ -66,7 +66,7 @@ public class ContainerAlloyFurnace extends RebornContainer { for (int i = 0; i < this.crafters.size(); i++) { - ICrafting crafting = (ICrafting) this.crafters.get(i); + ICrafting crafting = this.crafters.get(i); if (this.currentItemBurnTime != tile.currentItemBurnTime) { crafting.sendProgressBarUpdate(this, 0, tile.currentItemBurnTime); diff --git a/src/main/java/techreborn/client/container/ContainerBatbox.java b/src/main/java/techreborn/client/container/ContainerBatbox.java index 0eff121fb..8076c1e9e 100644 --- a/src/main/java/techreborn/client/container/ContainerBatbox.java +++ b/src/main/java/techreborn/client/container/ContainerBatbox.java @@ -56,7 +56,7 @@ public class ContainerBatbox extends RebornContainer super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.energy != (int) tile.getEnergy()) { icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); diff --git a/src/main/java/techreborn/client/container/ContainerBlastFurnace.java b/src/main/java/techreborn/client/container/ContainerBlastFurnace.java index c36203f89..79dfdec3e 100644 --- a/src/main/java/techreborn/client/container/ContainerBlastFurnace.java +++ b/src/main/java/techreborn/client/container/ContainerBlastFurnace.java @@ -59,7 +59,7 @@ public class ContainerBlastFurnace extends ContainerCrafting super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.heat != tile.getHeat()) { icrafting.sendProgressBarUpdate(this, 10, tile.getHeat()); diff --git a/src/main/java/techreborn/client/container/ContainerCrafting.java b/src/main/java/techreborn/client/container/ContainerCrafting.java index 9187f5002..d5de09623 100644 --- a/src/main/java/techreborn/client/container/ContainerCrafting.java +++ b/src/main/java/techreborn/client/container/ContainerCrafting.java @@ -26,7 +26,7 @@ public abstract class ContainerCrafting extends RebornContainer super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.currentTickTime != crafter.currentTickTime || crafter.currentTickTime == -1) { icrafting.sendProgressBarUpdate(this, 0, crafter.currentTickTime); diff --git a/src/main/java/techreborn/client/container/ContainerDieselGenerator.java b/src/main/java/techreborn/client/container/ContainerDieselGenerator.java index 333b39434..a399878a5 100644 --- a/src/main/java/techreborn/client/container/ContainerDieselGenerator.java +++ b/src/main/java/techreborn/client/container/ContainerDieselGenerator.java @@ -55,7 +55,7 @@ public class ContainerDieselGenerator extends RebornContainer super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.energy != (int) tiledieselGenerator.getEnergy()) { icrafting.sendProgressBarUpdate(this, 0, (int) tiledieselGenerator.getEnergy()); diff --git a/src/main/java/techreborn/client/container/ContainerFusionReactor.java b/src/main/java/techreborn/client/container/ContainerFusionReactor.java index 8d9181db5..ebdec6563 100644 --- a/src/main/java/techreborn/client/container/ContainerFusionReactor.java +++ b/src/main/java/techreborn/client/container/ContainerFusionReactor.java @@ -58,7 +58,7 @@ public class ContainerFusionReactor extends RebornContainer super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.coilStatus != fusionController.coilStatus) { icrafting.sendProgressBarUpdate(this, 0, fusionController.coilStatus); diff --git a/src/main/java/techreborn/client/container/ContainerGenerator.java b/src/main/java/techreborn/client/container/ContainerGenerator.java index 1ad444f31..f717c3beb 100644 --- a/src/main/java/techreborn/client/container/ContainerGenerator.java +++ b/src/main/java/techreborn/client/container/ContainerGenerator.java @@ -59,7 +59,7 @@ public class ContainerGenerator extends RebornContainer super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.burnTime != tile.burnTime) { icrafting.sendProgressBarUpdate(this, 0, tile.burnTime); diff --git a/src/main/java/techreborn/client/container/ContainerIDSU.java b/src/main/java/techreborn/client/container/ContainerIDSU.java index 23cbdff80..c6460331b 100644 --- a/src/main/java/techreborn/client/container/ContainerIDSU.java +++ b/src/main/java/techreborn/client/container/ContainerIDSU.java @@ -43,7 +43,7 @@ public class ContainerIDSU extends RebornContainer { public void detectAndSendChanges() { super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.euOut != tile.output) { icrafting.sendProgressBarUpdate(this, 0, tile.output); } diff --git a/src/main/java/techreborn/client/container/ContainerImplosionCompressor.java b/src/main/java/techreborn/client/container/ContainerImplosionCompressor.java index b57086cad..f1cf81d0b 100644 --- a/src/main/java/techreborn/client/container/ContainerImplosionCompressor.java +++ b/src/main/java/techreborn/client/container/ContainerImplosionCompressor.java @@ -57,7 +57,7 @@ public class ContainerImplosionCompressor extends ContainerCrafting super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.multIBlockState != getMultIBlockStateint()) { icrafting.sendProgressBarUpdate(this, 3, getMultIBlockStateint()); diff --git a/src/main/java/techreborn/client/container/ContainerIndustrialGrinder.java b/src/main/java/techreborn/client/container/ContainerIndustrialGrinder.java index 3ebb16a1e..4f16f4c14 100644 --- a/src/main/java/techreborn/client/container/ContainerIndustrialGrinder.java +++ b/src/main/java/techreborn/client/container/ContainerIndustrialGrinder.java @@ -59,7 +59,7 @@ public class ContainerIndustrialGrinder extends ContainerCrafting super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.connectionStatus != tile.connectionStatus) { icrafting.sendProgressBarUpdate(this, 10, tile.connectionStatus); diff --git a/src/main/java/techreborn/client/container/ContainerLESU.java b/src/main/java/techreborn/client/container/ContainerLESU.java index 1ef413928..71b19fe70 100644 --- a/src/main/java/techreborn/client/container/ContainerLESU.java +++ b/src/main/java/techreborn/client/container/ContainerLESU.java @@ -49,7 +49,7 @@ public class ContainerLESU extends RebornContainer { public void detectAndSendChanges() { super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.euOut != tile.getMaxOutput()) { icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput()); } diff --git a/src/main/java/techreborn/client/container/ContainerMFE.java b/src/main/java/techreborn/client/container/ContainerMFE.java index a7b5a1187..c05fbac48 100644 --- a/src/main/java/techreborn/client/container/ContainerMFE.java +++ b/src/main/java/techreborn/client/container/ContainerMFE.java @@ -76,7 +76,7 @@ public class ContainerMFE extends RebornContainer super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.energy != (int) tile.getEnergy()) { icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); diff --git a/src/main/java/techreborn/client/container/ContainerMFSU.java b/src/main/java/techreborn/client/container/ContainerMFSU.java index 9b3bed47b..409c7a52c 100644 --- a/src/main/java/techreborn/client/container/ContainerMFSU.java +++ b/src/main/java/techreborn/client/container/ContainerMFSU.java @@ -71,7 +71,7 @@ public class ContainerMFSU extends RebornContainer super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.energy != (int) tile.getEnergy()) { icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); diff --git a/src/main/java/techreborn/client/container/ContainerMatterFabricator.java b/src/main/java/techreborn/client/container/ContainerMatterFabricator.java index 930c50b22..d70820ba6 100644 --- a/src/main/java/techreborn/client/container/ContainerMatterFabricator.java +++ b/src/main/java/techreborn/client/container/ContainerMatterFabricator.java @@ -60,7 +60,7 @@ public class ContainerMatterFabricator extends RebornContainer super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.progressTime != tile.progresstime) { icrafting.sendProgressBarUpdate(this, 0, tile.progresstime); diff --git a/src/main/java/techreborn/client/container/ContainerRollingMachine.java b/src/main/java/techreborn/client/container/ContainerRollingMachine.java index 5159ac13b..802b9b491 100644 --- a/src/main/java/techreborn/client/container/ContainerRollingMachine.java +++ b/src/main/java/techreborn/client/container/ContainerRollingMachine.java @@ -81,7 +81,7 @@ public class ContainerRollingMachine extends RebornContainer { for (int i = 0; i < this.crafters.size(); i++) { - ICrafting crafting = (ICrafting) this.crafters.get(i); + ICrafting crafting = this.crafters.get(i); if (this.currentItemBurnTime != tile.runTime) { crafting.sendProgressBarUpdate(this, 0, tile.runTime); diff --git a/src/main/java/techreborn/client/container/ContainerVacuumFreezer.java b/src/main/java/techreborn/client/container/ContainerVacuumFreezer.java index 5a8df7c1a..03ee6be6f 100644 --- a/src/main/java/techreborn/client/container/ContainerVacuumFreezer.java +++ b/src/main/java/techreborn/client/container/ContainerVacuumFreezer.java @@ -54,7 +54,7 @@ public class ContainerVacuumFreezer extends ContainerCrafting super.detectAndSendChanges(); for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); + ICrafting icrafting = this.crafters.get(i); if (this.machineStatus != tile.multiBlockStatus) { icrafting.sendProgressBarUpdate(this, 3, tile.multiBlockStatus); diff --git a/src/main/java/techreborn/client/container/SlotScrapbox.java b/src/main/java/techreborn/client/container/SlotScrapbox.java index 82882b9a4..5fdbf5ad4 100644 --- a/src/main/java/techreborn/client/container/SlotScrapbox.java +++ b/src/main/java/techreborn/client/container/SlotScrapbox.java @@ -15,11 +15,7 @@ public class SlotScrapbox extends Slot public boolean isItemValid(ItemStack par1ItemStack) { - if (par1ItemStack.getItem() == ModItems.scrapBox) - { - return true; - } - return false; + return par1ItemStack.getItem() == ModItems.scrapBox; } public int getSlotStackLimit() diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index 708c8cfc4..354bc0b85 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -74,7 +74,7 @@ public class GuiIndustrialSawmill extends GuiContainer // } // } drawTexturedModalRect(k + 11, l + 19, 176, 86, 12, 47); - if (sawmill.getMutliBlock() != true) + if (!sawmill.getMutliBlock()) { GuiUtil.drawTooltipBox(k + 30, l + 50 + 12 - 0, 114, 10); this.fontRendererObj.drawString(I18n.translateToLocal("techreborn.message.missingmultiblock"), k + 38, diff --git a/src/main/java/techreborn/client/render/parts/RenderCablePart.java b/src/main/java/techreborn/client/render/parts/RenderCablePart.java index 20ab978ae..a18893a5e 100644 --- a/src/main/java/techreborn/client/render/parts/RenderCablePart.java +++ b/src/main/java/techreborn/client/render/parts/RenderCablePart.java @@ -63,7 +63,7 @@ public class RenderCablePart implements IBakedModel @Override public List getQuads(IBlockState blockState, EnumFacing side, long rand) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); BlockFaceUV uv = new BlockFaceUV(new float[] { 0.0F, 0.0F, 16.0F, 16.0F }, 0); BlockPartFace face = new BlockPartFace(null, 0, "", uv); double thickness = type.cableThickness; diff --git a/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java b/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java index 4b9cbd73a..a0d6e3738 100644 --- a/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java +++ b/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java @@ -113,7 +113,7 @@ public class CasingConnectedTextureGenerator extends TextureAtlasSprite { IResource typeResource = manager.getResource(getTypeResource(type)); type_image[0] = ImageIO.read(typeResource.getInputStream()); - animation = (AnimationMetadataSection) typeResource.getMetadata("animation"); + animation = typeResource.getMetadata("animation"); IResource edgeResource = manager.getResource(getTypeResource(type + "_edge")); edge_image[0] = ImageIO.read(edgeResource.getInputStream()); diff --git a/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java b/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java index a765b2637..2df449c8b 100644 --- a/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java +++ b/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java @@ -118,7 +118,7 @@ public class LesuConnectedTextureGenerator extends TextureAtlasSprite { IResource typeResource = manager.getResource(getLapisResource()); type_image[0] = ImageIO.read(typeResource.getInputStream()); - animation = (AnimationMetadataSection) typeResource.getMetadata("animation"); + animation = typeResource.getMetadata("animation"); IResource edgeResource = manager.getResource(getTypeResource("lesu_block")); edge_image[0] = ImageIO.read(edgeResource.getInputStream()); diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index 58ed14fde..1f9b76058 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -18,7 +18,7 @@ public class CompatManager public static boolean isIC2ClassicLoaded = false; public static boolean isClassicEnet = false; public static boolean isGregTechLoaded = false; - public ArrayList compatModules = new ArrayList(); + public ArrayList compatModules = new ArrayList<>(); public CompatManager() { @@ -87,7 +87,7 @@ public class CompatManager } else if (obj instanceof Boolean) { Boolean boo = (Boolean) obj; - if (boo == false) + if (!boo) { } return; @@ -95,7 +95,7 @@ public class CompatManager } try { - compatModules.add((ICompatModule) moduleClass.newInstance()); + compatModules.add(moduleClass.newInstance()); } catch (InstantiationException e) { e.printStackTrace(); diff --git a/src/main/java/techreborn/config/TechRebornConfigGui.java b/src/main/java/techreborn/config/TechRebornConfigGui.java index aa1916a58..ed0898965 100644 --- a/src/main/java/techreborn/config/TechRebornConfigGui.java +++ b/src/main/java/techreborn/config/TechRebornConfigGui.java @@ -23,7 +23,7 @@ public class TechRebornConfigGui extends GuiConfig private static List getConfigCategories() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add( new DummyConfigElement.DummyCategoryElement(I18n.translateToLocal("config.techreborn.category.general"), "tr.configgui.category.trGeneral", TRGeneral.class)); diff --git a/src/main/java/techreborn/events/OreUnifier.java b/src/main/java/techreborn/events/OreUnifier.java index 8ed3a06be..bd649f8db 100644 --- a/src/main/java/techreborn/events/OreUnifier.java +++ b/src/main/java/techreborn/events/OreUnifier.java @@ -15,7 +15,7 @@ import java.util.HashMap; public class OreUnifier { - public static HashMap oreHash = new HashMap(); + public static HashMap oreHash = new HashMap<>(); public static void registerOre(String name, ItemStack ore) { diff --git a/src/main/java/techreborn/init/ModParts.java b/src/main/java/techreborn/init/ModParts.java index 9db7e5f3f..662abcc6a 100644 --- a/src/main/java/techreborn/init/ModParts.java +++ b/src/main/java/techreborn/init/ModParts.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; public class ModParts { - public static HashMap stackCable = new HashMap(); + public static HashMap stackCable = new HashMap<>(); public static void init() { // TODO 1.8 diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 35fb2ec52..5e47fdea7 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -2,7 +2,6 @@ package techreborn.init; import java.security.InvalidParameterException; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils; import net.minecraft.block.Block; diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index 741f9f9bb..23b894c2d 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -66,11 +66,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITex public boolean canHarvestBlock(IBlockState state) { // TODO needs // FIXME: 13/03/2016 - if (OreDictUtils.isOre(state, "stone") && PoweredItem.canUseEnergy(cost, null)) - { - return true; - } - return false; + return OreDictUtils.isOre(state, "stone") && PoweredItem.canUseEnergy(cost, null); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 31b3f11df..72cdd5dfe 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -75,11 +75,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITextur public boolean isItemActive(ItemStack stack) { - if (!ItemNBTHelper.verifyExistance(stack, "isActive")) - { - return true; - } else - return false; + return !ItemNBTHelper.verifyExistance(stack, "isActive"); } // @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/items/tools/ItemTreeTap.java b/src/main/java/techreborn/items/tools/ItemTreeTap.java index fed3c3a0e..9c18a71fb 100644 --- a/src/main/java/techreborn/items/tools/ItemTreeTap.java +++ b/src/main/java/techreborn/items/tools/ItemTreeTap.java @@ -26,11 +26,7 @@ public class ItemTreeTap extends Item implements ITexturedItem @Override public boolean showDurabilityBar(ItemStack stack) { - if (stack.getMetadata() != 0) - { - return true; - } - return false; + return stack.getMetadata() != 0; } @Override diff --git a/src/main/java/techreborn/items/tools/ItemWrench.java b/src/main/java/techreborn/items/tools/ItemWrench.java index cdad59640..77b60f21f 100644 --- a/src/main/java/techreborn/items/tools/ItemWrench.java +++ b/src/main/java/techreborn/items/tools/ItemWrench.java @@ -101,7 +101,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem { if (player.isSneaking()) { - List items = new ArrayList(); + List items = new ArrayList<>(); if (tile instanceof IInventory) { IInventory inventory = (IInventory) tile; diff --git a/src/main/java/techreborn/lib/Key.java b/src/main/java/techreborn/lib/Key.java index b3ee569e7..96dbb9f02 100644 --- a/src/main/java/techreborn/lib/Key.java +++ b/src/main/java/techreborn/lib/Key.java @@ -3,5 +3,5 @@ package techreborn.lib; public enum Key { - UNKNOWN, CONFIG; + UNKNOWN, CONFIG } diff --git a/src/main/java/techreborn/manual/pages/CraftingInfoPage.java b/src/main/java/techreborn/manual/pages/CraftingInfoPage.java index ab53aa3ce..006d4cd1f 100644 --- a/src/main/java/techreborn/manual/pages/CraftingInfoPage.java +++ b/src/main/java/techreborn/manual/pages/CraftingInfoPage.java @@ -175,7 +175,7 @@ public class CraftingInfoPage extends TitledPage { if (formattedDescription == null) { - formattedDescription = new ArrayList(); + formattedDescription = new ArrayList<>(); if (Strings.isNullOrEmpty(rawDescription)) { @@ -265,7 +265,7 @@ public class CraftingInfoPage extends TitledPage private ItemStack[] getFirstRecipeForItem(ItemStack resultingItem) { ItemStack[] recipeItems = new ItemStack[9]; - for (IRecipe recipe : (List) CraftingManager.getInstance().getRecipeList()) + for (IRecipe recipe : CraftingManager.getInstance().getRecipeList()) { if (recipe == null) continue; diff --git a/src/main/java/techreborn/manual/pages/DescriptionPage.java b/src/main/java/techreborn/manual/pages/DescriptionPage.java index 6683e3980..d1b0b72ec 100644 --- a/src/main/java/techreborn/manual/pages/DescriptionPage.java +++ b/src/main/java/techreborn/manual/pages/DescriptionPage.java @@ -96,7 +96,7 @@ public class DescriptionPage extends TitledPage { if (formattedDescription == null) { - formattedDescription = new ArrayList(); + formattedDescription = new ArrayList<>(); if (Strings.isNullOrEmpty(rawDescription)) { diff --git a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java index 93fc43488..1cf10f184 100644 --- a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java +++ b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java @@ -1,7 +1,6 @@ package techreborn.multiblocks; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/techreborn/parts/CableMultipart.java b/src/main/java/techreborn/parts/CableMultipart.java index 027abf136..244e47f5f 100644 --- a/src/main/java/techreborn/parts/CableMultipart.java +++ b/src/main/java/techreborn/parts/CableMultipart.java @@ -239,10 +239,7 @@ public abstract class CableMultipart extends Multipart CableMultipart cableMultipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir.getOpposite()); - if (cableMultipart != null && cableMultipart.getCableType() == getCableType()) { - return true; - } - return false; + return cableMultipart != null && cableMultipart.getCableType() == getCableType(); } public TileEntity getNeighbourTile(EnumFacing side) { diff --git a/src/main/java/techreborn/tiles/TileAesu.java b/src/main/java/techreborn/tiles/TileAesu.java index d1bfabf11..80d91176c 100644 --- a/src/main/java/techreborn/tiles/TileAesu.java +++ b/src/main/java/techreborn/tiles/TileAesu.java @@ -64,11 +64,7 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileAlloyFurnace.java b/src/main/java/techreborn/tiles/TileAlloyFurnace.java index 9340a43d3..41be31d18 100644 --- a/src/main/java/techreborn/tiles/TileAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/TileAlloyFurnace.java @@ -303,11 +303,7 @@ public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, II @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileAlloySmelter.java b/src/main/java/techreborn/tiles/TileAlloySmelter.java index c229288a4..8c3b131be 100644 --- a/src/main/java/techreborn/tiles/TileAlloySmelter.java +++ b/src/main/java/techreborn/tiles/TileAlloySmelter.java @@ -62,11 +62,7 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable, @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/TileAssemblingMachine.java index 875f4257f..1977ff5c5 100644 --- a/src/main/java/techreborn/tiles/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/TileAssemblingMachine.java @@ -57,11 +57,7 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileBlastFurnace.java b/src/main/java/techreborn/tiles/TileBlastFurnace.java index 5d25ca4e7..4dcb488ea 100644 --- a/src/main/java/techreborn/tiles/TileBlastFurnace.java +++ b/src/main/java/techreborn/tiles/TileBlastFurnace.java @@ -71,11 +71,7 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileCentrifuge.java b/src/main/java/techreborn/tiles/TileCentrifuge.java index 645dd0729..80a3b26b3 100644 --- a/src/main/java/techreborn/tiles/TileCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileCentrifuge.java @@ -82,11 +82,7 @@ public class TileCentrifuge extends TilePowerAcceptor @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileChargeBench.java b/src/main/java/techreborn/tiles/TileChargeBench.java index 7f03f7995..11d175291 100644 --- a/src/main/java/techreborn/tiles/TileChargeBench.java +++ b/src/main/java/techreborn/tiles/TileChargeBench.java @@ -65,11 +65,7 @@ public class TileChargeBench extends TilePowerAcceptor implements IWrenchable, I @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileChemicalReactor.java b/src/main/java/techreborn/tiles/TileChemicalReactor.java index c2a634da7..e02e65ff7 100644 --- a/src/main/java/techreborn/tiles/TileChemicalReactor.java +++ b/src/main/java/techreborn/tiles/TileChemicalReactor.java @@ -57,11 +57,7 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileChunkLoader.java b/src/main/java/techreborn/tiles/TileChunkLoader.java index dab3d8afe..63e9f5aec 100644 --- a/src/main/java/techreborn/tiles/TileChunkLoader.java +++ b/src/main/java/techreborn/tiles/TileChunkLoader.java @@ -41,11 +41,7 @@ public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, I @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileDigitalChest.java b/src/main/java/techreborn/tiles/TileDigitalChest.java index b43d25fab..fd5e23df1 100644 --- a/src/main/java/techreborn/tiles/TileDigitalChest.java +++ b/src/main/java/techreborn/tiles/TileDigitalChest.java @@ -209,11 +209,7 @@ public class TileDigitalChest extends TileMachineBase implements IInventory, IWr @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/TileImplosionCompressor.java index f53b4cc35..72d20984e 100644 --- a/src/main/java/techreborn/tiles/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/TileImplosionCompressor.java @@ -54,11 +54,7 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java index bc0349eb0..b8dcba2b1 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java @@ -60,11 +60,7 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/TileIndustrialGrinder.java index 752e7ae75..cde29dc09 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/TileIndustrialGrinder.java @@ -19,7 +19,6 @@ import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; import reborncore.common.util.Tank; -import techreborn.api.recipe.BaseRecipe; import techreborn.api.recipe.ITileRecipeHandler; import techreborn.api.recipe.machines.IndustrialGrinderRecipe; import techreborn.utils.RecipeCrafter; @@ -71,11 +70,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override @@ -195,11 +190,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor @Override public boolean canFill(EnumFacing from, Fluid fluid) { - if (fluid == FluidRegistry.WATER || fluid == ModFluids.fluidMercury || fluid == ModFluids.fluidSodiumpersulfate) - { - return true; - } - return false; + return fluid == FluidRegistry.WATER || fluid == ModFluids.fluidMercury || fluid == ModFluids.fluidSodiumpersulfate; } @Override diff --git a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java index b5a54f1e4..72c473db6 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java @@ -110,11 +110,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override @@ -189,11 +185,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor @Override public boolean canFill(EnumFacing from, Fluid fluid) { - if (fluid == FluidRegistry.WATER) - { - return true; - } - return false; + return fluid == FluidRegistry.WATER; } @Override diff --git a/src/main/java/techreborn/tiles/TileIronFurnace.java b/src/main/java/techreborn/tiles/TileIronFurnace.java index 02d534076..34ef4b1ac 100644 --- a/src/main/java/techreborn/tiles/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/TileIronFurnace.java @@ -119,7 +119,7 @@ public class TileIronFurnace extends TileMachineBase implements IInventory } if (fuel <= 0 && canSmelt()) { - fuel = fuelGague = (int) (getItemBurnTime(getStackInSlot(fuelslot))); + fuel = fuelGague = getItemBurnTime(getStackInSlot(fuelslot)); if (fuel > 0) { if (getStackInSlot(fuelslot).getItem().hasContainerItem()) // Fuel diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 5d65fe58c..3f2988808 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -1,6 +1,5 @@ package techreborn.tiles; -import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -46,11 +45,7 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/TileQuantumChest.java index 4eeb55167..df2f6e269 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/TileQuantumChest.java @@ -265,11 +265,7 @@ public class TileQuantumChest extends TileMachineBase @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index 9429ab2ef..0ebc2909f 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -254,11 +254,7 @@ public class TileQuantumTank extends TileMachineBase @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileRollingMachine.java b/src/main/java/techreborn/tiles/TileRollingMachine.java index d7ce68eeb..c94b9e1c2 100644 --- a/src/main/java/techreborn/tiles/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/TileRollingMachine.java @@ -141,11 +141,7 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable public boolean canMake() { - if (RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, worldObj) == null) - { - return false; - } - return true; + return RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, worldObj) != null; } @Override @@ -163,11 +159,7 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileScrapboxinator.java b/src/main/java/techreborn/tiles/TileScrapboxinator.java index 65d1ea971..f7dc7a0b5 100644 --- a/src/main/java/techreborn/tiles/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/TileScrapboxinator.java @@ -106,11 +106,7 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable public boolean canOpen() { - if (getStackInSlot(input1) != null && getStackInSlot(output) == null) - { - return true; - } - return false; + return getStackInSlot(input1) != null && getStackInSlot(output) == null; } public boolean isBurning() @@ -144,11 +140,7 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/TileVacuumFreezer.java index 65957b295..1f8c240b0 100644 --- a/src/main/java/techreborn/tiles/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/TileVacuumFreezer.java @@ -102,11 +102,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable, @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java index 27c38a059..69d944ae8 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java @@ -45,21 +45,13 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn @Override public boolean canAcceptEnergy(EnumFacing direction) { - if (direction == EnumFacing.DOWN || direction == EnumFacing.UP) - { - return false; - } - return true; + return !(direction == EnumFacing.DOWN || direction == EnumFacing.UP); } @Override public boolean canProvideEnergy(EnumFacing direction) { - if (direction == EnumFacing.DOWN || direction == EnumFacing.UP) - { - return true; - } - return false; + return direction == EnumFacing.DOWN || direction == EnumFacing.UP; } @Override @@ -272,8 +264,8 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn { if (reactorRecipe.getBottomInput() != null) { - if (ItemUtils.isItemEqual(getStackInSlot(bottomStackSlot), - reactorRecipe.getBottomInput(), true, true, true) == false) + if (!ItemUtils.isItemEqual(getStackInSlot(bottomStackSlot), + reactorRecipe.getBottomInput(), true, true, true)) { break; } @@ -376,8 +368,8 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn { if (currentRecipe.getBottomInput() != null) { - if (ItemUtils.isItemEqual(getStackInSlot(bottomStackSlot), currentRecipe.getBottomInput(), true, true, - true) == false) + if (!ItemUtils.isItemEqual(getStackInSlot(bottomStackSlot), currentRecipe.getBottomInput(), true, true, + true)) { return false; } diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index 974ab778b..14c4a8b37 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -51,11 +51,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java index 32abacb33..1477b2dc3 100644 --- a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java +++ b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java @@ -56,11 +56,7 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index 2fbff1db9..62b1c58c5 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -34,7 +34,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF public static final int euTick = 16; public Tank tank = new Tank("TileGasTurbine", FluidContainerRegistry.BUCKET_VOLUME * 10, this); public Inventory inventory = new Inventory(3, "TileGasTurbine", 64, this); - Map fluids = new HashMap(); + Map fluids = new HashMap<>(); // We use this to keep track of fractional millibuckets, allowing us to hit // our eu/bucket targets while still only ever removing integer millibucket @@ -65,11 +65,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileGenerator.java b/src/main/java/techreborn/tiles/generator/TileGenerator.java index 13dc9fe60..7926a032b 100644 --- a/src/main/java/techreborn/tiles/generator/TileGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileGenerator.java @@ -106,11 +106,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java index becbb9fd5..a9d816b89 100644 --- a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java @@ -68,11 +68,7 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java index 1804858b0..05ed224e4 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java @@ -34,7 +34,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench public static final int euTick = 8; public Tank tank = new Tank("TileSemifluidGenerator", FluidContainerRegistry.BUCKET_VOLUME * 10, this); public Inventory inventory = new Inventory(3, "TileSemifluidGenerator", 64, this); - Map fluids = new HashMap(); + Map fluids = new HashMap<>(); // We use this to keep track of fractional millibuckets, allowing us to hit // our eu/bucket targets while still only ever removing integer millibucket @@ -71,11 +71,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index e207ea0f4..ce74f1e83 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -54,11 +54,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/idsu/IDSUManager.java b/src/main/java/techreborn/tiles/idsu/IDSUManager.java index 3b2b5d2da..0969ef0de 100644 --- a/src/main/java/techreborn/tiles/idsu/IDSUManager.java +++ b/src/main/java/techreborn/tiles/idsu/IDSUManager.java @@ -20,7 +20,7 @@ public class IDSUManager public static final String savename = "idsu.json"; public static IDSUManager INSTANCE; - public HashMap worldData = new HashMap(); + public HashMap worldData = new HashMap<>(); @SubscribeEvent(priority = EventPriority.HIGHEST) public void worldSave(WorldEvent.Save event) @@ -122,7 +122,7 @@ public class IDSUManager public class IDSUWorldSaveData { - public TreeMap idsuValues = new TreeMap(); + public TreeMap idsuValues = new TreeMap<>(); public World world; diff --git a/src/main/java/techreborn/tiles/lesu/LesuNetwork.java b/src/main/java/techreborn/tiles/lesu/LesuNetwork.java index 0efb0beb8..8454729b8 100644 --- a/src/main/java/techreborn/tiles/lesu/LesuNetwork.java +++ b/src/main/java/techreborn/tiles/lesu/LesuNetwork.java @@ -5,7 +5,7 @@ import java.util.ArrayList; public class LesuNetwork { - public ArrayList storages = new ArrayList(); + public ArrayList storages = new ArrayList<>(); public TileLesu master; @@ -37,7 +37,7 @@ public class LesuNetwork { if (network != this) { - ArrayList tileLesuStorages = new ArrayList(); + ArrayList tileLesuStorages = new ArrayList<>(); tileLesuStorages.addAll(network.storages); network.clear(false); for (TileLesuStorage lesuStorage : tileLesuStorages) diff --git a/src/main/java/techreborn/tiles/lesu/TileLesu.java b/src/main/java/techreborn/tiles/lesu/TileLesu.java index 8606a339b..3ad05c696 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesu.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesu.java @@ -14,7 +14,7 @@ public class TileLesu extends TilePowerAcceptor public int connectedBlocks = 0; public Inventory inventory = new Inventory(2, "TileAesu", 64, this); - private ArrayList countedNetworks = new ArrayList(); + private ArrayList countedNetworks = new ArrayList<>(); private double euLastTick = 0; private double euChange; private int ticks; diff --git a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java index e990844e2..d87040e74 100644 --- a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java +++ b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java @@ -53,11 +53,7 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override public void updateEntity() diff --git a/src/main/java/techreborn/tiles/teir1/TileCompressor.java b/src/main/java/techreborn/tiles/teir1/TileCompressor.java index f270e007a..0d6f3ab2e 100644 --- a/src/main/java/techreborn/tiles/teir1/TileCompressor.java +++ b/src/main/java/techreborn/tiles/teir1/TileCompressor.java @@ -56,11 +56,7 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java index a61bfecc0..ed6cddfd7 100644 --- a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java @@ -162,11 +162,7 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/teir1/TileExtractor.java b/src/main/java/techreborn/tiles/teir1/TileExtractor.java index 9074e8512..31bc0ace7 100644 --- a/src/main/java/techreborn/tiles/teir1/TileExtractor.java +++ b/src/main/java/techreborn/tiles/teir1/TileExtractor.java @@ -56,11 +56,7 @@ public class TileExtractor extends TilePowerAcceptor implements IWrenchable, IIn @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/teir1/TileGrinder.java b/src/main/java/techreborn/tiles/teir1/TileGrinder.java index 0c11bfee3..e26370fa9 100644 --- a/src/main/java/techreborn/tiles/teir1/TileGrinder.java +++ b/src/main/java/techreborn/tiles/teir1/TileGrinder.java @@ -59,11 +59,7 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IInve @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/teir1/TileRecycler.java b/src/main/java/techreborn/tiles/teir1/TileRecycler.java index 1554be8a9..2e33fb347 100644 --- a/src/main/java/techreborn/tiles/teir1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/teir1/TileRecycler.java @@ -113,11 +113,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv public boolean canRecycle() { - if (getStackInSlot(input1) != null && hasSlotGotSpace(input1)) - { - return true; - } - return false; + return getStackInSlot(input1) != null && hasSlotGotSpace(input1); } public boolean hasSlotGotSpace(int slot) @@ -163,11 +159,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override diff --git a/src/main/java/techreborn/tiles/transformers/TileTransformer.java b/src/main/java/techreborn/tiles/transformers/TileTransformer.java index b7de03457..ea57fb9b7 100644 --- a/src/main/java/techreborn/tiles/transformers/TileTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileTransformer.java @@ -46,11 +46,7 @@ public class TileTransformer extends TilePowerAcceptor implements IWrenchable, I @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - if (entityPlayer.isSneaking()) - { - return true; - } - return false; + return entityPlayer.isSneaking(); } @Override public float getWrenchDropRate() diff --git a/src/main/java/techreborn/utils/RecipeCrafter.java b/src/main/java/techreborn/utils/RecipeCrafter.java index 9f07ca842..2d4bfef23 100644 --- a/src/main/java/techreborn/utils/RecipeCrafter.java +++ b/src/main/java/techreborn/utils/RecipeCrafter.java @@ -174,7 +174,7 @@ public class RecipeCrafter canGiveInvAll = false; } } - ArrayList filledSlots = new ArrayList();// The + ArrayList filledSlots = new ArrayList<>();// The // slots // that // have diff --git a/src/main/java/techreborn/utils/upgrade/UpgradeHandler.java b/src/main/java/techreborn/utils/upgrade/UpgradeHandler.java index 1fc31510e..08cbe38c2 100644 --- a/src/main/java/techreborn/utils/upgrade/UpgradeHandler.java +++ b/src/main/java/techreborn/utils/upgrade/UpgradeHandler.java @@ -12,7 +12,7 @@ public class UpgradeHandler { Inventory inventory; - ArrayList slots = new ArrayList(); + ArrayList slots = new ArrayList<>(); public UpgradeHandler(RecipeCrafter crafter, Inventory inventory, int... slots) { this.crafter = crafter; diff --git a/src/main/java/techreborn/world/TechRebornRetroGen.java b/src/main/java/techreborn/world/TechRebornRetroGen.java index 5ecdca5ff..9d9530049 100644 --- a/src/main/java/techreborn/world/TechRebornRetroGen.java +++ b/src/main/java/techreborn/world/TechRebornRetroGen.java @@ -22,7 +22,7 @@ public class TechRebornRetroGen { private static final String RETROGEN_TAG = "techrebonr:retogen"; private static final Set completedChunks = Sets.newHashSet(); - private final Deque chunksToRetroGen = new ArrayDeque(64); + private final Deque chunksToRetroGen = new ArrayDeque<>(64); private boolean isChunkEligibleForRetroGen(ChunkDataEvent.Load event) {