- プラスチック関連を整備

src/main/generated/assets/ragium/lang/en_us.json

@@ -73,6 +73,7 @@
   "content.ragium.exporter": "Exporter",
   "content.ragium.grate": "Grate",
   "content.ragium.hull": "Hull",
+  "content.ragium.plastic": "Plastic",
   "entity.ragium.anvil_dynamite": "Anvil Dynamite",
   "entity.ragium.bedrock_dynamite": "Bedrock Dynamite",
   "entity.ragium.blazing_dynamite": "Blazing Dynamite",
@@ -166,7 +167,6 @@
   "item.ragium.emerald_processor": "Emerald Processor",
   "item.ragium.empty_fluid_cube": "Fluid Cube (Empty)",
   "item.ragium.engine": "V8 Engine",
-  "item.ragium.engineering_plastic_plate": "Engineering Plastic Plate",
   "item.ragium.filled_fluid_cube": "Fluid Cube (%s)",
   "item.ragium.flattening_dynamite": "Flattening Dynamite",
   "item.ragium.flour": "Flour",
@@ -187,7 +187,6 @@
   "item.ragium.nuclear_waste": "Nuclear Waste",
   "item.ragium.obsidian_tear": "Obsidian Tear",
   "item.ragium.pipe_press_mold": "Press Mold (Pipe)",
-  "item.ragium.plastic_plate": "Plastic Plate",
   "item.ragium.plate_press_mold": "Press Mold (Plate)",
   "item.ragium.plutonium_fuel": "Plutonium Fuel",
   "item.ragium.polymer_resin": "Polymer Resin",

src/main/generated/assets/ragium/lang/ja_jp.json

@@ -73,6 +73,7 @@
   "content.ragium.exporter": "搬出機",
   "content.ragium.grate": "格子",
   "content.ragium.hull": "筐体",
+  "content.ragium.plastic": "プラスチック",
   "entity.ragium.anvil_dynamite": "金床ダイナマイト",
   "entity.ragium.bedrock_dynamite": "岩盤ダイナマイト",
   "entity.ragium.blazing_dynamite": "燃え盛るダイナマイト",
@@ -166,7 +167,6 @@
   "item.ragium.emerald_processor": "エメラルドプロセッサ",
   "item.ragium.empty_fluid_cube": "液体キューブ（なし）",
   "item.ragium.engine": "V8エンジン",
-  "item.ragium.engineering_plastic_plate": "エンジニアリングプラスチック板",
   "item.ragium.filled_fluid_cube": "液体キューブ（%s）",
   "item.ragium.flattening_dynamite": "整地用ダイナマイト",
   "item.ragium.flour": "小麦粉",
@@ -187,7 +187,6 @@
   "item.ragium.nuclear_waste": "核廃棄物",
   "item.ragium.obsidian_tear": "黒曜石の涙",
   "item.ragium.pipe_press_mold": "プレス型（パイプ）",
-  "item.ragium.plastic_plate": "プラスチック板",
   "item.ragium.plate_press_mold": "プレス型（板材）",
   "item.ragium.plutonium_fuel": "プルトニウム燃料",
   "item.ragium.polymer_resin": "高分子樹脂",

src/main/generated/assets/ragium/models/item/engineering_plastic_plate.json → src/main/generated/assets/ragium/models/item/advanced_plastic.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "ragium:item/engineering_plastic_plate"
+    "layer0": "ragium:item/advanced_plastic"
   }
 }

src/main/generated/assets/ragium/models/item/plastic_plate.json → src/main/generated/assets/ragium/models/item/basic_plastic.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "ragium:item/plastic_plate"
+    "layer0": "ragium:item/basic_plastic"
   }
 }

src/main/generated/assets/ragium/models/item/primitive_plastic.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "ragium:item/primitive_plastic"
+  }
+}

src/main/generated/data/c/tags/item/plastics/advanced.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "ragium:advanced_plastic"
+  ]
+}

src/main/generated/data/c/tags/item/plastics/basic.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "ragium:basic_plastic"
+  ]
+}

src/main/generated/data/c/tags/item/plastics/primitive.json

@@ -0,0 +1,9 @@
+{
+  "values": [
+    {
+      "id": "oritech:plastic_sheet",
+      "required": false
+    },
+    "ragium:primitive_plastic"
+  ]
+}

src/main/generated/data/ragium/advancement/petro_chemistry/engineering_plastic.json → src/main/generated/data/ragium/advancement/petro_chemistry/plastic1.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "ragium:engineering_plastic_plate"
+            "items": "#c:plastics/primitive"
           }
         ]
       },
@@ -14,13 +14,17 @@
   },
   "display": {
     "description": "",
-    "frame": "goal",
     "icon": {
       "count": 1,
-      "id": "ragium:engineering_plastic_plate"
+      "id": "ragium:primitive_plastic"
     },
     "title": {
-      "translate": "item.ragium.engineering_plastic_plate"
+      "translate": "machine_tier.ragium.primitive.prefix",
+      "with": [
+        {
+          "translate": "content.ragium.plastic"
+        }
+      ]
     }
   },
   "requirements": [

src/main/generated/data/ragium/advancement/petro_chemistry/plastic2.json

@@ -0,0 +1,36 @@
+{
+  "parent": "ragium:petro_chemistry/plastic1",
+  "criteria": {
+    "has_items": {
+      "conditions": {
+        "items": [
+          {
+            "items": "#c:plastics/basic"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "display": {
+    "description": "",
+    "icon": {
+      "count": 1,
+      "id": "ragium:basic_plastic"
+    },
+    "title": {
+      "translate": "machine_tier.ragium.basic.prefix",
+      "with": [
+        {
+          "translate": "content.ragium.plastic"
+        }
+      ]
+    }
+  },
+  "requirements": [
+    [
+      "has_items"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/main/generated/data/ragium/advancement/petro_chemistry/plastic3.json

@@ -0,0 +1,37 @@
+{
+  "parent": "ragium:petro_chemistry/plastic2",
+  "criteria": {
+    "has_items": {
+      "conditions": {
+        "items": [
+          {
+            "items": "#c:plastics/advanced"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "display": {
+    "description": "",
+    "frame": "goal",
+    "icon": {
+      "count": 1,
+      "id": "ragium:advanced_plastic"
+    },
+    "title": {
+      "translate": "machine_tier.ragium.advanced.prefix",
+      "with": [
+        {
+          "translate": "content.ragium.plastic"
+        }
+      ]
+    }
+  },
+  "requirements": [
+    [
+      "has_items"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cube_pvc.json → src/main/generated/data/ragium/advancement/recipes/misc/shaped/advanced_empty_fluid_cube.json

@@ -5,15 +5,15 @@
       "conditions": {
         "items": [
           {
-            "items": "ragium:engineering_plastic_plate"
+            "items": "#c:plastics/advanced"
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "ragium:shaped/empty_fluid_cube_pvc"
+        "recipe": "ragium:shaped/advanced_empty_fluid_cube"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "ragium:shaped/empty_fluid_cube_pvc"
+      "ragium:shaped/advanced_empty_fluid_cube"
     ]
   }
 }

src/main/generated/data/ragium/advancement/recipes/misc/shaped/advanced_plastic_block.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": "#c:plastics/advanced"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "ragium:shaped/advanced_plastic_block"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_the_item"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "ragium:shaped/advanced_plastic_block"
+    ]
+  }
+}

src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cubenull.json → src/main/generated/data/ragium/advancement/recipes/misc/shaped/basic_empty_fluid_cube.json

@@ -5,15 +5,15 @@
       "conditions": {
         "items": [
           {
-            "items": "minecraft:glass_pane"
+            "items": "#c:plastics/basic"
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "ragium:shaped/empty_fluid_cubenull"
+        "recipe": "ragium:shaped/basic_empty_fluid_cube"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "ragium:shaped/empty_fluid_cubenull"
+      "ragium:shaped/basic_empty_fluid_cube"
     ]
   }
 }

src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cube_pe.json → src/main/generated/data/ragium/advancement/recipes/misc/shaped/basic_plastic_block.json

@@ -5,15 +5,15 @@
       "conditions": {
         "items": [
           {
-            "items": "ragium:plastic_plate"
+            "items": "#c:plastics/basic"
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "ragium:shaped/empty_fluid_cube_pe"
+        "recipe": "ragium:shaped/basic_plastic_block"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "ragium:shaped/empty_fluid_cube_pe"
+      "ragium:shaped/basic_plastic_block"
     ]
   }
 }

src/main/generated/data/ragium/advancement/recipes/misc/shaped/plastic_block.json → src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cube.json

@@ -5,15 +5,15 @@
       "conditions": {
         "items": [
           {
-            "items": "ragium:plastic_plate"
+            "items": "#c:glass_panes"
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "ragium:shaped/plastic_block"
+        "recipe": "ragium:shaped/empty_fluid_cube"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "ragium:shaped/plastic_block"
+      "ragium:shaped/empty_fluid_cube"
     ]
   }
 }