diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index be508f8c2..25793a3ec 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -219,7 +219,7 @@ public class Core { } @SubscribeEvent - public void LoadPackets(RegisterPacketEvent event){ + public void LoadPackets(RegisterPacketEvent event) { event.registerPacket(PacketSyncSideConfig.class, Side.SERVER); event.registerPacket(PacketAesu.class, Side.SERVER); event.registerPacket(PacketIdsu.class, Side.SERVER); diff --git a/src/main/java/techreborn/api/RollingMachineRecipe.java b/src/main/java/techreborn/api/RollingMachineRecipe.java index 680752036..8920ac331 100644 --- a/src/main/java/techreborn/api/RollingMachineRecipe.java +++ b/src/main/java/techreborn/api/RollingMachineRecipe.java @@ -35,14 +35,9 @@ import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; -import org.apache.commons.lang3.Validate; import reborncore.common.util.CraftingHelper; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; public class RollingMachineRecipe { @@ -50,21 +45,21 @@ public class RollingMachineRecipe { private final HashMap recipes = new HashMap<>(); public void addShapedOreRecipe(ResourceLocation resourceLocation, ItemStack outputItemStack, Object... objectInputs) { -// Validate.notNull(outputItemStack); -// Validate.notNull(outputItemStack.getItem()); -// if (objectInputs.length == 0) { -// Validate.notNull(null); //Quick way to crash -// } -// recipes.put(resourceLocation, new ShapedOreRecipe(resourceLocation, outputItemStack, objectInputs)); + // Validate.notNull(outputItemStack); + // Validate.notNull(outputItemStack.getItem()); + // if (objectInputs.length == 0) { + // Validate.notNull(null); //Quick way to crash + // } + // recipes.put(resourceLocation, new ShapedOreRecipe(resourceLocation, outputItemStack, objectInputs)); } public void addShapelessOreRecipe(ResourceLocation resourceLocation, ItemStack outputItemStack, Object... objectInputs) { -// Validate.notNull(outputItemStack); -// Validate.notNull(outputItemStack.getItem()); -// if (objectInputs.length == 0) { -// Validate.notNull(null); //Quick way to crash -// } -// recipes.put(resourceLocation, new ShapelessOreRecipe(resourceLocation, outputItemStack, objectInputs)); + // Validate.notNull(outputItemStack); + // Validate.notNull(outputItemStack.getItem()); + // if (objectInputs.length == 0) { + // Validate.notNull(null); //Quick way to crash + // } + // recipes.put(resourceLocation, new ShapelessOreRecipe(resourceLocation, outputItemStack, objectInputs)); } public void addRecipe(ResourceLocation resourceLocation, ItemStack output, Object... components) { @@ -115,7 +110,7 @@ public class RollingMachineRecipe { recipes.put(resourceLocation, new ShapedRecipes("", j, k, recipeArray, output)); } - public void addShapelessRecipe(ResourceLocation resourceLocation,ItemStack output, Object... components) { + public void addShapelessRecipe(ResourceLocation resourceLocation, ItemStack output, Object... components) { NonNullList ingredients = NonNullList.create(); for (int j = 0; j < components.length; j++) { ingredients.add(CraftingHelper.toIngredient(components[j])); diff --git a/src/main/java/techreborn/api/TechRebornAPI.java b/src/main/java/techreborn/api/TechRebornAPI.java index 82cefd45a..75475ad08 100644 --- a/src/main/java/techreborn/api/TechRebornAPI.java +++ b/src/main/java/techreborn/api/TechRebornAPI.java @@ -44,15 +44,15 @@ public final class TechRebornAPI { } public static void addShapelessOreRollingMachinceRecipe(ResourceLocation resourceLocation, ItemStack output, Object... components) { - RollingMachineRecipe.instance.addShapelessOreRecipe(resourceLocation,output, components); + RollingMachineRecipe.instance.addShapelessOreRecipe(resourceLocation, output, components); } public static void addRollingMachinceRecipe(ResourceLocation resourceLocation, ItemStack output, Object... components) { - RollingMachineRecipe.instance.addRecipe(resourceLocation,output, components); + RollingMachineRecipe.instance.addRecipe(resourceLocation, output, components); } public static void addShapelessRollingMachinceRecipe(ResourceLocation resourceLocation, ItemStack output, Object... components) { - RollingMachineRecipe.instance.addShapelessRecipe(resourceLocation,output, components); + RollingMachineRecipe.instance.addShapelessRecipe(resourceLocation, output, components); } /** diff --git a/src/main/java/techreborn/api/generator/EFluidGenerator.java b/src/main/java/techreborn/api/generator/EFluidGenerator.java index e5742dc11..33ce46fe5 100644 --- a/src/main/java/techreborn/api/generator/EFluidGenerator.java +++ b/src/main/java/techreborn/api/generator/EFluidGenerator.java @@ -28,12 +28,14 @@ import javax.annotation.Nonnull; public enum EFluidGenerator { THERMAL("TechReborn.ThermalGenerator"), GAS("TechReborn.GasGenerator"), DIESEL( - "TechReborn.DieselGenerator"), SEMIFLUID("TechReborn.SemifluidGenerator"); + "TechReborn.DieselGenerator"), SEMIFLUID("TechReborn.SemifluidGenerator"); @Nonnull private final String recipeID; - private EFluidGenerator(@Nonnull String recipeID) { + private EFluidGenerator( + @Nonnull + String recipeID) { this.recipeID = recipeID; } diff --git a/src/main/java/techreborn/api/generator/FluidGeneratorRecipe.java b/src/main/java/techreborn/api/generator/FluidGeneratorRecipe.java index fde596e89..2f23e5ec2 100644 --- a/src/main/java/techreborn/api/generator/FluidGeneratorRecipe.java +++ b/src/main/java/techreborn/api/generator/FluidGeneratorRecipe.java @@ -30,9 +30,8 @@ public class FluidGeneratorRecipe { private final EFluidGenerator generatorType; private final Fluid fluid; private final int energyPerMb; - - public FluidGeneratorRecipe(Fluid fluid, int energyPerMb, EFluidGenerator generatorType) - { + + public FluidGeneratorRecipe(Fluid fluid, int energyPerMb, EFluidGenerator generatorType) { this.fluid = fluid; this.energyPerMb = energyPerMb; this.generatorType = generatorType; @@ -41,6 +40,7 @@ public class FluidGeneratorRecipe { public Fluid getFluid() { return fluid; } + public int getEnergyPerMb() { return energyPerMb; } @@ -52,7 +52,7 @@ public class FluidGeneratorRecipe { @Override public String toString() { return "FluidGeneratorRecipe [generatorType=" + generatorType + ", fluid=" + fluid + ", energyPerMb=" - + energyPerMb + "]"; + + energyPerMb + "]"; } @Override diff --git a/src/main/java/techreborn/api/generator/FluidGeneratorRecipeList.java b/src/main/java/techreborn/api/generator/FluidGeneratorRecipeList.java index 8f7d9ef13..831043eec 100644 --- a/src/main/java/techreborn/api/generator/FluidGeneratorRecipeList.java +++ b/src/main/java/techreborn/api/generator/FluidGeneratorRecipeList.java @@ -25,33 +25,29 @@ package techreborn.api.generator; import com.google.common.collect.Sets; +import net.minecraftforge.fluids.Fluid; import java.util.HashSet; import java.util.Optional; -import net.minecraftforge.fluids.Fluid; - public class FluidGeneratorRecipeList { private HashSet recipes; - - public FluidGeneratorRecipeList(FluidGeneratorRecipe... recipes) - { + + public FluidGeneratorRecipeList(FluidGeneratorRecipe... recipes) { this.recipes = Sets.newHashSet(recipes); } - + public boolean addRecipe(FluidGeneratorRecipe fluidGeneratorRecipe) { - if(!this.getRecipeForFluid(fluidGeneratorRecipe.getFluid()).isPresent()) + if (!this.getRecipeForFluid(fluidGeneratorRecipe.getFluid()).isPresent()) return this.getRecipes().add(fluidGeneratorRecipe); return false; } - - public boolean removeRecipe(FluidGeneratorRecipe fluidGeneratorRecipe) - { + + public boolean removeRecipe(FluidGeneratorRecipe fluidGeneratorRecipe) { return this.getRecipes().remove(fluidGeneratorRecipe); } - - public Optional getRecipeForFluid(Fluid fluid) - { + + public Optional getRecipeForFluid(Fluid fluid) { return this.recipes.stream().filter(recipe -> recipe.getFluid().equals(fluid)).findAny(); } diff --git a/src/main/java/techreborn/api/generator/GeneratorRecipeHelper.java b/src/main/java/techreborn/api/generator/GeneratorRecipeHelper.java index 9482436ea..991d2ea77 100644 --- a/src/main/java/techreborn/api/generator/GeneratorRecipeHelper.java +++ b/src/main/java/techreborn/api/generator/GeneratorRecipeHelper.java @@ -24,10 +24,10 @@ package techreborn.api.generator; -import java.util.EnumMap; - import net.minecraftforge.fluids.Fluid; +import java.util.EnumMap; + public class GeneratorRecipeHelper { /** @@ -36,19 +36,17 @@ public class GeneratorRecipeHelper { * FluidGeneratorRecipe. */ public static EnumMap fluidRecipes = new EnumMap<>( - EFluidGenerator.class); + EFluidGenerator.class); /** * Register a Fluid energy recipe. - * - * @param generatorType - * A value of the EFluidGenerator type in which the fluid is - * allowed to be consumed. + * + * @param generatorType A value of the EFluidGenerator type in which the fluid is + * allowed to be consumed. * @param fluidType - * @param energyPerMb - * Represent the energy / MILLI_BUCKET the fluid will produce. - * Some generators use this value to alter their fluid decay - * speed to match their maximum energy output. + * @param energyPerMb Represent the energy / MILLI_BUCKET the fluid will produce. + * Some generators use this value to alter their fluid decay + * speed to match their maximum energy output. */ public static void registerFluidRecipe(EFluidGenerator generatorType, Fluid fluidType, int energyPerMb) { fluidRecipes.putIfAbsent(generatorType, new FluidGeneratorRecipeList()); @@ -56,12 +54,10 @@ public class GeneratorRecipeHelper { } /** - * - * @param generatorType - * A value of the EFluidGenerator type in which the fluid is - * allowed to be consumed. + * @param generatorType A value of the EFluidGenerator type in which the fluid is + * allowed to be consumed. * @return An object holding a set of availables recipes for this type of - * FluidGenerator. + * FluidGenerator. */ public static FluidGeneratorRecipeList getFluidRecipesForGenerator(EFluidGenerator generatorType) { return fluidRecipes.get(generatorType); diff --git a/src/main/java/techreborn/api/recipe/BaseRecipe.java b/src/main/java/techreborn/api/recipe/BaseRecipe.java index 79533719a..3ab45b16d 100644 --- a/src/main/java/techreborn/api/recipe/BaseRecipe.java +++ b/src/main/java/techreborn/api/recipe/BaseRecipe.java @@ -130,12 +130,12 @@ public abstract class BaseRecipe implements IBaseRecipeType, Cloneable { if (inuput == null) { throw new InvalidParameterException("input is invalid!"); } - if(inuput instanceof ItemStack){ - if(((ItemStack) inuput).isEmpty()){ + if (inuput instanceof ItemStack) { + if (((ItemStack) inuput).isEmpty()) { throw new InvalidParameterException("input is invalid!"); } } - if(RecipeTranslator.getStackFromObject(inuput) == null){ + if (RecipeTranslator.getStackFromObject(inuput) == null) { throw new InvalidParameterException("Could not determin recipe input for " + inuput); } inputs.add(inuput); diff --git a/src/main/java/techreborn/blocks/BlockComputerCube.java b/src/main/java/techreborn/blocks/BlockComputerCube.java index 7e5b58e7f..0a2679341 100644 --- a/src/main/java/techreborn/blocks/BlockComputerCube.java +++ b/src/main/java/techreborn/blocks/BlockComputerCube.java @@ -27,10 +27,8 @@ package techreborn.blocks; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -47,7 +45,7 @@ public class BlockComputerCube extends BlockMachineBase implements IAdvancedRota @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.MANUAL.ordinal(), world, x, y, z); return true; @@ -73,4 +71,4 @@ public class BlockComputerCube extends BlockMachineBase implements IAdvancedRota return this.prefix + "computer_cube"; } -} \ No newline at end of file +} diff --git a/src/main/java/techreborn/blocks/BlockDigitalChest.java b/src/main/java/techreborn/blocks/BlockDigitalChest.java index 07d0a97f1..da02b7ac5 100644 --- a/src/main/java/techreborn/blocks/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/BlockDigitalChest.java @@ -34,10 +34,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidBase; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -83,8 +81,8 @@ public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRota if (itemStack != ItemStack.EMPTY && itemStack.getCount() > 0) { if (itemStack.getItem() instanceof ItemBlock) { if (((ItemBlock) itemStack.getItem()).block instanceof BlockFluidBase - || ((ItemBlock) itemStack.getItem()).block instanceof BlockStaticLiquid - || ((ItemBlock) itemStack.getItem()).block instanceof BlockDynamicLiquid) { + || ((ItemBlock) itemStack.getItem()).block instanceof BlockStaticLiquid + || ((ItemBlock) itemStack.getItem()).block instanceof BlockDynamicLiquid) { continue; } } @@ -100,7 +98,7 @@ public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRota final float dZ = rand.nextFloat() * 0.8F + 0.1F; final EntityItem entityItem = new EntityItem(world, pos.getX() + dX, pos.getY() + dY, pos.getZ() + dZ, - itemStack.copy()); + itemStack.copy()); if (itemStack.hasTagCompound()) { entityItem.getEntityItem().setTagCompound(itemStack.getTagCompound().copy()); @@ -122,7 +120,7 @@ public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRota @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.DIGITAL_CHEST.ordinal(), world, x, y, z); return true; diff --git a/src/main/java/techreborn/blocks/BlockFlare.java b/src/main/java/techreborn/blocks/BlockFlare.java index c537758b6..6da72bce1 100644 --- a/src/main/java/techreborn/blocks/BlockFlare.java +++ b/src/main/java/techreborn/blocks/BlockFlare.java @@ -25,7 +25,6 @@ package techreborn.blocks; import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; diff --git a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java index 074eb9bed..6a96dbafe 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java @@ -30,10 +30,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -52,9 +50,9 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { final TileEntityFusionController tileEntityFusionController = (TileEntityFusionController) world - .getTileEntity(new BlockPos(x, y, z)); + .getTileEntity(new BlockPos(x, y, z)); tileEntityFusionController.checkCoils(); if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.FUSION_CONTROLLER.ordinal(), world, x, y, z); @@ -66,7 +64,7 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv super.onEntityWalk(worldIn, pos, entityIn); if (worldIn.getTileEntity(pos) instanceof TileEntityFusionController) { if (((TileEntityFusionController) worldIn.getTileEntity(pos)).crafingTickTime != 0 - && ((TileEntityFusionController) worldIn.getTileEntity(pos)).checkCoils()) { + && ((TileEntityFusionController) worldIn.getTileEntity(pos)).checkCoils()) { entityIn.attackEntityFrom(new FusionDamageSource(), 200F); } } diff --git a/src/main/java/techreborn/blocks/BlockMachineFrame.java b/src/main/java/techreborn/blocks/BlockMachineFrame.java index 484393710..86632d89e 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrame.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrame.java @@ -30,7 +30,6 @@ import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/techreborn/blocks/BlockOre2.java b/src/main/java/techreborn/blocks/BlockOre2.java index 70fd54071..3b7e5b00f 100644 --- a/src/main/java/techreborn/blocks/BlockOre2.java +++ b/src/main/java/techreborn/blocks/BlockOre2.java @@ -31,7 +31,6 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index 9ad91f3c2..4d9b02e78 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -37,10 +37,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidBase; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -87,8 +85,8 @@ public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRota if (itemStack != ItemStack.EMPTY && itemStack.getCount() > 0) { if (itemStack.getItem() instanceof ItemBlock) { if (((ItemBlock) itemStack.getItem()).block instanceof BlockFluidBase - || ((ItemBlock) itemStack.getItem()).block instanceof BlockStaticLiquid - || ((ItemBlock) itemStack.getItem()).block instanceof BlockDynamicLiquid) { + || ((ItemBlock) itemStack.getItem()).block instanceof BlockStaticLiquid + || ((ItemBlock) itemStack.getItem()).block instanceof BlockDynamicLiquid) { continue; } } @@ -104,7 +102,7 @@ public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRota final float dZ = rand.nextFloat() * 0.8F + 0.1F; final EntityItem entityItem = new EntityItem(world, pos.getX() + dX, pos.getY() + dY, pos.getZ() + dZ, - itemStack.copy()); + itemStack.copy()); if (itemStack.hasTagCompound()) { entityItem.getEntityItem().setTagCompound(itemStack.getTagCompound().copy()); @@ -126,7 +124,7 @@ public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRota @Override public boolean onBlockActivated(final World worldIn, final BlockPos pos, final IBlockState state, final EntityPlayer playerIn, - final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ) { + final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ) { if (!playerIn.isSneaking()) playerIn.openGui(Core.INSTANCE, EGui.QUANTUM_CHEST.ordinal(), worldIn, pos.getX(), pos.getY(), pos.getZ()); return true; diff --git a/src/main/java/techreborn/blocks/BlockQuantumTank.java b/src/main/java/techreborn/blocks/BlockQuantumTank.java index 10a4c2620..cf0a299bb 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/BlockQuantumTank.java @@ -28,10 +28,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -55,7 +53,7 @@ public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotat @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (this.fillBlockWithFluid(world, new BlockPos(x, y, z), player)) { return true; } diff --git a/src/main/java/techreborn/blocks/BlockRubberSapling.java b/src/main/java/techreborn/blocks/BlockRubberSapling.java index 147cf6166..b1bfd3e99 100644 --- a/src/main/java/techreborn/blocks/BlockRubberSapling.java +++ b/src/main/java/techreborn/blocks/BlockRubberSapling.java @@ -28,7 +28,6 @@ import net.minecraft.block.BlockSapling; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockBlastFurnace.java b/src/main/java/techreborn/blocks/advanced_machine/BlockBlastFurnace.java index b132af38d..97d4a9d0f 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockBlastFurnace.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockBlastFurnace.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockBlastFurnace extends BlockMachineBase implements IRotationText @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.BLAST_FURNACE.ordinal(), world, x, y, z); return true; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockCentrifuge.java b/src/main/java/techreborn/blocks/advanced_machine/BlockCentrifuge.java index 4fceb3562..fea7356c6 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockCentrifuge.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockCentrifuge.java @@ -27,10 +27,8 @@ package techreborn.blocks.advanced_machine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -53,7 +51,7 @@ public class BlockCentrifuge extends BlockMachineBase implements IRotationTextur @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) { player.openGui(Core.INSTANCE, EGui.CENTRIFUGE.ordinal(), world, x, y, z); } diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java index f7f738a05..899c88f77 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockImplosionCompressor extends BlockMachineBase implements IRotat @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.IMPLOSION_COMPRESSOR.ordinal(), world, x, y, z); return true; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java index c90b79af4..4e3ac2a44 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase implements IRo @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.INDUSTRIAL_ELECTROLYZER.ordinal(), world, x, y, z); return true; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java index 41d7f4708..c07806189 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java @@ -29,10 +29,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -55,7 +53,7 @@ public class BlockIndustrialGrinder extends BlockMachineBase implements IRotatio @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (this.fillBlockWithFluid(world, new BlockPos(x, y, z), player)) { return true; } diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java index 90118ec58..77d9abfc2 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java @@ -29,10 +29,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -55,7 +53,7 @@ public class BlockIndustrialSawmill extends BlockMachineBase implements IRotatio @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (this.fillBlockWithFluid(world, new BlockPos(x, y, z), player)) { return true; } diff --git a/src/main/java/techreborn/blocks/cable/BlockCable.java b/src/main/java/techreborn/blocks/cable/BlockCable.java index 9b98e328d..17019e4e5 100644 --- a/src/main/java/techreborn/blocks/cable/BlockCable.java +++ b/src/main/java/techreborn/blocks/cable/BlockCable.java @@ -68,7 +68,6 @@ public class BlockCable extends BlockContainer { public static final PropertyBool DOWN = PropertyBool.create("down"); public static final IProperty TYPE = PropertyEnum.create("type", EnumCableType.class); - public BlockCable() { super(Material.ROCK); setCreativeTab(TechRebornCreativeTab.instance); @@ -122,7 +121,7 @@ public class BlockCable extends BlockContainer { @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { - for(EnumCableType cableType : EnumCableType.values()){ + for (EnumCableType cableType : EnumCableType.values()) { list.add(new ItemStack(this, 1, cableType.ordinal())); } } @@ -158,7 +157,7 @@ public class BlockCable extends BlockContainer { IBlockState actualState = state; for (EnumFacing facing : EnumFacing.values()) { TileEntity tileEntity = getTileEntitySafely(worldIn, pos.offset(facing)); - if(tileEntity != null){ + if (tileEntity != null) { actualState = actualState.withProperty(getProperty(facing), tileEntity.hasCapability(CapabilityEnergy.ENERGY, facing.getOpposite())); } } diff --git a/src/main/java/techreborn/blocks/cable/EnumCableType.java b/src/main/java/techreborn/blocks/cable/EnumCableType.java index ab30765af..910eee611 100644 --- a/src/main/java/techreborn/blocks/cable/EnumCableType.java +++ b/src/main/java/techreborn/blocks/cable/EnumCableType.java @@ -61,7 +61,7 @@ public enum EnumCableType implements IStringSerializable { return friendlyName.toLowerCase(); } - public ItemStack getStack(){ - return new ItemStack(ModBlocks.CABLE,1, this.ordinal()); + public ItemStack getStack() { + return new ItemStack(ModBlocks.CABLE, 1, this.ordinal()); } } diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index b9f02a913..d07dc4041 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -29,10 +29,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -55,7 +53,7 @@ public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedR @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (this.fillBlockWithFluid(world, new BlockPos(x, y, z), player)) { return true; } diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java index 9e4f24293..e35c1d6d5 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java @@ -26,7 +26,6 @@ package techreborn.blocks.generator; import net.minecraft.block.material.Material; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index f9b792c76..9349705be 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -29,10 +29,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -55,7 +53,7 @@ public class BlockGasTurbine extends BlockMachineBase implements IAdvancedRotati @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (this.fillBlockWithFluid(world, new BlockPos(x, y, z), player)) { return true; } diff --git a/src/main/java/techreborn/blocks/generator/BlockGenerator.java b/src/main/java/techreborn/blocks/generator/BlockGenerator.java index 696900747..d39766f39 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockGenerator.java @@ -27,10 +27,8 @@ package techreborn.blocks.generator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -53,7 +51,7 @@ public class BlockGenerator extends BlockMachineBase implements IRotationTexture @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) { player.openGui(Core.INSTANCE, EGui.GENERATOR.ordinal(), world, x, y, z); } diff --git a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java index 74b3a61a1..0c4b0b2b5 100644 --- a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java @@ -26,7 +26,6 @@ package techreborn.blocks.generator; import net.minecraft.block.material.Material; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index e6b4c11bb..5801d62fc 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -29,10 +29,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -55,7 +53,7 @@ public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvanc @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (this.fillBlockWithFluid(world, new BlockPos(x, y, z), player)) { return true; } diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index b3a8fed4c..1bb371d35 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -28,10 +28,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (this.fillBlockWithFluid(world, new BlockPos(x, y, z), player)) { return true; } diff --git a/src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java b/src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java index 3f679d5f2..b62901c6d 100644 --- a/src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/iron_machines/BlockAlloyFurnace.java @@ -32,10 +32,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -61,7 +59,7 @@ public class BlockAlloyFurnace extends BlockMachineBase implements IRotationText @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.ALLOY_FURNACE.ordinal(), world, x, y, z); return true; diff --git a/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java b/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java index 634e77678..6a910bf1d 100644 --- a/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java @@ -35,10 +35,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -65,7 +63,7 @@ public class BlockIronFurnace extends BlockMachineBase implements IRotationTextu @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.IRON_FURNACE.ordinal(), world, x, y, z); return true; @@ -92,22 +90,22 @@ public class BlockIronFurnace extends BlockMachineBase implements IRotationTextu switch (enumfacing) { case WEST: worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, - new int[0]); + new int[0]); worldIn.spawnParticle(EnumParticleTypes.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); break; case EAST: worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, - new int[0]); + new int[0]); worldIn.spawnParticle(EnumParticleTypes.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); break; case NORTH: worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D, - new int[0]); + new int[0]); worldIn.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D, new int[0]); break; case SOUTH: worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D, - new int[0]); + new int[0]); worldIn.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D, new int[0]); } } diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index 8be9c62bf..1c5226016 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockAssemblingMachine extends BlockMachineBase implements IRotatio @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.ASSEMBLING_MACHINE.ordinal(), world, x, y, z); return true; diff --git a/src/main/java/techreborn/blocks/machine/BlockChargeBench.java b/src/main/java/techreborn/blocks/machine/BlockChargeBench.java index fe2bdc39f..bfa3c7299 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChargeBench.java +++ b/src/main/java/techreborn/blocks/machine/BlockChargeBench.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockChargeBench extends BlockMachineBase implements IRotationTextu @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.CHARGEBENCH.ordinal(), world, x, y, z); return true; diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index dc36fd8dd..e5c6d088c 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.CHEMICAL_REACTOR.ordinal(), world, x, y, z); return true; diff --git a/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java b/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java index 1e6b2889e..18428db74 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockChunkLoader extends BlockMachineBase implements IAdvancedRotat @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.CHUNK_LOADER.ordinal(), world, x, y, z); return true; diff --git a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java index 7f37c76d8..27dcc34a6 100644 --- a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockMatterFabricator extends BlockMachineBase implements IAdvanced @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.MATTER_FABRICATOR.ordinal(), world, x, y, z); return true; diff --git a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java index 1ec2dc8ea..2adb97180 100644 --- a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockRollingMachine extends BlockMachineBase implements IAdvancedRo @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.ROLLING_MACHINE.ordinal(), world, x, y, z); return true; diff --git a/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java b/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java index 2f151d966..d7ee3afd1 100644 --- a/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java +++ b/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java @@ -31,10 +31,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -59,7 +57,7 @@ public class BlockScrapboxinator extends BlockMachineBase implements IRotationTe @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) { player.openGui(Core.INSTANCE, EGui.SCRAPBOXINATOR.ordinal(), world, x, y, z); } diff --git a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java index 104ced939..5a5da7709 100644 --- a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java @@ -32,10 +32,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -57,7 +55,15 @@ public class BlockVacuumFreezer extends BlockMachineBase implements IAdvancedRot } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, final EntityPlayer player, final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ) { + public boolean onBlockActivated(final World world, + final BlockPos pos, + final IBlockState state, + final EntityPlayer player, + final EnumHand hand, + final EnumFacing side, + final float hitX, + final float hitY, + final float hitZ) { if (!player.isSneaking()) { player.openGui(Core.INSTANCE, EGui.VACUUM_FREEZER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); return true; diff --git a/src/main/java/techreborn/blocks/storage/BlockAESU.java b/src/main/java/techreborn/blocks/storage/BlockAESU.java index 1449c6c8f..b8ed821d3 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAESU.java +++ b/src/main/java/techreborn/blocks/storage/BlockAESU.java @@ -30,7 +30,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import techreborn.client.EGui; import techreborn.init.ModBlocks; import techreborn.tiles.TileAesu; diff --git a/src/main/java/techreborn/blocks/storage/BlockBatBox.java b/src/main/java/techreborn/blocks/storage/BlockBatBox.java index ce664b2fe..cbea93cb1 100644 --- a/src/main/java/techreborn/blocks/storage/BlockBatBox.java +++ b/src/main/java/techreborn/blocks/storage/BlockBatBox.java @@ -30,7 +30,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import techreborn.client.EGui; import techreborn.tiles.storage.TileBatBox; diff --git a/src/main/java/techreborn/blocks/storage/BlockIDSU.java b/src/main/java/techreborn/blocks/storage/BlockIDSU.java index b22ad2ab5..0253c4f69 100644 --- a/src/main/java/techreborn/blocks/storage/BlockIDSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockIDSU.java @@ -32,7 +32,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import techreborn.client.EGui; import techreborn.tiles.idsu.TileIDSU; @@ -51,7 +50,7 @@ public class BlockIDSU extends BlockEnergyStorage { @Override public IBlockState getStateForPlacement(final World world, final BlockPos pos, final EnumFacing facing, final float hitX, final float hitY, - final float hitZ, final int meta, final EntityLivingBase placer) { + final float hitZ, final int meta, final EntityLivingBase placer) { final TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileIDSU) { ((TileIDSU) tile).ownerUdid = placer.getUniqueID().toString(); diff --git a/src/main/java/techreborn/blocks/storage/BlockLESU.java b/src/main/java/techreborn/blocks/storage/BlockLESU.java index b013bcd94..a42316314 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLESU.java +++ b/src/main/java/techreborn/blocks/storage/BlockLESU.java @@ -30,7 +30,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import techreborn.client.EGui; import techreborn.tiles.lesu.TileLesu; diff --git a/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java b/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java index 6f846e2be..b91749c5b 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java @@ -40,7 +40,8 @@ import techreborn.tiles.lesu.TileLesuStorage; import java.util.ArrayList; import java.util.List; -public class BlockLESUStorage extends BaseTileBlock {; +public class BlockLESUStorage extends BaseTileBlock { + ; public BlockLESUStorage(Material material) { super(material); diff --git a/src/main/java/techreborn/blocks/storage/BlockMFE.java b/src/main/java/techreborn/blocks/storage/BlockMFE.java index 2185a60aa..bf02dcf4a 100644 --- a/src/main/java/techreborn/blocks/storage/BlockMFE.java +++ b/src/main/java/techreborn/blocks/storage/BlockMFE.java @@ -30,7 +30,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import techreborn.client.EGui; import techreborn.init.ModBlocks; import techreborn.tiles.storage.TileMFE; diff --git a/src/main/java/techreborn/blocks/storage/BlockMFSU.java b/src/main/java/techreborn/blocks/storage/BlockMFSU.java index 5f6184e12..ba2534b78 100644 --- a/src/main/java/techreborn/blocks/storage/BlockMFSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockMFSU.java @@ -30,7 +30,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import techreborn.client.EGui; import techreborn.init.ModBlocks; import techreborn.tiles.storage.TileMFSU; diff --git a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java index 91ee9cbb2..dcf30d1ef 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockAlloySmelter extends BlockMachineBase implements IRotationText @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, EGui.ALLOY_SMELTER.ordinal(), world, x, y, z); return true; diff --git a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java index 55070ed31..dd342167f 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockCompressor extends BlockMachineBase implements IRotationTextur @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) { player.openGui(Core.INSTANCE, EGui.COMPRESSOR.ordinal(), world, x, y, z); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java index 819192c82..9efb50886 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java +++ b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockElectricFurnace extends BlockMachineBase implements IRotationT @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) { player.openGui(Core.INSTANCE, EGui.ELECTRIC_FURNACE.ordinal(), world, x, y, z); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java index fe9070deb..484df4419 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockExtractor extends BlockMachineBase implements IRotationTexture @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) { player.openGui(Core.INSTANCE, EGui.EXTRACTOR.ordinal(), world, x, y, z); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java index 2be083ae9..031e579eb 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockGrinder extends BlockMachineBase implements IAdvancedRotationT @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) { player.openGui(Core.INSTANCE, EGui.GRINDER.ordinal(), world, x, y, z); } diff --git a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java index 29fec9c72..87929f272 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java @@ -28,10 +28,8 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -54,7 +52,7 @@ public class BlockRecycler extends BlockMachineBase implements IRotationTexture @Override public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, - final float hitY, final float hitZ) { + final float hitY, final float hitZ) { if (!player.isSneaking()) { player.openGui(Core.INSTANCE, EGui.RECYCLER.ordinal(), world, x, y, z); } diff --git a/src/main/java/techreborn/client/EGui.java b/src/main/java/techreborn/client/EGui.java index ce868f59f..950099fa8 100644 --- a/src/main/java/techreborn/client/EGui.java +++ b/src/main/java/techreborn/client/EGui.java @@ -68,8 +68,7 @@ public enum EGui { private final boolean containerBuilder; - private EGui(final boolean containerBuilder) - { + private EGui(final boolean containerBuilder) { this.containerBuilder = containerBuilder; } diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index 5d4a3795a..de1ef63c3 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -29,7 +29,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; - import techreborn.client.container.*; import techreborn.client.gui.*; import techreborn.manual.GuiManual; @@ -48,7 +47,7 @@ public class GuiHandler implements IGuiHandler { @Override public Object getServerGuiElement(final int ID, final EntityPlayer player, final World world, final int x, - final int y, final int z) { + final int y, final int z) { final EGui gui = EGui.values()[ID]; final TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); @@ -73,7 +72,7 @@ public class GuiHandler implements IGuiHandler { @Override public Object getClientGuiElement(final int ID, final EntityPlayer player, final World world, final int x, - final int y, final int z) { + final int y, final int z) { final EGui gui = EGui.values()[ID]; final TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index 982c87817..22288b66b 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -179,7 +179,7 @@ public class RegisterItemJsons { } for (EnumCableType cableType : EnumCableType.values()) { - registerBlockstate(ModBlocks.CABLE, cableType.ordinal(), "inv_" +cableType.getName().toLowerCase()); + registerBlockstate(ModBlocks.CABLE, cableType.ordinal(), "inv_" + cableType.getName().toLowerCase()); } } diff --git a/src/main/java/techreborn/client/container/ContainerLESU.java b/src/main/java/techreborn/client/container/ContainerLESU.java index ebf2b9e73..fbaf0c0f1 100644 --- a/src/main/java/techreborn/client/container/ContainerLESU.java +++ b/src/main/java/techreborn/client/container/ContainerLESU.java @@ -30,7 +30,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.gui.slots.BaseSlot; import reborncore.common.container.RebornContainer; -import techreborn.config.ConfigTechReborn; import techreborn.tiles.lesu.TileLesu; public class ContainerLESU extends RebornContainer { diff --git a/src/main/java/techreborn/client/container/IContainerProvider.java b/src/main/java/techreborn/client/container/IContainerProvider.java index f2cfd953f..d4c722340 100644 --- a/src/main/java/techreborn/client/container/IContainerProvider.java +++ b/src/main/java/techreborn/client/container/IContainerProvider.java @@ -25,7 +25,6 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; - import techreborn.client.container.builder.BuiltContainer; public interface IContainerProvider { diff --git a/src/main/java/techreborn/client/container/builder/BuiltContainer.java b/src/main/java/techreborn/client/container/builder/BuiltContainer.java index 36f6de7b7..d2bc6e809 100644 --- a/src/main/java/techreborn/client/container/builder/BuiltContainer.java +++ b/src/main/java/techreborn/client/container/builder/BuiltContainer.java @@ -24,16 +24,14 @@ package techreborn.client.container.builder; -import org.apache.commons.lang3.Range; -import org.apache.commons.lang3.tuple.MutableTriple; -import org.apache.commons.lang3.tuple.Pair; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; - +import org.apache.commons.lang3.Range; +import org.apache.commons.lang3.tuple.MutableTriple; +import org.apache.commons.lang3.tuple.Pair; import reborncore.common.util.ItemUtils; import techreborn.client.container.IRightClickHandler; @@ -58,8 +56,8 @@ public class BuiltContainer extends Container { private Integer[] integerParts; public BuiltContainer(final String name, final Predicate canInteract, - final List> playerSlotRange, - final List> tileSlotRange) { + final List> playerSlotRange, + final List> tileSlotRange) { this.name = name; this.canInteract = canInteract; @@ -107,10 +105,10 @@ public class BuiltContainer extends Container { @Override public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, EntityPlayer player) { - if(dragType == 1 && slotId > 0 && slotId < 1000){ + if (dragType == 1 && slotId > 0 && slotId < 1000) { Slot slot = this.inventorySlots.get(slotId); - if(slot instanceof IRightClickHandler){ - if(((IRightClickHandler) slot).handleRightClick(slot.getSlotIndex(), player, this)){ + if (slot instanceof IRightClickHandler) { + if (((IRightClickHandler) slot).handleRightClick(slot.getSlotIndex(), player, this)) { return ItemStack.EMPTY; } } @@ -180,20 +178,16 @@ public class BuiltContainer extends Container { @Override public void updateProgressBar(final int id, final int value) { - if(id < this.shortValues.size()) - { + if (id < this.shortValues.size()) { this.shortValues.get(id).getMiddle().accept((short) value); this.shortValues.get(id).setRight((short) value); - } - else if (id - this.shortValues.size() < this.integerValues.size() * 2) - { + } else if (id - this.shortValues.size() < this.integerValues.size() * 2) { if ((id - this.shortValues.size()) % 2 == 0) this.integerParts[(id - this.shortValues.size()) / 2] = value; - else - { + else { this.integerValues.get((id - this.shortValues.size()) / 2).getMiddle().accept( - (this.integerParts[(id - this.shortValues.size()) / 2] & 0xFFFF) << 16 | value & 0xFFFF); + (this.integerParts[(id - this.shortValues.size()) / 2] & 0xFFFF) << 16 | value & 0xFFFF); } } } @@ -247,7 +241,7 @@ public class BuiltContainer extends Container { final Slot slot = this.inventorySlots.get(slotIndex); final ItemStack stackInSlot = slot.getStack(); if (stackInSlot != ItemStack.EMPTY && ItemUtils.isItemEqual(stackInSlot, stackToShift, true, true) - && slot.isItemValid(stackToShift)) { + && slot.isItemValid(stackToShift)) { final int resultingStackSize = stackInSlot.getCount() + stackToShift.getCount(); final int max = Math.min(stackToShift.getMaxStackSize(), slot.getSlotStackLimit()); if (resultingStackSize <= max) { @@ -299,4 +293,4 @@ public class BuiltContainer extends Container { public String getName() { return this.name; } -} \ No newline at end of file +} diff --git a/src/main/java/techreborn/client/container/builder/ContainerBuilder.java b/src/main/java/techreborn/client/container/builder/ContainerBuilder.java index 40472bf7d..b30e9d23e 100644 --- a/src/main/java/techreborn/client/container/builder/ContainerBuilder.java +++ b/src/main/java/techreborn/client/container/builder/ContainerBuilder.java @@ -24,14 +24,13 @@ package techreborn.client.container.builder; -import org.apache.commons.lang3.Range; -import org.apache.commons.lang3.tuple.Pair; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.Slot; +import org.apache.commons.lang3.Range; +import org.apache.commons.lang3.tuple.Pair; import java.util.ArrayList; import java.util.List; @@ -91,8 +90,8 @@ public class ContainerBuilder { public BuiltContainer create() { final BuiltContainer built = new BuiltContainer(this.name, this.canInteract, - this.playerInventoryRanges, - this.tileInventoryRanges); + this.playerInventoryRanges, + this.tileInventoryRanges); if (!this.shortValues.isEmpty()) built.addShortSync(this.shortValues); if (!this.integerValues.isEmpty()) diff --git a/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java b/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java index d7d0c2330..ff6de453b 100644 --- a/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java +++ b/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java @@ -24,9 +24,6 @@ package techreborn.client.container.builder; -import org.apache.commons.lang3.Range; -import org.apache.commons.lang3.tuple.Pair; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.SlotFurnaceFuel; @@ -34,7 +31,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; - +import org.apache.commons.lang3.Range; +import org.apache.commons.lang3.tuple.Pair; import reborncore.api.power.IEnergyInterfaceItem; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IUpgrade; @@ -43,7 +41,6 @@ import reborncore.client.gui.slots.BaseSlot; import reborncore.client.gui.slots.SlotFake; import reborncore.client.gui.slots.SlotOutput; import reborncore.common.powerSystem.TilePowerAcceptor; - import techreborn.Core; import techreborn.client.container.builder.slot.FilteredSlot; import techreborn.client.container.builder.slot.UpgradeSlot; @@ -63,7 +60,7 @@ public class ContainerTileInventoryBuilder { this.tile = tile; this.parent = parent; this.rangeStart = parent.slots.size(); - if(tile instanceof IUpgradeable){ + if (tile instanceof IUpgradeable) { upgradeSlots((IUpgradeable) tile); } } @@ -84,7 +81,7 @@ public class ContainerTileInventoryBuilder { } public ContainerTileInventoryBuilder filterSlot(final int index, final int x, final int y, - final Predicate filter) { + final Predicate filter) { this.parent.slots.add(new FilteredSlot(this.tile, index, x, y).setFilter(filter)); return this; } @@ -92,20 +89,19 @@ public class ContainerTileInventoryBuilder { @SuppressWarnings("null") public ContainerTileInventoryBuilder energySlot(final int index, final int x, final int y) { this.parent.slots.add(new FilteredSlot(this.tile, index, x, y) - .setFilter(stack -> stack.hasCapability(CapabilityEnergy.ENERGY, EnumFacing.UP) - || stack.getItem() instanceof IEnergyInterfaceItem)); + .setFilter(stack -> stack.hasCapability(CapabilityEnergy.ENERGY, EnumFacing.UP) + || stack.getItem() instanceof IEnergyInterfaceItem)); return this; } @SuppressWarnings("null") public ContainerTileInventoryBuilder fluidSlot(final int index, final int x, final int y) { this.parent.slots.add(new FilteredSlot(this.tile, index, x, y).setFilter( - stack -> stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, EnumFacing.UP))); + stack -> stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, EnumFacing.UP))); return this; } - public ContainerTileInventoryBuilder fuelSlot(final int index, final int x, final int y) - { + public ContainerTileInventoryBuilder fuelSlot(final int index, final int x, final int y) { this.parent.slots.add(new SlotFurnaceFuel(this.tile, index, x, y)); return this; } @@ -113,12 +109,12 @@ public class ContainerTileInventoryBuilder { @Deprecated public ContainerTileInventoryBuilder upgradeSlot(final int index, final int x, final int y) { this.parent.slots.add(new FilteredSlot(this.tile, index, x, y) - .setFilter(stack -> stack.getItem() instanceof IUpgrade)); + .setFilter(stack -> stack.getItem() instanceof IUpgrade)); return this; } - private ContainerTileInventoryBuilder upgradeSlots(IUpgradeable upgradeable){ - if(upgradeable.canBeUpgraded()){ + private ContainerTileInventoryBuilder upgradeSlots(IUpgradeable upgradeable) { + if (upgradeable.canBeUpgraded()) { for (int i = 0; i < upgradeable.getUpgradeSlotCount(); i++) { this.parent.slots.add(new UpgradeSlot(upgradeable.getUpgradeInvetory(), i, -19, i * 18 + 12)); } @@ -127,12 +123,9 @@ public class ContainerTileInventoryBuilder { } /** - * - * @param supplier - * The supplier must supply a variable holding inside a Short, it - * will be truncated by force. - * @param setter - * The setter to call when the variable has been updated. + * @param supplier The supplier must supply a variable holding inside a Short, it + * will be truncated by force. + * @param setter The setter to call when the variable has been updated. */ public ContainerTileInventoryBuilder syncShortValue(final IntSupplier supplier, final IntConsumer setter) { this.parent.shortValues.add(Pair.of(supplier, setter)); @@ -140,12 +133,9 @@ public class ContainerTileInventoryBuilder { } /** - * - * @param supplier - * The supplier it can supply a variable holding in an Integer it - * will be split inside multiples shorts. - * @param setter - * The setter to call when the variable has been updated. + * @param supplier The supplier it can supply a variable holding in an Integer it + * will be split inside multiples shorts. + * @param setter The setter to call when the variable has been updated. */ public ContainerTileInventoryBuilder syncIntegerValue(final IntSupplier supplier, final IntConsumer setter) { this.parent.integerValues.add(Pair.of(supplier, setter)); @@ -155,7 +145,7 @@ public class ContainerTileInventoryBuilder { public ContainerTileInventoryBuilder syncEnergyValue() { if (this.tile instanceof TilePowerAcceptor) return this.syncIntegerValue(() -> (int) ((TilePowerAcceptor) this.tile).getEnergy(), - ((TilePowerAcceptor) this.tile)::setEnergy) + ((TilePowerAcceptor) this.tile)::setEnergy) .syncIntegerValue(() -> (int) ((TilePowerAcceptor) this.tile).extraPowerStoage, ((TilePowerAcceptor) this.tile)::setExtraPowerStoage); Core.logHelper.error(this.tile + " is not an instance of TilePowerAcceptor! Energy cannot be synced."); @@ -165,14 +155,14 @@ public class ContainerTileInventoryBuilder { public ContainerTileInventoryBuilder syncCrafterValue() { if (this.tile instanceof IRecipeCrafterProvider) return this - .syncIntegerValue(() -> ((IRecipeCrafterProvider) this.tile).getRecipeCrafter().currentTickTime, - (currentTickTime) -> ((IRecipeCrafterProvider) this.tile) - .getRecipeCrafter().currentTickTime = currentTickTime) - .syncIntegerValue(() -> ((IRecipeCrafterProvider) this.tile).getRecipeCrafter().currentNeededTicks, - (currentNeededTicks) -> ((IRecipeCrafterProvider) this.tile) - .getRecipeCrafter().currentNeededTicks = currentNeededTicks); + .syncIntegerValue(() -> ((IRecipeCrafterProvider) this.tile).getRecipeCrafter().currentTickTime, + (currentTickTime) -> ((IRecipeCrafterProvider) this.tile) + .getRecipeCrafter().currentTickTime = currentTickTime) + .syncIntegerValue(() -> ((IRecipeCrafterProvider) this.tile).getRecipeCrafter().currentNeededTicks, + (currentNeededTicks) -> ((IRecipeCrafterProvider) this.tile) + .getRecipeCrafter().currentNeededTicks = currentNeededTicks); Core.logHelper - .error(this.tile + " is not an instance of IRecipeCrafterProvider! Craft progress cannot be synced."); + .error(this.tile + " is not an instance of IRecipeCrafterProvider! Craft progress cannot be synced."); return this; } diff --git a/src/main/java/techreborn/client/container/builder/slot/SpriteSlot.java b/src/main/java/techreborn/client/container/builder/slot/SpriteSlot.java index 8a908a0a0..f65f42494 100644 --- a/src/main/java/techreborn/client/container/builder/slot/SpriteSlot.java +++ b/src/main/java/techreborn/client/container/builder/slot/SpriteSlot.java @@ -24,14 +24,13 @@ package techreborn.client.container.builder.slot; -import javax.annotation.Nullable; - import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; - import techreborn.lib.ModInfo; +import javax.annotation.Nullable; + public class SpriteSlot extends FilteredSlot { private final String sprite; diff --git a/src/main/java/techreborn/client/container/builder/slot/UpgradeSlot.java b/src/main/java/techreborn/client/container/builder/slot/UpgradeSlot.java index 795717ff5..1789d1c2c 100644 --- a/src/main/java/techreborn/client/container/builder/slot/UpgradeSlot.java +++ b/src/main/java/techreborn/client/container/builder/slot/UpgradeSlot.java @@ -31,7 +31,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import reborncore.api.tile.IUpgrade; import reborncore.api.tile.IUpgradeable; -import reborncore.common.tile.TileBase; import reborncore.common.util.Inventory; import techreborn.client.container.IRightClickHandler; import techreborn.client.container.builder.BuiltContainer; @@ -46,7 +45,6 @@ public class UpgradeSlot extends Slot implements IRightClickHandler { super(inventory, index, xPosition, yPosition); } - @Override public boolean isItemValid(final ItemStack stack) { return stack.getItem() instanceof IUpgrade; @@ -59,15 +57,15 @@ public class UpgradeSlot extends Slot implements IRightClickHandler { @Override public boolean handleRightClick(int slotID, EntityPlayer player, BuiltContainer container) { - if(inventory instanceof Inventory){ + if (inventory instanceof Inventory) { Inventory inv = (Inventory) inventory; TileEntity tileEntity = inv.getTileBase(); - if(tileEntity instanceof IUpgradeable){ + if (tileEntity instanceof IUpgradeable) { IUpgradeable upgradeable = (IUpgradeable) tileEntity; - if(upgradeable.canBeUpgraded()){ + if (upgradeable.canBeUpgraded()) { ItemStack stack = upgradeable.getUpgradeInvetory().getStackInSlot(slotID); - if(!stack.isEmpty() && stack.getItem() instanceof IUpgrade){ - if(player.world.isRemote){ + if (!stack.isEmpty() && stack.getItem() instanceof IUpgrade) { + if (player.world.isRemote) { ((IUpgrade) stack.getItem()).handleRightClick(tileEntity, stack, container, slotID); } } diff --git a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java index 85dad55d0..b660435db 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java @@ -29,13 +29,12 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import techreborn.tiles.TileAlloyFurnace; public class GuiAlloyFurnace extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/alloy_furnace.png"); + "textures/gui/alloy_furnace.png"); TileAlloyFurnace alloyfurnace; @@ -73,8 +72,8 @@ public class GuiAlloyFurnace extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { final String name = I18n.translateToLocal("tile.techreborn.alloyfurnace.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java index e2cfa3395..a899d05fc 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java +++ b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java @@ -29,13 +29,12 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import techreborn.tiles.TileAlloySmelter; public class GuiAlloySmelter extends GuiContainer { public static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/electric_alloy_furnace.png"); + "textures/gui/electric_alloy_furnace.png"); TileAlloySmelter alloysmelter; @@ -78,8 +77,8 @@ public class GuiAlloySmelter extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { final String name = I18n.translateToLocal("tile.techreborn.alloysmelter.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java index e2395a01f..a3078fd76 100644 --- a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java @@ -29,13 +29,12 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import techreborn.tiles.TileAssemblingMachine; public class GuiAssemblingMachine extends GuiContainer { public static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/assembling_machine.png"); + "textures/gui/assembling_machine.png"); TileAssemblingMachine assemblingmachine; @@ -78,8 +77,8 @@ public class GuiAssemblingMachine extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { final String name = I18n.translateToLocal("tile.techreborn.assemblinmachine.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/techreborn/client/gui/GuiBase.java b/src/main/java/techreborn/client/gui/GuiBase.java index 20ac29b27..40bf4eb45 100644 --- a/src/main/java/techreborn/client/gui/GuiBase.java +++ b/src/main/java/techreborn/client/gui/GuiBase.java @@ -112,22 +112,22 @@ public class GuiBase extends GuiContainer { protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int mouseX, int mouseY) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); builder.drawDefaultBackground(this, guiLeft, guiTop, xSize, ySize); - if(drawPlayerSlots()){ + if (drawPlayerSlots()) { builder.drawPlayerSlots(this, guiLeft + xSize / 2, guiTop + 93, true); } - if(tryAddUpgrades() && tile instanceof IUpgradeable){ + if (tryAddUpgrades() && tile instanceof IUpgradeable) { IUpgradeable upgradeable = (IUpgradeable) tile; - if(upgradeable.canBeUpgraded()){ + if (upgradeable.canBeUpgraded()) { builder.drawUpgrades(this, upgradeable, guiLeft, guiTop); } } } - public boolean drawPlayerSlots(){ + public boolean drawPlayerSlots() { return true; } - public boolean tryAddUpgrades(){ + public boolean tryAddUpgrades() { return true; } diff --git a/src/main/java/techreborn/client/gui/GuiChunkLoader.java b/src/main/java/techreborn/client/gui/GuiChunkLoader.java index d77eea30d..cf55fe580 100644 --- a/src/main/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/main/java/techreborn/client/gui/GuiChunkLoader.java @@ -30,13 +30,12 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import techreborn.tiles.TileChunkLoader; public class GuiChunkLoader extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/industrial_chunkloader.png"); + "textures/gui/industrial_chunkloader.png"); TileChunkLoader chunkloader; private GuiButton plusOneButton; private GuiButton plusTenButton; @@ -80,9 +79,9 @@ public class GuiChunkLoader extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { final String name = I18n.translateToLocal("tile.techreborn.chunkloader.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java index a928f6025..c5d7f3fc6 100644 --- a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java @@ -29,15 +29,13 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import reborncore.common.powerSystem.PowerSystem; - import techreborn.tiles.generator.TileDieselGenerator; public class GuiDieselGenerator extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/diesel_generator.png"); + "textures/gui/diesel_generator.png"); TileDieselGenerator dieselGenerator; @@ -61,14 +59,14 @@ public class GuiDieselGenerator extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { final String name = I18n.translateToLocal("tile.techreborn.dieselgenerator.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255); this.fontRendererObj.drawString(this.dieselGenerator.tank.getFluidAmount() + "", 10, 30, 16448255); this.fontRendererObj.drawString("Power Amount", 10, 40, 16448255); this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(this.dieselGenerator.getEnergy()) + "", 10, 50, - 16448255); + 16448255); } } diff --git a/src/main/java/techreborn/client/gui/GuiDigitalChest.java b/src/main/java/techreborn/client/gui/GuiDigitalChest.java index 08b815d37..5c02b2eb0 100644 --- a/src/main/java/techreborn/client/gui/GuiDigitalChest.java +++ b/src/main/java/techreborn/client/gui/GuiDigitalChest.java @@ -26,7 +26,6 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - import techreborn.tiles.TileDigitalChest; public class GuiDigitalChest extends GuiBase { @@ -54,12 +53,12 @@ public class GuiDigitalChest extends GuiBase { if (this.digitalChest.storedItem != ItemStack.EMPTY && this.digitalChest.getStackInSlot(1) != null) { this.builder.drawBigBlueBar(this, 31, 43, - this.digitalChest.storedItem.getCount() + this.digitalChest.getStackInSlot(1).getCount(), - this.digitalChest.maxCapacity, mouseX - this.guiLeft, mouseY - this.guiTop, "Stored", layer); + this.digitalChest.storedItem.getCount() + this.digitalChest.getStackInSlot(1).getCount(), + this.digitalChest.maxCapacity, mouseX - this.guiLeft, mouseY - this.guiTop, "Stored", layer); } if (this.digitalChest.storedItem == ItemStack.EMPTY && this.digitalChest.getStackInSlot(1) != null) { this.builder.drawBigBlueBar(this, 31, 43, this.digitalChest.getStackInSlot(1).getCount(), - this.digitalChest.maxCapacity, mouseX - this.guiLeft, mouseY - this.guiTop, "Stored", layer); + this.digitalChest.maxCapacity, mouseX - this.guiLeft, mouseY - this.guiTop, "Stored", layer); } } } diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index d35350a4e..f0a85da6f 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -32,12 +32,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.translation.I18n; - import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import reborncore.common.misc.Location; import reborncore.common.powerSystem.PowerSystem; - import techreborn.client.ClientMultiBlocks; import techreborn.proxies.ClientProxy; import techreborn.tiles.fusionReactor.TileEntityFusionController; @@ -47,7 +45,7 @@ import java.io.IOException; public class GuiFusionReactor extends GuiContainer { public static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/fusion_reactor.png"); + "textures/gui/fusion_reactor.png"); TileEntityFusionController fusionController; @@ -61,16 +59,16 @@ public class GuiFusionReactor extends GuiContainer { final String name = I18n.translateToLocal("tile.techreborn.fusioncontrolcomputer.name"); this.fontRendererObj.drawString(name, 87, 6, 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(this.fusionController.getEnergy()), 11, 8, - 16448255); + 16448255); this.fontRendererObj.drawString("Coils: " + (this.fusionController.getCoilStatus() == 1 ? "Yes" : "No"), 11, 16, - 16448255); + 16448255); if (this.fusionController.getNeededPower() > 1 && this.fusionController.getCrafingTickTime() < 1) this.fontRendererObj.drawString("Start: " - + this.percentage(this.fusionController.getNeededPower(), (int) this.fusionController.getEnergy()) - + "%", 11, 24, 16448255); + + this.percentage(this.fusionController.getNeededPower(), (int) this.fusionController.getEnergy()) + + "%", 11, 24, 16448255); } @@ -82,10 +80,10 @@ public class GuiFusionReactor extends GuiContainer { this.buttonList.add(button); super.initGui(); final BlockPos coordinates = new BlockPos( - this.fusionController.getPos().getX() + this.fusionController.getPos().getX() - EnumFacing.getFront(this.fusionController.getFacingInt()).getFrontOffsetX() * 2, - this.fusionController.getPos().getY() - 1, this.fusionController.getPos().getZ() - - EnumFacing.getFront(this.fusionController.getFacingInt()).getFrontOffsetZ() * 2); + this.fusionController.getPos().getY() - 1, this.fusionController.getPos().getZ() + - EnumFacing.getFront(this.fusionController.getFacingInt()).getFrontOffsetZ() * 2); if (coordinates.equals(MultiblockRenderEvent.anchor)) { ClientProxy.multiblockRenderEvent.setMultiblock(null); button.displayString = "B"; @@ -96,7 +94,7 @@ public class GuiFusionReactor extends GuiContainer { @Override protected void drawGuiContainerBackgroundLayer(final float p_146976_1_, final int p_146976_2_, - final int p_146976_3_) { + final int p_146976_3_) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(GuiFusionReactor.texture); final int k = (this.width - this.xSize) / 2; @@ -126,10 +124,10 @@ public class GuiFusionReactor extends GuiContainer { final MultiblockSet set = new MultiblockSet(ClientMultiBlocks.reactor); ClientProxy.multiblockRenderEvent.setMultiblock(set); ClientProxy.multiblockRenderEvent.parent = new Location(this.fusionController.getPos().getX(), - this.fusionController.getPos().getY(), this.fusionController.getPos().getZ(), - this.fusionController.getWorld()); + this.fusionController.getPos().getY(), this.fusionController.getPos().getZ(), + this.fusionController.getWorld()); MultiblockRenderEvent.anchor = new BlockPos(this.fusionController.getPos().getX(), - this.fusionController.getPos().getY() - 1, this.fusionController.getPos().getZ()); + this.fusionController.getPos().getY() - 1, this.fusionController.getPos().getZ()); button.displayString = "A"; } else { diff --git a/src/main/java/techreborn/client/gui/GuiGasTurbine.java b/src/main/java/techreborn/client/gui/GuiGasTurbine.java index f50ea33b0..6aa45d820 100644 --- a/src/main/java/techreborn/client/gui/GuiGasTurbine.java +++ b/src/main/java/techreborn/client/gui/GuiGasTurbine.java @@ -29,14 +29,13 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import techreborn.tiles.generator.TileGasTurbine; public class GuiGasTurbine extends GuiContainer { // TODO: use semifluid generator texture private static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/thermal_generator.png"); + "textures/gui/thermal_generator.png"); TileGasTurbine gasTurbine; @@ -60,9 +59,9 @@ public class GuiGasTurbine extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { final String name = "Gas Turbine"; this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255); this.fontRendererObj.drawString(this.gasTurbine.tank.getFluidAmount() + "", 10, 30, 16448255); } diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 66a6d5852..ba2bb7958 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -29,13 +29,12 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import techreborn.tiles.multiblock.TileImplosionCompressor; public class GuiImplosionCompressor extends GuiContainer { public static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/implosion_compressor.png"); + "textures/gui/implosion_compressor.png"); TileImplosionCompressor compressor; diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java index f9d822acb..7a5d60017 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java @@ -29,17 +29,15 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import techreborn.tiles.TileIndustrialElectrolyzer; public class GuiIndustrialElectrolyzer extends GuiContainer { public static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/industrial_electrolyzer.png"); + "textures/gui/industrial_electrolyzer.png"); TileIndustrialElectrolyzer eletrolyzer; - public GuiIndustrialElectrolyzer(final EntityPlayer player, final TileIndustrialElectrolyzer tileeletrolyzer) { super(tileeletrolyzer.createContainer(player)); this.xSize = 176; @@ -79,8 +77,8 @@ public class GuiIndustrialElectrolyzer extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { final String name = I18n.translateToLocal("tile.techreborn.industrialelectrolyzer.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index c3ee14c6f..2c6b546b0 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -32,13 +32,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fluids.FluidStack; - import techreborn.tiles.multiblock.TileIndustrialSawmill; public class GuiIndustrialSawmill extends GuiContainer { public static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/industrial_sawmill.png"); + "textures/gui/industrial_sawmill.png"); TileIndustrialSawmill sawmill; @@ -82,7 +81,7 @@ public class GuiIndustrialSawmill extends GuiContainer { if (!this.sawmill.getMutliBlock()) { //GuiUtil.drawTooltipBox(k + 30, l + 50 + 12, 114, 10); this.fontRendererObj.drawString(I18n.translateToLocal("techreborn.message.missingmultiblock"), k + 38, - l + 52 + 12, -1); + l + 52 + 12, -1); } } } diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index 3b0a38544..7e64b4812 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -29,13 +29,12 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import techreborn.tiles.TileIronFurnace; public class GuiIronFurnace extends GuiContainer { public static final ResourceLocation texture = new ResourceLocation("minecraft", - "textures/gui/container/furnace.png"); + "textures/gui/container/furnace.png"); TileIronFurnace furnace; @@ -71,9 +70,9 @@ public class GuiIronFurnace extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { final String name = I18n.translateToLocal("tile.techreborn.ironfurnace.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/techreborn/client/gui/GuiQuantumChest.java b/src/main/java/techreborn/client/gui/GuiQuantumChest.java index 8339d4134..3c976cb8a 100644 --- a/src/main/java/techreborn/client/gui/GuiQuantumChest.java +++ b/src/main/java/techreborn/client/gui/GuiQuantumChest.java @@ -26,7 +26,6 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - import techreborn.tiles.TileQuantumChest; public class GuiQuantumChest extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiQuantumTank.java b/src/main/java/techreborn/client/gui/GuiQuantumTank.java index 46a70959b..b0427cd4b 100644 --- a/src/main/java/techreborn/client/gui/GuiQuantumTank.java +++ b/src/main/java/techreborn/client/gui/GuiQuantumTank.java @@ -29,13 +29,12 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import techreborn.tiles.TileQuantumTank; public class GuiQuantumTank extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/thermal_generator.png"); + "textures/gui/thermal_generator.png"); TileQuantumTank quantumTank; @@ -59,9 +58,9 @@ public class GuiQuantumTank extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { final String name = I18n.translateToLocal("tile.techreborn.quantumTank.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255); this.fontRendererObj.drawString(this.quantumTank.tank.getFluidAmount() + "", 10, 30, 16448255); } diff --git a/src/main/java/techreborn/client/gui/GuiRollingMachine.java b/src/main/java/techreborn/client/gui/GuiRollingMachine.java index 262c06f79..79ca03f97 100644 --- a/src/main/java/techreborn/client/gui/GuiRollingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiRollingMachine.java @@ -30,13 +30,12 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import techreborn.tiles.TileRollingMachine; public class GuiRollingMachine extends GuiContainer { public static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/rolling_machine.png"); + "textures/gui/rolling_machine.png"); TileRollingMachine rollingMachine; public GuiRollingMachine(final EntityPlayer player, final TileRollingMachine tileRollingmachine) { @@ -67,9 +66,9 @@ public class GuiRollingMachine extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { final String name = I18n.translateToLocal("tile.techreborn.rollingmachine.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiScrapboxinator.java b/src/main/java/techreborn/client/gui/GuiScrapboxinator.java index d62d50f16..2a8b7000e 100644 --- a/src/main/java/techreborn/client/gui/GuiScrapboxinator.java +++ b/src/main/java/techreborn/client/gui/GuiScrapboxinator.java @@ -29,13 +29,12 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; - import techreborn.tiles.TileScrapboxinator; public class GuiScrapboxinator extends GuiContainer { public static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/scrapboxinator.png"); + "textures/gui/scrapboxinator.png"); TileScrapboxinator scrapboxinator; @@ -72,8 +71,8 @@ public class GuiScrapboxinator extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { final String name = net.minecraft.util.text.translation.I18n.translateToLocal("tile.techreborn.scrapboxinator.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, - 4210752); + 4210752); } } diff --git a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java index 128427aee..d0ce23b58 100644 --- a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java @@ -29,16 +29,14 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import reborncore.client.RenderUtil; - import techreborn.tiles.generator.TileSemifluidGenerator; public class GuiSemifluidGenerator extends GuiContainer { // TODO: use semifluid generator texture private static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/semifluid_generator.png"); + "textures/gui/semifluid_generator.png"); TileSemifluidGenerator semifluidGenerator; @@ -63,10 +61,10 @@ public class GuiSemifluidGenerator extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { final String name = "Semifluid Generator"; this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255); this.fontRendererObj.drawString(this.semifluidGenerator.tank.getFluidAmount() + "", 10, 30, 16448255); } -} \ No newline at end of file +} diff --git a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java index 694c2bf72..5b5293859 100644 --- a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java @@ -29,15 +29,13 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import reborncore.client.RenderUtil; - import techreborn.tiles.generator.TileThermalGenerator; public class GuiThermalGenerator extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/thermal_generator.png"); + "textures/gui/thermal_generator.png"); TileThermalGenerator thermalGenerator; @@ -62,9 +60,9 @@ public class GuiThermalGenerator extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { final String name = I18n.translateToLocal("tile.techreborn.thermalGenerator.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255); this.fontRendererObj.drawString(this.thermalGenerator.tank.getFluidAmount() + "", 10, 30, 16448255); this.fontRendererObj.drawString(this.thermalGenerator.getEnergy() + "", 10, 40, 16448255); diff --git a/src/main/java/techreborn/client/gui/TRBuilder.java b/src/main/java/techreborn/client/gui/TRBuilder.java index 9f85660ea..c72f78ee3 100644 --- a/src/main/java/techreborn/client/gui/TRBuilder.java +++ b/src/main/java/techreborn/client/gui/TRBuilder.java @@ -333,7 +333,7 @@ public class TRBuilder extends GuiBuilder { public void drawUpgrades(GuiScreen gui, IUpgradeable upgradeable, int posX, int posY) { Minecraft.getMinecraft().getTextureManager().bindTexture(GUI_SHEET); - gui.drawTexturedModalRect(posX -27, posY + 4, 126, 151, 30, 87); + gui.drawTexturedModalRect(posX - 27, posY + 4, 126, 151, 30, 87); } public void drawScrapSlot(GuiScreen gui, int posX, int posY) { diff --git a/src/main/java/techreborn/client/gui/upgrades/GuiSideConfig.java b/src/main/java/techreborn/client/gui/upgrades/GuiSideConfig.java index d2b41a659..59d2798ee 100644 --- a/src/main/java/techreborn/client/gui/upgrades/GuiSideConfig.java +++ b/src/main/java/techreborn/client/gui/upgrades/GuiSideConfig.java @@ -27,7 +27,6 @@ package techreborn.client.gui.upgrades; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -62,7 +61,7 @@ public class GuiSideConfig extends GuiBase { super.initGui(); this.buttonList.clear(); int i = 0; - for(EnumFacing facing : EnumFacing.VALUES){ + for (EnumFacing facing : EnumFacing.VALUES) { buttonList.add(new GuiButton(facing.getIndex(), guiLeft + 150, guiTop + i++ * 23 + 22, 20, 20, "✓")); } } @@ -72,7 +71,6 @@ public class GuiSideConfig extends GuiBase { super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.BACKGROUND; - } @Override @@ -82,11 +80,11 @@ public class GuiSideConfig extends GuiBase { int offset = 10; RenderHelper.enableStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting(); - for(EnumFacing facing : EnumFacing.VALUES){ + for (EnumFacing facing : EnumFacing.VALUES) { BlockPos pos = tileEntity.getPos().offset(facing); IBlockState state = tileEntity.getWorld().getBlockState(pos); ItemStack stack = state.getBlock().getPickBlock(state, new RayTraceResult(new Vec3d(0, 0, 0), facing, pos), tileEntity.getWorld(), pos, Minecraft.getMinecraft().player); - if(stack != null && !stack.isEmpty() && stack.getItem() != null){ + if (stack != null && !stack.isEmpty() && stack.getItem() != null) { drawCentredString(stack.getDisplayName() + " - " + facing.getName(), offset += 22, 4210752, layer); itemRender.renderItemIntoGUI(stack, 10, offset - 2); } else { diff --git a/src/main/java/techreborn/command/TechRebornDevCommand.java b/src/main/java/techreborn/command/TechRebornDevCommand.java index 0c4407d54..24ee483d0 100644 --- a/src/main/java/techreborn/command/TechRebornDevCommand.java +++ b/src/main/java/techreborn/command/TechRebornDevCommand.java @@ -114,7 +114,7 @@ public class TechRebornDevCommand extends CommandBase { sender.sendMessage(new TextComponentString(e.getLocalizedMessage())); } } else if ("ores".equals(args[0])) { - for(String ore: OreDictionary.getOreNames()){ + for (String ore : OreDictionary.getOreNames()) { System.out.println(ore); } } diff --git a/src/main/java/techreborn/compat/crafttweaker/CTGeneric.java b/src/main/java/techreborn/compat/crafttweaker/CTGeneric.java index b520c29c4..10de4b597 100644 --- a/src/main/java/techreborn/compat/crafttweaker/CTGeneric.java +++ b/src/main/java/techreborn/compat/crafttweaker/CTGeneric.java @@ -158,7 +158,7 @@ public class CTGeneric { public void apply() { for (IBaseRecipeType recipeType : RecipeHandler.getRecipeClassFromName(name)) { for (Object stack : recipeType.getInputs()) { - if(stack instanceof ItemStack){ + if (stack instanceof ItemStack) { if (output.matches(MineTweakerMC.getIItemStack((ItemStack) stack))) { removedRecipes.add((BaseRecipe) recipeType); RecipeHandler.recipeList.remove(recipeType); diff --git a/src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java b/src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java index a6f52d5bf..7cc52f0c6 100644 --- a/src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java +++ b/src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java @@ -54,7 +54,7 @@ public class CTIndustrialGrinder extends CTGeneric { fluidStack = CraftTweakerCompat.toFluidStack(fluid); } - IndustrialGrinderRecipe r = new IndustrialGrinderRecipe(oInput1, fluidStack, CraftTweakerCompat.toStack(output1), CraftTweakerCompat.toStack(output2), CraftTweakerCompat.toStack(output3), CraftTweakerCompat.toStack(output4), ticktime, euTick); + IndustrialGrinderRecipe r = new IndustrialGrinderRecipe(oInput1, fluidStack, CraftTweakerCompat.toStack(output1), CraftTweakerCompat.toStack(output2), CraftTweakerCompat.toStack(output3), CraftTweakerCompat.toStack(output4), ticktime, euTick); addRecipe(r); } diff --git a/src/main/java/techreborn/compat/crafttweaker/CTRollingMachine.java b/src/main/java/techreborn/compat/crafttweaker/CTRollingMachine.java index 89d739b16..e29999b21 100644 --- a/src/main/java/techreborn/compat/crafttweaker/CTRollingMachine.java +++ b/src/main/java/techreborn/compat/crafttweaker/CTRollingMachine.java @@ -35,7 +35,6 @@ import reborncore.common.util.ItemUtils; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.RollingMachineRecipe; -import techreborn.api.TechRebornAPI; import java.util.ArrayList; import java.util.List; @@ -44,17 +43,16 @@ import java.util.Map; @ZenClass("mods.techreborn.rollingMachine") public class CTRollingMachine { - //TODO 1.12 Crafttweaker -// @ZenMethod -// public static void addShaped(IItemStack output, IIngredient[][] ingredients) { -// TechRebornAPI.addRollingOreMachinceRecipe(toStack(output), toShapedObjects(ingredients)); -// } + // @ZenMethod + // public static void addShaped(IItemStack output, IIngredient[][] ingredients) { + // TechRebornAPI.addRollingOreMachinceRecipe(toStack(output), toShapedObjects(ingredients)); + // } -// @ZenMethod -// public static void addShapeless(IItemStack output, IIngredient[] ingredients) { -// TechRebornAPI.addShapelessOreRollingMachinceRecipe(toStack(output), toObjects(ingredients)); -// } + // @ZenMethod + // public static void addShapeless(IItemStack output, IIngredient[] ingredients) { + // TechRebornAPI.addShapelessOreRollingMachinceRecipe(toStack(output), toObjects(ingredients)); + // } @ZenMethod public static void removeRecipe(IItemStack output) { @@ -64,7 +62,7 @@ public class CTRollingMachine { toRemove.add(recipe.getKey()); } } - for(ResourceLocation resourceLocation : toRemove){ + for (ResourceLocation resourceLocation : toRemove) { RollingMachineRecipe.instance.getRecipeList().remove(resourceLocation); } } diff --git a/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java b/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java index 81500d325..bae5a2ee5 100644 --- a/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java @@ -47,7 +47,7 @@ public abstract class BaseRecipeWrapper extends BlankRecip inputs = new ArrayList<>(); outputs = new ArrayList<>(); for (Object input : baseRecipe.getInputs()) { - if(input instanceof ItemStack){ + if (input instanceof ItemStack) { ItemStack stack = (ItemStack) input; if (baseRecipe.useOreDic()) { List oreDictInputs = expandOreDict(stack); @@ -55,7 +55,7 @@ public abstract class BaseRecipeWrapper extends BlankRecip } else { inputs.add(Collections.singletonList(stack)); } - } else if (input instanceof String){ + } else if (input instanceof String) { inputs.add(OreDictionary.getOres((String) input)); } } diff --git a/src/main/java/techreborn/compat/jei/BuiltContainerTransferInfo.java b/src/main/java/techreborn/compat/jei/BuiltContainerTransferInfo.java index 450876a23..1969d8cad 100644 --- a/src/main/java/techreborn/compat/jei/BuiltContainerTransferInfo.java +++ b/src/main/java/techreborn/compat/jei/BuiltContainerTransferInfo.java @@ -24,15 +24,13 @@ package techreborn.compat.jei; +import mezz.jei.api.recipe.transfer.IRecipeTransferInfo; import net.minecraft.inventory.Slot; - import techreborn.client.container.builder.BuiltContainer; import java.util.ArrayList; import java.util.List; -import mezz.jei.api.recipe.transfer.IRecipeTransferInfo; - public class BuiltContainerTransferInfo implements IRecipeTransferInfo { private final String containerName, recipeCategory; @@ -40,8 +38,8 @@ public class BuiltContainerTransferInfo implements IRecipeTransferInfo { @Nonnull private final IJeiHelpers jeiHelpers; - public FluidGeneratorRecipeHandler(@Nonnull IJeiHelpers jeiHelpers) { + public FluidGeneratorRecipeHandler( + @Nonnull + IJeiHelpers jeiHelpers) { this.jeiHelpers = jeiHelpers; } diff --git a/src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.java index 4ac3e32b3..050b6fc51 100644 --- a/src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.java @@ -24,13 +24,6 @@ package techreborn.compat.jei.generators.fluid; -import javax.annotation.Nonnull; - -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; -import java.text.NumberFormat; -import java.util.Locale; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawable; @@ -41,6 +34,12 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import techreborn.api.generator.FluidGeneratorRecipe; +import javax.annotation.Nonnull; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.text.NumberFormat; +import java.util.Locale; + public class FluidGeneratorRecipeWrapper extends BlankRecipeWrapper { private static final DecimalFormat formatter; @@ -58,13 +57,17 @@ public class FluidGeneratorRecipeWrapper extends BlankRecipeWrapper { private final FluidGeneratorRecipe baseRecipe; private final IDrawable energyProduced; - public FluidGeneratorRecipeWrapper(@Nonnull IJeiHelpers jeiHelpers, @Nonnull FluidGeneratorRecipe recipe) { + public FluidGeneratorRecipeWrapper( + @Nonnull + IJeiHelpers jeiHelpers, + @Nonnull + FluidGeneratorRecipe recipe) { this.baseRecipe = recipe; IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); energyProduced = guiHelper.createDrawable(FluidGeneratorRecipeCategory.texture, 176, 3, - (int) (25 * ((recipe.getEnergyPerMb() * 1000.0) / FLUID_GENERATOR_STORAGE)), 14); + (int) (25 * ((recipe.getEnergyPerMb() * 1000.0) / FLUID_GENERATOR_STORAGE)), 14); } @Override @@ -74,7 +77,7 @@ public class FluidGeneratorRecipeWrapper extends BlankRecipeWrapper { energyProduced.draw(minecraft, 73, 26); minecraft.fontRendererObj.drawString(formatter.format(baseRecipe.getEnergyPerMb() * 1000) + " FE", 70, 13, - 0x444444); + 0x444444); } @Override diff --git a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java index 7dd349d0e..e1be3be3b 100644 --- a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java @@ -50,6 +50,7 @@ public class GrinderRecipeCategory extends BlankRecipeCategory { @Nonnull private final IJeiHelpers jeiHelpers; - public IndustrialSawmillRecipeHandler(@Nonnull IJeiHelpers jeiHelpers) { + public IndustrialSawmillRecipeHandler( + @Nonnull + IJeiHelpers jeiHelpers) { this.jeiHelpers = jeiHelpers; } - + @Nonnull @Override public Class getRecipeClass() { @@ -51,7 +52,7 @@ public class IndustrialSawmillRecipeHandler implements IRecipeHandler{ +public class IndustrialSawmillRecipeWrapper extends BaseRecipeWrapper { public static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/industrial_sawmill.png"); + "textures/gui/industrial_sawmill.png"); private final IDrawableAnimated progress; - public IndustrialSawmillRecipeWrapper( @Nonnull IJeiHelpers jeiHelpers, @@ -80,23 +77,20 @@ public class IndustrialSawmillRecipeWrapper extends BaseRecipeWrapper type.maxInsulation){ + public static ItemStack getIC2Cable(CableType type, int insulation) { + if (insulation > type.maxInsulation) { return null; } ItemCable itemCable = ItemName.cable.getInstance(); return itemCable.getCable(type, insulation); } - } diff --git a/src/main/java/techreborn/init/IC2Duplicates.java b/src/main/java/techreborn/init/IC2Duplicates.java index 4e00a23ca..875479513 100644 --- a/src/main/java/techreborn/init/IC2Duplicates.java +++ b/src/main/java/techreborn/init/IC2Duplicates.java @@ -31,6 +31,7 @@ import techreborn.config.ConfigTechReborn; import techreborn.items.ItemIngots; import techreborn.items.ItemParts; import techreborn.items.ItemUpgrades; + /** * Created by Mark on 18/12/2016. */ @@ -102,7 +103,7 @@ public enum IC2Duplicates { } public boolean hasIC2Stack() { - if(ic2Stack == null){ + if (ic2Stack == null) { return false; } return !ic2Stack.isEmpty(); diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index b2fde6dbd..d64bfe857 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -213,9 +213,9 @@ public class ModBlocks { registerBlock(CABLE, ItemBlockCable.class, "cable"); GameRegistry.registerTileEntity(TileCable.class, "TileCableTR"); Core.proxy.registerCustomBlockStateLocation(CABLE, "cable"); -// for (EnumCableType cableType : EnumCableType.values()) { -// Core.proxy.registerSubBlockInventoryLocation(CABLE, cableType.ordinal(), "techreborn:cable", "type=inv_" + cableType.getName().toLowerCase()); -// } + // for (EnumCableType cableType : EnumCableType.values()) { + // Core.proxy.registerSubBlockInventoryLocation(CABLE, cableType.ordinal(), "techreborn:cable", "type=inv_" + cableType.getName().toLowerCase()); + // } MACHINE_CASINGS = new BlockMachineCasing(Material.ROCK); registerBlock(MACHINE_CASINGS, ItemBlockMachineCasing.class, "machinecasing"); diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 7e14f152f..c6ab26d8b 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -83,7 +83,8 @@ public class ModItems { public static Item ENERGY_CRYSTAL; public static Item SCRAP_BOX; public static Item FREQUENCY_TRANSMITTER; - public static @Nullable Item BRONZE_SWORD; + public static @Nullable + Item BRONZE_SWORD; @Nullable public static Item BRONZE_PICKAXE; @Nullable @@ -349,8 +350,8 @@ public class ModItems { public static void registerItem(Item item, String name) { item.setRegistryName(name); GameRegistry.register(item); - if(item.getClass().isInstance(IEnergyItemInfo.class)){ - if(!item.getClass().isInstance(IEnergyInterfaceItem.class)){ + if (item.getClass().isInstance(IEnergyItemInfo.class)) { + if (!item.getClass().isInstance(IEnergyInterfaceItem.class)) { Core.logHelper.error(name + " was not patched with the power mixin. This is a error, the item may not work as intended."); Core.logHelper.error("Please check that the reborn core loading plugin has been registerd."); } diff --git a/src/main/java/techreborn/init/ModPoweredItems.java b/src/main/java/techreborn/init/ModPoweredItems.java index 4e08efec9..b8258183a 100644 --- a/src/main/java/techreborn/init/ModPoweredItems.java +++ b/src/main/java/techreborn/init/ModPoweredItems.java @@ -31,7 +31,7 @@ import reborncore.common.powerSystem.PoweredItem; */ public class ModPoweredItems { - public static void preInit(){ + public static void preInit() { PoweredItem.registerPoweredItem("techreborn.items.tools.ItemRockCutter"); PoweredItem.registerPoweredItem("techreborn.items.armor.ItemLithiumBatpack"); PoweredItem.registerPoweredItem("techreborn.items.armor.ItemLapotronPack"); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 7679dc654..a0b22fe9c 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -92,8 +92,8 @@ public class ModRecipes { addCompressorRecipes(); } - public static void postInit(){ - if(ConfigTechReborn.disableRailcraftSteelNuggetRecipe){ + public static void postInit() { + if (ConfigTechReborn.disableRailcraftSteelNuggetRecipe) { Iterator iterator = FurnaceRecipes.instance().getSmeltingList().entrySet().iterator(); Map.Entry entry; while (iterator.hasNext()) { @@ -101,7 +101,7 @@ public class ModRecipes { if (entry.getValue() instanceof ItemStack && entry.getKey() instanceof ItemStack) { ItemStack input = (ItemStack) entry.getKey(); ItemStack output = (ItemStack) entry.getValue(); - if(ItemUtils.isInputEqual("nuggetSteel", output, true , true, false) && ItemUtils.isInputEqual("nuggetIron", input, true , true, false)){ + if (ItemUtils.isInputEqual("nuggetSteel", output, true, true, false) && ItemUtils.isInputEqual("nuggetIron", input, true, true, false)) { Core.logHelper.info("Removing a steelnugget smelting recipe"); iterator.remove(); } @@ -333,7 +333,6 @@ public class ModRecipes { "circuitBasic", 'T', IC2Duplicates.MVT.getStackBasedOnConfig()); } - CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("energy_storage"), "PPP", "WBW", "PCP", 'P', "plankWood", 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), 'C', "circuitBasic", 'B', ModItems.RE_BATTERY); diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index 5004edb90..afb2a741d 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -56,7 +56,7 @@ public class CraftingTableRecipes extends RecipeMethods { registerShapeless(getStack(ModBlocks.RUBBER_PLANKS, 4), getStack(ModBlocks.RUBBER_LOG)); - if(!IC2Duplicates.deduplicate()){ + if (!IC2Duplicates.deduplicate()) { registerShapeless(getStack(ModItems.FREQUENCY_TRANSMITTER), getStack(IC2Duplicates.CABLE_ICOPPER), "circuitBasic"); } diff --git a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java index c07fa9716..e3c551883 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java @@ -143,7 +143,7 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods { } - if(input instanceof ItemStack){ + if (input instanceof ItemStack) { if (((ItemStack) input).getItem() instanceof DynamicCell) { int inputCount = ((ItemStack) input).getCount(); if (cellCount < inputCount) { diff --git a/src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java index 25393219a..b9518f3a2 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java @@ -87,8 +87,8 @@ public class IndustrialSawmillRecipes extends RecipeMethods { @Nonnull public static ItemStack findMatchingRecipe(InventoryCrafting inv) { - for(IRecipe recipe : CraftingManager.field_193380_a){ - if (recipe.matches(inv, null)) { + for (IRecipe recipe : CraftingManager.field_193380_a) { + if (recipe.matches(inv, null)) { return recipe.getCraftingResult(inv); } } diff --git a/src/main/java/techreborn/init/recipes/RecipeMethods.java b/src/main/java/techreborn/init/recipes/RecipeMethods.java index d3a747547..fffc15be0 100644 --- a/src/main/java/techreborn/init/recipes/RecipeMethods.java +++ b/src/main/java/techreborn/init/recipes/RecipeMethods.java @@ -86,9 +86,9 @@ public abstract class RecipeMethods { } else if (type == Type.NUGGET) { object = "nugget" + StringUtils.toFirstCapital(name); } - if(object != null){ - if(object instanceof String){ - if(OreUtil.doesOreExistAndValid((String) object)){ + if (object != null) { + if (object instanceof String) { + if (OreUtil.doesOreExistAndValid((String) object)) { return object; } } else { @@ -136,7 +136,7 @@ public abstract class RecipeMethods { } static ItemStack getStack(Item item, int count, boolean wildcard) { - return getStack(item, count, wildcard ? OreDictionary.WILDCARD_VALUE : 0); + return getStack(item, count, wildcard ? OreDictionary.WILDCARD_VALUE : 0); } static ItemStack getStack(Item item, int count, int metadata) { @@ -156,7 +156,7 @@ public abstract class RecipeMethods { } static ItemStack getStack(Block block, int count, boolean wildcard) { - return getStack(block, count, wildcard ? OreDictionary.WILDCARD_VALUE : 0); + return getStack(block, count, wildcard ? OreDictionary.WILDCARD_VALUE : 0); } static ItemStack getStack(Block block, int count, int metadata) { diff --git a/src/main/java/techreborn/init/recipes/RollingMachineRecipes.java b/src/main/java/techreborn/init/recipes/RollingMachineRecipes.java index f44a5d54f..f1232d517 100644 --- a/src/main/java/techreborn/init/recipes/RollingMachineRecipes.java +++ b/src/main/java/techreborn/init/recipes/RollingMachineRecipes.java @@ -37,24 +37,24 @@ import techreborn.lib.ModInfo; public class RollingMachineRecipes extends RecipeMethods { public static void init() { register(new ResourceLocation(ModInfo.MOD_ID, "cupronickel_heating_coil"), getMaterial("cupronickel_heating_coil", 3, Type.PART), "NCN", "C C", "NCN", 'N', "ingotNickel", 'C', "ingotCopper"); - register(new ResourceLocation(ModInfo.MOD_ID, "nichrome_heating_coil"),getMaterial("nichrome_heating_coil", 2, Type.PART), " N ", "NCN", " N ", 'N', "ingotNickel", 'C', "ingotChrome"); + register(new ResourceLocation(ModInfo.MOD_ID, "nichrome_heating_coil"), getMaterial("nichrome_heating_coil", 2, Type.PART), " N ", "NCN", " N ", 'N', "ingotNickel", 'C', "ingotChrome"); if (oresExist("ingotAluminum")) { - register(new ResourceLocation(ModInfo.MOD_ID, "kanthal_heating_coil"),getMaterial("kanthal_heating_coil", 3, Type.PART), "RRR", "CAA", "CCA", 'R', "ingotRefinedIron", 'C', "ingotChrome", 'A', "ingotAluminum"); + register(new ResourceLocation(ModInfo.MOD_ID, "kanthal_heating_coil"), getMaterial("kanthal_heating_coil", 3, Type.PART), "RRR", "CAA", "CCA", 'R', "ingotRefinedIron", 'C', "ingotChrome", 'A', "ingotAluminum"); } if (oresExist("ingotAluminium")) { - register(new ResourceLocation(ModInfo.MOD_ID, "kanthal_heating_coil2"),getMaterial("kanthal_heating_coil", 3, Type.PART), "RRR", "CAA", "CCA", 'R', "ingotRefinedIron", 'C', "ingotChrome", 'A', "ingotAluminium"); + register(new ResourceLocation(ModInfo.MOD_ID, "kanthal_heating_coil2"), getMaterial("kanthal_heating_coil", 3, Type.PART), "RRR", "CAA", "CCA", 'R', "ingotRefinedIron", 'C', "ingotChrome", 'A', "ingotAluminium"); } - register(new ResourceLocation(ModInfo.MOD_ID, "rail"),getStack(Blocks.RAIL, 24), "I I", "ISI", "I I", 'I', "ingotIron", 'S', "stickWood"); - register(new ResourceLocation(ModInfo.MOD_ID, "gold_rail"),getStack(Blocks.GOLDEN_RAIL, 8), "I I", "ISI", "IRI", 'I', "ingotGold", 'S', "stickWood", 'R', "dustRedstone"); - register(new ResourceLocation(ModInfo.MOD_ID, "detector_rail"),getStack(Blocks.DETECTOR_RAIL, 8), "I I", "IPI", "IRI", 'I', "ingotIron", 'P', getStack(Blocks.STONE_PRESSURE_PLATE), 'R', "dustRedstone"); - register(new ResourceLocation(ModInfo.MOD_ID, "activator_rail"),getStack(Blocks.ACTIVATOR_RAIL, 8), "ISI", "IRI", "ISI", 'I', "ingotIron", 'S', "stickWood", 'R', getStack(Blocks.REDSTONE_TORCH)); - register(new ResourceLocation(ModInfo.MOD_ID, "iron_bars"),getStack(Blocks.IRON_BARS, 24), "III", "III", 'I', "ingotIron"); - register(new ResourceLocation(ModInfo.MOD_ID, "iron_door"),getStack(Items.IRON_DOOR, 4), "II ", "II ", "II ", 'I', "ingotIron"); - register(new ResourceLocation(ModInfo.MOD_ID, "minecart"),getStack(Items.MINECART, 2), "I I", "III", 'I', "ingotIron"); - register(new ResourceLocation(ModInfo.MOD_ID, "bucket"),getStack(Items.BUCKET, 2), "I I", "I I", " I ", 'I', "ingotIron"); - register(new ResourceLocation(ModInfo.MOD_ID, "tripwire_hook"),getStack(Blocks.TRIPWIRE_HOOK, 4), " I ", " S ", " W ", 'I', "ingotIron", 'S', "stickWood", 'W', "plankWood"); - register(new ResourceLocation(ModInfo.MOD_ID, "heavy_pressure_plate"),getStack(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE, 2), "II ", 'I', "ingotIron"); - register(new ResourceLocation(ModInfo.MOD_ID, "light_pressure_plate"),getStack(Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE, 2), "GG ", 'G', "ingotGold"); + register(new ResourceLocation(ModInfo.MOD_ID, "rail"), getStack(Blocks.RAIL, 24), "I I", "ISI", "I I", 'I', "ingotIron", 'S', "stickWood"); + register(new ResourceLocation(ModInfo.MOD_ID, "gold_rail"), getStack(Blocks.GOLDEN_RAIL, 8), "I I", "ISI", "IRI", 'I', "ingotGold", 'S', "stickWood", 'R', "dustRedstone"); + register(new ResourceLocation(ModInfo.MOD_ID, "detector_rail"), getStack(Blocks.DETECTOR_RAIL, 8), "I I", "IPI", "IRI", 'I', "ingotIron", 'P', getStack(Blocks.STONE_PRESSURE_PLATE), 'R', "dustRedstone"); + register(new ResourceLocation(ModInfo.MOD_ID, "activator_rail"), getStack(Blocks.ACTIVATOR_RAIL, 8), "ISI", "IRI", "ISI", 'I', "ingotIron", 'S', "stickWood", 'R', getStack(Blocks.REDSTONE_TORCH)); + register(new ResourceLocation(ModInfo.MOD_ID, "iron_bars"), getStack(Blocks.IRON_BARS, 24), "III", "III", 'I', "ingotIron"); + register(new ResourceLocation(ModInfo.MOD_ID, "iron_door"), getStack(Items.IRON_DOOR, 4), "II ", "II ", "II ", 'I', "ingotIron"); + register(new ResourceLocation(ModInfo.MOD_ID, "minecart"), getStack(Items.MINECART, 2), "I I", "III", 'I', "ingotIron"); + register(new ResourceLocation(ModInfo.MOD_ID, "bucket"), getStack(Items.BUCKET, 2), "I I", "I I", " I ", 'I', "ingotIron"); + register(new ResourceLocation(ModInfo.MOD_ID, "tripwire_hook"), getStack(Blocks.TRIPWIRE_HOOK, 4), " I ", " S ", " W ", 'I', "ingotIron", 'S', "stickWood", 'W', "plankWood"); + register(new ResourceLocation(ModInfo.MOD_ID, "heavy_pressure_plate"), getStack(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE, 2), "II ", 'I', "ingotIron"); + register(new ResourceLocation(ModInfo.MOD_ID, "light_pressure_plate"), getStack(Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE, 2), "GG ", 'G', "ingotGold"); } static void register(ResourceLocation resourceLocation, ItemStack output, Object... componentsObjects) { diff --git a/src/main/java/techreborn/itemblocks/ItemBlockCable.java b/src/main/java/techreborn/itemblocks/ItemBlockCable.java index 14a6c49ed..dfb3224f4 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockCable.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockCable.java @@ -14,14 +14,11 @@ public class ItemBlockCable extends ItemBlock { super(block); } - public int getMetadata(int damage) - { + public int getMetadata(int damage) { return damage; } - - public String getUnlocalizedName(ItemStack stack) - { + public String getUnlocalizedName(ItemStack stack) { return super.getUnlocalizedName() + "." + EnumCableType.values()[stack.getItemDamage()].getName(); } } diff --git a/src/main/java/techreborn/items/ItemDestructopack.java b/src/main/java/techreborn/items/ItemDestructopack.java index ea157633a..1310df228 100644 --- a/src/main/java/techreborn/items/ItemDestructopack.java +++ b/src/main/java/techreborn/items/ItemDestructopack.java @@ -24,21 +24,18 @@ package techreborn.items; +import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; - import reborncore.RebornCore; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTabMisc; -import me.modmuss50.jsonDestroyer.api.ITexturedItem; - public class ItemDestructopack extends ItemTextureBase implements ITexturedItem { public ItemDestructopack() { @@ -49,9 +46,9 @@ public class ItemDestructopack extends ItemTextureBase implements ITexturedItem @Override public ActionResult onItemRightClick(final World world, final EntityPlayer player, - final EnumHand hand) { + final EnumHand hand) { player.openGui(Core.INSTANCE, EGui.DESTRUCTOPACK.ordinal(), world, (int) player.posX, (int) player.posY, - (int) player.posY); + (int) player.posY); return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index 33f833937..cc6419006 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -27,7 +27,6 @@ package techreborn.items; import com.google.common.base.CaseFormat; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import techreborn.client.TechRebornCreativeTabMisc; diff --git a/src/main/java/techreborn/items/ItemIngots.java b/src/main/java/techreborn/items/ItemIngots.java index 9caf4dad1..317647989 100644 --- a/src/main/java/techreborn/items/ItemIngots.java +++ b/src/main/java/techreborn/items/ItemIngots.java @@ -27,7 +27,6 @@ package techreborn.items; import com.google.common.base.CaseFormat; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import techreborn.client.TechRebornCreativeTabMisc; diff --git a/src/main/java/techreborn/items/ItemNuggets.java b/src/main/java/techreborn/items/ItemNuggets.java index 652ef8bac..efa822094 100644 --- a/src/main/java/techreborn/items/ItemNuggets.java +++ b/src/main/java/techreborn/items/ItemNuggets.java @@ -26,7 +26,6 @@ package techreborn.items; import com.google.common.base.CaseFormat; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import techreborn.client.TechRebornCreativeTabMisc; diff --git a/src/main/java/techreborn/items/ItemParts.java b/src/main/java/techreborn/items/ItemParts.java index dd9756741..d6d06b668 100644 --- a/src/main/java/techreborn/items/ItemParts.java +++ b/src/main/java/techreborn/items/ItemParts.java @@ -25,14 +25,11 @@ package techreborn.items; import com.google.common.base.CaseFormat; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.world.World; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -42,13 +39,13 @@ import java.security.InvalidParameterException; public class ItemParts extends ItemTRNoDestroy { public static final String[] types = new String[] { "energy_flow_circuit", "data_control_circuit", "data_storage_circuit", - "data_orb", "diamond_grinding_head", "diamond_saw_blade", "tungsten_grinding_head", "helium_coolant_simple", - "helium_coolant_triple", "helium_coolant_six", "nak_coolant_simple", "nak_coolant_triple", "nak_coolant_six", - "cupronickel_heating_coil", "nichrome_heating_coil", "kanthal_heating_coil", ModItems.META_PLACEHOLDER, "super_conductor", - "thorium_cell", "double_thorium_cell", "quad_thorium_cell", "plutonium_cell", "double_plutonium_cell", - "quad_plutonium_cell", "computer_monitor", "machine_parts", "neutron_reflector", "iridium_neutron_reflector", - "thick_neutron_reflector", "electronic_circuit", "advanced_circuit", "sap", "rubber", "scrap", - "carbon_mesh", "carbon_fiber", "coolant_simple", "coolant_triple", "coolant_six" }; + "data_orb", "diamond_grinding_head", "diamond_saw_blade", "tungsten_grinding_head", "helium_coolant_simple", + "helium_coolant_triple", "helium_coolant_six", "nak_coolant_simple", "nak_coolant_triple", "nak_coolant_six", + "cupronickel_heating_coil", "nichrome_heating_coil", "kanthal_heating_coil", ModItems.META_PLACEHOLDER, "super_conductor", + "thorium_cell", "double_thorium_cell", "quad_thorium_cell", "plutonium_cell", "double_plutonium_cell", + "quad_plutonium_cell", "computer_monitor", "machine_parts", "neutron_reflector", "iridium_neutron_reflector", + "thick_neutron_reflector", "electronic_circuit", "advanced_circuit", "sap", "rubber", "scrap", + "carbon_mesh", "carbon_fiber", "coolant_simple", "coolant_triple", "coolant_six" }; public ItemParts() { this.setCreativeTab(TechRebornCreativeTab.instance); @@ -110,7 +107,7 @@ public class ItemParts extends ItemTRNoDestroy { switch (itemStack.getItemDamage()) { case 37: // Destructo pack player.openGui(Core.INSTANCE, EGui.DESTRUCTOPACK.ordinal(), world, (int) player.posX, (int) player.posY, - (int) player.posY); + (int) player.posY); break; } return itemStack; diff --git a/src/main/java/techreborn/items/ItemUpgrades.java b/src/main/java/techreborn/items/ItemUpgrades.java index 5fbf94ecc..4fce6f4f4 100644 --- a/src/main/java/techreborn/items/ItemUpgrades.java +++ b/src/main/java/techreborn/items/ItemUpgrades.java @@ -30,7 +30,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -105,10 +104,10 @@ public class ItemUpgrades extends ItemTRNoDestroy implements IUpgrade { @Override public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { super.addInformation(stack, world, tooltip, flag); - if(stack.getItemDamage() == 4 || stack.getItemDamage() == 5){ + if (stack.getItemDamage() == 4 || stack.getItemDamage() == 5) { tooltip.add("Facing: " + getFacing(stack).getName()); String text = Core.proxy.getUpgradeConfigText(); - if(!text.isEmpty()){ + if (!text.isEmpty()) { tooltip.add(text); } } @@ -123,77 +122,77 @@ public class ItemUpgrades extends ItemTRNoDestroy implements IUpgrade { @Nonnull ItemStack stack) { - if (stack.getItemDamage() == 0) { - if(crafter != null) { - crafter.addSpeedMulti(0.25); - crafter.addPowerMulti(0.5); - } + if (stack.getItemDamage() == 0) { + if (crafter != null) { + crafter.addSpeedMulti(0.25); + crafter.addPowerMulti(0.5); + } - } else if(stack.getItemDamage() == 4){ - EnumFacing dir = getFacing(stack); - TileEntity tileEntity = machineBase.getWorld().getTileEntity(machineBase.getPos().offset(dir)); - if(tileEntity instanceof IInventory){ - if(crafter != null){ - for(Integer outSlot : crafter.outputSlots){ - ItemStack outputStack = crafter.inventory.getStackInSlot(outSlot); - if(!outputStack.isEmpty()){ - int amount = InventoryHelper.testInventoryInsertion((IInventory) tileEntity, outputStack, dir); - if(amount > 0){ - InventoryHelper.insertItemIntoInventory((IInventory) tileEntity,outputStack); - crafter.inventory.decrStackSize(outSlot, amount); - } + } else if (stack.getItemDamage() == 4) { + EnumFacing dir = getFacing(stack); + TileEntity tileEntity = machineBase.getWorld().getTileEntity(machineBase.getPos().offset(dir)); + if (tileEntity instanceof IInventory) { + if (crafter != null) { + for (Integer outSlot : crafter.outputSlots) { + ItemStack outputStack = crafter.inventory.getStackInSlot(outSlot); + if (!outputStack.isEmpty()) { + int amount = InventoryHelper.testInventoryInsertion((IInventory) tileEntity, outputStack, dir); + if (amount > 0) { + InventoryHelper.insertItemIntoInventory((IInventory) tileEntity, outputStack); + crafter.inventory.decrStackSize(outSlot, amount); } } - } else if (machineBase instanceof IMachineSlotProvider){ - IMachineSlotProvider slotProvider = (IMachineSlotProvider) machineBase; - for(Integer outSlot : slotProvider.getOuputSlots()){ - ItemStack outputStack = slotProvider.getMachineInv().getStackInSlot(outSlot); - if(!outputStack.isEmpty()){ - int amount = InventoryHelper.testInventoryInsertion((IInventory) tileEntity, outputStack, dir); - if(amount > 0){ - InventoryHelper.insertItemIntoInventory((IInventory) tileEntity,outputStack); - slotProvider.getMachineInv().decrStackSize(outSlot, amount); - } + } + } else if (machineBase instanceof IMachineSlotProvider) { + IMachineSlotProvider slotProvider = (IMachineSlotProvider) machineBase; + for (Integer outSlot : slotProvider.getOuputSlots()) { + ItemStack outputStack = slotProvider.getMachineInv().getStackInSlot(outSlot); + if (!outputStack.isEmpty()) { + int amount = InventoryHelper.testInventoryInsertion((IInventory) tileEntity, outputStack, dir); + if (amount > 0) { + InventoryHelper.insertItemIntoInventory((IInventory) tileEntity, outputStack); + slotProvider.getMachineInv().decrStackSize(outSlot, amount); } } - } else { - IInventory inventory = machineBase; - for (int outSlot = 0; outSlot < inventory.getSizeInventory(); outSlot++) { - ItemStack outputStack = inventory.getStackInSlot(outSlot); - if(!outputStack.isEmpty()){ - int amount = InventoryHelper.testInventoryInsertion((IInventory) tileEntity, outputStack, dir); - if(amount > 0){ - InventoryHelper.insertItemIntoInventory((IInventory) tileEntity,outputStack); - inventory.decrStackSize(outSlot, amount); - } + } + } else { + IInventory inventory = machineBase; + for (int outSlot = 0; outSlot < inventory.getSizeInventory(); outSlot++) { + ItemStack outputStack = inventory.getStackInSlot(outSlot); + if (!outputStack.isEmpty()) { + int amount = InventoryHelper.testInventoryInsertion((IInventory) tileEntity, outputStack, dir); + if (amount > 0) { + InventoryHelper.insertItemIntoInventory((IInventory) tileEntity, outputStack); + inventory.decrStackSize(outSlot, amount); } } } } - } else if (stack.getItemDamage() == 5){ - if(machineBase.getWorld().getTotalWorldTime() % 10 != 0){ - return; - } - EnumFacing dir = getFacing(stack); - TileEntity tileEntity = machineBase.getWorld().getTileEntity(machineBase.getPos().offset(dir)); - if(tileEntity != null && tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir.getOpposite())){ - IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir.getOpposite()); - for (int i = 0; i < itemHandler.getSlots(); i++) { - ItemStack stack1 = itemHandler.getStackInSlot(i); - if(crafter == null || crafter.isStackValidInput(stack1)){ - ItemStack extractedStack = itemHandler.extractItem(i, 1, true); - int amount = InventoryHelper.testInventoryInsertion(machineBase, extractedStack, null); - if(amount > 0){ - extractedStack = itemHandler.extractItem(i, 1, false); - extractedStack.setCount(1); - InventoryHelper.insertItemIntoInventory(machineBase , extractedStack); - } + } + } else if (stack.getItemDamage() == 5) { + if (machineBase.getWorld().getTotalWorldTime() % 10 != 0) { + return; + } + EnumFacing dir = getFacing(stack); + TileEntity tileEntity = machineBase.getWorld().getTileEntity(machineBase.getPos().offset(dir)); + if (tileEntity != null && tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir.getOpposite())) { + IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir.getOpposite()); + for (int i = 0; i < itemHandler.getSlots(); i++) { + ItemStack stack1 = itemHandler.getStackInSlot(i); + if (crafter == null || crafter.isStackValidInput(stack1)) { + ItemStack extractedStack = itemHandler.extractItem(i, 1, true); + int amount = InventoryHelper.testInventoryInsertion(machineBase, extractedStack, null); + if (amount > 0) { + extractedStack = itemHandler.extractItem(i, 1, false); + extractedStack.setCount(1); + InventoryHelper.insertItemIntoInventory(machineBase, extractedStack); } } } + } } - if(machineBase instanceof TilePowerAcceptor){ + if (machineBase instanceof TilePowerAcceptor) { if (stack.getItemDamage() == 2) { TilePowerAcceptor acceptor = (TilePowerAcceptor) machineBase; acceptor.extraPowerStoage += 40000; @@ -208,8 +207,8 @@ public class ItemUpgrades extends ItemTRNoDestroy implements IUpgrade { @Override @SideOnly(Side.CLIENT) public void handleRightClick(TileEntity tile, ItemStack stack, Container container, int slotID) { - if(tile.getWorld().isRemote){ - if(stack.getItemDamage() == 4 || stack.getItemDamage() == 5){ + if (tile.getWorld().isRemote) { + if (stack.getItemDamage() == 4 || stack.getItemDamage() == 5) { //TODO use the full gui handler Minecraft.getMinecraft().displayGuiScreen(new GuiSideConfig(Minecraft.getMinecraft().player, tile, getContainer(Minecraft.getMinecraft().player), slotID)); } @@ -217,11 +216,11 @@ public class ItemUpgrades extends ItemTRNoDestroy implements IUpgrade { } @SideOnly(Side.CLIENT) - public BuiltContainer getContainer(EntityPlayer player){ + public BuiltContainer getContainer(EntityPlayer player) { return new ContainerBuilder("sides").create(); } - public EnumFacing getFacing(ItemStack stack){ + public EnumFacing getFacing(ItemStack stack) { return EnumFacing.VALUES[ItemNBTHelper.getInt(stack, "side", 0)]; } -} \ No newline at end of file +} diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index 2c00fc95c..fdd78c8b0 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -36,7 +36,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index 53040d5a6..b190cc5c7 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -28,7 +28,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -36,7 +35,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; @@ -108,7 +106,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack uncharged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK); ItemStack charged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK); PoweredItem.setEnergy(getMaxPower(charged), charged); @@ -117,5 +115,4 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo { itemList.add(charged); } - } diff --git a/src/main/java/techreborn/items/battery/ItemBattery.java b/src/main/java/techreborn/items/battery/ItemBattery.java index 79efdc619..c57e186aa 100644 --- a/src/main/java/techreborn/items/battery/ItemBattery.java +++ b/src/main/java/techreborn/items/battery/ItemBattery.java @@ -32,7 +32,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.items.ItemTRNoDestroy; diff --git a/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java b/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java index b28bf58b4..a90893a3f 100644 --- a/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java +++ b/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java @@ -25,7 +25,6 @@ package techreborn.items.battery; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java b/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java index 47167419a..06ec101c6 100644 --- a/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java +++ b/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java @@ -25,7 +25,6 @@ package techreborn.items.battery; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -43,7 +42,7 @@ public class ItemLapotronCrystal extends ItemBattery { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_CRYSTAL); ItemStack uncharged = stack.copy(); ItemStack charged = stack.copy(); diff --git a/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java b/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java index cc456a38a..bc60eb1d7 100644 --- a/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java +++ b/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java @@ -25,7 +25,6 @@ package techreborn.items.battery; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -44,7 +43,7 @@ public class ItemLapotronicOrb extends ItemBattery { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_ORB); ItemStack uncharged = stack.copy(); ItemStack charged = stack.copy(); diff --git a/src/main/java/techreborn/items/battery/ItemLithiumBattery.java b/src/main/java/techreborn/items/battery/ItemLithiumBattery.java index 162872ec9..8ade53737 100644 --- a/src/main/java/techreborn/items/battery/ItemLithiumBattery.java +++ b/src/main/java/techreborn/items/battery/ItemLithiumBattery.java @@ -25,7 +25,6 @@ package techreborn.items.battery; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -43,7 +42,7 @@ public class ItemLithiumBattery extends ItemBattery { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack stack = new ItemStack(ModItems.LITHIUM_BATTERY); ItemStack uncharged = stack.copy(); ItemStack charged = stack.copy(); diff --git a/src/main/java/techreborn/items/battery/ItemReBattery.java b/src/main/java/techreborn/items/battery/ItemReBattery.java index c0b999d19..9b4c8825e 100644 --- a/src/main/java/techreborn/items/battery/ItemReBattery.java +++ b/src/main/java/techreborn/items/battery/ItemReBattery.java @@ -25,7 +25,6 @@ package techreborn.items.battery; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -43,7 +42,7 @@ public class ItemReBattery extends ItemBattery { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack stack = new ItemStack(ModItems.RE_BATTERY); ItemStack uncharged = stack.copy(); ItemStack charged = stack.copy(); diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java index fa2113f4d..ef81d7148 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java @@ -27,7 +27,6 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -48,7 +47,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack stack = new ItemStack(ModItems.ADVANCED_CHAINSAW); ItemStack uncharged = stack.copy(); ItemStack charged = stack.copy(); diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index c97d5d022..2e6a355b1 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -31,7 +31,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java index e4df1acba..9a7af5303 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java @@ -25,7 +25,6 @@ package techreborn.items.tools; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -47,7 +46,7 @@ public class ItemAdvancedJackhammer extends ItemJackhammer { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack stack = new ItemStack(ModItems.ADVANCED_JACKHAMMER); ItemStack uncharged = stack.copy(); ItemStack charged = stack.copy(); diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 2305a412c..4bbe02d37 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -38,7 +38,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index 02eabb0a9..aff0779ee 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -28,14 +28,12 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; @@ -107,7 +105,7 @@ public class ItemCloakingDevice extends ItemTRNoDestroy implements IEnergyItemIn @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack uncharged = new ItemStack(ModItems.CLOAKING_DEVICE); ItemStack charged = new ItemStack(ModItems.CLOAKING_DEVICE); PoweredItem.setEnergy(getMaxPower(charged), charged); diff --git a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java index f121f4681..0f35ae6bc 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java @@ -27,7 +27,6 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -48,7 +47,7 @@ public class ItemDiamondChainsaw extends ItemChainsaw { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack stack = new ItemStack(ModItems.DIAMOND_CHAINSAW); ItemStack uncharged = stack.copy(); ItemStack charged = stack.copy(); diff --git a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java index fe6aaf28a..19a141385 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java @@ -27,7 +27,6 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -48,7 +47,7 @@ public class ItemDiamondDrill extends ItemDrill { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack stack = new ItemStack(ModItems.DIAMOND_DRILL); ItemStack uncharged = stack.copy(); ItemStack charged = stack.copy(); diff --git a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java index a1159cfca..763fd11ff 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java @@ -25,7 +25,6 @@ package techreborn.items.tools; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index 943041196..b39d8a68f 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -34,7 +34,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import reborncore.api.power.IEnergyItemInfo; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; diff --git a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java index df6231593..7c43e7499 100644 --- a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java +++ b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java @@ -29,23 +29,21 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; +import techreborn.compat.CompatManager; import techreborn.init.ModItems; import techreborn.items.ItemTRNoDestroy; -import techreborn.compat.CompatManager; /** * Created by modmuss50 on 05/11/2016. @@ -66,7 +64,7 @@ public class ItemElectricTreetap extends ItemTRNoDestroy implements IEnergyItemI public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { IBlockState state = worldIn.getBlockState(pos); Block block = state.getBlock(); - if(CompatManager.isIC2Loaded && block == Block.getBlockFromName("ic2:rubber_wood") && PoweredItem.canUseEnergy(20, playerIn.getHeldItem(hand))) + if (CompatManager.isIC2Loaded && block == Block.getBlockFromName("ic2:rubber_wood") && PoweredItem.canUseEnergy(20, playerIn.getHeldItem(hand))) if (ItemTreetap.attemptExtract(playerIn, worldIn, pos, side, state, null) && !worldIn.isRemote) { PoweredItem.useEnergy(20, playerIn.getHeldItem(hand)); return EnumActionResult.SUCCESS; @@ -111,4 +109,4 @@ public class ItemElectricTreetap extends ItemTRNoDestroy implements IEnergyItemI itemList.add(charged); } -} \ No newline at end of file +} diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index 38d9043e5..131aa3660 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -31,7 +31,6 @@ import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.init.Enchantments; -import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -39,14 +38,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.utils.OreDictUtils; -import java.util.List; import java.util.Random; public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo { @@ -80,7 +76,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo { @Override public boolean canHarvestBlock(final IBlockState state, final ItemStack stack) { return OreDictUtils.isOre(state, "stone") - || state.getBlock().getMaterial(state) == Material.ROCK && PoweredItem.canUseEnergy(this.cost, stack); + || state.getBlock().getMaterial(state) == Material.ROCK && PoweredItem.canUseEnergy(this.cost, stack); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 6505266bc..910418fb3 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -34,7 +34,6 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.IItemPropertyGetter; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.nbt.NBTTagCompound; @@ -46,7 +45,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import reborncore.common.util.ChatUtils; import techreborn.client.TechRebornCreativeTab; @@ -115,7 +113,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack inactiveUncharged = new ItemStack(ModItems.NANOSABER); inactiveUncharged.setTagCompound(new NBTTagCompound()); inactiveUncharged.getTagCompound().setBoolean("isActive", false); @@ -143,17 +141,16 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { } } - @Override public ActionResult onItemRightClick(final World world, final EntityPlayer player, - final EnumHand hand) { + final EnumHand hand) { final ItemStack stack = player.getHeldItem(hand); if (player.isSneaking()) { if (!PoweredItem.canUseEnergy(this.cost, stack)) { ChatUtils.sendNoSpamMessages(MessageIDs.nanosaberID, new TextComponentString( - TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.nanosaberEnergyErrorTo") + " " - + TextFormatting.GOLD + I18n - .translateToLocal("techreborn.message.nanosaberActivate"))); + TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.nanosaberEnergyErrorTo") + " " + + TextFormatting.GOLD + I18n + .translateToLocal("techreborn.message.nanosaberActivate"))); } else { if (stack.getTagCompound() == null || !stack.getTagCompound().getBoolean("isActive")) { if (stack.getTagCompound() == null) { @@ -162,17 +159,17 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { stack.getTagCompound().setBoolean("isActive", true); if (world.isRemote && ConfigTechReborn.NanosaberChat) { ChatUtils.sendNoSpamMessages(MessageIDs.nanosaberID, new TextComponentString( - TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " " - + TextFormatting.GOLD + I18n - .translateToLocal("techreborn.message.nanosaberActive"))); + TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " " + + TextFormatting.GOLD + I18n + .translateToLocal("techreborn.message.nanosaberActive"))); } } else { stack.getTagCompound().setBoolean("isActive", false); if (world.isRemote && ConfigTechReborn.NanosaberChat) { ChatUtils.sendNoSpamMessages(MessageIDs.nanosaberID, new TextComponentString( - TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " " - + TextFormatting.GOLD + I18n - .translateToLocal("techreborn.message.nanosaberInactive"))); + TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " " + + TextFormatting.GOLD + I18n + .translateToLocal("techreborn.message.nanosaberInactive"))); } } } diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 7480050ff..583d71fdd 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -30,7 +30,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.util.*; @@ -40,7 +39,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; @@ -146,7 +144,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack uncharged = new ItemStack(ModItems.OMNI_TOOL); ItemStack charged = new ItemStack(ModItems.OMNI_TOOL); PoweredItem.setEnergy(getMaxPower(charged), charged); @@ -155,7 +153,6 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { itemList.add(charged); } - @Override public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.add(TextFormatting.RED + "WIP Coming Soon"); diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 6e5b5fdcf..5919c5939 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -32,7 +32,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -41,7 +40,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; @@ -143,7 +141,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack uncharged = new ItemStack(ModItems.ROCK_CUTTER); ItemStack charged = new ItemStack(ModItems.ROCK_CUTTER); PoweredItem.setEnergy(getMaxPower(charged), charged); @@ -152,5 +150,4 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { itemList.add(charged); } - } diff --git a/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java index 3da320bc8..59da8da3f 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java @@ -27,7 +27,6 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -48,7 +47,7 @@ public class ItemSteelChainsaw extends ItemChainsaw { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack stack = new ItemStack(ModItems.STEEL_CHAINSAW); ItemStack uncharged = stack.copy(); ItemStack charged = stack.copy(); diff --git a/src/main/java/techreborn/items/tools/ItemSteelDrill.java b/src/main/java/techreborn/items/tools/ItemSteelDrill.java index 6ac831388..7779f2d72 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelDrill.java +++ b/src/main/java/techreborn/items/tools/ItemSteelDrill.java @@ -27,7 +27,6 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -48,7 +47,7 @@ public class ItemSteelDrill extends ItemDrill { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack stack = new ItemStack(ModItems.STEEL_DRILL); ItemStack uncharged = stack.copy(); ItemStack charged = stack.copy(); diff --git a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java index f77ba168c..923b0aeb0 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java @@ -25,7 +25,6 @@ package techreborn.items.tools; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -47,7 +46,7 @@ public class ItemSteelJackhammer extends ItemJackhammer { @SideOnly(Side.CLIENT) @Override public void getSubItems( - CreativeTabs par2CreativeTabs, NonNullList itemList) { + CreativeTabs par2CreativeTabs, NonNullList itemList) { ItemStack stack = new ItemStack(ModItems.STEEL_JACKHAMMER); ItemStack uncharged = stack.copy(); ItemStack charged = stack.copy(); diff --git a/src/main/java/techreborn/items/tools/ItemTRHoe.java b/src/main/java/techreborn/items/tools/ItemTRHoe.java index c573a982b..71d05e4a0 100644 --- a/src/main/java/techreborn/items/tools/ItemTRHoe.java +++ b/src/main/java/techreborn/items/tools/ItemTRHoe.java @@ -27,7 +27,6 @@ package techreborn.items.tools; import net.minecraft.item.ItemHoe; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; public class ItemTRHoe extends ItemHoe { diff --git a/src/main/java/techreborn/items/tools/ItemTRPickaxe.java b/src/main/java/techreborn/items/tools/ItemTRPickaxe.java index cdfced84c..8b4ad97f1 100644 --- a/src/main/java/techreborn/items/tools/ItemTRPickaxe.java +++ b/src/main/java/techreborn/items/tools/ItemTRPickaxe.java @@ -25,7 +25,6 @@ package techreborn.items.tools; import net.minecraft.item.ItemPickaxe; -import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; public class ItemTRPickaxe extends ItemPickaxe { diff --git a/src/main/java/techreborn/items/tools/ItemTRSpade.java b/src/main/java/techreborn/items/tools/ItemTRSpade.java index 6f984df1f..b0ab888e5 100644 --- a/src/main/java/techreborn/items/tools/ItemTRSpade.java +++ b/src/main/java/techreborn/items/tools/ItemTRSpade.java @@ -25,7 +25,6 @@ package techreborn.items.tools; import net.minecraft.item.ItemSpade; -import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; public class ItemTRSpade extends ItemSpade { diff --git a/src/main/java/techreborn/items/tools/ItemTRSword.java b/src/main/java/techreborn/items/tools/ItemTRSword.java index 5d64d00df..f52683b04 100644 --- a/src/main/java/techreborn/items/tools/ItemTRSword.java +++ b/src/main/java/techreborn/items/tools/ItemTRSword.java @@ -25,7 +25,6 @@ package techreborn.items.tools; import net.minecraft.item.ItemSword; -import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; public class ItemTRSword extends ItemSword { diff --git a/src/main/java/techreborn/items/tools/ItemTechManual.java b/src/main/java/techreborn/items/tools/ItemTechManual.java index 4e95365ec..22b51b55d 100644 --- a/src/main/java/techreborn/items/tools/ItemTechManual.java +++ b/src/main/java/techreborn/items/tools/ItemTechManual.java @@ -33,7 +33,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; - import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; @@ -51,9 +50,9 @@ public class ItemTechManual extends ItemTRNoDestroy { @Override public ActionResult onItemRightClick(final World world, final EntityPlayer player, - final EnumHand hand) { + final EnumHand hand) { player.openGui(Core.INSTANCE, EGui.MANUAL.ordinal(), world, (int) player.posX, (int) player.posY, - (int) player.posY); + (int) player.posY); return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } diff --git a/src/main/java/techreborn/items/tools/ItemTreeTap.java b/src/main/java/techreborn/items/tools/ItemTreeTap.java index e7816db12..6c0044c5a 100644 --- a/src/main/java/techreborn/items/tools/ItemTreeTap.java +++ b/src/main/java/techreborn/items/tools/ItemTreeTap.java @@ -25,25 +25,18 @@ package techreborn.items.tools; import ic2.core.item.tool.ItemTreetap; -import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTab; -import techreborn.items.ItemTRNoDestroy; import techreborn.compat.CompatManager; -import techreborn.lib.ModInfo; +import techreborn.items.ItemTRNoDestroy; public class ItemTreeTap extends ItemTRNoDestroy { @@ -54,12 +47,11 @@ public class ItemTreeTap extends ItemTRNoDestroy { setCreativeTab(TechRebornCreativeTab.instance); } - @Override public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { IBlockState state = worldIn.getBlockState(pos); Block block = state.getBlock(); - if(CompatManager.isIC2Loaded && block == Block.getBlockFromName("ic2:rubber_wood")) { + if (CompatManager.isIC2Loaded && block == Block.getBlockFromName("ic2:rubber_wood")) { ItemTreetap.attemptExtract(playerIn, worldIn, pos, side, state, null); if (!worldIn.isRemote) playerIn.getHeldItem(hand).damageItem(1, playerIn); diff --git a/src/main/java/techreborn/manual/pages/CraftingInfoPage.java b/src/main/java/techreborn/manual/pages/CraftingInfoPage.java index c32c48753..80de8529f 100644 --- a/src/main/java/techreborn/manual/pages/CraftingInfoPage.java +++ b/src/main/java/techreborn/manual/pages/CraftingInfoPage.java @@ -25,7 +25,6 @@ package techreborn.manual.pages; import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -37,13 +36,15 @@ import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.*; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; import org.lwjgl.opengl.GL11; import techreborn.manual.PageCollection; import techreborn.manual.util.ButtonUtil; diff --git a/src/main/java/techreborn/packets/PacketAesu.java b/src/main/java/techreborn/packets/PacketAesu.java index d3031615a..5bfe16b99 100644 --- a/src/main/java/techreborn/packets/PacketAesu.java +++ b/src/main/java/techreborn/packets/PacketAesu.java @@ -59,8 +59,8 @@ public class PacketAesu implements INetworkPacket { @Override public void processData(PacketAesu message, MessageContext context) { -// if (!pos.getWorld().isRemote) { -// pos.handleGuiInputFromClient(buttonID); -// } + // if (!pos.getWorld().isRemote) { + // pos.handleGuiInputFromClient(buttonID); + // } } } diff --git a/src/main/java/techreborn/packets/PacketSyncSideConfig.java b/src/main/java/techreborn/packets/PacketSyncSideConfig.java index 6135a373a..9ad8d4903 100644 --- a/src/main/java/techreborn/packets/PacketSyncSideConfig.java +++ b/src/main/java/techreborn/packets/PacketSyncSideConfig.java @@ -70,7 +70,7 @@ public class PacketSyncSideConfig implements INetworkPacket 0) { if (this.getStackInSlot(this.fuelslot).getItem().hasContainerItem()) // Fuel - // slot + // slot { this.setInventorySlotContents(this.fuelslot, new ItemStack(this.getStackInSlot(this.fuelslot).getItem().getContainerItem())); } else if (this.getStackInSlot(this.fuelslot).getCount() > 1) { @@ -215,8 +213,8 @@ public class TileIronFurnace extends TileLegacyMachineBase @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("ironfurnace").player(player.inventory).inventory(8, 84).hotbar(8, 142) - .addInventory().tile(this).slot(0, 56, 17).outputSlot(1, 116, 34).fuelSlot(2, 56, 53) - .syncIntegerValue(this::getBurnTime, this::setBurnTime) - .syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime).addInventory().create(); + .addInventory().tile(this).slot(0, 56, 17).outputSlot(1, 116, 34).fuelSlot(2, 56, 53) + .syncIntegerValue(this::getBurnTime, this::setBurnTime) + .syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime).addInventory().create(); } } diff --git a/src/main/java/techreborn/tiles/TileRollingMachine.java b/src/main/java/techreborn/tiles/TileRollingMachine.java index 460289da9..7a9a088e0 100644 --- a/src/main/java/techreborn/tiles/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/TileRollingMachine.java @@ -97,7 +97,6 @@ public class TileRollingMachine extends TilePowerAcceptor public double getBaseMaxInput() { return maxInput; } - @Override public void updateEntity() { diff --git a/src/main/java/techreborn/tiles/TileScrapboxinator.java b/src/main/java/techreborn/tiles/TileScrapboxinator.java index 5b1868d31..0782c61c6 100644 --- a/src/main/java/techreborn/tiles/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/TileScrapboxinator.java @@ -218,7 +218,6 @@ public class TileScrapboxinator extends TilePowerAcceptor return maxInput; } - @Override public Inventory getInventory() { return this.inventory; diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java index b01b4444b..79788efb7 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java @@ -104,7 +104,6 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn return maxInput; } - @Override public void readFromNBT(final NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); diff --git a/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java index 17a44614c..395bb81cc 100644 --- a/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java @@ -32,7 +32,6 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import reborncore.api.power.EnumPowerTier; import reborncore.api.tile.IInventoryProvider; import reborncore.common.IWrenchable; import reborncore.common.blocks.BlockMachineBase; @@ -40,7 +39,6 @@ import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; import reborncore.common.util.Tank; - import techreborn.api.generator.EFluidGenerator; import techreborn.api.generator.FluidGeneratorRecipe; import techreborn.api.generator.FluidGeneratorRecipeList; @@ -81,7 +79,7 @@ public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implement if (!this.world.isRemote) { if (this.acceptFluid() && FluidUtils.drainContainers(this.tank, this.inventory, 0, 1) - || FluidUtils.fillContainers(this.tank, this.inventory, 0, 1, this.tank.getFluidType())) + || FluidUtils.fillContainers(this.tank, this.inventory, 0, 1, this.tank.getFluidType())) this.syncWithAll(); } @@ -110,10 +108,10 @@ public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implement if (!this.world.isRemote) { if (this.world.getTotalWorldTime() - this.lastOutput < 30 && !this.isActive()) this.world.setBlockState(this.getPos(), - this.world.getBlockState(this.getPos()).withProperty(BlockMachineBase.ACTIVE, true)); + this.world.getBlockState(this.getPos()).withProperty(BlockMachineBase.ACTIVE, true)); else if (this.world.getTotalWorldTime() - this.lastOutput > 30 && this.isActive()) this.world.setBlockState(this.getPos(), - this.world.getBlockState(this.getPos()).withProperty(BlockMachineBase.ACTIVE, false)); + this.world.getBlockState(this.getPos()).withProperty(BlockMachineBase.ACTIVE, false)); } } @@ -198,7 +196,7 @@ public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implement @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), - getPos().getY(), getPos().getZ()); + getPos().getY(), getPos().getZ()); readFromNBT(packet.getNbtCompound()); } diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index b7f9c3d16..7e69f7b1c 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -32,7 +32,6 @@ import techreborn.api.generator.EFluidGenerator; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; @@ -67,11 +66,10 @@ public class TileGasTurbine extends TileBaseFluidGenerator implements IContainer return maxOutput; } - @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("gasturbine").player(player.inventory).inventory(8, 84).hotbar(8, 142) - .addInventory().tile(this).slot(0, 80, 17).outputSlot(1, 80, 53).fakeSlot(2, 59, 42).syncEnergyValue() - .addInventory().create(); + .addInventory().tile(this).slot(0, 80, 17).outputSlot(1, 80, 53).fakeSlot(2, 59, 42).syncEnergyValue() + .addInventory().create(); } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java b/src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java index e87b09b57..aec46050d 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java +++ b/src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java @@ -52,7 +52,7 @@ import techreborn.multiblocks.MultiBlockCasing; import techreborn.tiles.TileMachineCasing; public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, - ITileRecipeHandler, IRecipeCrafterProvider, IContainerProvider { + ITileRecipeHandler, IRecipeCrafterProvider, IContainerProvider { public static int euTick = 5; public int tickTime; @@ -108,32 +108,32 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, public int getHeat() { for (final EnumFacing direction : EnumFacing.values()) { final TileEntity tileEntity = this.world.getTileEntity(new BlockPos(this.getPos().getX() + direction.getFrontOffsetX(), - this.getPos().getY() + direction.getFrontOffsetY(), this.getPos().getZ() + direction.getFrontOffsetZ())); + this.getPos().getY() + direction.getFrontOffsetY(), this.getPos().getZ() + direction.getFrontOffsetZ())); if (tileEntity instanceof TileMachineCasing) { if (((TileMachineCasing) tileEntity).isConnected() - && ((TileMachineCasing) tileEntity).getMultiblockController().isAssembled()) { + && ((TileMachineCasing) tileEntity).getMultiblockController().isAssembled()) { final MultiBlockCasing casing = ((TileMachineCasing) tileEntity).getMultiblockController(); final Location location = new Location(this.getPos().getX(), this.getPos().getY(), this.getPos().getZ(), direction); location.modifyPositionFromSide(direction, 1); int heat = 0; if (this.world.getBlockState(new BlockPos(location.getX(), location.getY() - 1, location.getZ())) - .getBlock() == tileEntity.getBlockType()) { + .getBlock() == tileEntity.getBlockType()) { return 0; } for (final IMultiblockPart part : casing.connectedParts) { final BlockMachineCasing casing1 = (BlockMachineCasing) this.world.getBlockState(part.getPos()) - .getBlock(); + .getBlock(); heat += casing1 - .getHeatFromState(part.getWorld().getBlockState(part.getWorldLocation().toBlockPos())); + .getHeatFromState(part.getWorld().getBlockState(part.getWorldLocation().toBlockPos())); // TODO meta fix } if (this.world.getBlockState(new BlockPos(location.getX(), location.getY(), location.getZ())) - .getBlock().getUnlocalizedName().equals("tile.lava") - && this.world - .getBlockState(new BlockPos(location.getX(), location.getY() + 1, location.getZ())) - .getBlock().getUnlocalizedName().equals("tile.lava")) { + .getBlock().getUnlocalizedName().equals("tile.lava") + && this.world + .getBlockState(new BlockPos(location.getX(), location.getY() + 1, location.getZ())) + .getBlock().getUnlocalizedName().equals("tile.lava")) { heat += 500; } return heat; @@ -146,7 +146,7 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, @Override public void onDataPacket(final NetworkManager net, final SPacketUpdateTileEntity packet) { this.world.markBlockRangeForRenderUpdate(this.getPos().getX(), this.getPos().getY(), this.getPos().getZ(), this.getPos().getX(), - this.getPos().getY(), this.getPos().getZ()); + this.getPos().getY(), this.getPos().getZ()); this.readFromNBT(packet.getNbtCompound()); } @@ -252,8 +252,8 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("blastfurnace").player(player.inventory).inventory().hotbar() - .addInventory().tile(this).slot(0, 50, 27).slot(1, 50, 47).outputSlot(2, 92, 36).outputSlot(3, 110, 36) - .syncEnergyValue().syncCrafterValue().syncIntegerValue(this::getHeat, this::setHeat).addInventory() - .create(); + .addInventory().tile(this).slot(0, 50, 27).slot(1, 50, 47).outputSlot(2, 92, 36).outputSlot(3, 110, 36) + .syncEnergyValue().syncCrafterValue().syncIntegerValue(this::getHeat, this::setHeat).addInventory() + .create(); } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java index b805f8431..47682cec5 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java @@ -42,7 +42,7 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; public class TileImplosionCompressor extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { + implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { public Inventory inventory = new Inventory(4, "TileImplosionCompressor", 64, this); public MultiblockChecker multiblockChecker; @@ -174,8 +174,8 @@ public class TileImplosionCompressor extends TilePowerAcceptor @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("implosioncompressor").player(player.inventory).inventory(8, 84).hotbar(8, 142) - .addInventory().tile(this).slot(0, 37, 26).slot(1, 37, 44).outputSlot(2, 93, 35).outputSlot(3, 111, 35) - .syncEnergyValue().syncCrafterValue().addInventory().create(); + .addInventory().tile(this).slot(0, 37, 26).slot(1, 37, 44).outputSlot(2, 93, 35).outputSlot(3, 111, 35) + .syncEnergyValue().syncCrafterValue().addInventory().create(); } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java index 81a7f75dc..5019da765 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java @@ -103,7 +103,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha } public boolean getMutliBlock() { - if(multiblockChecker == null){ + if (multiblockChecker == null) { return false; } final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_NORMAL, @@ -225,7 +225,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha @Override public boolean canCraft(final TileEntity tile, final IndustrialGrinderRecipe recipe) { - if(!getMutliBlock()){ + if (!getMutliBlock()) { return false; } final FluidStack recipeFluid = recipe.fluidStack; diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java index 022600a3f..94179082b 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java @@ -50,7 +50,7 @@ import techreborn.items.ItemDusts; import java.util.Random; public class TileIndustrialSawmill extends TilePowerAcceptor -implements IWrenchable, IInventoryProvider, IContainerProvider { + implements IWrenchable, IInventoryProvider, IContainerProvider { public static final int TANK_CAPACITY = 16000; public Inventory inventory = new Inventory(5, "Sawmill", 64, this); @@ -74,8 +74,8 @@ implements IWrenchable, IInventoryProvider, IContainerProvider { for (final int id : OreDictionary.getOreIDs(wood)) { final String name = OreDictionary.getOreName(id); if (name.equals("logWood") && this.canAddOutput(2, 10) && this.canAddOutput(3, 5) - && this.canAddOutput(4, 3) && this.canUseEnergy(128.0F) && !this.tank.isEmpty() - && this.tank.getFluid().amount >= 1000) { + && this.canAddOutput(4, 3) && this.canUseEnergy(128.0F) && !this.tank.isEmpty() + && this.tank.getFluid().amount >= 1000) { wood.shrink(1); if (wood.getCount() == 0) this.setInventorySlotContents(0, ItemStack.EMPTY); @@ -122,11 +122,11 @@ implements IWrenchable, IInventoryProvider, IContainerProvider { public boolean getMutliBlock() { final boolean down = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_NORMAL, - MultiblockChecker.ZERO_OFFSET); + MultiblockChecker.ZERO_OFFSET); final boolean up = this.multiblockChecker.checkRectY(1, 1, MultiblockChecker.CASING_NORMAL, - new BlockPos(0, 2, 0)); + new BlockPos(0, 2, 0)); final boolean blade = this.multiblockChecker.checkRingY(1, 1, MultiblockChecker.CASING_REINFORCED, - new BlockPos(0, 1, 0)); + new BlockPos(0, 1, 0)); final IBlockState centerBlock = this.multiblockChecker.getBlock(0, 1, 0); final boolean center = centerBlock.getBlock() == Blocks.WATER; return down && center && blade && up; @@ -243,7 +243,7 @@ implements IWrenchable, IInventoryProvider, IContainerProvider { @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("industrialsawmill").player(player.inventory).inventory(8, 84).hotbar(8, 142) - .addInventory().tile(this).slot(0, 32, 26).slot(1, 32, 44).outputSlot(2, 84, 35).outputSlot(3, 102, 35) - .outputSlot(4, 120, 35).syncEnergyValue().addInventory().create(); + .addInventory().tile(this).slot(0, 32, 26).slot(1, 32, 44).outputSlot(2, 84, 35).outputSlot(3, 102, 35) + .outputSlot(4, 120, 35).syncEnergyValue().addInventory().create(); } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java index 3b2a8996b..e10f1397b 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java @@ -41,7 +41,7 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; public class TileVacuumFreezer extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { + implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { public Inventory inventory = new Inventory(3, "TileVacuumFreezer", 64, this); public MultiblockChecker multiblockChecker; diff --git a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java index 126c274c8..f924a3a78 100644 --- a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java @@ -42,7 +42,7 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; public class TileElectricFurnace extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IContainerProvider, IMachineSlotProvider { + implements IWrenchable, IInventoryProvider, IContainerProvider, IMachineSlotProvider { public Inventory inventory = new Inventory(6, "TileElectricFurnace", 64, this); public int capacity = 1000; @@ -236,18 +236,18 @@ public class TileElectricFurnace extends TilePowerAcceptor @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("electricfurnace").player(player.inventory).inventory().hotbar().addInventory() - .tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue() - .syncIntegerValue(this::getBurnTime, this::setBurnTime).addInventory().create(); + .tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue() + .syncIntegerValue(this::getBurnTime, this::setBurnTime).addInventory().create(); } @Override public int[] getInputSlots() { - return new int[]{input1}; + return new int[] { input1 }; } @Override public int[] getOuputSlots() { - return new int[]{output}; + return new int[] { output }; } @Override diff --git a/src/main/java/techreborn/tiles/teir1/TileGrinder.java b/src/main/java/techreborn/tiles/teir1/TileGrinder.java index e526845b0..345093223 100644 --- a/src/main/java/techreborn/tiles/teir1/TileGrinder.java +++ b/src/main/java/techreborn/tiles/teir1/TileGrinder.java @@ -41,7 +41,7 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; public class TileGrinder extends TilePowerAcceptor -implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { + implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { public Inventory inventory = new Inventory(6, "TileGrinder", 64, this); diff --git a/src/main/java/techreborn/tiles/teir1/TileRecycler.java b/src/main/java/techreborn/tiles/teir1/TileRecycler.java index 05db35e09..73cf9ccb6 100644 --- a/src/main/java/techreborn/tiles/teir1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/teir1/TileRecycler.java @@ -219,7 +219,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("recycler").player(player.inventory).inventory().hotbar().addInventory() - .tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue() - .syncIntegerValue(this::getProgress, this::setProgress).addInventory().create(); + .tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue() + .syncIntegerValue(this::getProgress, this::setProgress).addInventory().create(); } } diff --git a/src/main/java/techreborn/world/TechRebornRetroGen.java b/src/main/java/techreborn/world/TechRebornRetroGen.java index fcb405406..df0ec085c 100644 --- a/src/main/java/techreborn/world/TechRebornRetroGen.java +++ b/src/main/java/techreborn/world/TechRebornRetroGen.java @@ -25,7 +25,6 @@ package techreborn.world; import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; import com.google.common.collect.Sets; import net.minecraft.world.World; import net.minecraftforge.event.world.ChunkDataEvent; diff --git a/src/main/java/techreborn/world/TechRebornWorldGen.java b/src/main/java/techreborn/world/TechRebornWorldGen.java index 4d9b7ae1d..d471b0f61 100644 --- a/src/main/java/techreborn/world/TechRebornWorldGen.java +++ b/src/main/java/techreborn/world/TechRebornWorldGen.java @@ -157,21 +157,21 @@ public class TechRebornWorldGen implements IWorldGenerator { Type typeOfHashMap = new TypeToken() { }.getType(); config = gson.fromJson(jsonString, typeOfHashMap); -// ArrayUtils.addAll(config.endOres, config.neatherOres, config.overworldOres).stream().forEach(oreConfig -> { -// if (oreConfig.minYHeight > oreConfig.maxYHeight) { -// printError(oreConfig.blockName + " ore generation value is invalid, the min y height is bigger than the max y height, this ore value will be disabled in code"); -// -// oreConfig.minYHeight = -1; -// oreConfig.maxYHeight = -1; -// } -// -// if (oreConfig.minYHeight < 0 || oreConfig.maxYHeight < 0) { -// printError(oreConfig.blockName + " ore generation value is invalid, the min y height or the max y height is less than 0, this ore value will be disabled in code"); -// oreConfig.minYHeight = -1; -// oreConfig.maxYHeight = -1; -// } -// -// }); + // ArrayUtils.addAll(config.endOres, config.neatherOres, config.overworldOres).stream().forEach(oreConfig -> { + // if (oreConfig.minYHeight > oreConfig.maxYHeight) { + // printError(oreConfig.blockName + " ore generation value is invalid, the min y height is bigger than the max y height, this ore value will be disabled in code"); + // + // oreConfig.minYHeight = -1; + // oreConfig.maxYHeight = -1; + // } + // + // if (oreConfig.minYHeight < 0 || oreConfig.maxYHeight < 0) { + // printError(oreConfig.blockName + " ore generation value is invalid, the min y height or the max y height is less than 0, this ore value will be disabled in code"); + // oreConfig.minYHeight = -1; + // oreConfig.maxYHeight = -1; + // } + // + // }); } catch (Exception e) { Core.logHelper.error( "The ores.json file was invalid, bad things are about to happen, I will try and save the world now :"); @@ -250,10 +250,10 @@ public class TechRebornWorldGen implements IWorldGenerator { yPos = ore.minYHeight + random.nextInt(ore.maxYHeight - ore.minYHeight); zPos = chunkZ * 16 + random.nextInt(16); BlockPos pos = new BlockPos(xPos, yPos, zPos); - if(ore.blockNiceName.equalsIgnoreCase("iridium")){ //Work around for iridium + if (ore.blockNiceName.equalsIgnoreCase("iridium")) { //Work around for iridium BlockPos iridiumPos = pos.add(8, 0, 8); // standard worldgen offset is added here like in WorldGenMinable#generate IBlockState blockState = world.getBlockState(iridiumPos); - if(blockState.getBlock().isReplaceableOreGen(blockState, world, iridiumPos, predicate)){ + if (blockState.getBlock().isReplaceableOreGen(blockState, world, iridiumPos, predicate)) { world.setBlockState(iridiumPos, ore.state, 2); } @@ -265,7 +265,6 @@ public class TechRebornWorldGen implements IWorldGenerator { } } - } } }