more recipes

src/main/java/techreborn/init/RecipeTemplate.java

@@ -16,7 +16,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.recipe.CraftingRecipe;
-import net.minecraft.recipe.Recipe;
 import net.minecraft.recipe.RecipeType;
 import net.minecraft.text.LiteralText;
 import net.minecraft.util.Identifier;
@@ -27,7 +26,6 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
-import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -75,7 +73,7 @@ public class RecipeTemplate {
 			String path = identifier.getPath();
 
 			if(path.contains("_")){
-				String name = path.substring(0, path.lastIndexOf('_'));
+				String name = path.substring(0, path.lastIndexOf('_')).replace("_storage", "");
 				String type = path.substring(path.lastIndexOf('_') + 1);
 
 				Map<String, Item> typeMap = map.computeIfAbsent(type, s -> new HashMap<>());
@@ -89,9 +87,9 @@ public class RecipeTemplate {
 
 		}
 
-		boolean compressor = false;
+		boolean compressor = true;
-		boolean grinder = false;
+		boolean grinder = true;
-		boolean sawmill = true;
+		boolean sawmill = false;
 
 		if(compressor){
 			//Compressor

src/main/resources/data/techreborn/recipes/compressor/advanced_alloy_plate.json

@@ -1,15 +0,0 @@
-{
-  "type": "techreborn:compressor",
-  "power": 20,
-  "time": 400,
-  "ingredients": [
-    {
-      "item": "techreborn:advanced_alloy_ingot"
-    }
-  ],
-  "results": [
-    {
-      "item": "techreborn:advanced_alloy_plate"
-    }
-  ]
-}

src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate_2.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:aluminum_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:aluminum_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate_2.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:brass_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:brass_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate_2.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:bronze_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:bronze_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate_2.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:chrome_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:chrome_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate_2.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:copper_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:copper_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate_2.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:electrum_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:electrum_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate_2.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:invar_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:invar_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate_1.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:iridium_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:iridium_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate_2.json

@@ -1,15 +1,16 @@
 {
   "type": "techreborn:compressor",
-  "power": 20,
+  "power": 10,
   "time": 300,
   "ingredients": [
     {
-      "item": "techreborn:lazurite_dust"
+      "item": "techreborn:lead_storage_block"
     }
   ],
   "results": [
     {
-      "item": "techreborn:lazurite_plate"
+      "item": "techreborn:lead_plate",
+      "count": 9
     }
   ]
 }

src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate_2.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:nickel_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:nickel_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/peridot_plate_1.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:peridot_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:peridot_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate_2.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:platinum_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:platinum_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/red_garnet_plate_1.json

@@ -1,7 +1,7 @@
 {
   "type": "techreborn:compressor",
-  "power": 20,
+  "power": 10,
-  "time": 400,
+  "time": 300,
   "ingredients": [
     {
       "item": "techreborn:red_garnet_storage_block"

src/main/resources/data/techreborn/recipes/compressor/auto/refined_iron_plate_1.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:refined_iron_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:refined_iron_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/ruby_plate_1.json

@@ -1,15 +1,16 @@
 {
   "type": "techreborn:compressor",
-  "power": 20,
+  "power": 10,
   "time": 300,
   "ingredients": [
     {
-      "item": "techreborn:obsidian_dust"
+      "item": "techreborn:ruby_storage_block"
     }
   ],
   "results": [
     {
-      "item": "techreborn:obsidian_plate"
+      "item": "techreborn:ruby_plate",
+      "count": 9
     }
   ]
 }

src/main/resources/data/techreborn/recipes/compressor/auto/sapphire_plate_1.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:sapphire_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:sapphire_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate_2.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:silver_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:silver_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate_2.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:steel_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:steel_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate_2.json

@@ -1,15 +1,16 @@
 {
   "type": "techreborn:compressor",
-  "power": 20,
+  "power": 10,
   "time": 300,
   "ingredients": [
     {
-      "item": "techreborn:yellow_garnet_dust"
+      "item": "techreborn:tin_storage_block"
     }
   ],
   "results": [
     {
-      "item": "techreborn:yellow_garnet_plate"
+      "item": "techreborn:tin_plate",
+      "count": 9
     }
   ]
 }

src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate_2.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:titanium_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:titanium_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate_2.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:tungsten_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:tungsten_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/tungstensteel_plate_1.json

@@ -0,0 +1,16 @@
+{
+  "type": "techreborn:compressor",
+  "power": 10,
+  "time": 300,
+  "ingredients": [
+    {
+      "item": "techreborn:tungstensteel_storage_block"
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:tungstensteel_plate",
+      "count": 9
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/compressor/auto/yellow_garnet_plate_1.json

@@ -1,7 +1,7 @@
 {
   "type": "techreborn:compressor",
-  "power": 20,
+  "power": 10,
-  "time": 400,
+  "time": 300,
   "ingredients": [
     {
       "item": "techreborn:yellow_garnet_storage_block"

src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate_2.json

@@ -1,15 +1,16 @@
 {
   "type": "techreborn:compressor",
-  "power": 20,
+  "power": 10,
   "time": 300,
   "ingredients": [
     {
-      "item": "techreborn:red_garnet_dust"
+      "item": "techreborn:zinc_storage_block"
     }
   ],
   "results": [
     {
-      "item": "techreborn:red_garnet_plate"
+      "item": "techreborn:zinc_plate",
+      "count": 9
     }
   ]
 }

src/main/resources/data/techreborn/recipes/compressor/refined_iron_plate.json

@@ -1,15 +0,0 @@
-{
-  "type": "techreborn:compressor",
-  "power": 20,
-  "time": 400,
-  "ingredients": [
-    {
-      "item": "techreborn:refined_iron_ingot"
-    }
-  ],
-  "results": [
-    {
-      "item": "techreborn:refined_iron_plate"
-    }
-  ]
-}

src/main/resources/techreborn_annotations.json

@@ -369,19 +369,6 @@
         }
       ]
     },
-    "techreborn/init/recipes/IndustrialSawmillRecipes": {
-      "className": "techreborn/init/recipes/IndustrialSawmillRecipes",
-      "annotations": [
-        {
-          "desc": "Lreborncore/common/registration/RebornRegister;",
-          "values": [
-            "value",
-            "techreborn"
-          ],
-          "api": 458752
-        }
-      ]
-    },
     "techreborn/entities/EntityNukePrimed": {
       "className": "techreborn/entities/EntityNukePrimed",
       "annotations": [