Code formatter take 2

This commit is contained in:
modmuss50 2016-03-25 09:47:34 +00:00
parent 33985f1a31
commit 5eed5b161d
450 changed files with 32768 additions and 26684 deletions

View file

@ -2,51 +2,65 @@ package techreborn.tiles.lesu;
import java.util.ArrayList;
public class LesuNetwork {
public class LesuNetwork
{
public ArrayList<TileLesuStorage> storages = new ArrayList<TileLesuStorage>();
public ArrayList<TileLesuStorage> storages = new ArrayList<TileLesuStorage>();
public TileLesu master;
public TileLesu master;
public void addElement(TileLesuStorage lesuStorage) {
if (!storages.contains(lesuStorage) && storages.size() < 5000) {
storages.add(lesuStorage);
}
}
public void addElement(TileLesuStorage lesuStorage)
{
if (!storages.contains(lesuStorage) && storages.size() < 5000)
{
storages.add(lesuStorage);
}
}
public void removeElement(TileLesuStorage lesuStorage) {
storages.remove(lesuStorage);
rebuild();
}
public void removeElement(TileLesuStorage lesuStorage)
{
storages.remove(lesuStorage);
rebuild();
}
private void rebuild() {
master = null;
for (TileLesuStorage lesuStorage : storages) {
lesuStorage.findAndJoinNetwork(lesuStorage.getWorld(), lesuStorage.getPos().getX(), lesuStorage.getPos().getY(), lesuStorage.getPos().getZ());
}
}
private void rebuild()
{
master = null;
for (TileLesuStorage lesuStorage : storages)
{
lesuStorage.findAndJoinNetwork(lesuStorage.getWorld(), lesuStorage.getPos().getX(),
lesuStorage.getPos().getY(), lesuStorage.getPos().getZ());
}
}
public void merge(LesuNetwork network) {
if (network != this) {
ArrayList<TileLesuStorage> tileLesuStorages = new ArrayList<TileLesuStorage>();
tileLesuStorages.addAll(network.storages);
network.clear(false);
for (TileLesuStorage lesuStorage : tileLesuStorages) {
lesuStorage.setNetwork(this);
}
if (network.master != null && this.master == null) {
this.master = network.master;
}
}
}
public void merge(LesuNetwork network)
{
if (network != this)
{
ArrayList<TileLesuStorage> tileLesuStorages = new ArrayList<TileLesuStorage>();
tileLesuStorages.addAll(network.storages);
network.clear(false);
for (TileLesuStorage lesuStorage : tileLesuStorages)
{
lesuStorage.setNetwork(this);
}
if (network.master != null && this.master == null)
{
this.master = network.master;
}
}
}
private void clear(boolean clearTiles) {
if (clearTiles) {
for (TileLesuStorage tileLesuStorage : storages) {
tileLesuStorage.resetNetwork();
}
}
storages.clear();
}
private void clear(boolean clearTiles)
{
if (clearTiles)
{
for (TileLesuStorage tileLesuStorage : storages)
{
tileLesuStorage.resetNetwork();
}
}
storages.clear();
}
}

View file

@ -1,5 +1,6 @@
package techreborn.tiles.lesu;
import java.util.ArrayList;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@ -8,103 +9,125 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.config.ConfigTechReborn;
import java.util.ArrayList;
public class TileLesu extends TilePowerAcceptor
{// TODO wrench
public class TileLesu extends TilePowerAcceptor {//TODO wrench
public int connectedBlocks = 0;
public Inventory inventory = new Inventory(2, "TileAesu", 64, this);
private ArrayList<LesuNetwork> countedNetworks = new ArrayList<LesuNetwork>();
private double euLastTick = 0;
private double euChange;
private int ticks;
private int output;
private int maxStorage;
private ArrayList<LesuNetwork> countedNetworks = new ArrayList<LesuNetwork>();
public int connectedBlocks = 0;
public TileLesu()
{
super(5);
}
private double euLastTick = 0;
private double euChange;
private int ticks;
private int output;
private int maxStorage;
@Override
public void updateEntity()
{
super.updateEntity();
if (worldObj.isRemote)
{
return;
}
countedNetworks.clear();
connectedBlocks = 0;
for (EnumFacing dir : EnumFacing.values())
{
if (worldObj.getTileEntity(
new BlockPos(getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(),
getPos().getZ() + dir.getFrontOffsetZ())) instanceof TileLesuStorage)
{
if (((TileLesuStorage) worldObj.getTileEntity(
new BlockPos(getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(),
getPos().getZ() + dir.getFrontOffsetZ()))).network != null)
{
LesuNetwork network = ((TileLesuStorage) worldObj.getTileEntity(new BlockPos(
getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(),
getPos().getZ() + dir.getFrontOffsetZ()))).network;
if (!countedNetworks.contains(network))
{
if (network.master == null || network.master == this)
{
connectedBlocks += network.storages.size();
countedNetworks.add(network);
network.master = this;
break;
}
}
}
}
}
maxStorage = ((connectedBlocks + 1) * ConfigTechReborn.lesuStoragePerBlock);
output = (connectedBlocks * ConfigTechReborn.extraOutputPerLesuBlock) + ConfigTechReborn.baseLesuOutput;
public Inventory inventory = new Inventory(4, "TileAesu", 64, this);
if (ticks == ConfigTechReborn.aveargeEuOutTickTime)
{
euChange = -1;
ticks = 0;
} else
{
ticks++;
if (euChange == -1)
{
euChange = 0;
}
euChange += getEnergy() - euLastTick;
if (euLastTick == getEnergy())
{
euChange = 0;
}
}
public TileLesu() {
super(5);
}
euLastTick = getEnergy();
}
@Override
public void updateEntity() {
super.updateEntity();
if (worldObj.isRemote) {
return;
}
countedNetworks.clear();
connectedBlocks = 0;
for (EnumFacing dir : EnumFacing.values()) {
if (worldObj.getTileEntity(new BlockPos(getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(), getPos().getZ() + dir.getFrontOffsetZ())) instanceof TileLesuStorage) {
if (((TileLesuStorage) worldObj.getTileEntity(new BlockPos(getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(), getPos().getZ() + dir.getFrontOffsetZ()))).network != null) {
LesuNetwork network = ((TileLesuStorage) worldObj.getTileEntity(new BlockPos(getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(), getPos().getZ() + dir.getFrontOffsetZ()))).network;
if (!countedNetworks.contains(network)) {
if (network.master == null || network.master == this) {
connectedBlocks += network.storages.size();
countedNetworks.add(network);
network.master = this;
break;
}
}
}
}
}
maxStorage = ((connectedBlocks + 1) * ConfigTechReborn.lesuStoragePerBlock);
output = (connectedBlocks * ConfigTechReborn.extraOutputPerLesuBlock) + ConfigTechReborn.baseLesuOutput;
public double getEuChange()
{
if (euChange == -1)
{
return 0;
}
return (euChange / ticks);
}
if (ticks == ConfigTechReborn.aveargeEuOutTickTime) {
euChange = -1;
ticks = 0;
} else {
ticks++;
if (euChange == -1) {
euChange = 0;
}
euChange += getEnergy() - euLastTick;
if (euLastTick == getEnergy()) {
euChange = 0;
}
}
@Override
public double getMaxPower()
{
return maxStorage;
}
euLastTick = getEnergy();
}
@Override
public boolean canAcceptEnergy(EnumFacing direction)
{
return direction != getFacingEnum();
}
@Override
public boolean canProvideEnergy(EnumFacing direction)
{
return direction == getFacingEnum();
}
public double getEuChange() {
if (euChange == -1) {
return 0;
}
return (euChange / ticks);
}
@Override
public double getMaxOutput()
{
return output;
}
@Override
public double getMaxPower() {
return maxStorage;
}
@Override
public double getMaxInput()
{
return 8192;
}
@Override
public boolean canAcceptEnergy(EnumFacing direction) {
return direction != getFacingEnum();
}
@Override
public boolean canProvideEnergy(EnumFacing direction) {
return direction == getFacingEnum();
}
@Override
public double getMaxOutput() {
return output;
}
@Override
public double getMaxInput() {
return 8192;
}
@Override
public EnumPowerTier getTier() {
return EnumPowerTier.EXTREME;
}
@Override
public EnumPowerTier getTier()
{
return EnumPowerTier.EXTREME;
}
}

View file

@ -5,56 +5,77 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import reborncore.common.tile.TileMachineBase;
public class TileLesuStorage extends TileMachineBase {
public class TileLesuStorage extends TileMachineBase
{
public LesuNetwork network;
public LesuNetwork network;
@Override
public void updateEntity() {
super.updateEntity();
if (network == null) {
findAndJoinNetwork(worldObj, getPos().getX(), getPos().getY(), getPos().getZ());
} else {
if (network.master != null && network.master.getWorld().getTileEntity(new BlockPos(network.master.getPos().getX(), network.master.getPos().getY(), network.master.getPos().getZ())) != network.master) {
network.master = null;
}
}
}
@Override
public void updateEntity()
{
super.updateEntity();
if (network == null)
{
findAndJoinNetwork(worldObj, getPos().getX(), getPos().getY(), getPos().getZ());
} else
{
if (network.master != null
&& network.master.getWorld().getTileEntity(new BlockPos(network.master.getPos().getX(),
network.master.getPos().getY(), network.master.getPos().getZ())) != network.master)
{
network.master = null;
}
}
}
public final void findAndJoinNetwork(World world, int x, int y, int z) {
network = new LesuNetwork();
network.addElement(this);
for (EnumFacing direction : EnumFacing.values()) {
if (world.getTileEntity(new BlockPos(x + direction.getFrontOffsetX(), y + direction.getFrontOffsetY(), z + direction.getFrontOffsetZ())) instanceof TileLesuStorage) {
TileLesuStorage lesu = (TileLesuStorage) world.getTileEntity(new BlockPos(x + direction.getFrontOffsetX(), y + direction.getFrontOffsetY(), z + direction.getFrontOffsetZ()));
if (lesu.network != null) {
lesu.network.merge(network);
}
}
}
}
public final void findAndJoinNetwork(World world, int x, int y, int z)
{
network = new LesuNetwork();
network.addElement(this);
for (EnumFacing direction : EnumFacing.values())
{
if (world.getTileEntity(new BlockPos(x + direction.getFrontOffsetX(), y + direction.getFrontOffsetY(),
z + direction.getFrontOffsetZ())) instanceof TileLesuStorage)
{
TileLesuStorage lesu = (TileLesuStorage) world
.getTileEntity(new BlockPos(x + direction.getFrontOffsetX(), y + direction.getFrontOffsetY(),
z + direction.getFrontOffsetZ()));
if (lesu.network != null)
{
lesu.network.merge(network);
}
}
}
}
public final void setNetwork(LesuNetwork n) {
if (n == null) {
} else {
network = n;
network.addElement(this);
}
}
public final void setNetwork(LesuNetwork n)
{
if (n == null)
{
} else
{
network = n;
network.addElement(this);
}
}
public final void resetNetwork() {
network = null;
}
public final void resetNetwork()
{
network = null;
}
public final void removeFromNetwork() {
if (network == null) {
} else
network.removeElement(this);
}
public final void removeFromNetwork()
{
if (network == null)
{
} else
network.removeElement(this);
}
public final void rebuildNetwork() {
this.removeFromNetwork();
this.resetNetwork();
this.findAndJoinNetwork(worldObj, getPos().getX(), getPos().getY(), getPos().getZ());
}
public final void rebuildNetwork()
{
this.removeFromNetwork();
this.resetNetwork();
this.findAndJoinNetwork(worldObj, getPos().getX(), getPos().getY(), getPos().getZ());
}
}