Enable "Use as substitution" by default (#204)

GTNewHorizons · Dec 13, 2022 · d9d92c7 · d9d92c7
1 parent 5fb8039
commit d9d92c7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTermEx.java b/src/main/java/appeng/container/implementations/ContainerPatternTermEx.java
@@ -69,7 +69,7 @@ public void setHidden(boolean hide) {
     public boolean substitute = false;
 
     @GuiSync(96 + (17 - 9) + 13)
-    public boolean beSubstitute = false;
+    public boolean beSubstitute = true;
 
     @GuiSync(96 + (17 - 9) + 16)
     public boolean inverted;

diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java
@@ -66,7 +66,11 @@ public PatternHelper(final ItemStack is, final World w) {
         this.isCrafting = encodedValue.getBoolean("crafting");
 
         this.canSubstitute = encodedValue.getBoolean("substitute");
-        this.canBeSubstitute = encodedValue.getBoolean("beSubstitute");
+        if (encodedValue.hasKey("beSubstitute")) {
+            this.canBeSubstitute = encodedValue.getBoolean("beSubstitute");
+        } else {
+            this.canBeSubstitute = true;
+        }
         this.patternItem = is;
         this.pattern = AEItemStack.create(is);
 

diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java
@@ -121,7 +121,12 @@ public void addCheckedInformation(
         final ICraftingPatternDetails details = this.getPatternForItem(stack, player.worldObj);
         final boolean isCrafting = encodedValue.getBoolean("crafting");
         final boolean substitute = encodedValue.getBoolean("substitute");
-        final boolean beSubstitute = encodedValue.getBoolean("beSubstitute");
+        final boolean beSubstitute;
+        if (encodedValue.hasKey("beSubstitute")) {
+            beSubstitute = encodedValue.getBoolean("beSubstitute");
+        } else {
+            beSubstitute = true;
+        }
         IAEItemStack[] inItems;
         IAEItemStack[] outItems;
 

diff --git a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java b/src/main/java/appeng/parts/reporting/PartPatternTerminal.java
@@ -47,7 +47,7 @@ public class PartPatternTerminal extends AbstractPartTerminal {
 
     private boolean craftingMode = true;
     private boolean substitute = false;
-    private boolean beSubstitute = false;
+    private boolean beSubstitute = true;
 
     @Reflected
     public PartPatternTerminal(final ItemStack is) {
@@ -68,7 +68,11 @@ public void readFromNBT(final NBTTagCompound data) {
         super.readFromNBT(data);
         this.setCraftingRecipe(data.getBoolean("craftingMode"));
         this.setSubstitution(data.getBoolean("substitute"));
-        this.setCanBeSubstitution(data.getBoolean("beSubstitute"));
+        if (data.hasKey("beSubstitute")) {
+            this.setCanBeSubstitution(data.getBoolean("beSubstitute"));
+        } else {
+            this.setCanBeSubstitution(true);
+        }
         this.pattern.readFromNBT(data, "pattern");
         this.output.readFromNBT(data, "outputList");
         this.crafting.readFromNBT(data, "craftingGrid");

diff --git a/src/main/java/appeng/parts/reporting/PartPatternTerminalEx.java b/src/main/java/appeng/parts/reporting/PartPatternTerminalEx.java
@@ -26,7 +26,7 @@ public class PartPatternTerminalEx extends AbstractPartTerminal {
     private final AppEngInternalInventory pattern = new AppEngInternalInventory(this, 2);
 
     private boolean substitute = false;
-    private boolean beSubstitute = false;
+    private boolean beSubstitute = true;
     private boolean inverted = false;
     private int activePage = 0;
 
@@ -53,7 +53,11 @@ public void readFromNBT(final NBTTagCompound data) {
         this.crafting.readFromNBT(data, "craftingGrid");
 
         this.setSubstitution(data.getBoolean("substitute"));
-        this.setCanBeSubstitution(data.getBoolean("beSubstitute"));
+        if (data.hasKey("beSubstitute")) {
+            this.setCanBeSubstitution(data.getBoolean("beSubstitute"));
+        } else {
+            this.setCanBeSubstitution(true);
+        }
         this.setInverted(data.getBoolean("inverted"));
         this.setActivePage(data.getInteger("activePage"));
     }