fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "restore method name to keep compat with NEE"

Browse Source 
This reverts commit c5607bda4e.
This commit is contained in:
PrototypeTrousers
2022-11-20 14:03:36 -03:00
parent 20ba83c529
commit e1ea4ae22f
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/implementations/ContainerExpandedProcessingPatternTerm.java
+3 -3
View File
@@ -20,10 +20,10 @@ public class ContainerExpandedProcessingPatternTerm extends ContainerPatternEnco
this.craftingSlots = new SlotFakeCraftingMatrix[PROCESSING_INPUT_LIMIT]; this.craftingSlots = new SlotFakeCraftingMatrix[PROCESSING_INPUT_LIMIT];
this.outputSlots = new OptionalSlotFake[PROCESSING_OUTPUT_LIMIT]; this.outputSlots = new OptionalSlotFake[PROCESSING_OUTPUT_LIMIT];
final IItemHandler patternInv = this.getPatternTerminal().getInventoryByName("pattern"); final IItemHandler patternInv = this.getPart().getInventoryByName("pattern");
final IItemHandler output = this.getPatternTerminal().getInventoryByName("output"); final IItemHandler output = this.getPart().getInventoryByName("output");
this.crafting = this.getPatternTerminal().getInventoryByName("crafting"); this.crafting = this.getPart().getInventoryByName("crafting");
for (int y = 0; y < 4; y++) { for (int y = 0; y < 4; y++) {
for (int x = 0; x < 4; x++) { for (int x = 0; x < 4; x++) {
src/main/java/appeng/container/implementations/ContainerPatternEncoder.java
+6 -6
View File
@@ -77,7 +77,7 @@ public abstract class ContainerPatternEncoder extends ContainerMEMonitorable imp
final AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get(idx); // require AE SLots! final AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get(idx); // require AE SLots!
ItemStack itemStack = clickSlot.getStack(); ItemStack itemStack = clickSlot.getStack();
if (AEApi.instance().definitions().materials().blankPattern().isSameAs(itemStack)) { if (AEApi.instance().definitions().materials().blankPattern().isSameAs(itemStack)) {
IItemHandler patternInv = this.getPatternTerminal().getInventoryByName("pattern"); IItemHandler patternInv = this.getPart().getInventoryByName("pattern");
ItemStack remainder = patternInv.insertItem(0, itemStack, false); ItemStack remainder = patternInv.insertItem(0, itemStack, false);
clickSlot.putStack(remainder); clickSlot.putStack(remainder);
} }
@@ -85,7 +85,7 @@ public abstract class ContainerPatternEncoder extends ContainerMEMonitorable imp
return super.transferStackInSlot(p, idx); return super.transferStackInSlot(p, idx);
} }
public AbstractPartEncoder getPatternTerminal() { public AbstractPartEncoder getPart() {
return this.patternTerminal; return this.patternTerminal;
} }
@@ -97,7 +97,7 @@ public abstract class ContainerPatternEncoder extends ContainerMEMonitorable imp
if (name.equals("player")) { if (name.equals("player")) {
return new PlayerInvWrapper(this.getInventoryPlayer()); return new PlayerInvWrapper(this.getInventoryPlayer());
} }
return this.getPatternTerminal().getInventoryByName(name); return this.getPart().getInventoryByName(name);
} }
@Override @Override
@@ -490,12 +490,12 @@ public abstract class ContainerPatternEncoder extends ContainerMEMonitorable imp
public void detectAndSendChanges() { public void detectAndSendChanges() {
super.detectAndSendChanges(); super.detectAndSendChanges();
if (Platform.isServer()) { if (Platform.isServer()) {
if (this.isCraftingMode() != this.getPatternTerminal().isCraftingRecipe()) { if (this.isCraftingMode() != this.getPart().isCraftingRecipe()) {
this.setCraftingMode(this.getPatternTerminal().isCraftingRecipe()); this.setCraftingMode(this.getPart().isCraftingRecipe());
this.updateOrderOfOutputSlots(); this.updateOrderOfOutputSlots();
} }
this.substitute = this.getPatternTerminal().isSubstitution(); this.substitute = this.getPart().isSubstitution();
} }
} }
src/main/java/appeng/container/implementations/ContainerPatternTerm.java
+14 -14
View File
@@ -27,16 +27,19 @@ import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList; import appeng.api.storage.data.IItemList;
import appeng.container.ContainerNull; 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.OptionalSlotFake;
import appeng.container.slot.SlotFakeCraftingMatrix; import appeng.container.slot.SlotFakeCraftingMatrix;
import appeng.container.slot.SlotPatternOutputs; import appeng.container.slot.SlotPatternOutputs;
import appeng.container.slot.SlotPatternTerm; import appeng.container.slot.SlotPatternTerm;
import appeng.container.slot.SlotPlayerHotBar;
import appeng.container.slot.SlotPlayerInv;
import appeng.container.slot.SlotRestrictedInput; import appeng.container.slot.SlotRestrictedInput;
import appeng.core.sync.packets.PacketPatternSlot; import appeng.core.sync.packets.PacketPatternSlot;
import appeng.items.storage.ItemViewCell; import appeng.items.storage.ItemViewCell;
import appeng.me.helpers.MachineSource; import appeng.me.helpers.MachineSource;
import appeng.parts.reporting.AbstractPartEncoder;
import appeng.parts.reporting.PartPatternTerminal;
import appeng.util.InventoryAdaptor; import appeng.util.InventoryAdaptor;
import appeng.util.Platform; import appeng.util.Platform;
import appeng.util.inv.AdaptorItemHandler; import appeng.util.inv.AdaptorItemHandler;
@@ -45,8 +48,10 @@ import appeng.util.item.AEItemStack;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.IContainerListener;
import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.InventoryCraftResult;
import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.inventory.Slot;
import net.minecraft.inventory.SlotCrafting; import net.minecraft.inventory.SlotCrafting;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.CraftingManager;
@@ -63,10 +68,10 @@ public class ContainerPatternTerm extends ContainerPatternEncoder {
this.craftingSlots = new SlotFakeCraftingMatrix[9]; this.craftingSlots = new SlotFakeCraftingMatrix[9];
this.outputSlots = new OptionalSlotFake[3]; this.outputSlots = new OptionalSlotFake[3];
final IItemHandler patternInv = this.getPatternTerminal().getInventoryByName("pattern"); final IItemHandler patternInv = this.getPart().getInventoryByName("pattern");
final IItemHandler output = this.getPatternTerminal().getInventoryByName("output"); final IItemHandler output = this.getPart().getInventoryByName("output");
this.crafting = this.getPatternTerminal().getInventoryByName("crafting"); this.crafting = this.getPart().getInventoryByName("crafting");
for (int y = 0; y < 3; y++) { for (int y = 0; y < 3; y++) {
for (int x = 0; x < 3; x++) { for (int x = 0; x < 3; x++) {
@@ -101,9 +106,9 @@ public class ContainerPatternTerm extends ContainerPatternEncoder {
@Override @Override
public boolean isSlotEnabled(final int idx) { public boolean isSlotEnabled(final int idx) {
if (idx == 1) { if (idx == 1) {
return Platform.isServer() ? !this.getPatternTerminal().isCraftingRecipe() : !this.isCraftingMode(); return Platform.isServer() ? !this.getPart().isCraftingRecipe() : !this.isCraftingMode();
} else if (idx == 2) { } else if (idx == 2) {
return Platform.isServer() ? this.getPatternTerminal().isCraftingRecipe() : this.isCraftingMode(); return Platform.isServer() ? this.getPart().isCraftingRecipe() : this.isCraftingMode();
} else { } else {
return false; return false;
} }
@@ -148,7 +153,7 @@ public class ContainerPatternTerm extends ContainerPatternEncoder {
return; return;
} }
final IMEMonitor<IAEItemStack> storage = this.getPatternTerminal() final IMEMonitor<IAEItemStack> storage = this.getPart()
.getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); .getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class));
final IItemList<IAEItemStack> all = storage.getStorageList(); final IItemList<IAEItemStack> all = storage.getStorageList();
@@ -190,15 +195,10 @@ public class ContainerPatternTerm extends ContainerPatternEncoder {
if (!failed.isEmpty()) { if (!failed.isEmpty()) {
this.getCellInventory() this.getCellInventory()
.injectItems(AEItemStack.fromItemStack(failed), Actionable.MODULATE, .injectItems(AEItemStack.fromItemStack(failed), Actionable.MODULATE,
new MachineSource(this.getPatternTerminal())); new MachineSource(this.getPart()));
} }
} }
} }
} }
} }
@Override
public PartPatternTerminal getPatternTerminal() {
return (PartPatternTerminal) super.getPatternTerminal();
}
} }
src/main/java/appeng/core/sync/packets/PacketValueConfig.java
+2 -2
View File
@@ -133,7 +133,7 @@ public class PacketValueConfig extends AppEngPacket {
if (c instanceof ContainerPatternTerm) { if (c instanceof ContainerPatternTerm) {
final ContainerPatternTerm cpt = (ContainerPatternTerm) c; final ContainerPatternTerm cpt = (ContainerPatternTerm) c;
if (this.Name.equals("PatternTerminal.CraftMode")) { if (this.Name.equals("PatternTerminal.CraftMode")) {
cpt.getPatternTerminal().setCraftingRecipe(this.Value.equals("1")); cpt.getPart().setCraftingRecipe(this.Value.equals("1"));
} else if (this.Name.equals("PatternTerminal.Encode")) { } else if (this.Name.equals("PatternTerminal.Encode")) {
if (this.Value.equals("2")) { if (this.Value.equals("2")) {
cpt.encodeAndMoveToInventory(); cpt.encodeAndMoveToInventory();
@@ -157,7 +157,7 @@ public class PacketValueConfig extends AppEngPacket {
} else if (this.Name.equals("PatternTerminal.MaximizeCount")) { } else if (this.Name.equals("PatternTerminal.MaximizeCount")) {
cpt.maximizeCount(); cpt.maximizeCount();
} else if (this.Name.equals("PatternTerminal.Substitute")) { } else if (this.Name.equals("PatternTerminal.Substitute")) {
cpt.getPatternTerminal().setSubstitution(this.Value.equals("1")); cpt.getPart().setSubstitution(this.Value.equals("1"));
} }
} else if (c instanceof ContainerExpandedProcessingPatternTerm) { } else if (c instanceof ContainerExpandedProcessingPatternTerm) {
final ContainerExpandedProcessingPatternTerm cept = (ContainerExpandedProcessingPatternTerm) c; final ContainerExpandedProcessingPatternTerm cept = (ContainerExpandedProcessingPatternTerm) c;