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

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -34,7 +34,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF
public static final int euTick = 16;
public Tank tank = new Tank("TileGasTurbine", FluidContainerRegistry.BUCKET_VOLUME * 10, this);
public Inventory inventory = new Inventory(3, "TileGasTurbine", 64, this);
Map<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
// our eu/bucket targets while still only ever removing integer millibucket
@ -65,11 +65,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF
@Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{
if (entityPlayer.isSneaking())
{
return true;
}
return false;
return entityPlayer.isSneaking();
}
@Override

View file

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

View file

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

View file

@ -34,7 +34,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench
public static final int euTick = 8;
public Tank tank = new Tank("TileSemifluidGenerator", FluidContainerRegistry.BUCKET_VOLUME * 10, this);
public Inventory inventory = new Inventory(3, "TileSemifluidGenerator", 64, this);
Map<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
// our eu/bucket targets while still only ever removing integer millibucket
@ -71,11 +71,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench
@Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{
if (entityPlayer.isSneaking())
{
return true;
}
return false;
return entityPlayer.isSneaking();
}
@Override

View file

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

View file

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

View file

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

View file

@ -14,7 +14,7 @@ public class TileLesu extends TilePowerAcceptor
public int connectedBlocks = 0;
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 euChange;
private int ticks;

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -113,11 +113,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv
public boolean canRecycle()
{
if (getStackInSlot(input1) != null && hasSlotGotSpace(input1))
{
return true;
}
return false;
return getStackInSlot(input1) != null && hasSlotGotSpace(input1);
}
public boolean hasSlotGotSpace(int slot)
@ -163,11 +159,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv
@Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer)
{
if (entityPlayer.isSneaking())
{
return true;
}
return false;
return entityPlayer.isSneaking();
}
@Override

View file

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