Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Added the state of the ItemDistributor to the NBTTadCompound

Browse source
This commit is contained in:
Johannes Gäßler 2017-06-28 00:16:04 +02:00
parent 95a1d46086
commit 40d850aece
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java
View file

@ -11,10 +11,11 @@ import gregtech.common.gui.GT_Container_ChestBuffer;
import gregtech.common.gui.GT_GUIContainer_ChestBuffer; import gregtech.common.gui.GT_GUIContainer_ChestBuffer;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer { public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer {
private byte[] sideWeights = new byte[6]; private byte[] itemsPerSide = new byte[6];
private byte currentSide = 0, currentSideItemCount = 0; private byte currentSide = 0, currentSideItemCount = 0;
public GT_MetaTileEntity_ItemDistributor(int aID, String aName, String aNameRegional, int aTier) { public GT_MetaTileEntity_ItemDistributor(int aID, String aName, String aNameRegional, int aTier) {
@ -52,7 +53,7 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
int movedItems = 0; int movedItems = 0;
TileEntity adjacentTileEntity = aBaseMetaTileEntity.getTileEntityAtSide(currentSide); TileEntity adjacentTileEntity = aBaseMetaTileEntity.getTileEntityAtSide(currentSide);
int inspectedSides = 0; int inspectedSides = 0;
while (sideWeights[currentSide] == 0) { while (itemsPerSide[currentSide] == 0) {
currentSide = (byte) ((currentSide + 1) % 6); currentSide = (byte) ((currentSide + 1) % 6);
currentSideItemCount = 0; currentSideItemCount = 0;
adjacentTileEntity = aBaseMetaTileEntity.getTileEntityAtSide(currentSide); adjacentTileEntity = aBaseMetaTileEntity.getTileEntityAtSide(currentSide);
@ -63,9 +64,9 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
} }
movedItems = GT_Utility.moveOneItemStack(aBaseMetaTileEntity, adjacentTileEntity, currentSide, movedItems = GT_Utility.moveOneItemStack(aBaseMetaTileEntity, adjacentTileEntity, currentSide,
GT_Utility.getOppositeSide(currentSide), null, false, (byte) 64, (byte) 1, GT_Utility.getOppositeSide(currentSide), null, false, (byte) 64, (byte) 1,
(byte) (sideWeights[currentSide] - currentSideItemCount), (byte) 1); (byte) (itemsPerSide[currentSide] - currentSideItemCount), (byte) 1);
currentSideItemCount += movedItems; currentSideItemCount += movedItems;
if (currentSideItemCount >= sideWeights[currentSide]) { if (currentSideItemCount >= itemsPerSide[currentSide]) {
currentSide = (byte) ((currentSide + 1) % 6); currentSide = (byte) ((currentSide + 1) % 6);
currentSideItemCount = 0; currentSideItemCount = 0;
} }
@ -90,9 +91,32 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer
@Override @Override
public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
sideWeights[aSide] += aPlayer.isSneaking() ? -1 : 1; //Adjust items per side by 1 or -1, constrained to the cyclic interval [0, 127]
sideWeights[aSide] = (byte) ((sideWeights[aSide] + 128) % 128); itemsPerSide[aSide] += aPlayer.isSneaking() ? -1 : 1;
GT_Utility.sendChatToPlayer(aPlayer, trans("110", "Side Weight: " + sideWeights[aSide])); itemsPerSide[aSide] = (byte) ((itemsPerSide[aSide] + 128) % 128);
GT_Utility.sendChatToPlayer(aPlayer, trans("110", "Items per side: " + itemsPerSide[aSide]));
}
@Override
public void saveNBTData(NBTTagCompound aNBT) {
super.saveNBTData(aNBT);
aNBT.setByteArray("mItemsPerSide", itemsPerSide);
aNBT.setByte("mCurrentSide", currentSide);
aNBT.setByte("mCurrentSideItemCount", currentSideItemCount);
}
@Override
public void loadNBTData(NBTTagCompound aNBT) {
super.loadNBTData(aNBT);
itemsPerSide = aNBT.getByteArray("mItemsPerSide");
currentSide = aNBT.getByte("mCurrentSide");
currentSideItemCount = aNBT.getByte("mCurrentSideItemCount");
}
@Override
public void setItemNBT(NBTTagCompound aNBT) {
super.setItemNBT(aNBT);
aNBT.setByteArray("mItemsPerSide", itemsPerSide);
} }
public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {