Merge branch 'forge/1.20.1' into configkeysizelimit

ko-lja · web-flow · commit 7113141b146b · 2025-08-07T14:39:02.000+02:00
diff --git a/guidebook/items-blocks-machines/crafting_cpu_multiblock.md b/guidebook/items-blocks-machines/crafting_cpu_multiblock.md
@@ -12,6 +12,7 @@ item_ids:
 - ae2:16k_crafting_storage
 - ae2:64k_crafting_storage
 - ae2:256k_crafting_storage
+- ae2:singularity_crafting_storage
 - ae2:crafting_accelerator
 - ae2:crafting_monitor
 - ae2:crafting_unit
@@ -76,9 +77,11 @@ of the other components. They are also a base ingredient in the other components
   <BlockImage id="64k_crafting_storage" scale="4" />
 
   <BlockImage id="256k_crafting_storage" scale="4" />
+
+  <BlockImage id="singularity_crafting_storage" scale="4" />
 </Row>
 
-(Required) Crafting storages are available in all the standard cell sizes (1k, 4k, 16k, 64k, 256k). They store the ingredients and
+(Required) Crafting storages are available in all the standard cell sizes (1k, 4k, 16k, 64k, 256k) and <ItemLink id="ae2:singularity_crafting_storage" />(More on that below).
 intermediate ingredients involved in a craft, so larger or more storages are required for the CPU to handle crafting jobs
 with more ingredients.
 
@@ -117,3 +120,12 @@ distributing the ingredient batches between the surrounding assemblers.
 The screen can be colored with a <ItemLink id="color_applicator" />.
 
 <RecipeFor id="crafting_monitor" />
+
+# Singularity Crafting Storage
+
+<BlockImage id="singularity_crafting_storage" scale="4" />
+
+The singularity crafting storage is a special crafting storage that provides MAX_LONG(2^63-1) bytes of storage.
+
+Very powerful indeed, but also somewhat dangerous, since if you want to use this, it needs to be the only crafting storage in this cpu multiblock,
+otherwise you won't be able to select this cpu when trying to craft something.
diff --git a/guidebook/items-blocks-machines/pattern_box.md b/guidebook/items-blocks-machines/pattern_box.md
@@ -0,0 +1,20 @@
+---
+navigation:
+  parent: items-blocks-machines/items-blocks-machines-index.md
+  title: Pattern Box
+  icon: pattern_box
+  position: 411
+categories:
+- tools
+item_ids:
+- ae2:pattern_box
+---
+
+# Pattern Box
+
+<ItemImage id="pattern_box" scale="4" />
+
+The Pattern Box is somewhat like the [Network Tool](network_tool.md), allowing you to store and transport [Encoded Patterns](patterns.md) instead of [Upgrade Cards](upgrade_cards.md).
+
+It has 27 slots in which to store, well, [Encoded Patterns](patterns.md), and they will be available in any AE2 device UI if the tool
+is anywhere in your inventory.
diff --git a/guidebook/items-blocks-machines/upgrade_cards.md b/guidebook/items-blocks-machines/upgrade_cards.md
@@ -18,6 +18,7 @@ item_ids:
 - ae2:crafting_card
 - ae2:equal_distribution_card
 - ae2:energy_card
+- ae2:auto_complete_card
 ---
 
 # Upgrade Cards
@@ -40,6 +41,8 @@ item_ids:
   <ItemImage id="equal_distribution_card" scale="2" />
 
   <ItemImage id="energy_card" scale="2" />
+
+  <ItemImage id="auto_complete_card" scale="2" />
 </Row>
 
 Upgrade cards change the behavior of AE2 [devices](../ae2-mechanics/devices.md) and machines, increasing their speed, improving their
@@ -168,3 +171,12 @@ Energy cards add more energy storage to certain tools like portable terminals, a
 more efficient.
 
 <RecipeFor id="energy_card" />
+
+## Auto Complete Card
+
+<ItemImage id="auto_complete_card" scale="2" />
+
+Auto Complete cards let the device send crafting requests to your [autocrafting](../ae2-mechanics/autocrafting.md)
+system to get the items it desires.
+
+<RecipeFor id="auto_complete_card" />
diff --git a/src/generated/resources/data/ae2/advancements/recipes/misc/materials/auto_complete_card.json b/src/generated/resources/data/ae2/advancements/recipes/misc/materials/auto_complete_card.json
@@ -0,0 +1,48 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_advanced_card": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "ae2:advanced_card"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_crafting_card": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "ae2:crafting_card"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "ae2:materials/auto_complete_card"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_advanced_card",
+      "has_crafting_card",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "ae2:materials/auto_complete_card"
+    ]
+  },
+  "sends_telemetry_event": false
+}
diff --git a/src/generated/resources/data/ae2/recipes/materials/auto_complete_card.json b/src/generated/resources/data/ae2/recipes/materials/auto_complete_card.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
+      "item": "ae2:advanced_card"
+    },
+    {
+      "item": "ae2:crafting_card"
+    }
+  ],
+  "result": {
+    "item": "ae2:auto_complete_card"
+  }
+}
diff --git a/src/main/java/appeng/client/gui/me/crafting/CraftConfirmTableRenderer.java b/src/main/java/appeng/client/gui/me/crafting/CraftConfirmTableRenderer.java
@@ -58,7 +58,8 @@ protected List<Component> getEntryDescription(CraftingPlanSummaryEntry entry) {
         if (entry.storedAmount() > 0) {
             var percentage = NumberUtil.createPercentageComponent(
                     entry.missingAmount() == 0 ? entry.storedAmount() : entry.missingAmount(),
-                    entry.availableAmount());
+                    entry.availableAmount(),
+                    entry.missingAmount() > 0);
             lines.add(GuiText.UsedAmount.text().withStyle(percentage.getStyle()).append(percentage));
         }
         return lines;
@@ -90,7 +91,8 @@ protected List<Component> getEntryTooltip(CraftingPlanSummaryEntry entry) {
         if (entry.storedAmount() > 0) {
             var percentage = NumberUtil.createPercentageComponent(
                     entry.missingAmount() == 0 ? entry.storedAmount() : entry.missingAmount(),
-                    entry.availableAmount());
+                    entry.availableAmount(),
+                    entry.missingAmount() > 0);
             lines.add(GuiText.UsedAmount.text().withStyle(percentage.getStyle()).append(percentage));
         }
 
diff --git a/src/main/java/appeng/client/gui/me/patternaccess/PatternAccessTermScreen.java b/src/main/java/appeng/client/gui/me/patternaccess/PatternAccessTermScreen.java
@@ -62,6 +62,7 @@
 import appeng.client.gui.style.PaletteColor;
 import appeng.client.gui.style.ScreenStyle;
 import appeng.client.gui.widgets.AETextField;
+import appeng.client.gui.widgets.PatternBoxPanel;
 import appeng.client.gui.widgets.Scrollbar;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
 import appeng.client.gui.widgets.SettingToggleButton;
@@ -160,6 +161,10 @@ public PatternAccessTermScreen(C menu, Inventory playerInventory,
 
         this.addToLeftToolbar(showPatternProviders);
 
+        if (menu.getPatternBox().isPresent()) {
+            this.widgets.add("patternbox", new PatternBoxPanel(style, menu.getPatternBox().getName()));
+        }
+
         this.searchField = widgets.addTextField("search");
         this.searchField.setResponder(str -> this.refreshList());
         this.searchField.setPlaceholder(GuiText.SearchPlaceholder.text());
diff --git a/src/main/java/appeng/core/definitions/AEBlocks.java b/src/main/java/appeng/core/definitions/AEBlocks.java
@@ -192,7 +192,7 @@ public final class AEBlocks {
     public static final BlockDefinition<CraftingUnitBlock> CRAFTING_STORAGE_64K = craftingBlock("64k Crafting Storage", AEBlockIds.CRAFTING_STORAGE_64K, () -> new CraftingUnitBlock(CraftingUnitType.STORAGE_64K), () -> AEItems.CELL_COMPONENT_64K);
     public static final BlockDefinition<CraftingUnitBlock> CRAFTING_STORAGE_256K = craftingBlock("256k Crafting Storage", AEBlockIds.CRAFTING_STORAGE_256K, () -> new CraftingUnitBlock(CraftingUnitType.STORAGE_256K), () -> AEItems.CELL_COMPONENT_256K);
     // Don't make this a CraftingBlockItem since we don't want a disassembly item
-    public static final BlockDefinition<CraftingUnitBlock> CRAFTING_STORAGE_SINGULARITY = block("Singularity Crafting Storage", AEBlockIds.CRAFTING_STORAGE_SINGULARITY, () -> new CraftingUnitBlock(CraftingUnitType.SINGULARITY));
+    public static final BlockDefinition<CraftingUnitBlock> CRAFTING_STORAGE_SINGULARITY = block("Singularity Crafting Storage", AEBlockIds.CRAFTING_STORAGE_SINGULARITY, () -> new CraftingUnitBlock(CraftingUnitType.SINGULARITY), AEBaseBlockItem::new);
     public static final BlockDefinition<CraftingMonitorBlock> CRAFTING_MONITOR = craftingBlock("Crafting Monitor", AEBlockIds.CRAFTING_MONITOR, () -> new CraftingMonitorBlock(CraftingUnitType.MONITOR), () -> AEParts.STORAGE_MONITOR);
 
     private static <T extends Block> BlockDefinition<T> craftingBlock(String englishName, ResourceLocation id, Supplier<T> blockSupplier, Supplier<ItemLike> disassemblyExtra) {
diff --git a/src/main/java/appeng/datagen/providers/recipes/CraftingRecipes.java b/src/main/java/appeng/datagen/providers/recipes/CraftingRecipes.java
@@ -113,6 +113,12 @@ public void buildRecipes(Consumer<FinishedRecipe> consumer) {
                 .define('b', AEItems.ADVANCED_CARD)
                 .unlockedBy("has_advanced_card", has(AEItems.ADVANCED_CARD))
                 .save(consumer, AppEng.makeId("materials/cardenergy"));
+        ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, AEItems.AUTO_COMPLETE_CARD)
+                .requires(AEItems.ADVANCED_CARD)
+                .requires(AEItems.CRAFTING_CARD)
+                .unlockedBy("has_advanced_card", has(AEItems.ADVANCED_CARD))
+                .unlockedBy("has_crafting_card", has(AEItems.CRAFTING_CARD))
+                .save(consumer, AppEng.makeId("materials/auto_complete_card"));
 
         // ====================================================
         // Misc Materials
diff --git a/src/main/java/appeng/init/client/InitRenderTypes.java b/src/main/java/appeng/init/client/InitRenderTypes.java
@@ -56,6 +56,7 @@ public final class InitRenderTypes {
             AEBlocks.CRAFTING_STORAGE_16K,
             AEBlocks.CRAFTING_STORAGE_64K,
             AEBlocks.CRAFTING_STORAGE_256K,
+            AEBlocks.CRAFTING_STORAGE_SINGULARITY,
             AEBlocks.SPATIAL_PYLON,
             AEBlocks.SKY_STONE_TANK,
             AEBlocks.SMALL_QUARTZ_BUD,
diff --git a/src/main/java/appeng/menu/implementations/PatternAccessTermMenu.java b/src/main/java/appeng/menu/implementations/PatternAccessTermMenu.java
@@ -57,6 +57,7 @@
 import appeng.helpers.InventoryAction;
 import appeng.helpers.patternprovider.PatternContainer;
 import appeng.menu.AEBaseMenu;
+import appeng.menu.PatternBoxMenu;
 import appeng.menu.guisync.GuiSync;
 import appeng.parts.reporting.PatternAccessTerminalPart;
 import appeng.util.inv.AppEngInternalInventory;
@@ -69,6 +70,7 @@
 public class PatternAccessTermMenu extends AEBaseMenu {
 
     private final IConfigurableObject host;
+    private final PatternBoxMenu patternBox;
     @GuiSync(1)
     public ShowPatternProviders showPatternProviders = ShowPatternProviders.VISIBLE;
 
@@ -106,6 +108,7 @@ public PatternAccessTermMenu(MenuType<?> menuType, int id, Inventory ip, IConfig
         if (bindInventory) {
             this.createPlayerInventorySlots(ip);
         }
+        this.patternBox = new PatternBoxMenu(this);
     }
 
     @SuppressWarnings("unchecked")
@@ -115,6 +118,7 @@ public void broadcastChanges() {
             return;
         }
 
+        this.patternBox.tick();
         showPatternProviders = this.host.getConfigManager().getSetting(Settings.TERMINAL_SHOW_PATTERN_PROVIDERS);
 
         super.broadcastChanges();
@@ -478,4 +482,8 @@ private static Class<? extends PatternContainer> tryCastMachineToContainer(Class
         }
         return null;
     }
+
+    public PatternBoxMenu getPatternBox() {
+        return this.patternBox;
+    }
 }
diff --git a/src/main/java/appeng/util/NumberUtil.java b/src/main/java/appeng/util/NumberUtil.java
@@ -32,15 +32,15 @@ public static String formatNumber(double number) {
     /**
      * Creates a Component displaying a percentage with coloring.
      *
-     * @param current The current amount.
-     * @param max     The maximum amount.
+     * @param available The available amount.
+     * @param requested The requested amount.
      * @return Colored Component based on percentage.
      */
-    public static Component createPercentageComponent(double current, double max) {
-        if (max <= 0)
+    public static Component createPercentageComponent(double available, double requested, boolean hasMissing) {
+        if (requested <= 0)
             return Component.literal("0%").withStyle(ChatFormatting.GREEN);
 
-        double percentage = current / max;
+        double percentage = available / requested + (hasMissing ? 1 : 0);
         String percentageText = formatNumber(percentage * 100) + "%";
 
         if (percentage > 1.0) {
diff --git a/src/main/resources/assets/ae2/textures/block/crafting/singularity_storage.png b/src/main/resources/assets/ae2/textures/block/crafting/singularity_storage.png
diff --git a/src/main/resources/assets/ae2/textures/block/crafting/singularity_storage.png.mcmeta b/src/main/resources/assets/ae2/textures/block/crafting/singularity_storage.png.mcmeta
@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "frametime": 4,
+    "interpolate": true
+  }
+}
diff --git a/src/main/resources/assets/ae2/textures/block/crafting/singularity_storage_light.png b/src/main/resources/assets/ae2/textures/block/crafting/singularity_storage_light.png
diff --git a/src/main/resources/assets/ae2/textures/block/crafting/singularity_storage_light.png.mcmeta b/src/main/resources/assets/ae2/textures/block/crafting/singularity_storage_light.png.mcmeta
@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "frametime": 4,
+    "interpolate": true
+  }
+}
diff --git a/src/main/resources/assets/ae2/textures/item/pattern_box.png b/src/main/resources/assets/ae2/textures/item/pattern_box.png
diff --git a/src/main/resources/assets/ae2/textures/item/processing_pattern.png b/src/main/resources/assets/ae2/textures/item/processing_pattern.png
diff --git a/src/main/resources/assets/ae2/textures/item/smithing_table_pattern.png b/src/main/resources/assets/ae2/textures/item/smithing_table_pattern.png
diff --git a/src/main/resources/assets/ae2/textures/item/stonecutting_pattern.png b/src/main/resources/assets/ae2/textures/item/stonecutting_pattern.png
