Auto remove un needed things in the code

This commit is contained in:
modmuss50 2016-04-03 14:34:39 +01:00
parent 7e7fcf2ad9
commit 510f969c94
105 changed files with 141 additions and 348 deletions

View file

@ -18,7 +18,7 @@ import java.util.List;
public class RollingMachineRecipe { public class RollingMachineRecipe {
public static final RollingMachineRecipe instance = new RollingMachineRecipe(); public static final RollingMachineRecipe instance = new RollingMachineRecipe();
private final List<IRecipe> recipes = new ArrayList<IRecipe>(); private final List<IRecipe> recipes = new ArrayList<>();
public void addShapedOreRecipe(ItemStack outputItemStack, Object... objectInputs) { public void addShapedOreRecipe(ItemStack outputItemStack, Object... objectInputs) {
recipes.add(new ShapedOreRecipe(outputItemStack, objectInputs)); recipes.add(new ShapedOreRecipe(outputItemStack, objectInputs));
@ -66,8 +66,8 @@ public class RollingMachineRecipe {
ItemStack recipeArray[] = new ItemStack[j * k]; ItemStack recipeArray[] = new ItemStack[j * k];
for (int i1 = 0; i1 < j * k; i1++) { for (int i1 = 0; i1 < j * k; i1++) {
char c = s.charAt(i1); char c = s.charAt(i1);
if (hashmap.containsKey(Character.valueOf(c))) { if (hashmap.containsKey(c)) {
recipeArray[i1] = ((ItemStack) hashmap.get(Character.valueOf(c))).copy(); recipeArray[i1] = ((ItemStack) hashmap.get(c)).copy();
} else { } else {
recipeArray[i1] = null; recipeArray[i1] = null;
} }
@ -77,7 +77,7 @@ public class RollingMachineRecipe {
} }
public void addShapelessRecipe(ItemStack output, Object... components) { public void addShapelessRecipe(ItemStack output, Object... components) {
List<ItemStack> ingredients = new ArrayList<ItemStack>(); List<ItemStack> ingredients = new ArrayList<>();
for (int j = 0; j < components.length; j++) { for (int j = 0; j < components.length; j++) {
Object obj = components[j]; Object obj = components[j];
if (obj instanceof ItemStack) { if (obj instanceof ItemStack) {
@ -100,7 +100,7 @@ public class RollingMachineRecipe {
public ItemStack findMatchingRecipe(InventoryCrafting inv, World world) { public ItemStack findMatchingRecipe(InventoryCrafting inv, World world) {
for (int k = 0; k < recipes.size(); k++) { for (int k = 0; k < recipes.size(); k++) {
IRecipe irecipe = (IRecipe) recipes.get(k); IRecipe irecipe = recipes.get(k);
if (irecipe.matches(inv, world)) { if (irecipe.matches(inv, world)) {
return irecipe.getCraftingResult(inv); return irecipe.getCraftingResult(inv);
} }

View file

@ -13,9 +13,6 @@ public class SlotUpgrade extends Slot {
@Override @Override
public boolean isItemValid(ItemStack stack) { public boolean isItemValid(ItemStack stack) {
if (stack.getItem() instanceof IMachineUpgrade) { return stack.getItem() instanceof IMachineUpgrade;
return true;
} else
return false;
} }
} }

View file

@ -7,7 +7,7 @@ public class FusionReactorRecipeHelper {
/** /**
* This is the list of all the recipes * This is the list of all the recipes
*/ */
public static ArrayList<FusionReactorRecipe> reactorRecipes = new ArrayList<FusionReactorRecipe>(); public static ArrayList<FusionReactorRecipe> reactorRecipes = new ArrayList<>();
/** /**
* Register your reactor recipe here * Register your reactor recipe here

View file

@ -14,13 +14,13 @@ public class RecipeHandler {
/** /**
* This is the array list of all of the recipes for all of the machines * This is the array list of all of the recipes for all of the machines
*/ */
public static final ArrayList<IBaseRecipeType> recipeList = new ArrayList<IBaseRecipeType>(); public static final ArrayList<IBaseRecipeType> recipeList = new ArrayList<>();
public static HashMap<IBaseRecipeType, String> stackMap = new HashMap<IBaseRecipeType, String>(); public static HashMap<IBaseRecipeType, String> stackMap = new HashMap<>();
/** /**
* This is a list of all the registered machine names. * This is a list of all the registered machine names.
*/ */
public static ArrayList<String> machineNames = new ArrayList<String>(); public static ArrayList<String> machineNames = new ArrayList<>();
/** /**
* Use this to get all of the recipes form a recipe name * Use this to get all of the recipes form a recipe name
@ -29,7 +29,7 @@ public class RecipeHandler {
* @return A list of all the recipes of a given name. * @return A list of all the recipes of a given name.
*/ */
public static List<IBaseRecipeType> getRecipeClassFromName(String name) { public static List<IBaseRecipeType> getRecipeClassFromName(String name) {
List<IBaseRecipeType> baseRecipeList = new ArrayList<IBaseRecipeType>(); List<IBaseRecipeType> baseRecipeList = new ArrayList<>();
for (IBaseRecipeType baseRecipe : recipeList) { for (IBaseRecipeType baseRecipe : recipeList) {
if (baseRecipe.getRecipeName().equals(name)) { if (baseRecipe.getRecipeName().equals(name)) {
baseRecipeList.add(baseRecipe); baseRecipeList.add(baseRecipe);
@ -66,7 +66,7 @@ public class RecipeHandler {
machineNames.add(recipe.getRecipeName()); machineNames.add(recipe.getRecipeName());
} }
recipeList.add(recipe); recipeList.add(recipe);
StringBuffer buffer = new StringBuffer(); StringBuilder buffer = new StringBuilder();
for (StackTraceElement ste : Thread.currentThread().getStackTrace()) { for (StackTraceElement ste : Thread.currentThread().getStackTrace()) {
buffer.append(ste); buffer.append(ste);
} }
@ -82,10 +82,9 @@ public class RecipeHandler {
for (int i = 0; i < baseRecipeType.getInputs().size(); i++) { for (int i = 0; i < baseRecipeType.getInputs().size(); i++) {
if (ItemUtils.isItemEqual(baseRecipeType.getInputs().get(i), recipe.getInputs().get(i), true, if (ItemUtils.isItemEqual(baseRecipeType.getInputs().get(i), recipe.getInputs().get(i), true,
false, false)) { false, false)) {
StringBuffer itemInfo = new StringBuffer(); StringBuilder itemInfo = new StringBuilder();
for (ItemStack inputs : baseRecipeType.getInputs()) { for (ItemStack inputs : baseRecipeType.getInputs()) {
itemInfo.append(":" + inputs.getItem().getUnlocalizedName() + "," itemInfo.append(":").append(inputs.getItem().getUnlocalizedName()).append(",").append(inputs.getDisplayName()).append(",").append(inputs.stackSize);
+ inputs.getDisplayName() + "," + inputs.stackSize);
} }
Core.logHelper.all(stackMap.get(baseRecipeType)); Core.logHelper.all(stackMap.get(baseRecipeType));
// throw new Exception("Found a duplicate recipe for // throw new Exception("Found a duplicate recipe for

View file

@ -1,7 +1,6 @@
package techreborn.api.recipe.machines; package techreborn.api.recipe.machines;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import techreborn.api.Reference; import techreborn.api.Reference;
import techreborn.api.recipe.BaseRecipe; import techreborn.api.recipe.BaseRecipe;

View file

@ -1,7 +1,6 @@
package techreborn.api.recipe.machines; package techreborn.api.recipe.machines;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import techreborn.api.Reference; import techreborn.api.Reference;
import techreborn.api.recipe.BaseRecipe; import techreborn.api.recipe.BaseRecipe;

View file

@ -1,7 +1,6 @@
package techreborn.api.recipe.machines; package techreborn.api.recipe.machines;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import techreborn.api.Reference; import techreborn.api.Reference;
import techreborn.api.recipe.BaseRecipe; import techreborn.api.recipe.BaseRecipe;

View file

@ -1,7 +1,6 @@
package techreborn.api.recipe.machines; package techreborn.api.recipe.machines;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import techreborn.api.Reference; import techreborn.api.Reference;
import techreborn.api.recipe.BaseRecipe; import techreborn.api.recipe.BaseRecipe;

View file

@ -46,14 +46,14 @@ public class RecipeConfig {
public void addInputs(ConfigItem item) { public void addInputs(ConfigItem item) {
if (inputs == null) { if (inputs == null) {
inputs = new ArrayList<ConfigItem>(); inputs = new ArrayList<>();
} }
inputs.add(item); inputs.add(item);
} }
public void addOutputs(ConfigItem item) { public void addOutputs(ConfigItem item) {
if (outputs == null) { if (outputs == null) {
outputs = new ArrayList<ConfigItem>(); outputs = new ArrayList<>();
} }
outputs.add(item); outputs.add(item);
} }

View file

@ -12,7 +12,7 @@ import java.util.ArrayList;
public class RecipeConfigManager { public class RecipeConfigManager {
public static ArrayList<RecipeConfig> configs = new ArrayList<RecipeConfig>(); public static ArrayList<RecipeConfig> configs = new ArrayList<>();
static File configFile = null; static File configFile = null;

View file

@ -47,7 +47,7 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured
@Override @Override
public int getMetaFromState(IBlockState state) public int getMetaFromState(IBlockState state)
{ {
return (Integer) state.getValue(METADATA); return state.getValue(METADATA);
} }
protected BlockStateContainer createBlockState() protected BlockStateContainer createBlockState()
@ -104,12 +104,12 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured
public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess worldIn, BlockPos pos, EnumFacing side) public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess worldIn, BlockPos pos, EnumFacing side)
{ {
Block b = worldIn.getBlockState(pos).getBlock(); Block b = worldIn.getBlockState(pos).getBlock();
return b == (Block) this ? false : super.shouldSideBeRendered(blockState, worldIn, pos, side); return b != (Block) this && super.shouldSideBeRendered(blockState, worldIn, pos, side);
} }
public boolean shouldConnectToBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta) public boolean shouldConnectToBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta)
{ {
return block == (Block) this; return block == this;
} }
@Override @Override

View file

@ -128,7 +128,7 @@ public class BlockNuke extends BaseBlock implements ITexturedBlock
public IBlockState getStateFromMeta(int meta) public IBlockState getStateFromMeta(int meta)
{ {
return this.getDefaultState().withProperty(OVERLAY, Boolean.valueOf((meta & 1) > 0)); return this.getDefaultState().withProperty(OVERLAY, (meta & 1) > 0);
} }
protected BlockStateContainer createBlockState() protected BlockStateContainer createBlockState()

View file

@ -1,6 +1,5 @@
package techreborn.blocks; package techreborn.blocks;
import java.security.InvalidParameterException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
@ -149,7 +148,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi
return set.drop(fortune, random); return set.drop(fortune, random);
} }
ArrayList<ItemStack> block = new ArrayList<ItemStack>(); ArrayList<ItemStack> block = new ArrayList<>();
block.add(new ItemStack(Item.getItemFromBlock(this), 1, metadata)); block.add(new ItemStack(Item.getItemFromBlock(this), 1, metadata));
return block; return block;
} }

View file

@ -153,7 +153,7 @@ public class BlockPlayerDetector extends BlockMachineBase implements ITexturedBl
@Override @Override
public int getMetaFromState(IBlockState state) public int getMetaFromState(IBlockState state)
{ {
return (Integer) state.getValue(METADATA); return state.getValue(METADATA);
} }
protected BlockStateContainer createBlockState() protected BlockStateContainer createBlockState()

View file

@ -35,8 +35,8 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO
setUnlocalizedName("techreborn.rubberleaves"); setUnlocalizedName("techreborn.rubberleaves");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
RebornCore.jsonDestroyer.registerObject(this); RebornCore.jsonDestroyer.registerObject(this);
this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, Boolean.valueOf(true)) this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true)
.withProperty(DECAYABLE, Boolean.valueOf(true))); .withProperty(DECAYABLE, true));
} }
@Override @Override
@ -48,7 +48,7 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO
@Override @Override
public List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) public List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune)
{ {
List<ItemStack> list = new java.util.ArrayList<ItemStack>(); List<ItemStack> list = new java.util.ArrayList<>();
list.add(new ItemStack(this, 1, 0)); list.add(new ItemStack(this, 1, 0));
return list; return list;
} }
@ -73,8 +73,8 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO
@Override @Override
protected ItemStack createStackedBlock(IBlockState state) protected ItemStack createStackedBlock(IBlockState state)
{ {
IBlockState newState = state.withProperty(CHECK_DECAY, Boolean.valueOf(false)).withProperty(DECAYABLE, IBlockState newState = state.withProperty(CHECK_DECAY, false).withProperty(DECAYABLE,
Boolean.valueOf(false)); false);
return super.createStackedBlock(newState); return super.createStackedBlock(newState);
} }
@ -100,19 +100,19 @@ public class BlockRubberLeaves extends BlockLeaves implements ITexturedBlock, IO
@Override @Override
public IBlockState getStateFromMeta(int meta) public IBlockState getStateFromMeta(int meta)
{ {
return this.getDefaultState().withProperty(DECAYABLE, Boolean.valueOf((meta & 1) == 0)) return this.getDefaultState().withProperty(DECAYABLE, (meta & 1) == 0)
.withProperty(CHECK_DECAY, Boolean.valueOf((meta & 2) > 0)); .withProperty(CHECK_DECAY, (meta & 2) > 0);
} }
@Override @Override
public int getMetaFromState(IBlockState state) public int getMetaFromState(IBlockState state)
{ {
int meta = 0; int meta = 0;
if (!((Boolean) state.getValue(DECAYABLE)).booleanValue()) if (!(Boolean) state.getValue(DECAYABLE))
{ {
meta |= 1; meta |= 1;
} }
if (((Boolean) state.getValue(CHECK_DECAY)).booleanValue()) if ((Boolean) state.getValue(CHECK_DECAY))
{ {
meta |= 2; meta |= 2;
} }

View file

@ -204,7 +204,7 @@ public class BlockRubberLog extends Block implements ITexturedBlock
@Override @Override
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
{ {
List<ItemStack> drops = new ArrayList<ItemStack>(); List<ItemStack> drops = new ArrayList<>();
drops.add(new ItemStack(this)); drops.add(new ItemStack(this));
if (state.getValue(HAS_SAP)) if (state.getValue(HAS_SAP))
{ {

View file

@ -23,7 +23,7 @@ public class BlockRubberSapling extends BlockSapling
{ {
setUnlocalizedName("techreborn.rubbersapling"); setUnlocalizedName("techreborn.rubbersapling");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
this.setDefaultState(this.getDefaultState().withProperty(STAGE, Integer.valueOf(0))); this.setDefaultState(this.getDefaultState().withProperty(STAGE, 0));
} }
@Override @Override

View file

@ -91,7 +91,7 @@ public class BlockStorage2 extends BaseBlock implements ITexturedBlock
@Override @Override
public int getMetaFromState(IBlockState state) public int getMetaFromState(IBlockState state)
{ {
return (Integer) state.getValue(METADATA); return state.getValue(METADATA);
} }
protected BlockStateContainer createBlockState() protected BlockStateContainer createBlockState()

View file

@ -42,13 +42,13 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock
@Override @Override
public IBlockState getStateFromMeta(int meta) public IBlockState getStateFromMeta(int meta)
{ {
return getDefaultState().withProperty(ACTIVE, meta == 0 ? false : true); return getDefaultState().withProperty(ACTIVE, meta != 0);
} }
@Override @Override
public int getMetaFromState(IBlockState state) public int getMetaFromState(IBlockState state)
{ {
return state.getValue(ACTIVE) == true ? 1 : 0; return state.getValue(ACTIVE) ? 1 : 0;
} }
@Override @Override

View file

@ -48,7 +48,7 @@ public class BlockAlloyFurnace extends BlockMachineBase implements IRotationText
@Override @Override
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
{ {
List<ItemStack> items = new ArrayList<ItemStack>(); List<ItemStack> items = new ArrayList<>();
items.add(new ItemStack(this)); items.add(new ItemStack(this));
return items; return items;
} }

View file

@ -52,7 +52,7 @@ public class BlockIronFurnace extends BlockMachineBase implements IRotationTextu
@Override @Override
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
{ {
List<ItemStack> items = new ArrayList<ItemStack>(); List<ItemStack> items = new ArrayList<>();
items.add(new ItemStack(this)); items.add(new ItemStack(this));
return items; return items;
} }
@ -63,7 +63,7 @@ public class BlockIronFurnace extends BlockMachineBase implements IRotationTextu
{ {
if (this.isActive(state)) if (this.isActive(state))
{ {
EnumFacing enumfacing = (EnumFacing) state.getValue(FACING); EnumFacing enumfacing = state.getValue(FACING);
double d0 = (double) pos.getX() + 0.5D; double d0 = (double) pos.getX() + 0.5D;
double d1 = (double) pos.getY() + rand.nextDouble() * 6.0D / 16.0D; double d1 = (double) pos.getY() + rand.nextDouble() * 6.0D / 16.0D;
double d2 = (double) pos.getZ() + 0.5D; double d2 = (double) pos.getZ() + 0.5D;

View file

@ -1,20 +1,16 @@
package techreborn.blocks.storage; package techreborn.blocks.storage;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.client.GuiHandler; import techreborn.client.GuiHandler;
import techreborn.init.ModBlocks;
import techreborn.tiles.storage.TileBatBox; import techreborn.tiles.storage.TileBatBox;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random;
/** /**
* Created by modmuss50 on 14/03/2016. * Created by modmuss50 on 14/03/2016.

View file

@ -88,7 +88,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat
Block block2 = state2.getBlock(); Block block2 = state2.getBlock();
IBlockState state3 = worldIn.getBlockState(pos.east()); IBlockState state3 = worldIn.getBlockState(pos.east());
Block block3 = state3.getBlock(); Block block3 = state3.getBlock();
EnumFacing enumfacing = (EnumFacing) state.getValue(FACING); EnumFacing enumfacing = state.getValue(FACING);
if (enumfacing == EnumFacing.NORTH && block.isFullBlock(state) && !block1.isFullBlock(state1)) if (enumfacing == EnumFacing.NORTH && block.isFullBlock(state) && !block1.isFullBlock(state1))
{ {
@ -141,7 +141,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat
IInventory inventory = (IInventory) tileEntity; IInventory inventory = (IInventory) tileEntity;
List<ItemStack> items = new ArrayList<ItemStack>(); List<ItemStack> items = new ArrayList<>();
for (int i = 0; i < inventory.getSizeInventory(); i++) for (int i = 0; i < inventory.getSizeInventory(); i++)
{ {
@ -274,7 +274,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat
{ {
if (this instanceof IRotationTexture) if (this instanceof IRotationTexture)
{ {
IRotationTexture rotationTexture = (IRotationTexture) this; IRotationTexture rotationTexture = this;
if (getFacing(blockState) == facing) if (getFacing(blockState) == facing)
{ {
return rotationTexture.getFrontOff(); return rotationTexture.getFrontOff();

View file

@ -52,7 +52,7 @@ public class BlockLESUStorage extends BlockMachineBase implements IAdvancedRotat
@Override @Override
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
{ {
List<ItemStack> items = new ArrayList<ItemStack>(); List<ItemStack> items = new ArrayList<>();
items.add(new ItemStack(this)); items.add(new ItemStack(this));
return items; return items;
} }
@ -65,7 +65,7 @@ public class BlockLESUStorage extends BlockMachineBase implements IAdvancedRotat
public boolean shouldConnectToBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta) public boolean shouldConnectToBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta)
{ {
return block == (Block) this; return block == this;
} }
@Override @Override

View file

@ -1,9 +1,7 @@
package techreborn.blocks.storage; package techreborn.blocks.storage;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
@ -12,10 +10,8 @@ import techreborn.client.GuiHandler;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.tiles.storage.TileMFE; import techreborn.tiles.storage.TileMFE;
import java.lang.reflect.Array;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random;
/** /**
* Created by modmuss50 on 14/03/2016. * Created by modmuss50 on 14/03/2016.

View file

@ -1,9 +1,7 @@
package techreborn.blocks.storage; package techreborn.blocks.storage;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
@ -14,7 +12,6 @@ import techreborn.tiles.storage.TileMFSU;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random;
/** /**
* Created by modmuss50 on 14/03/2016. * Created by modmuss50 on 14/03/2016.

View file

@ -72,7 +72,7 @@ public abstract class BlockTransformer extends BaseTileBlock implements IRotatio
Block block2 = state2.getBlock(); Block block2 = state2.getBlock();
IBlockState state3 = worldIn.getBlockState(pos.east()); IBlockState state3 = worldIn.getBlockState(pos.east());
Block block3 = state3.getBlock(); Block block3 = state3.getBlock();
EnumFacing enumfacing = (EnumFacing) state.getValue(FACING); EnumFacing enumfacing = state.getValue(FACING);
if (enumfacing == EnumFacing.NORTH && block.isFullBlock(state) && !block1.isFullBlock(state1)) if (enumfacing == EnumFacing.NORTH && block.isFullBlock(state) && !block1.isFullBlock(state1))
{ {
@ -128,7 +128,7 @@ public abstract class BlockTransformer extends BaseTileBlock implements IRotatio
IInventory inventory = (IInventory) tileEntity; IInventory inventory = (IInventory) tileEntity;
List<ItemStack> items = new ArrayList<ItemStack>(); List<ItemStack> items = new ArrayList<>();
for (int i = 0; i < inventory.getSizeInventory(); i++) for (int i = 0; i < inventory.getSizeInventory(); i++)
{ {
@ -262,7 +262,7 @@ public abstract class BlockTransformer extends BaseTileBlock implements IRotatio
{ {
if (this instanceof IRotationTexture) if (this instanceof IRotationTexture)
{ {
IRotationTexture rotationTexture = (IRotationTexture) this; IRotationTexture rotationTexture = this;
if (getFacing(blockState) == facing) if (getFacing(blockState) == facing)
{ {
return rotationTexture.getFrontOff(); return rotationTexture.getFrontOff();

View file

@ -42,7 +42,7 @@ public class ContainerAESU extends RebornContainer {
public void detectAndSendChanges() { public void detectAndSendChanges() {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) { for (int i = 0; i < this.crafters.size(); i++) {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.euOut != tile.getMaxOutput()) { if (this.euOut != tile.getMaxOutput()) {
icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput()); icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
} }

View file

@ -66,7 +66,7 @@ public class ContainerAlloyFurnace extends RebornContainer
{ {
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting crafting = (ICrafting) this.crafters.get(i); ICrafting crafting = this.crafters.get(i);
if (this.currentItemBurnTime != tile.currentItemBurnTime) if (this.currentItemBurnTime != tile.currentItemBurnTime)
{ {
crafting.sendProgressBarUpdate(this, 0, tile.currentItemBurnTime); crafting.sendProgressBarUpdate(this, 0, tile.currentItemBurnTime);

View file

@ -56,7 +56,7 @@ public class ContainerBatbox extends RebornContainer
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.energy != (int) tile.getEnergy()) if (this.energy != (int) tile.getEnergy())
{ {
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());

View file

@ -59,7 +59,7 @@ public class ContainerBlastFurnace extends ContainerCrafting
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.heat != tile.getHeat()) if (this.heat != tile.getHeat())
{ {
icrafting.sendProgressBarUpdate(this, 10, tile.getHeat()); icrafting.sendProgressBarUpdate(this, 10, tile.getHeat());

View file

@ -26,7 +26,7 @@ public abstract class ContainerCrafting extends RebornContainer
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.currentTickTime != crafter.currentTickTime || crafter.currentTickTime == -1) if (this.currentTickTime != crafter.currentTickTime || crafter.currentTickTime == -1)
{ {
icrafting.sendProgressBarUpdate(this, 0, crafter.currentTickTime); icrafting.sendProgressBarUpdate(this, 0, crafter.currentTickTime);

View file

@ -55,7 +55,7 @@ public class ContainerDieselGenerator extends RebornContainer
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.energy != (int) tiledieselGenerator.getEnergy()) if (this.energy != (int) tiledieselGenerator.getEnergy())
{ {
icrafting.sendProgressBarUpdate(this, 0, (int) tiledieselGenerator.getEnergy()); icrafting.sendProgressBarUpdate(this, 0, (int) tiledieselGenerator.getEnergy());

View file

@ -58,7 +58,7 @@ public class ContainerFusionReactor extends RebornContainer
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.coilStatus != fusionController.coilStatus) if (this.coilStatus != fusionController.coilStatus)
{ {
icrafting.sendProgressBarUpdate(this, 0, fusionController.coilStatus); icrafting.sendProgressBarUpdate(this, 0, fusionController.coilStatus);

View file

@ -59,7 +59,7 @@ public class ContainerGenerator extends RebornContainer
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.burnTime != tile.burnTime) if (this.burnTime != tile.burnTime)
{ {
icrafting.sendProgressBarUpdate(this, 0, tile.burnTime); icrafting.sendProgressBarUpdate(this, 0, tile.burnTime);

View file

@ -43,7 +43,7 @@ public class ContainerIDSU extends RebornContainer {
public void detectAndSendChanges() { public void detectAndSendChanges() {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) { for (int i = 0; i < this.crafters.size(); i++) {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.euOut != tile.output) { if (this.euOut != tile.output) {
icrafting.sendProgressBarUpdate(this, 0, tile.output); icrafting.sendProgressBarUpdate(this, 0, tile.output);
} }

View file

@ -57,7 +57,7 @@ public class ContainerImplosionCompressor extends ContainerCrafting
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.multIBlockState != getMultIBlockStateint()) if (this.multIBlockState != getMultIBlockStateint())
{ {
icrafting.sendProgressBarUpdate(this, 3, getMultIBlockStateint()); icrafting.sendProgressBarUpdate(this, 3, getMultIBlockStateint());

View file

@ -59,7 +59,7 @@ public class ContainerIndustrialGrinder extends ContainerCrafting
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.connectionStatus != tile.connectionStatus) if (this.connectionStatus != tile.connectionStatus)
{ {
icrafting.sendProgressBarUpdate(this, 10, tile.connectionStatus); icrafting.sendProgressBarUpdate(this, 10, tile.connectionStatus);

View file

@ -49,7 +49,7 @@ public class ContainerLESU extends RebornContainer {
public void detectAndSendChanges() { public void detectAndSendChanges() {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) { for (int i = 0; i < this.crafters.size(); i++) {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.euOut != tile.getMaxOutput()) { if (this.euOut != tile.getMaxOutput()) {
icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput()); icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
} }

View file

@ -76,7 +76,7 @@ public class ContainerMFE extends RebornContainer
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.energy != (int) tile.getEnergy()) if (this.energy != (int) tile.getEnergy())
{ {
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());

View file

@ -71,7 +71,7 @@ public class ContainerMFSU extends RebornContainer
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.energy != (int) tile.getEnergy()) if (this.energy != (int) tile.getEnergy())
{ {
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());

View file

@ -60,7 +60,7 @@ public class ContainerMatterFabricator extends RebornContainer
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.progressTime != tile.progresstime) if (this.progressTime != tile.progresstime)
{ {
icrafting.sendProgressBarUpdate(this, 0, tile.progresstime); icrafting.sendProgressBarUpdate(this, 0, tile.progresstime);

View file

@ -81,7 +81,7 @@ public class ContainerRollingMachine extends RebornContainer
{ {
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting crafting = (ICrafting) this.crafters.get(i); ICrafting crafting = this.crafters.get(i);
if (this.currentItemBurnTime != tile.runTime) if (this.currentItemBurnTime != tile.runTime)
{ {
crafting.sendProgressBarUpdate(this, 0, tile.runTime); crafting.sendProgressBarUpdate(this, 0, tile.runTime);

View file

@ -54,7 +54,7 @@ public class ContainerVacuumFreezer extends ContainerCrafting
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.crafters.size(); i++)
{ {
ICrafting icrafting = (ICrafting) this.crafters.get(i); ICrafting icrafting = this.crafters.get(i);
if (this.machineStatus != tile.multiBlockStatus) if (this.machineStatus != tile.multiBlockStatus)
{ {
icrafting.sendProgressBarUpdate(this, 3, tile.multiBlockStatus); icrafting.sendProgressBarUpdate(this, 3, tile.multiBlockStatus);

View file

@ -15,11 +15,7 @@ public class SlotScrapbox extends Slot
public boolean isItemValid(ItemStack par1ItemStack) public boolean isItemValid(ItemStack par1ItemStack)
{ {
if (par1ItemStack.getItem() == ModItems.scrapBox) return par1ItemStack.getItem() == ModItems.scrapBox;
{
return true;
}
return false;
} }
public int getSlotStackLimit() public int getSlotStackLimit()

View file

@ -74,7 +74,7 @@ public class GuiIndustrialSawmill extends GuiContainer
// } // }
// } // }
drawTexturedModalRect(k + 11, l + 19, 176, 86, 12, 47); drawTexturedModalRect(k + 11, l + 19, 176, 86, 12, 47);
if (sawmill.getMutliBlock() != true) if (!sawmill.getMutliBlock())
{ {
GuiUtil.drawTooltipBox(k + 30, l + 50 + 12 - 0, 114, 10); GuiUtil.drawTooltipBox(k + 30, l + 50 + 12 - 0, 114, 10);
this.fontRendererObj.drawString(I18n.translateToLocal("techreborn.message.missingmultiblock"), k + 38, this.fontRendererObj.drawString(I18n.translateToLocal("techreborn.message.missingmultiblock"), k + 38,

View file

@ -63,7 +63,7 @@ public class RenderCablePart implements IBakedModel
@Override @Override
public List<BakedQuad> getQuads(IBlockState blockState, EnumFacing side, long rand) public List<BakedQuad> getQuads(IBlockState blockState, EnumFacing side, long rand)
{ {
ArrayList<BakedQuad> list = new ArrayList<BakedQuad>(); ArrayList<BakedQuad> list = new ArrayList<>();
BlockFaceUV uv = new BlockFaceUV(new float[] { 0.0F, 0.0F, 16.0F, 16.0F }, 0); BlockFaceUV uv = new BlockFaceUV(new float[] { 0.0F, 0.0F, 16.0F, 16.0F }, 0);
BlockPartFace face = new BlockPartFace(null, 0, "", uv); BlockPartFace face = new BlockPartFace(null, 0, "", uv);
double thickness = type.cableThickness; double thickness = type.cableThickness;

View file

@ -113,7 +113,7 @@ public class CasingConnectedTextureGenerator extends TextureAtlasSprite
{ {
IResource typeResource = manager.getResource(getTypeResource(type)); IResource typeResource = manager.getResource(getTypeResource(type));
type_image[0] = ImageIO.read(typeResource.getInputStream()); type_image[0] = ImageIO.read(typeResource.getInputStream());
animation = (AnimationMetadataSection) typeResource.getMetadata("animation"); animation = typeResource.getMetadata("animation");
IResource edgeResource = manager.getResource(getTypeResource(type + "_edge")); IResource edgeResource = manager.getResource(getTypeResource(type + "_edge"));
edge_image[0] = ImageIO.read(edgeResource.getInputStream()); edge_image[0] = ImageIO.read(edgeResource.getInputStream());

View file

@ -118,7 +118,7 @@ public class LesuConnectedTextureGenerator extends TextureAtlasSprite
{ {
IResource typeResource = manager.getResource(getLapisResource()); IResource typeResource = manager.getResource(getLapisResource());
type_image[0] = ImageIO.read(typeResource.getInputStream()); type_image[0] = ImageIO.read(typeResource.getInputStream());
animation = (AnimationMetadataSection) typeResource.getMetadata("animation"); animation = typeResource.getMetadata("animation");
IResource edgeResource = manager.getResource(getTypeResource("lesu_block")); IResource edgeResource = manager.getResource(getTypeResource("lesu_block"));
edge_image[0] = ImageIO.read(edgeResource.getInputStream()); edge_image[0] = ImageIO.read(edgeResource.getInputStream());

View file

@ -18,7 +18,7 @@ public class CompatManager
public static boolean isIC2ClassicLoaded = false; public static boolean isIC2ClassicLoaded = false;
public static boolean isClassicEnet = false; public static boolean isClassicEnet = false;
public static boolean isGregTechLoaded = false; public static boolean isGregTechLoaded = false;
public ArrayList<ICompatModule> compatModules = new ArrayList<ICompatModule>(); public ArrayList<ICompatModule> compatModules = new ArrayList<>();
public CompatManager() public CompatManager()
{ {
@ -87,7 +87,7 @@ public class CompatManager
} else if (obj instanceof Boolean) } else if (obj instanceof Boolean)
{ {
Boolean boo = (Boolean) obj; Boolean boo = (Boolean) obj;
if (boo == false) if (!boo)
{ {
} }
return; return;
@ -95,7 +95,7 @@ public class CompatManager
} }
try try
{ {
compatModules.add((ICompatModule) moduleClass.newInstance()); compatModules.add(moduleClass.newInstance());
} catch (InstantiationException e) } catch (InstantiationException e)
{ {
e.printStackTrace(); e.printStackTrace();

View file

@ -23,7 +23,7 @@ public class TechRebornConfigGui extends GuiConfig
private static List<IConfigElement> getConfigCategories() private static List<IConfigElement> getConfigCategories()
{ {
List<IConfigElement> list = new ArrayList<IConfigElement>(); List<IConfigElement> list = new ArrayList<>();
list.add( list.add(
new DummyConfigElement.DummyCategoryElement(I18n.translateToLocal("config.techreborn.category.general"), new DummyConfigElement.DummyCategoryElement(I18n.translateToLocal("config.techreborn.category.general"),
"tr.configgui.category.trGeneral", TRGeneral.class)); "tr.configgui.category.trGeneral", TRGeneral.class));

View file

@ -15,7 +15,7 @@ import java.util.HashMap;
public class OreUnifier public class OreUnifier
{ {
public static HashMap<String, ItemStack> oreHash = new HashMap<String, ItemStack>(); public static HashMap<String, ItemStack> oreHash = new HashMap<>();
public static void registerOre(String name, ItemStack ore) public static void registerOre(String name, ItemStack ore)
{ {

View file

@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack;
public class ModParts public class ModParts
{ {
public static HashMap<Integer, ItemStack> stackCable = new HashMap<Integer, ItemStack>(); public static HashMap<Integer, ItemStack> stackCable = new HashMap<>();
public static void init() public static void init()
{ // TODO 1.8 { // TODO 1.8

View file

@ -2,7 +2,6 @@ package techreborn.init;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import net.minecraft.block.Block; import net.minecraft.block.Block;

View file

@ -66,11 +66,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITex
public boolean canHarvestBlock(IBlockState state) public boolean canHarvestBlock(IBlockState state)
{ {
// TODO needs // FIXME: 13/03/2016 // TODO needs // FIXME: 13/03/2016
if (OreDictUtils.isOre(state, "stone") && PoweredItem.canUseEnergy(cost, null)) return OreDictUtils.isOre(state, "stone") && PoweredItem.canUseEnergy(cost, null);
{
return true;
}
return false;
} }
@Override @Override

View file

@ -75,11 +75,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITextur
public boolean isItemActive(ItemStack stack) public boolean isItemActive(ItemStack stack)
{ {
if (!ItemNBTHelper.verifyExistance(stack, "isActive")) return !ItemNBTHelper.verifyExistance(stack, "isActive");
{
return true;
} else
return false;
} }
// @SideOnly(Side.CLIENT) // @SideOnly(Side.CLIENT)

View file

@ -26,11 +26,7 @@ public class ItemTreeTap extends Item implements ITexturedItem
@Override @Override
public boolean showDurabilityBar(ItemStack stack) public boolean showDurabilityBar(ItemStack stack)
{ {
if (stack.getMetadata() != 0) return stack.getMetadata() != 0;
{
return true;
}
return false;
} }
@Override @Override

View file

@ -101,7 +101,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem
{ {
if (player.isSneaking()) if (player.isSneaking())
{ {
List<ItemStack> items = new ArrayList<ItemStack>(); List<ItemStack> items = new ArrayList<>();
if (tile instanceof IInventory) if (tile instanceof IInventory)
{ {
IInventory inventory = (IInventory) tile; IInventory inventory = (IInventory) tile;

View file

@ -3,5 +3,5 @@ package techreborn.lib;
public enum Key public enum Key
{ {
UNKNOWN, CONFIG; UNKNOWN, CONFIG
} }

View file

@ -175,7 +175,7 @@ public class CraftingInfoPage extends TitledPage
{ {
if (formattedDescription == null) if (formattedDescription == null)
{ {
formattedDescription = new ArrayList<String>(); formattedDescription = new ArrayList<>();
if (Strings.isNullOrEmpty(rawDescription)) if (Strings.isNullOrEmpty(rawDescription))
{ {
@ -265,7 +265,7 @@ public class CraftingInfoPage extends TitledPage
private ItemStack[] getFirstRecipeForItem(ItemStack resultingItem) private ItemStack[] getFirstRecipeForItem(ItemStack resultingItem)
{ {
ItemStack[] recipeItems = new ItemStack[9]; ItemStack[] recipeItems = new ItemStack[9];
for (IRecipe recipe : (List<IRecipe>) CraftingManager.getInstance().getRecipeList()) for (IRecipe recipe : CraftingManager.getInstance().getRecipeList())
{ {
if (recipe == null) if (recipe == null)
continue; continue;

View file

@ -96,7 +96,7 @@ public class DescriptionPage extends TitledPage
{ {
if (formattedDescription == null) if (formattedDescription == null)
{ {
formattedDescription = new ArrayList<String>(); formattedDescription = new ArrayList<>();
if (Strings.isNullOrEmpty(rawDescription)) if (Strings.isNullOrEmpty(rawDescription))
{ {

View file

@ -1,7 +1,6 @@
package techreborn.multiblocks; package techreborn.multiblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

View file

@ -239,10 +239,7 @@ public abstract class CableMultipart extends Multipart
CableMultipart cableMultipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir.getOpposite()); CableMultipart cableMultipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir.getOpposite());
if (cableMultipart != null && cableMultipart.getCableType() == getCableType()) { return cableMultipart != null && cableMultipart.getCableType() == getCableType();
return true;
}
return false;
} }
public TileEntity getNeighbourTile(EnumFacing side) { public TileEntity getNeighbourTile(EnumFacing side) {

View file

@ -64,11 +64,7 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -303,11 +303,7 @@ public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, II
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -62,11 +62,7 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable,
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -57,11 +57,7 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -71,11 +71,7 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable,
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -82,11 +82,7 @@ public class TileCentrifuge extends TilePowerAcceptor
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -65,11 +65,7 @@ public class TileChargeBench extends TilePowerAcceptor implements IWrenchable, I
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -57,11 +57,7 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -41,11 +41,7 @@ public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, I
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -209,11 +209,7 @@ public class TileDigitalChest extends TileMachineBase implements IInventory, IWr
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -54,11 +54,7 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -60,11 +60,7 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -19,7 +19,6 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.FluidUtils; import reborncore.common.util.FluidUtils;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
import reborncore.common.util.Tank; import reborncore.common.util.Tank;
import techreborn.api.recipe.BaseRecipe;
import techreborn.api.recipe.ITileRecipeHandler; import techreborn.api.recipe.ITileRecipeHandler;
import techreborn.api.recipe.machines.IndustrialGrinderRecipe; import techreborn.api.recipe.machines.IndustrialGrinderRecipe;
import techreborn.utils.RecipeCrafter; import techreborn.utils.RecipeCrafter;
@ -71,11 +70,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override
@ -195,11 +190,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor
@Override @Override
public boolean canFill(EnumFacing from, Fluid fluid) public boolean canFill(EnumFacing from, Fluid fluid)
{ {
if (fluid == FluidRegistry.WATER || fluid == ModFluids.fluidMercury || fluid == ModFluids.fluidSodiumpersulfate) return fluid == FluidRegistry.WATER || fluid == ModFluids.fluidMercury || fluid == ModFluids.fluidSodiumpersulfate;
{
return true;
}
return false;
} }
@Override @Override

View file

@ -110,11 +110,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override
@ -189,11 +185,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor
@Override @Override
public boolean canFill(EnumFacing from, Fluid fluid) public boolean canFill(EnumFacing from, Fluid fluid)
{ {
if (fluid == FluidRegistry.WATER) return fluid == FluidRegistry.WATER;
{
return true;
}
return false;
} }
@Override @Override

View file

@ -119,7 +119,7 @@ public class TileIronFurnace extends TileMachineBase implements IInventory
} }
if (fuel <= 0 && canSmelt()) if (fuel <= 0 && canSmelt())
{ {
fuel = fuelGague = (int) (getItemBurnTime(getStackInSlot(fuelslot))); fuel = fuelGague = getItemBurnTime(getStackInSlot(fuelslot));
if (fuel > 0) if (fuel > 0)
{ {
if (getStackInSlot(fuelslot).getItem().hasContainerItem()) // Fuel if (getStackInSlot(fuelslot).getItem().hasContainerItem()) // Fuel

View file

@ -1,6 +1,5 @@
package techreborn.tiles; package techreborn.tiles;
import ic2.api.tile.IWrenchable;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -46,11 +45,7 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -265,11 +265,7 @@ public class TileQuantumChest extends TileMachineBase
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -254,11 +254,7 @@ public class TileQuantumTank extends TileMachineBase
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -141,11 +141,7 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable
public boolean canMake() public boolean canMake()
{ {
if (RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, worldObj) == null) return RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, worldObj) != null;
{
return false;
}
return true;
} }
@Override @Override
@ -163,11 +159,7 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -106,11 +106,7 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable
public boolean canOpen() public boolean canOpen()
{ {
if (getStackInSlot(input1) != null && getStackInSlot(output) == null) return getStackInSlot(input1) != null && getStackInSlot(output) == null;
{
return true;
}
return false;
} }
public boolean isBurning() public boolean isBurning()
@ -144,11 +140,7 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -102,11 +102,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable,
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -45,21 +45,13 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
@Override @Override
public boolean canAcceptEnergy(EnumFacing direction) public boolean canAcceptEnergy(EnumFacing direction)
{ {
if (direction == EnumFacing.DOWN || direction == EnumFacing.UP) return !(direction == EnumFacing.DOWN || direction == EnumFacing.UP);
{
return false;
}
return true;
} }
@Override @Override
public boolean canProvideEnergy(EnumFacing direction) public boolean canProvideEnergy(EnumFacing direction)
{ {
if (direction == EnumFacing.DOWN || direction == EnumFacing.UP) return direction == EnumFacing.DOWN || direction == EnumFacing.UP;
{
return true;
}
return false;
} }
@Override @Override
@ -272,8 +264,8 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
{ {
if (reactorRecipe.getBottomInput() != null) if (reactorRecipe.getBottomInput() != null)
{ {
if (ItemUtils.isItemEqual(getStackInSlot(bottomStackSlot), if (!ItemUtils.isItemEqual(getStackInSlot(bottomStackSlot),
reactorRecipe.getBottomInput(), true, true, true) == false) reactorRecipe.getBottomInput(), true, true, true))
{ {
break; break;
} }
@ -376,8 +368,8 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
{ {
if (currentRecipe.getBottomInput() != null) if (currentRecipe.getBottomInput() != null)
{ {
if (ItemUtils.isItemEqual(getStackInSlot(bottomStackSlot), currentRecipe.getBottomInput(), true, true, if (!ItemUtils.isItemEqual(getStackInSlot(bottomStackSlot), currentRecipe.getBottomInput(), true, true,
true) == false) true))
{ {
return false; return false;
} }

View file

@ -51,11 +51,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -56,11 +56,7 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -34,7 +34,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF
public static final int euTick = 16; public static final int euTick = 16;
public Tank tank = new Tank("TileGasTurbine", FluidContainerRegistry.BUCKET_VOLUME * 10, this); public Tank tank = new Tank("TileGasTurbine", FluidContainerRegistry.BUCKET_VOLUME * 10, this);
public Inventory inventory = new Inventory(3, "TileGasTurbine", 64, this); public Inventory inventory = new Inventory(3, "TileGasTurbine", 64, this);
Map<String, Integer> fluids = new HashMap<String, Integer>(); Map<String, Integer> fluids = new HashMap<>();
// We use this to keep track of fractional millibuckets, allowing us to hit // We use this to keep track of fractional millibuckets, allowing us to hit
// our eu/bucket targets while still only ever removing integer millibucket // our eu/bucket targets while still only ever removing integer millibucket
@ -65,11 +65,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -106,11 +106,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -68,11 +68,7 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -34,7 +34,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench
public static final int euTick = 8; public static final int euTick = 8;
public Tank tank = new Tank("TileSemifluidGenerator", FluidContainerRegistry.BUCKET_VOLUME * 10, this); public Tank tank = new Tank("TileSemifluidGenerator", FluidContainerRegistry.BUCKET_VOLUME * 10, this);
public Inventory inventory = new Inventory(3, "TileSemifluidGenerator", 64, this); public Inventory inventory = new Inventory(3, "TileSemifluidGenerator", 64, this);
Map<String, Integer> fluids = new HashMap<String, Integer>(); Map<String, Integer> fluids = new HashMap<>();
// We use this to keep track of fractional millibuckets, allowing us to hit // We use this to keep track of fractional millibuckets, allowing us to hit
// our eu/bucket targets while still only ever removing integer millibucket // our eu/bucket targets while still only ever removing integer millibucket
@ -71,11 +71,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -54,11 +54,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -20,7 +20,7 @@ public class IDSUManager
public static final String savename = "idsu.json"; public static final String savename = "idsu.json";
public static IDSUManager INSTANCE; public static IDSUManager INSTANCE;
public HashMap<World, IDSUWorldSaveData> worldData = new HashMap<World, IDSUWorldSaveData>(); public HashMap<World, IDSUWorldSaveData> worldData = new HashMap<>();
@SubscribeEvent(priority = EventPriority.HIGHEST) @SubscribeEvent(priority = EventPriority.HIGHEST)
public void worldSave(WorldEvent.Save event) public void worldSave(WorldEvent.Save event)
@ -122,7 +122,7 @@ public class IDSUManager
public class IDSUWorldSaveData public class IDSUWorldSaveData
{ {
public TreeMap<String, IDSUValueSaveData> idsuValues = new TreeMap<String, IDSUValueSaveData>(); public TreeMap<String, IDSUValueSaveData> idsuValues = new TreeMap<>();
public World world; public World world;

View file

@ -5,7 +5,7 @@ import java.util.ArrayList;
public class LesuNetwork public class LesuNetwork
{ {
public ArrayList<TileLesuStorage> storages = new ArrayList<TileLesuStorage>(); public ArrayList<TileLesuStorage> storages = new ArrayList<>();
public TileLesu master; public TileLesu master;
@ -37,7 +37,7 @@ public class LesuNetwork
{ {
if (network != this) if (network != this)
{ {
ArrayList<TileLesuStorage> tileLesuStorages = new ArrayList<TileLesuStorage>(); ArrayList<TileLesuStorage> tileLesuStorages = new ArrayList<>();
tileLesuStorages.addAll(network.storages); tileLesuStorages.addAll(network.storages);
network.clear(false); network.clear(false);
for (TileLesuStorage lesuStorage : tileLesuStorages) for (TileLesuStorage lesuStorage : tileLesuStorages)

View file

@ -14,7 +14,7 @@ public class TileLesu extends TilePowerAcceptor
public int connectedBlocks = 0; public int connectedBlocks = 0;
public Inventory inventory = new Inventory(2, "TileAesu", 64, this); public Inventory inventory = new Inventory(2, "TileAesu", 64, this);
private ArrayList<LesuNetwork> countedNetworks = new ArrayList<LesuNetwork>(); private ArrayList<LesuNetwork> countedNetworks = new ArrayList<>();
private double euLastTick = 0; private double euLastTick = 0;
private double euChange; private double euChange;
private int ticks; private int ticks;

View file

@ -53,11 +53,7 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable,
@Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override public void updateEntity() @Override public void updateEntity()

View file

@ -56,11 +56,7 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -162,11 +162,7 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -56,11 +56,7 @@ public class TileExtractor extends TilePowerAcceptor implements IWrenchable, IIn
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

View file

@ -59,11 +59,7 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IInve
@Override @Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{ {
if (entityPlayer.isSneaking()) return entityPlayer.isSneaking();
{
return true;
}
return false;
} }
@Override @Override

Some files were not shown because too many files have changed in this diff Show more