Added new ore processing recipes

Restored Compressor Added new Items "Slag", "Wood Plate"
Hiiragi283 · Nov 7, 2024 · 9f8036e · 9f8036e
1 parent 0255548
commit 9f8036e
Show file tree

Hide file tree

Showing 43 changed files with 277 additions and 11 deletions.
diff --git a/src/client/kotlin/hiiragi283/ragium/data/RagiumLangProviders.kt b/src/client/kotlin/hiiragi283/ragium/data/RagiumLangProviders.kt
@@ -212,6 +212,7 @@ object RagiumLangProviders {
             builder.add(RagiumItems.RAGI_ALLOY_COMPOUND, "Ragi-Alloy Compound")
             builder.add(RagiumItems.RAGI_CRYSTAL_PROCESSOR, "Ragi-Crystal Processor")
             builder.add(RagiumItems.REMOVER_DYNAMITE, "Remover Dynamite")
+            builder.add(RagiumItems.SLAG, "Slag")
             builder.add(RagiumItems.SOAP_INGOT, "Soap Ingot")
             builder.add(RagiumItems.SOLAR_PANEL, "Solar Panel")
             builder.add(RagiumItems.TRADER_CATALOG, "Trader Catalog")
@@ -284,6 +285,7 @@ object RagiumLangProviders {
                 "Smelt multiple ingredients into one",
             )
             builder.add(RagiumMachineKeys.CHEMICAL_REACTOR, "Chemical Reactor", "Are You Ready?")
+            builder.add(RagiumMachineKeys.COMPRESSOR, "Compressor")
             builder.add(
                 RagiumMachineKeys.DISTILLATION_TOWER,
                 "Distillation Tower",
@@ -311,6 +313,7 @@ object RagiumLangProviders {
             builder.add(RagiumMaterialKeys.IRON, "Iron")
             builder.add(RagiumMaterialKeys.NITER, "Niter")
             builder.add(RagiumMaterialKeys.SULFUR, "Sulfur")
+            builder.add(RagiumMaterialKeys.WOOD, "Wood")
 
             builder.add(RagiumMaterialKeys.RAGINITE, "Raginite")
             builder.add(RagiumMaterialKeys.RAGI_STEEL, "Ragi-Steel")
@@ -435,6 +438,7 @@ object RagiumLangProviders {
             builder.add(RagiumItems.RAGI_ALLOY_COMPOUND, "ラギ合金混合物")
             builder.add(RagiumItems.RAGI_CRYSTAL_PROCESSOR, "ラギクリスタリルプロセッサ")
             builder.add(RagiumItems.REMOVER_DYNAMITE, "削除用ダイナマイト")
+            builder.add(RagiumItems.SLAG, "スラグ")
             builder.add(RagiumItems.SOAP_INGOT, "石鹸インゴット")
             builder.add(RagiumItems.SOLAR_PANEL, "太陽光パネル")
             builder.add(RagiumItems.TRADER_CATALOG, "行商人カタログ")
@@ -479,6 +483,7 @@ object RagiumLangProviders {
             builder.add(RagiumMachineKeys.ASSEMBLER, "組立機", "悪魔博士，アッセンブル！")
             builder.add(RagiumMachineKeys.BLAST_FURNACE, "大型高炉", "複数の素材を一つに焼き上げる")
             builder.add(RagiumMachineKeys.CHEMICAL_REACTOR, "化学反応槽", "Are You Ready?")
+            builder.add(RagiumMachineKeys.COMPRESSOR, "圧縮機")
             builder.add(RagiumMachineKeys.DISTILLATION_TOWER, "蒸留塔", "原油を処理する")
             builder.add(RagiumMachineKeys.ELECTROLYZER, "電解槽", "エレキ オン")
             builder.add(RagiumMachineKeys.EXTRACTOR, "抽出器")
@@ -498,6 +503,7 @@ object RagiumLangProviders {
             builder.add(RagiumMaterialKeys.IRON, "鉄")
             builder.add(RagiumMaterialKeys.NITER, "硝石")
             builder.add(RagiumMaterialKeys.SULFUR, "硫黄")
+            builder.add(RagiumMaterialKeys.WOOD, "木材")
 
             builder.add(RagiumMaterialKeys.RAGINITE, "ラギナイト")
             builder.add(RagiumMaterialKeys.RAGI_STEEL, "ラギスチール")

diff --git a/src/main/generated/assets/ragium/blockstates/advanced_compressor.json b/src/main/generated/assets/ragium/blockstates/advanced_compressor.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "ragium:block/dynamic_processor",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "ragium:block/dynamic_processor"
+    },
+    "facing=south": {
+      "model": "ragium:block/dynamic_processor",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "ragium:block/dynamic_processor",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/generated/assets/ragium/blockstates/basic_compressor.json b/src/main/generated/assets/ragium/blockstates/basic_compressor.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "ragium:block/dynamic_processor",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "ragium:block/dynamic_processor"
+    },
+    "facing=south": {
+      "model": "ragium:block/dynamic_processor",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "ragium:block/dynamic_processor",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/generated/assets/ragium/blockstates/primitive_compressor.json b/src/main/generated/assets/ragium/blockstates/primitive_compressor.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "ragium:block/dynamic_processor",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "ragium:block/dynamic_processor"
+    },
+    "facing=south": {
+      "model": "ragium:block/dynamic_processor",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "ragium:block/dynamic_processor",
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/generated/assets/ragium/lang/en_us.json b/src/main/generated/assets/ragium/lang/en_us.json
@@ -155,6 +155,7 @@
   "item.ragium.ragi_alloy_compound": "Ragi-Alloy Compound",
   "item.ragium.ragi_crystal_processor": "Ragi-Crystal Processor",
   "item.ragium.remover_dynamite": "Remover Dynamite",
+  "item.ragium.slag": "Slag",
   "item.ragium.soap_ingot": "Soap Ingot",
   "item.ragium.solar_panel": "Solar Panel",
   "item.ragium.steel_axe": "Steel Axe",
@@ -189,6 +190,7 @@
   "machine_type.ragium.chemical_reactor.description": "Are You Ready?",
   "machine_type.ragium.combustion_generator": "Combustion Generator",
   "machine_type.ragium.combustion_generator.description": "Generate energy from liquid fuels",
+  "machine_type.ragium.compressor": "Compressor",
   "machine_type.ragium.distillation_tower": "Distillation Tower",
   "machine_type.ragium.distillation_tower.description": "Process Crude Oil",
   "machine_type.ragium.drain": "Drain",
@@ -240,6 +242,7 @@
   "material.ragium.steel": "Steel",
   "material.ragium.stella": "S.T.E.L.L.A.",
   "material.ragium.sulfur": "Sulfur",
+  "material.ragium.wood": "Wood",
   "message.ragium.multi_shape.error": "Not matching condition; %s at %ss",
   "message.ragium.multi_shape.success": "The structure is valid!",
   "tag_prefix.ragium.deep_ore": "Deepslate %s Ore",

diff --git a/src/main/generated/assets/ragium/lang/ja_jp.json b/src/main/generated/assets/ragium/lang/ja_jp.json
@@ -152,6 +152,7 @@
   "item.ragium.ragi_alloy_compound": "ラギ合金混合物",
   "item.ragium.ragi_crystal_processor": "ラギクリスタリルプロセッサ",
   "item.ragium.remover_dynamite": "削除用ダイナマイト",
+  "item.ragium.slag": "スラグ",
   "item.ragium.soap_ingot": "石鹸インゴット",
   "item.ragium.solar_panel": "太陽光パネル",
   "item.ragium.steel_axe": "スチールの斧",
@@ -186,6 +187,7 @@
   "machine_type.ragium.chemical_reactor.description": "Are You Ready?",
   "machine_type.ragium.combustion_generator": "燃焼発電機",
   "machine_type.ragium.combustion_generator.description": "液体燃料から発電する",
+  "machine_type.ragium.compressor": "圧縮機",
   "machine_type.ragium.distillation_tower": "蒸留塔",
   "machine_type.ragium.distillation_tower.description": "原油を処理する",
   "machine_type.ragium.drain": "排水溝",
@@ -236,6 +238,7 @@
   "material.ragium.steel": "スチール",
   "material.ragium.stella": "S.T.E.L.L.A.",
   "material.ragium.sulfur": "硫黄",
+  "material.ragium.wood": "木材",
   "message.ragium.multi_shape.error": "次の条件を満たしていません; %s (座標 %s)",
   "message.ragium.multi_shape.success": "構造物は有効です！",
   "tag_prefix.ragium.deep_ore": "深層%s鉱石",

diff --git a/src/main/generated/assets/ragium/models/item/advanced_compressor.json b/src/main/generated/assets/ragium/models/item/advanced_compressor.json
@@ -0,0 +1,3 @@
+{
+  "parent": "ragium:block/dynamic_processor"
+}
diff --git a/src/main/generated/assets/ragium/models/item/basic_compressor.json b/src/main/generated/assets/ragium/models/item/basic_compressor.json
@@ -0,0 +1,3 @@
+{
+  "parent": "ragium:block/dynamic_processor"
+}
diff --git a/src/main/generated/assets/ragium/models/item/primitive_compressor.json b/src/main/generated/assets/ragium/models/item/primitive_compressor.json
@@ -0,0 +1,3 @@
+{
+  "parent": "ragium:block/dynamic_processor"
+}
diff --git a/src/main/generated/assets/ragium/models/item/slag.json b/src/main/generated/assets/ragium/models/item/slag.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "ragium:item/slag"
+  }
+}
diff --git a/src/main/generated/assets/ragium/models/item/wood_plate.json b/src/main/generated/assets/ragium/models/item/wood_plate.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "ragium:item/wood_plate"
+  }
+}
diff --git a/src/main/generated/data/c/tags/item/dusts.json b/src/main/generated/data/c/tags/item/dusts.json
@@ -28,6 +28,10 @@
       "id": "#c:dusts/cryolite",
       "required": false
     },
+    {
+      "id": "#c:dusts/engineering_plastic",
+      "required": false
+    },
     {
       "id": "#c:dusts/fluorite",
       "required": false
@@ -44,6 +48,10 @@
       "id": "#c:dusts/niter",
       "required": false
     },
+    {
+      "id": "#c:dusts/plastic",
+      "required": false
+    },
     {
       "id": "#c:dusts/ragi_alloy",
       "required": false
@@ -76,9 +84,17 @@
       "id": "#c:dusts/steel",
       "required": false
     },
+    {
+      "id": "#c:dusts/stella",
+      "required": false
+    },
     {
       "id": "#c:dusts/sulfur",
       "required": false
+    },
+    {
+      "id": "#c:dusts/wood",
+      "required": false
     }
   ]
 }
diff --git a/src/main/generated/data/c/tags/item/plates.json b/src/main/generated/data/c/tags/item/plates.json
@@ -47,6 +47,10 @@
     {
       "id": "#c:plates/stella",
       "required": false
+    },
+    {
+      "id": "#c:plates/wood",
+      "required": false
     }
   ]
 }
diff --git a/src/main/generated/data/c/tags/item/plates/wood.json b/src/main/generated/data/c/tags/item/plates/wood.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "ragium:wood_plate"
+  ]
+}
diff --git a/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json
@@ -56,6 +56,9 @@
     "ragium:primitive_chemical_reactor",
     "ragium:basic_chemical_reactor",
     "ragium:advanced_chemical_reactor",
+    "ragium:primitive_compressor",
+    "ragium:basic_compressor",
+    "ragium:advanced_compressor",
     "ragium:primitive_distillation_tower",
     "ragium:basic_distillation_tower",
     "ragium:advanced_distillation_tower",

diff --git a/src/main/generated/data/minecraft/tags/item/planks.json b/src/main/generated/data/minecraft/tags/item/planks.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "ragium:wood_plate"
+  ]
+}
diff --git a/src/main/generated/data/ragium/loot_table/blocks/advanced_compressor.json b/src/main/generated/data/ragium/loot_table/blocks/advanced_compressor.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "ragium:advanced_compressor"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/main/generated/data/ragium/loot_table/blocks/basic_compressor.json b/src/main/generated/data/ragium/loot_table/blocks/basic_compressor.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "ragium:basic_compressor"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/main/generated/data/ragium/loot_table/blocks/primitive_compressor.json b/src/main/generated/data/ragium/loot_table/blocks/primitive_compressor.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "ragium:primitive_compressor"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}
diff --git a/src/main/generated/data/ragium/recipe/blast_furnace/aluminum_ingot_with_cryolite.json b/src/main/generated/data/ragium/recipe/blast_furnace/aluminum_ingot_with_cryolite.json
@@ -17,6 +17,10 @@
   "item_outputs": [
     {
       "item": "ragium:aluminum_ingot"
+    },
+    {
+      "count": 2,
+      "item": "ragium:slag"
     }
   ]
 }
diff --git a/src/main/generated/data/ragium/recipe/blast_furnace/ragi_steel_ingot.json b/src/main/generated/data/ragium/recipe/blast_furnace/ragi_steel_ingot.json
@@ -16,6 +16,9 @@
   "item_outputs": [
     {
       "item": "ragium:ragi_steel_ingot"
+    },
+    {
+      "item": "ragium:slag"
     }
   ]
 }
diff --git a/src/main/generated/data/ragium/recipe/blast_furnace/refined_ragi_steel_ingot.json b/src/main/generated/data/ragium/recipe/blast_furnace/refined_ragi_steel_ingot.json
@@ -19,6 +19,9 @@
   "item_outputs": [
     {
       "item": "ragium:refined_ragi_steel_ingot"
+    },
+    {
+      "item": "ragium:slag"
     }
   ]
 }
diff --git a/src/main/generated/data/ragium/recipe/blast_furnace/silicon_plate.json b/src/main/generated/data/ragium/recipe/blast_furnace/silicon_plate.json
@@ -17,6 +17,10 @@
   "item_outputs": [
     {
       "item": "ragium:silicon_plate"
+    },
+    {
+      "count": 2,
+      "item": "ragium:slag"
     }
   ]
 }
diff --git a/src/main/generated/data/ragium/recipe/blast_furnace/steel_ingot.json b/src/main/generated/data/ragium/recipe/blast_furnace/steel_ingot.json
@@ -16,6 +16,9 @@
   "item_outputs": [
     {
       "item": "ragium:steel_ingot"
+    },
+    {
+      "item": "ragium:slag"
     }
   ]
 }