remove pattern refill card (#984)

Co-authored-by: Kogepan229 <73163994+Kogepan229@users.noreply.github.com>

src/main/java/appeng/api/config/Upgrades.java

@@ -31,7 +31,6 @@ public enum Upgrades {
     CAPACITY(0),
     REDSTONE(0),
     CRAFTING(0),
-    PATTERN_REFILLER(0),
     STICKY(0),
     VOID_OVERFLOW(0),
     /**

src/main/java/appeng/api/definitions/IMaterials.java

@@ -144,8 +144,6 @@ public interface IMaterials {
 
     IItemDefinition cardOreFilter();
 
-    IItemDefinition cardPatternRefiller();
-
     IItemDefinition cardAdvancedBlocking();
 
     IItemDefinition cardLockCrafting();

src/main/java/appeng/container/implementations/ContainerMEMonitorable.java

@@ -120,7 +120,6 @@ public class ContainerMEMonitorable extends AEBaseContainer
     private IConfigManagerHost gui;
     private IConfigManager serverCM;
     private IGridNode networkNode;
-    protected SlotRestrictedInput patternRefiller = null;
 
     public ContainerMEMonitorable(final InventoryPlayer ip, final ITerminalHost monitorable) {
         this(ip, monitorable, true);

src/main/java/appeng/container/implementations/ContainerPatternTerm.java

@@ -519,9 +519,6 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
         if (s == this.patternSlotOUT) {
             this.isFirstUpdate = true;
             this.detectAndSendChanges();
-        } else if (s == patternRefiller && patternRefiller.getStack() != null) {
-            refillBlankPatterns(patternSlotIN);
-            detectAndSendChanges();
         }
     }
 

src/main/java/appeng/core/Registration.java

@@ -776,10 +776,6 @@ public final class Registration {
         // Inscriber
         Upgrades.SPEED.registerItem(blocks.inscriber(), 3);
 
-        // Terminals
-        Upgrades.PATTERN_REFILLER.registerItem(parts.patternTerminal(), 1);
-        Upgrades.PATTERN_REFILLER.registerItem(parts.patternTerminalEx(), 1);
-
         for (final Item wirelessTerminalItem : items.wirelessTerminal().maybeItem().asSet()) {
             registries.wireless().registerWirelessHandler((IWirelessTermHandler) wirelessTerminalItem);
         }

src/main/java/appeng/core/api/definitions/ApiMaterials.java

@@ -74,7 +74,6 @@ public final class ApiMaterials implements IMaterials {
     private final IItemDefinition cardInverter;
     private final IItemDefinition cardCrafting;
     private final IItemDefinition cardOreFilter;
-    private final IItemDefinition cardPatternRefiller;
     private final IItemDefinition cardAdvancedBlocking;
     private final IItemDefinition cardLockCrafting;
     private final IItemDefinition cardFakeCrafting;
@@ -181,8 +180,6 @@ public final class ApiMaterials implements IMaterials {
         this.cardInverter = new DamagedItemDefinition(itemMultiMaterial.createMaterial(MaterialType.CardInverter));
         this.cardCrafting = new DamagedItemDefinition(itemMultiMaterial.createMaterial(MaterialType.CardCrafting));
         this.cardOreFilter = new DamagedItemDefinition(itemMultiMaterial.createMaterial(MaterialType.CardOreFilter));
-        this.cardPatternRefiller = new DamagedItemDefinition(
-                itemMultiMaterial.createMaterial(MaterialType.CardPatternRefiller));
         this.cardAdvancedBlocking = new DamagedItemDefinition(
                 itemMultiMaterial.createMaterial(MaterialType.CardAdvancedBlocking));
         this.cardLockCrafting = new DamagedItemDefinition(
@@ -544,11 +541,6 @@ public final class ApiMaterials implements IMaterials {
         return this.blankPattern;
     }
 
-    @Override
-    public IItemDefinition cardPatternRefiller() {
-        return this.cardPatternRefiller;
-    }
-
     @Override
     public IItemDefinition cardAdvancedBlocking() {
         return this.cardAdvancedBlocking;

src/main/java/appeng/items/materials/ItemMultiMaterial.java

@@ -141,7 +141,6 @@ public final class ItemMultiMaterial extends AEBaseItem implements IStorageCompo
             case CardSuperSpeed -> Upgrades.SUPERSPEED;
             case CardInverter -> Upgrades.INVERTER;
             case CardCrafting -> Upgrades.CRAFTING;
-            case CardPatternRefiller -> Upgrades.PATTERN_REFILLER;
             case CardAdvancedBlocking -> Upgrades.ADVANCED_BLOCKING;
             case CardLockCrafting -> Upgrades.LOCK_CRAFTING;
             case CardSticky -> Upgrades.STICKY;

src/main/java/appeng/items/materials/MaterialType.java

@@ -114,7 +114,6 @@ public enum MaterialType {
     Cell4096kPart(59, AEFeature.XtremeStorageCells),
     Cell16384kPart(60, AEFeature.XtremeStorageCells),
     EmptyAdvancedStorageCell(61, AEFeature.XtremeStorageCells),
-    CardPatternRefiller(62),
     CardAdvancedBlocking(63),
     CardSticky(64),
     CardLockCrafting(65),

src/main/java/appeng/parts/AEBasePart.java

@@ -391,7 +391,8 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
                 if (data != null) {
                     memoryCard.setMemoryCardContents(memCardIS, name, data);
 
-                    ToolMemoryCard.setUpgradesInfo(data, (UpgradeInventory) this.getInventoryByName("upgrades"));
+                    if (this.getInventoryByName("upgrades") instanceof UpgradeInventory ui)
+                        ToolMemoryCard.setUpgradesInfo(data, ui);
 
                     memoryCard.notifyUser(player, MemoryCardMessages.SETTINGS_SAVED);
                 }

src/main/java/appeng/parts/reporting/AbstractPartTerminal.java

@@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.Vec3;
 
-import appeng.api.AEApi;
 import appeng.api.config.Settings;
 import appeng.api.config.SortDir;
 import appeng.api.config.SortOrder;
@@ -61,7 +60,6 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
     private final IConfigManager cm = new ConfigManager(this);
     private final AppEngInternalInventory viewCell = new AppEngInternalInventory(this, 5);
     private final PinsHolder pinsInv = new PinsHolder(this);
-    private final AppEngInternalInventory upgrades = new RefillerInventory(this);
 
     public AbstractPartTerminal(final ItemStack is) {
         super(is);
@@ -81,8 +79,6 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
                 drops.add(is);
             }
         }
-        ItemStack u = upgrades.getStackInSlot(0);
-        if (u != null) drops.add(u);
     }
 
     @Override
@@ -96,7 +92,6 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
         this.cm.readFromNBT(data);
         this.viewCell.readFromNBT(data, "viewCell");
         pinsInv.readFromNBT(data, "pins");
-        upgrades.readFromNBT(data, "upgrades");
     }
 
     @Override
@@ -105,7 +100,6 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
         this.cm.writeToNBT(data);
         this.viewCell.writeToNBT(data, "viewCell");
         pinsInv.writeToNBT(data, "pins");
-        upgrades.writeToNBT(data, "upgrades");
     }
 
     @Override
@@ -172,30 +166,5 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
         this.getHost().markForSave();
     }
 
-    @Override
-    public IInventory getInventoryByName(final String name) {
-        if (name.equals("upgrades")) {
-            return this.upgrades;
-        }
-        return super.getInventoryByName(name);
-    }
-
-    public boolean hasRefillerUpgrade() {
-        return upgrades.getStackInSlot(0) != null;
-    }
-
-    static class RefillerInventory extends AppEngInternalInventory {
-
-        public RefillerInventory(final IAEAppEngInventory parent) {
-            super(parent, 1, 1);
-            setTileEntity(parent);
-        }
-
-        public boolean isItemValidForSlot(final int i, final ItemStack itemstack) {
-            return i == 0 && getStackInSlot(0) == null
-                    && AEApi.instance().definitions().materials().cardPatternRefiller().isSameAs(itemstack);
-        }
-    }
-
     public abstract ItemStack getPrimaryGuiIcon();
 }