mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-22 13:10:13 +00:00
Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git
This commit is contained in:
commit
8b7acbef9f
2 files changed
+24
-2
No files matched your search
@@ -11,6 +11,7 @@ import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.CraftingManager;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.util.FakePlayer;
|
||||
|
||||
@@ -311,6 +312,15 @@ public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuf
|
||||
} else {
|
||||
bufferStacks = true;
|
||||
}
|
||||
|
||||
containerItems.clear();
|
||||
NBTTagList itemList = (NBTTagList) nbtRoot.getTag("containerItems");
|
||||
if(itemList != null) {
|
||||
for (int i = 0; i < itemList.tagCount(); i++) {
|
||||
NBTTagCompound itemStack = itemList.getCompoundTagAt(i);
|
||||
containerItems.add(ItemStack.loadItemStackFromNBT(itemStack));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -321,6 +331,18 @@ public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuf
|
||||
nbtRoot.setTag("craftingGrid", craftingRoot);
|
||||
|
||||
nbtRoot.setBoolean("bufferStacks", bufferStacks);
|
||||
|
||||
if (containerItems.isEmpty()) {
|
||||
nbtRoot.removeTag("containerItems");
|
||||
} else {
|
||||
NBTTagList itemList = new NBTTagList();
|
||||
for (ItemStack stack : containerItems) {
|
||||
NBTTagCompound itemStackNBT = new NBTTagCompound();
|
||||
stack.writeToNBT(itemStackNBT);
|
||||
itemList.appendTag(itemStackNBT);
|
||||
}
|
||||
nbtRoot.setTag("containerItems", itemList);
|
||||
}
|
||||
}
|
||||
|
||||
public void updateCraftingOutput() {
|
||||
|
||||
@@ -182,9 +182,9 @@ public class WailaCompat implements IWailaDataProvider {
|
||||
ForgeDirection side = accessor.getSide();
|
||||
IoMode mode = machine.getIoMode(side);
|
||||
currenttip.add(EnumChatFormatting.YELLOW
|
||||
+ String.format(EnderIO.lang.localize("gui.machine.side"), EnumChatFormatting.WHITE + EnderIO.lang.localize("gui.machine.side." + side.name().toLowerCase())));
|
||||
+ EnderIO.lang.localize("gui.machine.side", EnumChatFormatting.WHITE + EnderIO.lang.localize("gui.machine.side." + side.name().toLowerCase())));
|
||||
if(!(te instanceof TileInventoryPanel)) {
|
||||
currenttip.add(EnumChatFormatting.YELLOW + String.format(EnderIO.lang.localize("gui.machine.ioMode"), mode.colorLocalisedName()));
|
||||
currenttip.add(EnumChatFormatting.YELLOW + EnderIO.lang.localize("gui.machine.ioMode", mode.colorLocalisedName()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user