Compare commits

...
3 Commits
3 changed files with 16 additions and 14 deletions

No files matched your search

+2 -2
View File
@@ -2,9 +2,9 @@
dependencies { dependencies {
api('com.github.GTNewHorizons:ForestryMC:4.10.17:dev') api('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
implementation('com.github.GTNewHorizons:GTNHLib:0.6.39:dev') implementation('com.github.GTNewHorizons:GTNHLib:0.6.40:dev')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.90-GTNH:dev') devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.91-GTNH:dev')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api')
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
@@ -76,12 +76,14 @@ public class TileEntityMetadata extends TileEntity {
} }
public static ItemStack getItemStack(Block block, int damage) { public static ItemStack getItemStack(Block block, int damage) {
NBTTagCompound tag = new NBTTagCompound();
tag.setInteger("meta", damage);
ItemStack item = new ItemStack(block, 1, 0); ItemStack item = new ItemStack(block, 1, 0);
item.setItemDamage(Math.min(damage, 16387)); if (0 <= damage && damage < Short.MAX_VALUE) {
item.setTagCompound(tag); item.setItemDamage(damage);
} else {
NBTTagCompound tag = new NBTTagCompound();
tag.setInteger("meta", damage);
item.setTagCompound(tag);
}
return item; return item;
} }
@@ -248,13 +248,6 @@ public class ContainerCraftGUI extends Container {
public void handleNBT(Side side, EntityPlayer player, NBTTagCompound action) { public void handleNBT(Side side, EntityPlayer player, NBTTagCompound action) {
final String actionType = action.getString(ACTION_TYPE); final String actionType = action.getString(ACTION_TYPE);
if (actionType.equals(ACTION_BATCH)) {
NBTTagList actionsBatch = action.getTagList(ACTIONS, TAG_COMPOUND);
for (int i = 0; i < actionsBatch.tagCount(); i++) {
handleNBT(side, player, actionsBatch.getCompoundTagAt(i));
}
}
if (side == Side.SERVER) { if (side == Side.SERVER) {
switch (actionType) { switch (actionType) {
case TANK_CLICK -> tankClick(player, action.getByte(SLOT_ID)); case TANK_CLICK -> tankClick(player, action.getByte(SLOT_ID));
@@ -494,6 +487,13 @@ public class ContainerCraftGUI extends Container {
public void receiveNBT(Side side, EntityPlayer player, NBTTagCompound action) { public void receiveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
String actionType = action.getString(ACTION_TYPE); String actionType = action.getString(ACTION_TYPE);
if (actionType.equals(ACTION_BATCH)) {
NBTTagList actionsBatch = action.getTagList(ACTIONS, TAG_COMPOUND);
for (int i = 0; i < actionsBatch.tagCount(); i++) {
receiveNBT(side, player, actionsBatch.getCompoundTagAt(i));
}
return;
}
handleNBT(side, player, action); handleNBT(side, player, action);
window.receiveGuiNBT(getSide(), player, actionType, action); window.receiveGuiNBT(getSide(), player, actionType, action);
INetwork.ReceiveGuiNBT machine = Machine.getInterface(INetwork.ReceiveGuiNBT.class, window.getInventory()); INetwork.ReceiveGuiNBT machine = Machine.getInterface(INetwork.ReceiveGuiNBT.class, window.getInventory());