Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

optimize NBT usage and some other oddities

Browse source
This commit is contained in:
asiekierka 2014-10-25 11:58:25 +02:00
parent 13fddf9b87
commit 999b045b13
9 changed files with 48 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/buildcraft/builders/TileConstructionMarker.java
View file

@ -118,7 +118,7 @@ public class TileConstructionMarker extends TileBuildCraft implements IBuildingI
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
nbt.setInteger("direction", direction.ordinal());
nbt.setByte("direction", (byte) direction.ordinal());
if (itemBlueprint != null) {
NBTTagCompound bptNBT = new NBTTagCompound();
@ -141,7 +141,7 @@ public class TileConstructionMarker extends TileBuildCraft implements IBuildingI
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
direction = ForgeDirection.values()[nbt.getInteger("direction")];
direction = ForgeDirection.getOrientation(nbt.getByte("direction"));
if (nbt.hasKey("itemBlueprint")) {
itemBlueprint = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("itemBlueprint"));

36
common/buildcraft/core/triggers/StatementParameterDirection.java
View file

@ -8,8 +8,6 @@
*/
package buildcraft.core.triggers;
//import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.IIcon;
@ -22,29 +20,13 @@ import buildcraft.api.transport.IPipeTile;
public class StatementParameterDirection implements IActionParameter, ITriggerParameter {
// static IIcon[] icons = new IIcon[ForgeDirection.values().length];
@NetworkData
public ForgeDirection direction = ForgeDirection.UNKNOWN;
public StatementParameterDirection() {
}
/*
@Override
public void registerIcons(IIconRegister register) {
for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) {
icons[d.ordinal()] = register.registerIcon("buildcraft:triggers/trigger_dir_" + d.name().toLowerCase());
}
}
@Override
public IIcon getIconToDraw() {
return icons[direction.ordinal()];
}
*/
@Override
public ItemStack getItemStackToDraw() {
return null;
@ -53,38 +35,38 @@ public class StatementParameterDirection implements IActionParameter, ITriggerPa
@Override
public IIcon getIconToDraw() {
if (direction == ForgeDirection.UNKNOWN) {
return null;
return null;
} else {
return StatementIconProvider.INSTANCE.getIcon(StatementIconProvider.Action_Parameter_Direction_Down + direction.ordinal());
return StatementIconProvider.INSTANCE.getIcon(StatementIconProvider.Action_Parameter_Direction_Down + direction.ordinal());
}
}
@Override
public void clicked(IPipeTile pipe, IStatement stmt, ItemStack stack) {
do {
direction = ForgeDirection.getOrientation((direction.ordinal() + 1) % ForgeDirection.values().length);
} while (direction != ForgeDirection.UNKNOWN && !pipe.isPipeConnected(direction));
direction = ForgeDirection.getOrientation((direction.ordinal() + 1) % 6);
} while (!pipe.isPipeConnected(direction));
}
@Override
public void writeToNBT(NBTTagCompound nbt) {
nbt.setInteger("direction", direction.ordinal());
nbt.setByte("direction", (byte) direction.ordinal());
}
@Override
public void readFromNBT(NBTTagCompound nbt) {
if (nbt.hasKey("direction")) {
direction = ForgeDirection.values()[nbt.getInteger("direction")];
direction = ForgeDirection.getOrientation(nbt.getByte("direction"));
} else {
direction = ForgeDirection.UNKNOWN;
direction = ForgeDirection.UNKNOWN;
}
}
@Override
public boolean equals(Object object) {
if (object instanceof StatementParameterDirection) {
StatementParameterDirection param = (StatementParameterDirection) object;
return param.direction == this.direction;
StatementParameterDirection param = (StatementParameterDirection) object;
return param.direction == this.direction;
}
return false;
}

4
common/buildcraft/energy/TileEngine.java
View file

@ -418,7 +418,7 @@ public abstract class TileEngine extends TileBuildCraft implements IPowerRecepto
public void readFromNBT(NBTTagCompound data) {
super.readFromNBT(data);
orientation = ForgeDirection.getOrientation(data.getInteger("orientation"));
orientation = ForgeDirection.getOrientation(data.getByte("orientation"));
progress = data.getFloat("progress");
energy = data.getInteger("energy");
heat = data.getFloat("heat");
@ -428,7 +428,7 @@ public abstract class TileEngine extends TileBuildCraft implements IPowerRecepto
public void writeToNBT(NBTTagCompound data) {
super.writeToNBT(data);
data.setInteger("orientation", orientation.ordinal());
data.setByte("orientation", (byte) orientation.ordinal());
data.setFloat("progress", progress);
data.setInteger("energy", energy);
data.setFloat("heat", heat);

6
common/buildcraft/factory/TileRefinery.java
View file

@ -53,7 +53,7 @@ public class TileRefinery extends TileBuildCraft implements IFluidHandler, IInve
public SingleUseTank result = new SingleUseTank("result", LIQUID_PER_SLOT, this);
public TankManager<SingleUseTank> tankManager = new TankManager<SingleUseTank>(tanks[0], tanks[1], result);
public float animationSpeed = 1;
private int animationStage = 0;
private short animationStage = 0;
private SafeTimeTracker time = new SafeTimeTracker();
private SafeTimeTracker updateNetworkTime = new SafeTimeTracker(BuildCraftCore.updateFactor);
@ -198,7 +198,7 @@ public class TileRefinery extends TileBuildCraft implements IFluidHandler, IInve
tankManager.readFromNBT(data);
animationStage = data.getInteger("animationStage");
animationStage = data.getShort("animationStage");
animationSpeed = data.getFloat("animationSpeed");
updateRecipe();
@ -210,7 +210,7 @@ public class TileRefinery extends TileBuildCraft implements IFluidHandler, IInve
tankManager.writeToNBT(data);
data.setInteger("animationStage", animationStage);
data.setShort("animationStage", animationStage);
data.setFloat("animationSpeed", animationSpeed);
}

2
common/buildcraft/silicon/BlockLaser.java
View file

@ -121,7 +121,7 @@ public class BlockLaser extends BlockBuildCraft implements ICustomHighlight {
@Override
public IIcon getIcon(int i, int j) {
if (i == ForgeDirection.values()[j].getOpposite().ordinal()) {
if (i == (j ^ 1)) {
return textureBottom;
} else if (i == j) {
return textureTop;

5
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -678,6 +678,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
if (isValid(pipe)) {
pipe.container.scheduleNeighborChange();
pipe.container.redstoneInput = 0;
for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) {
ForgeDirection d = ForgeDirection.getOrientation(i);
@ -685,6 +686,10 @@ public class BlockGenericPipe extends BlockBuildCraft {
world.isBlockProvidingPowerTo(x + d.offsetX, y + d.offsetY, z + d.offsetZ, i),
world.getIndirectPowerLevelTo(x + d.offsetX, y + d.offsetY, z + d.offsetZ, i)
);
if (pipe.container.redstoneInput < pipe.container.redstoneInputSide[i]) {
pipe.container.redstoneInput = pipe.container.redstoneInputSide[i];
}
}
}
}

10
common/buildcraft/transport/ItemFacade.java
View file

@ -62,8 +62,8 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem {
public FacadeState(NBTTagCompound nbt) {
this.block = nbt.hasKey("block") ? (Block) Block.blockRegistry.getObject(nbt.getString("block")) : null;
this.metadata = nbt.getInteger("metadata");
this.wire = nbt.hasKey("wire") ? PipeWire.fromOrdinal(nbt.getInteger("wire")) : null;
this.metadata = nbt.getByte("metadata");
this.wire = nbt.hasKey("wire") ? PipeWire.fromOrdinal(nbt.getByte("wire")) : null;
this.transparent = nbt.hasKey("transparent") && nbt.getBoolean("transparent");
}
@ -90,9 +90,9 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem {
if (block != null) {
nbt.setString("block", Block.blockRegistry.getNameForObject(block));
}
nbt.setInteger("metadata", metadata);
nbt.setByte("metadata", (byte) metadata);
if (wire != null) {
nbt.setInteger("wire", wire.ordinal());
nbt.setByte("wire", (byte) wire.ordinal());
}
nbt.setBoolean("transparent", transparent);
}
@ -599,7 +599,7 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem {
ItemStack stack = new ItemStack(BuildCraftTransport.facadeItem, 1, 0);
NBTTagCompound nbt = new NBTTagCompound();
nbt.setInteger("type", (basic ? FacadeType.Basic : FacadeType.Phased).ordinal());
nbt.setByte("type", (byte) (basic ? FacadeType.Basic : FacadeType.Phased).ordinal());
nbt.setTag("states", FacadeState.writeArray(states));
stack.setTagCompound(nbt);

15
common/buildcraft/transport/TileGenericPipe.java
View file

@ -71,6 +71,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, IFlui
public boolean[] pipeConnectionsBuffer = new boolean[6];
public Pipe pipe;
public int redstoneInput;
public int[] redstoneInputSide = new int[ForgeDirection.VALID_DIRECTIONS.length];
protected boolean deletePipe = false;
@ -262,7 +263,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, IFlui
for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) {
final String key = "redstoneInputSide[" + i + "]";
nbt.setInteger(key, redstoneInputSide[i]);
nbt.setByte(key, (byte) redstoneInputSide[i]);
}
if (pipe != null) {
@ -279,9 +280,19 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, IFlui
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
redstoneInput = 0;
for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) {
final String key = "redstoneInputSide[" + i + "]";
redstoneInputSide[i] = nbt.hasKey(key) ? nbt.getInteger(key) : 0;
if (nbt.hasKey(key)) {
redstoneInputSide[i] = nbt.getByte(key);
if (redstoneInputSide[i] > redstoneInput) {
redstoneInput = redstoneInputSide[i];
}
} else {
redstoneInputSide[i] = 0;
}
}
coreState.pipeId = nbt.getInteger("pipeId");

8
common/buildcraft/transport/TravelingItem.java
View file

@ -172,8 +172,8 @@ public class TravelingItem {
setItemStack(ItemStack.loadItemStackFromNBT(data.getCompoundTag("Item")));
toCenter = data.getBoolean("toCenter");
input = ForgeDirection.getOrientation(data.getInteger("input"));
output = ForgeDirection.getOrientation(data.getInteger("output"));
input = ForgeDirection.getOrientation(data.getByte("input"));
output = ForgeDirection.getOrientation(data.getByte("output"));
byte c = data.getByte("color");
if (c != -1) {
@ -195,8 +195,8 @@ public class TravelingItem {
data.setTag("Item", itemStackTag);
data.setBoolean("toCenter", toCenter);
data.setInteger("input", input.ordinal());
data.setInteger("output", output.ordinal());
data.setByte("input", (byte) input.ordinal());
data.setByte("output", (byte) output.ordinal());
data.setByte("color", color != null ? (byte) color.ordinal() : -1);