Add recipes for new stuff.

MartinSVK12 · Mar 29, 2024 · c9c293b · c9c293b
1 parent 91284fb
commit c9c293b
Show file tree

Hide file tree

Showing 5 changed files with 144 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ bta_version=7.1-pre2a
 loader_version=0.15.6-babric.4-bta
 
 # Mods
-halplibe_version=3.5.0
+halplibe_version=3.5.1
 modmenu_version=2.0.4
 dragonfly_version=1.4.4-7.1
 btwaila_version=1.0.9-7.1

diff --git a/src/main/java/sunsetsatellite/signalindustries/commands/RecipeReloadCommand.java b/src/main/java/sunsetsatellite/signalindustries/commands/RecipeReloadCommand.java
@@ -52,6 +52,7 @@ public boolean execute(CommandHandler commandHandler, CommandSender commandSende
             DataLoader.loadRecipesFromFile("/recipes/trommel.json");
             DataLoader.loadRecipesFromFile("/recipes/workbench.json");
             SIRecipes.resetGroups();
+            SIRecipes.registerNamespaces();
             SIRecipes.load();
             DataLoader.loadDataPacks(Minecraft.getMinecraft(this));
             RECIPES_LOCAL_COPY = RECIPES;

diff --git a/src/main/java/sunsetsatellite/signalindustries/inventories/TileEntityItemConduit.java b/src/main/java/sunsetsatellite/signalindustries/inventories/TileEntityItemConduit.java
@@ -21,7 +21,6 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-//TODO: extract + split
 //TODO: more modes
 
 public class TileEntityItemConduit extends TileEntityWithName {
@@ -123,10 +122,8 @@ public void extractItem(){
             return;
         }
         Direction entry = null;
-        //select the entry direction based on mode
-        if(mode == PipeMode.RANDOM){
-            entry = entryList.get(random.nextInt(entryList.size())).getKey();
-        }
+        //select the entry direction randomly
+        entry = entryList.get(random.nextInt(entryList.size())).getKey();
         if(entry == null){
             return;
         }

diff --git a/src/main/java/sunsetsatellite/signalindustries/recipes/container/SIRecipes.java b/src/main/java/sunsetsatellite/signalindustries/recipes/container/SIRecipes.java
@@ -88,6 +88,10 @@ public static void load(){
     @Override
     public void initNamespaces() {
         resetGroups();
+        registerNamespaces();
+    }
+
+    public static void registerNamespaces(){
         SIGNAL_INDUSTRIES.register("workbench",WORKBENCH);
         SIGNAL_INDUSTRIES.register("extractor",EXTRACTOR);
         SIGNAL_INDUSTRIES.register("crusher",CRUSHER);
@@ -100,4 +104,5 @@ public void initNamespaces() {
         SIGNAL_INDUSTRIES.register("centrifuge",CENTRIFUGE);
         Registries.RECIPES.register("signalindustries",SIGNAL_INDUSTRIES);
     }
+
 }
diff --git a/src/main/resources/assets/signalindustries/recipes/workbench.json b/src/main/resources/assets/signalindustries/recipes/workbench.json
@@ -2200,15 +2200,15 @@
         "stack": {
           "id": 16479,
           "amount": 1,
-          "meta": 11
+          "meta": 4
         }
       },
       {
         "symbol": "O",
         "stack": {
           "id": 16479,
           "amount": 1,
-          "meta": 1
+          "meta": 14
         }
       },
       {
@@ -2249,15 +2249,15 @@
         "stack": {
           "id": 16479,
           "amount": 1,
-          "meta": 11
+          "meta": 4
         }
       },
       {
         "symbol": "O",
         "stack": {
           "id": 16479,
           "amount": 1,
-          "meta": 1
+          "meta": 14
         }
       },
       {
@@ -2809,6 +2809,72 @@
     },
     "consumeContainers": false
   },
+  {
+    "name": "signalindustries:workbench/basic_restrict_item_conduit",
+    "type": "minecraft:crafting/shaped",
+    "pattern": [
+      "CGC",
+      "BBB",
+      "CGC"
+    ],
+    "symbols": [
+      {
+        "symbol": "C",
+        "stack": {
+          "key": "item.signalindustries.crystalAlloyIngot",
+          "amount": 1,
+          "meta": 0
+        }
+      },
+      {
+        "symbol": "B",
+        "group": "minecraft:cobblestones"
+      },
+      {
+        "symbol": "G",
+        "stack": {
+          "key": "tile.glass",
+          "amount": 1,
+          "meta": 0
+        }
+      }
+    ],
+    "result": {
+      "key": "tile.signalindustries.basic.conduit.item.restrict",
+      "amount": 4,
+      "meta": 0
+    },
+    "consumeContainers": false
+  },
+  {
+    "name": "signalindustries:workbench/prototype_item_conduit",
+    "type": "minecraft:crafting/shaped",
+    "pattern": [
+      "CGC",
+      "   ",
+      "CGC"
+    ],
+    "symbols": [
+      {
+        "symbol": "C",
+        "group": "minecraft:cobblestones"
+      },
+      {
+        "symbol": "G",
+        "stack": {
+          "key": "tile.glass",
+          "amount": 1,
+          "meta": 0
+        }
+      }
+    ],
+    "result": {
+      "key": "tile.signalindustries.prototype.conduit.item",
+      "amount": 4,
+      "meta": 0
+    },
+    "consumeContainers": false
+  },
   {
     "name": "signalindustries:workbench/prototype_goggles",
     "type": "minecraft:crafting/shaped",
@@ -4828,5 +4894,70 @@
       "meta": 0
     },
     "consumeContainers": false
+  },
+  {
+    "name": "signalindustries:workbench/prototype_filter",
+    "type": "minecraft:crafting/shaped",
+    "pattern": [
+      "CRC",
+      "YMG",
+      "CBC"
+    ],
+    "symbols": [
+      {
+        "symbol": "C",
+        "stack": {
+          "key": "item.signalindustries.cobblestonePlate",
+          "amount": 1,
+          "meta": 0
+        }
+      },
+      {
+        "symbol": "R",
+        "stack": {
+          "id": 16479,
+          "amount": 1,
+          "meta": 1
+        }
+      },
+      {
+        "symbol": "G",
+        "stack": {
+          "id": 16479,
+          "amount": 1,
+          "meta": 2
+        }
+      },
+      {
+        "symbol": "B",
+        "stack": {
+          "id": 16479,
+          "amount": 1,
+          "meta": 4
+        }
+      },
+      {
+        "symbol": "Y",
+        "stack": {
+          "id": 16479,
+          "amount": 1,
+          "meta": 11
+        }
+      },
+      {
+        "symbol": "M",
+        "stack": {
+          "key": "tile.signalindustries.prototype.machine",
+          "amount": 1,
+          "meta": 0
+        }
+      }
+    ],
+    "result": {
+      "key": "tile.signalindustries.prototype.inserter",
+      "amount": 1,
+      "meta": 0
+    },
+    "consumeContainers": false
   }
 ]