diff --git a/src/main/java/appeng/container/implementations/ContainerExpandedProcessingPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerExpandedProcessingPatternTerm.java index dbdf4e17a..cc16a9e36 100644 --- a/src/main/java/appeng/container/implementations/ContainerExpandedProcessingPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerExpandedProcessingPatternTerm.java @@ -20,10 +20,10 @@ public class ContainerExpandedProcessingPatternTerm extends ContainerPatternEnco this.craftingSlots = new SlotFakeCraftingMatrix[PROCESSING_INPUT_LIMIT]; this.outputSlots = new OptionalSlotFake[PROCESSING_OUTPUT_LIMIT]; - final IItemHandler patternInv = this.getPart().getInventoryByName("pattern"); - final IItemHandler output = this.getPart().getInventoryByName("output"); + final IItemHandler patternInv = this.getPatternTerminal().getInventoryByName("pattern"); + final IItemHandler output = this.getPatternTerminal().getInventoryByName("output"); - this.crafting = this.getPart().getInventoryByName("crafting"); + this.crafting = this.getPatternTerminal().getInventoryByName("crafting"); for (int y = 0; y < 4; y++) { for (int x = 0; x < 4; x++) { diff --git a/src/main/java/appeng/container/implementations/ContainerPatternEncoder.java b/src/main/java/appeng/container/implementations/ContainerPatternEncoder.java index 221a15e1a..09d207f71 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternEncoder.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternEncoder.java @@ -77,7 +77,7 @@ public abstract class ContainerPatternEncoder extends ContainerMEMonitorable imp final AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get(idx); // require AE SLots! ItemStack itemStack = clickSlot.getStack(); if (AEApi.instance().definitions().materials().blankPattern().isSameAs(itemStack)) { - IItemHandler patternInv = this.getPart().getInventoryByName("pattern"); + IItemHandler patternInv = this.getPatternTerminal().getInventoryByName("pattern"); ItemStack remainder = patternInv.insertItem(0, itemStack, false); clickSlot.putStack(remainder); } @@ -85,7 +85,7 @@ public abstract class ContainerPatternEncoder extends ContainerMEMonitorable imp return super.transferStackInSlot(p, idx); } - public AbstractPartEncoder getPart() { + public AbstractPartEncoder getPatternTerminal() { return this.patternTerminal; } @@ -97,7 +97,7 @@ public abstract class ContainerPatternEncoder extends ContainerMEMonitorable imp if (name.equals("player")) { return new PlayerInvWrapper(this.getInventoryPlayer()); } - return this.getPart().getInventoryByName(name); + return this.getPatternTerminal().getInventoryByName(name); } @Override @@ -490,12 +490,12 @@ public abstract class ContainerPatternEncoder extends ContainerMEMonitorable imp public void detectAndSendChanges() { super.detectAndSendChanges(); if (Platform.isServer()) { - if (this.isCraftingMode() != this.getPart().isCraftingRecipe()) { - this.setCraftingMode(this.getPart().isCraftingRecipe()); + if (this.isCraftingMode() != this.getPatternTerminal().isCraftingRecipe()) { + this.setCraftingMode(this.getPatternTerminal().isCraftingRecipe()); this.updateOrderOfOutputSlots(); } - this.substitute = this.getPart().isSubstitution(); + this.substitute = this.getPatternTerminal().isSubstitution(); } } diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index ba597944d..718cf6872 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -27,19 +27,16 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.container.ContainerNull; -import appeng.container.guisync.GuiSync; -import appeng.container.slot.AppEngSlot; -import appeng.container.slot.IOptionalSlotHost; import appeng.container.slot.OptionalSlotFake; import appeng.container.slot.SlotFakeCraftingMatrix; import appeng.container.slot.SlotPatternOutputs; import appeng.container.slot.SlotPatternTerm; -import appeng.container.slot.SlotPlayerHotBar; -import appeng.container.slot.SlotPlayerInv; import appeng.container.slot.SlotRestrictedInput; import appeng.core.sync.packets.PacketPatternSlot; import appeng.items.storage.ItemViewCell; import appeng.me.helpers.MachineSource; +import appeng.parts.reporting.AbstractPartEncoder; +import appeng.parts.reporting.PartPatternTerminal; import appeng.util.InventoryAdaptor; import appeng.util.Platform; import appeng.util.inv.AdaptorItemHandler; @@ -48,10 +45,8 @@ import appeng.util.item.AEItemStack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; @@ -68,10 +63,10 @@ public class ContainerPatternTerm extends ContainerPatternEncoder { this.craftingSlots = new SlotFakeCraftingMatrix[9]; this.outputSlots = new OptionalSlotFake[3]; - final IItemHandler patternInv = this.getPart().getInventoryByName("pattern"); - final IItemHandler output = this.getPart().getInventoryByName("output"); + final IItemHandler patternInv = this.getPatternTerminal().getInventoryByName("pattern"); + final IItemHandler output = this.getPatternTerminal().getInventoryByName("output"); - this.crafting = this.getPart().getInventoryByName("crafting"); + this.crafting = this.getPatternTerminal().getInventoryByName("crafting"); for (int y = 0; y < 3; y++) { for (int x = 0; x < 3; x++) { @@ -106,9 +101,9 @@ public class ContainerPatternTerm extends ContainerPatternEncoder { @Override public boolean isSlotEnabled(final int idx) { if (idx == 1) { - return Platform.isServer() ? !this.getPart().isCraftingRecipe() : !this.isCraftingMode(); + return Platform.isServer() ? !this.getPatternTerminal().isCraftingRecipe() : !this.isCraftingMode(); } else if (idx == 2) { - return Platform.isServer() ? this.getPart().isCraftingRecipe() : this.isCraftingMode(); + return Platform.isServer() ? this.getPatternTerminal().isCraftingRecipe() : this.isCraftingMode(); } else { return false; } @@ -153,7 +148,7 @@ public class ContainerPatternTerm extends ContainerPatternEncoder { return; } - final IMEMonitor storage = this.getPart() + final IMEMonitor storage = this.getPatternTerminal() .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); final IItemList all = storage.getStorageList(); @@ -195,10 +190,15 @@ public class ContainerPatternTerm extends ContainerPatternEncoder { if (!failed.isEmpty()) { this.getCellInventory() .injectItems(AEItemStack.fromItemStack(failed), Actionable.MODULATE, - new MachineSource(this.getPart())); + new MachineSource(this.getPatternTerminal())); } } } } } + + @Override + public PartPatternTerminal getPatternTerminal() { + return (PartPatternTerminal) super.getPatternTerminal(); + } } diff --git a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java index 2f94a69c1..c75d5e4df 100644 --- a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java +++ b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java @@ -133,7 +133,7 @@ public class PacketValueConfig extends AppEngPacket { if (c instanceof ContainerPatternTerm) { final ContainerPatternTerm cpt = (ContainerPatternTerm) c; if (this.Name.equals("PatternTerminal.CraftMode")) { - cpt.getPart().setCraftingRecipe(this.Value.equals("1")); + cpt.getPatternTerminal().setCraftingRecipe(this.Value.equals("1")); } else if (this.Name.equals("PatternTerminal.Encode")) { if (this.Value.equals("2")) { cpt.encodeAndMoveToInventory(); @@ -157,7 +157,7 @@ public class PacketValueConfig extends AppEngPacket { } else if (this.Name.equals("PatternTerminal.MaximizeCount")) { cpt.maximizeCount(); } else if (this.Name.equals("PatternTerminal.Substitute")) { - cpt.getPart().setSubstitution(this.Value.equals("1")); + cpt.getPatternTerminal().setSubstitution(this.Value.equals("1")); } } else if (c instanceof ContainerExpandedProcessingPatternTerm) { final ContainerExpandedProcessingPatternTerm cept = (ContainerExpandedProcessingPatternTerm) c;