diff --git a/src/main/generated/assets/ragium/lang/en_us.json b/src/main/generated/assets/ragium/lang/en_us.json index 313a05ab8..718cd1cdb 100644 --- a/src/main/generated/assets/ragium/lang/en_us.json +++ b/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", diff --git a/src/main/generated/assets/ragium/lang/ja_jp.json b/src/main/generated/assets/ragium/lang/ja_jp.json index e719b219e..2b3aebe88 100644 --- a/src/main/generated/assets/ragium/lang/ja_jp.json +++ b/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": "高分子樹脂", diff --git a/src/main/generated/assets/ragium/models/item/engineering_plastic_plate.json b/src/main/generated/assets/ragium/models/item/advanced_plastic.json similarity index 53% rename from src/main/generated/assets/ragium/models/item/engineering_plastic_plate.json rename to src/main/generated/assets/ragium/models/item/advanced_plastic.json index f54525346..5e889d9f7 100644 --- a/src/main/generated/assets/ragium/models/item/engineering_plastic_plate.json +++ b/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" } } \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/item/plastic_plate.json b/src/main/generated/assets/ragium/models/item/basic_plastic.json similarity index 60% rename from src/main/generated/assets/ragium/models/item/plastic_plate.json rename to src/main/generated/assets/ragium/models/item/basic_plastic.json index ed29c8104..686bb8903 100644 --- a/src/main/generated/assets/ragium/models/item/plastic_plate.json +++ b/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" } } \ No newline at end of file diff --git a/src/main/generated/assets/ragium/models/item/primitive_plastic.json b/src/main/generated/assets/ragium/models/item/primitive_plastic.json new file mode 100644 index 000000000..8d57c4e9d --- /dev/null +++ b/src/main/generated/assets/ragium/models/item/primitive_plastic.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ragium:item/primitive_plastic" + } +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/plastics/advanced.json b/src/main/generated/data/c/tags/item/plastics/advanced.json new file mode 100644 index 000000000..c02dc8a9b --- /dev/null +++ b/src/main/generated/data/c/tags/item/plastics/advanced.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ragium:advanced_plastic" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/plastics/basic.json b/src/main/generated/data/c/tags/item/plastics/basic.json new file mode 100644 index 000000000..e240545f7 --- /dev/null +++ b/src/main/generated/data/c/tags/item/plastics/basic.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ragium:basic_plastic" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/plastics/primitive.json b/src/main/generated/data/c/tags/item/plastics/primitive.json new file mode 100644 index 000000000..7778029b4 --- /dev/null +++ b/src/main/generated/data/c/tags/item/plastics/primitive.json @@ -0,0 +1,9 @@ +{ + "values": [ + { + "id": "oritech:plastic_sheet", + "required": false + }, + "ragium:primitive_plastic" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/petro_chemistry/engineering_plastic.json b/src/main/generated/data/ragium/advancement/petro_chemistry/plastic1.json similarity index 64% rename from src/main/generated/data/ragium/advancement/petro_chemistry/engineering_plastic.json rename to src/main/generated/data/ragium/advancement/petro_chemistry/plastic1.json index abf0c0144..f5f0647d9 100644 --- a/src/main/generated/data/ragium/advancement/petro_chemistry/engineering_plastic.json +++ b/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": [ diff --git a/src/main/generated/data/ragium/advancement/petro_chemistry/plastic2.json b/src/main/generated/data/ragium/advancement/petro_chemistry/plastic2.json new file mode 100644 index 000000000..314b62b80 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/petro_chemistry/plastic3.json b/src/main/generated/data/ragium/advancement/petro_chemistry/plastic3.json new file mode 100644 index 000000000..32e529094 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cube_pvc.json b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/advanced_empty_fluid_cube.json similarity index 74% rename from src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cube_pvc.json rename to src/main/generated/data/ragium/advancement/recipes/misc/shaped/advanced_empty_fluid_cube.json index 11676885c..1db2d0fc4 100644 --- a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cube_pvc.json +++ b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/advanced_empty_fluid_cube.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "ragium:engineering_plastic_plate" + "items": "#c:plastics/advanced" } ] }, @@ -13,7 +13,7 @@ }, "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" ] } } \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/advanced_plastic_block.json b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/advanced_plastic_block.json new file mode 100644 index 000000000..87c8af5cc --- /dev/null +++ b/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" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cubenull.json b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/basic_empty_fluid_cube.json similarity index 75% rename from src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cubenull.json rename to src/main/generated/data/ragium/advancement/recipes/misc/shaped/basic_empty_fluid_cube.json index 8c56f7d4c..39f08eddc 100644 --- a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cubenull.json +++ b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/basic_empty_fluid_cube.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "minecraft:glass_pane" + "items": "#c:plastics/basic" } ] }, @@ -13,7 +13,7 @@ }, "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" ] } } \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cube_pe.json b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/basic_plastic_block.json similarity index 76% rename from src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cube_pe.json rename to src/main/generated/data/ragium/advancement/recipes/misc/shaped/basic_plastic_block.json index 7d85eb02f..573c35ac1 100644 --- a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cube_pe.json +++ b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/basic_plastic_block.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "ragium:plastic_plate" + "items": "#c:plastics/basic" } ] }, @@ -13,7 +13,7 @@ }, "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" ] } } \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/plastic_block.json b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cube.json similarity index 77% rename from src/main/generated/data/ragium/advancement/recipes/misc/shaped/plastic_block.json rename to src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cube.json index 16cff4403..961f41ff1 100644 --- a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/plastic_block.json +++ b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/empty_fluid_cube.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "ragium:plastic_plate" + "items": "#c:glass_panes" } ] }, @@ -13,7 +13,7 @@ }, "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" ] } } \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/plastic_block_from_engineering.json b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/plastic_block_from_engineering.json deleted file mode 100644 index 9a7d7448a..000000000 --- a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/plastic_block_from_engineering.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_item": { - "conditions": { - "items": [ - { - "items": "ragium:engineering_plastic_plate" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "ragium:shaped/plastic_block_from_engineering" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_the_item" - ] - ], - "rewards": { - "recipes": [ - "ragium:shaped/plastic_block_from_engineering" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/primitive_empty_fluid_cube.json b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/primitive_empty_fluid_cube.json new file mode 100644 index 000000000..bfce79b7e --- /dev/null +++ b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/primitive_empty_fluid_cube.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_item": { + "conditions": { + "items": [ + { + "items": "#c:plastics/primitive" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "ragium:shaped/primitive_empty_fluid_cube" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_the_item" + ] + ], + "rewards": { + "recipes": [ + "ragium:shaped/primitive_empty_fluid_cube" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/shaped/primitive_plastic_block.json b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/primitive_plastic_block.json new file mode 100644 index 000000000..3ff364ab6 --- /dev/null +++ b/src/main/generated/data/ragium/advancement/recipes/misc/shaped/primitive_plastic_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_item": { + "conditions": { + "items": [ + { + "items": "#c:plastics/primitive" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "ragium:shaped/primitive_plastic_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_the_item" + ] + ], + "rewards": { + "recipes": [ + "ragium:shaped/primitive_plastic_block" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/stonecutting/plastic_plate_from.json b/src/main/generated/data/ragium/advancement/recipes/misc/stonecutting/plastic_plate_from.json deleted file mode 100644 index 2abafaf99..000000000 --- a/src/main/generated/data/ragium/advancement/recipes/misc/stonecutting/plastic_plate_from.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "fabric:load_conditions": [ - { - "condition": "fabric:all_mods_loaded", - "values": [ - "oritech" - ] - } - ], - "parent": "minecraft:recipes/root", - "criteria": { - "has_input": { - "conditions": { - "items": [ - { - "items": "oritech:plastic_sheet" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "ragium:stonecutting/plastic_plate_from" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_input" - ] - ], - "rewards": { - "recipes": [ - "ragium:stonecutting/plastic_plate_from" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/stonecutting/plastic_sheet_to.json b/src/main/generated/data/ragium/advancement/recipes/misc/stonecutting/plastic_sheet_to.json deleted file mode 100644 index 4cbd9e229..000000000 --- a/src/main/generated/data/ragium/advancement/recipes/misc/stonecutting/plastic_sheet_to.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "fabric:load_conditions": [ - { - "condition": "fabric:all_mods_loaded", - "values": [ - "oritech" - ] - } - ], - "parent": "minecraft:recipes/root", - "criteria": { - "has_input": { - "conditions": { - "items": [ - { - "items": "ragium:plastic_plate" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "oritech:stonecutting/plastic_sheet_to" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_input" - ] - ], - "rewards": { - "recipes": [ - "oritech:stonecutting/plastic_sheet_to" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/stonecutting/polymer_resin_from.json b/src/main/generated/data/ragium/advancement/recipes/misc/stonecutting/polymer_resin_from.json deleted file mode 100644 index 61575c068..000000000 --- a/src/main/generated/data/ragium/advancement/recipes/misc/stonecutting/polymer_resin_from.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "fabric:load_conditions": [ - { - "condition": "fabric:all_mods_loaded", - "values": [ - "oritech" - ] - } - ], - "parent": "minecraft:recipes/root", - "criteria": { - "has_input": { - "conditions": { - "items": [ - { - "items": "oritech:polymer_resin" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "ragium:stonecutting/polymer_resin_from" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_input" - ] - ], - "rewards": { - "recipes": [ - "ragium:stonecutting/polymer_resin_from" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/ragium/advancement/recipes/misc/stonecutting/polymer_resin_to.json b/src/main/generated/data/ragium/advancement/recipes/misc/stonecutting/polymer_resin_to.json deleted file mode 100644 index 06c5ba2a0..000000000 --- a/src/main/generated/data/ragium/advancement/recipes/misc/stonecutting/polymer_resin_to.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "fabric:load_conditions": [ - { - "condition": "fabric:all_mods_loaded", - "values": [ - "oritech" - ] - } - ], - "parent": "minecraft:recipes/root", - "criteria": { - "has_input": { - "conditions": { - "items": [ - { - "items": "ragium:polymer_resin" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "oritech:stonecutting/polymer_resin_to" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_input" - ] - ], - "rewards": { - "recipes": [ - "oritech:stonecutting/polymer_resin_to" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/assembler/empty_fluid_cube_pe.json b/src/main/generated/data/ragium/recipe/assembler/empty_fluid_cube_pe.json deleted file mode 100644 index 150ccd65f..000000000 --- a/src/main/generated/data/ragium/recipe/assembler/empty_fluid_cube_pe.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "ragium:machine", - "catalyst": "ragium:empty_fluid_cube", - "definition": { - "type": "ragium:assembler", - "tier": "primitive" - }, - "item_inputs": [ - { - "count": 4, - "items": "ragium:plastic_plate" - } - ], - "item_outputs": [ - { - "count": 8, - "item": "ragium:empty_fluid_cube" - } - ] -} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/assembler/empty_fluid_cube_pvc.json b/src/main/generated/data/ragium/recipe/assembler/empty_fluid_cube_pvc.json deleted file mode 100644 index 3831efe75..000000000 --- a/src/main/generated/data/ragium/recipe/assembler/empty_fluid_cube_pvc.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "ragium:machine", - "catalyst": "ragium:empty_fluid_cube", - "definition": { - "type": "ragium:assembler", - "tier": "primitive" - }, - "item_inputs": [ - { - "count": 4, - "items": "ragium:engineering_plastic_plate" - } - ], - "item_outputs": [ - { - "count": 16, - "item": "ragium:empty_fluid_cube" - } - ] -} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/assembler/empty_fluid_cubenull.json b/src/main/generated/data/ragium/recipe/assembler/empty_fluid_cubenull.json deleted file mode 100644 index f88975e9e..000000000 --- a/src/main/generated/data/ragium/recipe/assembler/empty_fluid_cubenull.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "ragium:machine", - "catalyst": "ragium:empty_fluid_cube", - "definition": { - "type": "ragium:assembler", - "tier": "primitive" - }, - "item_inputs": [ - { - "count": 4, - "items": "minecraft:glass_pane" - } - ], - "item_outputs": [ - { - "count": 4, - "item": "ragium:empty_fluid_cube" - } - ] -} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/chemical_reactor/engineering_plastic_plate.json b/src/main/generated/data/ragium/recipe/chemical_reactor/advanced_plastic.json similarity index 59% rename from src/main/generated/data/ragium/recipe/chemical_reactor/engineering_plastic_plate.json rename to src/main/generated/data/ragium/recipe/chemical_reactor/advanced_plastic.json index 9c92da518..8cfbf31ec 100644 --- a/src/main/generated/data/ragium/recipe/chemical_reactor/engineering_plastic_plate.json +++ b/src/main/generated/data/ragium/recipe/chemical_reactor/advanced_plastic.json @@ -1,21 +1,22 @@ { "type": "ragium:machine", - "catalyst": "ragium:rock_wool", "definition": { "type": "ragium:chemical_reactor", "tier": "primitive" }, + "fluid_inputs": [ + { + "amount": 9000, + "fluids": "#c:aromatic_compounds" + } + ], "item_inputs": [ { - "count": 4, + "count": 2, "items": "ragium:polymer_resin" - }, - { - "count": 4, - "items": "ragium:rock_wool" } ], "item_outputs": [ - "ragium:engineering_plastic_plate" + "ragium:advanced_plastic" ] } \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/chemical_reactor/advanced_plastic_with_oxygen.json b/src/main/generated/data/ragium/recipe/chemical_reactor/advanced_plastic_with_oxygen.json new file mode 100644 index 000000000..b9348c82c --- /dev/null +++ b/src/main/generated/data/ragium/recipe/chemical_reactor/advanced_plastic_with_oxygen.json @@ -0,0 +1,25 @@ +{ + "type": "ragium:machine", + "definition": { + "type": "ragium:chemical_reactor", + "tier": "primitive" + }, + "fluid_inputs": [ + { + "amount": 9000, + "fluids": "#c:aromatic_compounds" + } + ], + "item_inputs": [ + { + "count": 2, + "items": "ragium:polymer_resin" + } + ], + "item_outputs": [ + { + "count": 2, + "item": "ragium:advanced_plastic" + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/chemical_reactor/engineering_plastic_plate_from_aromatic.json b/src/main/generated/data/ragium/recipe/chemical_reactor/basic_plastic.json similarity index 55% rename from src/main/generated/data/ragium/recipe/chemical_reactor/engineering_plastic_plate_from_aromatic.json rename to src/main/generated/data/ragium/recipe/chemical_reactor/basic_plastic.json index 32b7e53b9..731d37405 100644 --- a/src/main/generated/data/ragium/recipe/chemical_reactor/engineering_plastic_plate_from_aromatic.json +++ b/src/main/generated/data/ragium/recipe/chemical_reactor/basic_plastic.json @@ -5,13 +5,12 @@ "tier": "primitive" }, "fluid_inputs": [ - "#c:aromatic_compounds", - { - "amount": 27000, - "fluids": "#c:oxygen" - } + "#c:hydrochloric_acid" + ], + "item_inputs": [ + "ragium:polymer_resin" ], "item_outputs": [ - "ragium:engineering_plastic_plate" + "ragium:basic_plastic" ] } \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/chemical_reactor/basic_plastic_with_oxygen.json b/src/main/generated/data/ragium/recipe/chemical_reactor/basic_plastic_with_oxygen.json new file mode 100644 index 000000000..6398801eb --- /dev/null +++ b/src/main/generated/data/ragium/recipe/chemical_reactor/basic_plastic_with_oxygen.json @@ -0,0 +1,20 @@ +{ + "type": "ragium:machine", + "definition": { + "type": "ragium:chemical_reactor", + "tier": "primitive" + }, + "fluid_inputs": [ + "#c:hydrochloric_acid", + "#c:oxygen" + ], + "item_inputs": [ + "ragium:polymer_resin" + ], + "item_outputs": [ + { + "count": 2, + "item": "ragium:basic_plastic" + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/chemical_reactor/plastic_plate.json b/src/main/generated/data/ragium/recipe/chemical_reactor/primitive_plastic.json similarity index 86% rename from src/main/generated/data/ragium/recipe/chemical_reactor/plastic_plate.json rename to src/main/generated/data/ragium/recipe/chemical_reactor/primitive_plastic.json index 9d010b91e..69cbae8f1 100644 --- a/src/main/generated/data/ragium/recipe/chemical_reactor/plastic_plate.json +++ b/src/main/generated/data/ragium/recipe/chemical_reactor/primitive_plastic.json @@ -8,6 +8,6 @@ "ragium:polymer_resin" ], "item_outputs": [ - "ragium:plastic_plate" + "ragium:primitive_plastic" ] } \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/chemical_reactor/plastic_plate_with_oxygen.json b/src/main/generated/data/ragium/recipe/chemical_reactor/primitive_plastic_with_oxygen.json similarity index 86% rename from src/main/generated/data/ragium/recipe/chemical_reactor/plastic_plate_with_oxygen.json rename to src/main/generated/data/ragium/recipe/chemical_reactor/primitive_plastic_with_oxygen.json index 41d9ead61..94ed0ac58 100644 --- a/src/main/generated/data/ragium/recipe/chemical_reactor/plastic_plate_with_oxygen.json +++ b/src/main/generated/data/ragium/recipe/chemical_reactor/primitive_plastic_with_oxygen.json @@ -13,7 +13,7 @@ "item_outputs": [ { "count": 2, - "item": "ragium:plastic_plate" + "item": "ragium:primitive_plastic" } ] } \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/shaped/empty_fluid_cube_pvc.json b/src/main/generated/data/ragium/recipe/shaped/advanced_empty_fluid_cube.json similarity index 81% rename from src/main/generated/data/ragium/recipe/shaped/empty_fluid_cube_pvc.json rename to src/main/generated/data/ragium/recipe/shaped/advanced_empty_fluid_cube.json index 4e92072dc..1ab406aa8 100644 --- a/src/main/generated/data/ragium/recipe/shaped/empty_fluid_cube_pvc.json +++ b/src/main/generated/data/ragium/recipe/shaped/advanced_empty_fluid_cube.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "A": { - "item": "ragium:engineering_plastic_plate" + "tag": "c:plastics/advanced" } }, "pattern": [ diff --git a/src/main/generated/data/ragium/recipe/shaped/plastic_block_from_engineering.json b/src/main/generated/data/ragium/recipe/shaped/advanced_plastic_block.json similarity index 80% rename from src/main/generated/data/ragium/recipe/shaped/plastic_block_from_engineering.json rename to src/main/generated/data/ragium/recipe/shaped/advanced_plastic_block.json index 3f1d157ed..d7314023c 100644 --- a/src/main/generated/data/ragium/recipe/shaped/plastic_block_from_engineering.json +++ b/src/main/generated/data/ragium/recipe/shaped/advanced_plastic_block.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "A": { - "item": "ragium:engineering_plastic_plate" + "tag": "c:plastics/advanced" } }, "pattern": [ diff --git a/src/main/generated/data/ragium/recipe/shaped/empty_fluid_cube_pe.json b/src/main/generated/data/ragium/recipe/shaped/basic_empty_fluid_cube.json similarity index 85% rename from src/main/generated/data/ragium/recipe/shaped/empty_fluid_cube_pe.json rename to src/main/generated/data/ragium/recipe/shaped/basic_empty_fluid_cube.json index 15d500c45..27f18fb82 100644 --- a/src/main/generated/data/ragium/recipe/shaped/empty_fluid_cube_pe.json +++ b/src/main/generated/data/ragium/recipe/shaped/basic_empty_fluid_cube.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "A": { - "item": "ragium:plastic_plate" + "tag": "c:plastics/basic" } }, "pattern": [ diff --git a/src/main/generated/data/ragium/recipe/shaped/basic_plastic_block.json b/src/main/generated/data/ragium/recipe/shaped/basic_plastic_block.json new file mode 100644 index 000000000..65aa699b7 --- /dev/null +++ b/src/main/generated/data/ragium/recipe/shaped/basic_plastic_block.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "tag": "c:plastics/basic" + } + }, + "pattern": [ + "AA", + "AA" + ], + "result": { + "count": 8, + "id": "ragium:plastic_block" + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/shaped/empty_fluid_cubenull.json b/src/main/generated/data/ragium/recipe/shaped/empty_fluid_cube.json similarity index 85% rename from src/main/generated/data/ragium/recipe/shaped/empty_fluid_cubenull.json rename to src/main/generated/data/ragium/recipe/shaped/empty_fluid_cube.json index 351e5fa00..7600fe2c2 100644 --- a/src/main/generated/data/ragium/recipe/shaped/empty_fluid_cubenull.json +++ b/src/main/generated/data/ragium/recipe/shaped/empty_fluid_cube.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "A": { - "item": "minecraft:glass_pane" + "tag": "c:glass_panes" } }, "pattern": [ diff --git a/src/main/generated/data/ragium/recipe/shaped/primitive_empty_fluid_cube.json b/src/main/generated/data/ragium/recipe/shaped/primitive_empty_fluid_cube.json new file mode 100644 index 000000000..c435c760e --- /dev/null +++ b/src/main/generated/data/ragium/recipe/shaped/primitive_empty_fluid_cube.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "tag": "c:plastics/primitive" + } + }, + "pattern": [ + " A ", + "A A", + " A " + ], + "result": { + "count": 4, + "id": "ragium:empty_fluid_cube" + } +} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/shaped/plastic_block.json b/src/main/generated/data/ragium/recipe/shaped/primitive_plastic_block.json similarity index 84% rename from src/main/generated/data/ragium/recipe/shaped/plastic_block.json rename to src/main/generated/data/ragium/recipe/shaped/primitive_plastic_block.json index 33c7d3d4f..8e43e50c5 100644 --- a/src/main/generated/data/ragium/recipe/shaped/plastic_block.json +++ b/src/main/generated/data/ragium/recipe/shaped/primitive_plastic_block.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "A": { - "item": "ragium:plastic_plate" + "tag": "c:plastics/primitive" } }, "pattern": [ diff --git a/src/main/generated/data/ragium/recipe/stonecutting/plastic_plate_from.json b/src/main/generated/data/ragium/recipe/stonecutting/plastic_plate_from.json deleted file mode 100644 index 1085136e6..000000000 --- a/src/main/generated/data/ragium/recipe/stonecutting/plastic_plate_from.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "fabric:load_conditions": [ - { - "condition": "fabric:all_mods_loaded", - "values": [ - "oritech" - ] - } - ], - "type": "minecraft:stonecutting", - "ingredient": { - "item": "oritech:plastic_sheet" - }, - "result": { - "count": 1, - "id": "ragium:plastic_plate" - } -} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/stonecutting/plastic_sheet_to.json b/src/main/generated/data/ragium/recipe/stonecutting/plastic_sheet_to.json deleted file mode 100644 index 920b645e8..000000000 --- a/src/main/generated/data/ragium/recipe/stonecutting/plastic_sheet_to.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "fabric:load_conditions": [ - { - "condition": "fabric:all_mods_loaded", - "values": [ - "oritech" - ] - } - ], - "type": "minecraft:stonecutting", - "ingredient": { - "item": "ragium:plastic_plate" - }, - "result": { - "count": 1, - "id": "oritech:plastic_sheet" - } -} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/stonecutting/polymer_resin_from.json b/src/main/generated/data/ragium/recipe/stonecutting/polymer_resin_from.json deleted file mode 100644 index 1da6a7f25..000000000 --- a/src/main/generated/data/ragium/recipe/stonecutting/polymer_resin_from.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "fabric:load_conditions": [ - { - "condition": "fabric:all_mods_loaded", - "values": [ - "oritech" - ] - } - ], - "type": "minecraft:stonecutting", - "ingredient": { - "item": "oritech:polymer_resin" - }, - "result": { - "count": 1, - "id": "ragium:polymer_resin" - } -} \ No newline at end of file diff --git a/src/main/generated/data/ragium/recipe/stonecutting/polymer_resin_to.json b/src/main/generated/data/ragium/recipe/stonecutting/polymer_resin_to.json deleted file mode 100644 index 99bbe0a1c..000000000 --- a/src/main/generated/data/ragium/recipe/stonecutting/polymer_resin_to.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "fabric:load_conditions": [ - { - "condition": "fabric:all_mods_loaded", - "values": [ - "oritech" - ] - } - ], - "type": "minecraft:stonecutting", - "ingredient": { - "item": "ragium:polymer_resin" - }, - "result": { - "count": 1, - "id": "oritech:polymer_resin" - } -} \ No newline at end of file diff --git a/src/main/kotlin/hiiragi283/ragium/api/data/HTShapedRecipeJsonBuilder.kt b/src/main/kotlin/hiiragi283/ragium/api/data/HTShapedRecipeJsonBuilder.kt index 13062cb43..d119b63af 100644 --- a/src/main/kotlin/hiiragi283/ragium/api/data/HTShapedRecipeJsonBuilder.kt +++ b/src/main/kotlin/hiiragi283/ragium/api/data/HTShapedRecipeJsonBuilder.kt @@ -103,6 +103,11 @@ class HTShapedRecipeJsonBuilder private constructor(val output: ItemStack) : Cra } } + fun pattern2x2(): HTShapedRecipeJsonBuilder = patterns( + "AA", + "AA", + ) + fun pattern3x3(): HTShapedRecipeJsonBuilder = patterns( "AAA", "AAA", diff --git a/src/main/kotlin/hiiragi283/ragium/api/data/HTStonecuttingRecipeJsonBuilder.kt b/src/main/kotlin/hiiragi283/ragium/api/data/HTStonecuttingRecipeJsonBuilder.kt index 2d7e12f1b..66599d5e6 100644 --- a/src/main/kotlin/hiiragi283/ragium/api/data/HTStonecuttingRecipeJsonBuilder.kt +++ b/src/main/kotlin/hiiragi283/ragium/api/data/HTStonecuttingRecipeJsonBuilder.kt @@ -56,15 +56,4 @@ object HTStonecuttingRecipeJsonBuilder { ).criterion("has_input", RecipeProvider.conditionsFromTag(input)) .offerTo(exporter, id.withPrefixedPath("stonecutting/").withSuffixedPath(suffix)) } - - @JvmStatic - fun registerExchange( - exporter: RecipeExporter, - input: ItemConvertible, - output: ItemConvertible, - category: RecipeCategory = RecipeCategory.MISC, - ) { - register(exporter, input, output, category = category, suffix = "_to") - register(exporter, output, input, category = category, suffix = "_from") - } } diff --git a/src/main/kotlin/hiiragi283/ragium/api/machine/HTMachineTier.kt b/src/main/kotlin/hiiragi283/ragium/api/machine/HTMachineTier.kt index 6742aeae5..70faf60eb 100644 --- a/src/main/kotlin/hiiragi283/ragium/api/machine/HTMachineTier.kt +++ b/src/main/kotlin/hiiragi283/ragium/api/machine/HTMachineTier.kt @@ -106,6 +106,12 @@ enum class HTMachineTier( fun createId(key: HTMachineKey): Identifier = key.id.let { Identifier.of(it.namespace, idPattern.replace("%s", it.path)) } + fun getPlastic(): RagiumItems.Plastics = when (this) { + PRIMITIVE -> RagiumItems.Plastics.PRIMITIVE + BASIC -> RagiumItems.Plastics.BASIC + ADVANCED -> RagiumItems.Plastics.ADVANCED + } + fun getCircuitBoard(): RagiumItems.CircuitBoards = when (this) { PRIMITIVE -> RagiumItems.CircuitBoards.PRIMITIVE BASIC -> RagiumItems.CircuitBoards.BASIC diff --git a/src/main/kotlin/hiiragi283/ragium/api/material/HTMaterialType.kt b/src/main/kotlin/hiiragi283/ragium/api/material/HTMaterialType.kt index 98881f3d8..415bd96c7 100644 --- a/src/main/kotlin/hiiragi283/ragium/api/material/HTMaterialType.kt +++ b/src/main/kotlin/hiiragi283/ragium/api/material/HTMaterialType.kt @@ -20,6 +20,7 @@ enum class HTMaterialType(val validPrefixes: List) { HTTagPrefix.ORE, HTTagPrefix.PLATE, HTTagPrefix.RAW_MATERIAL, + HTTagPrefix.ROD, HTTagPrefix.STORAGE_BLOCK, ), MINERAL( diff --git a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItemGroup.kt b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItemGroup.kt index 213946fe5..4dc7146c3 100644 --- a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItemGroup.kt +++ b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItemGroup.kt @@ -128,6 +128,7 @@ object RagiumItemGroup { entries.add(RagiumItems.ITEM_FILTER) entries.add(RagiumItems.TRADER_CATALOG) + entries.addAll(RagiumItems.Plastics.entries) entries.addAll(RagiumItems.CircuitBoards.entries) entries.addAll(RagiumItems.Circuits.entries) entries.addAll(RagiumItems.Processors.entries) diff --git a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItems.kt b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItems.kt index e66136f4f..8cc401370 100644 --- a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItems.kt +++ b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumItems.kt @@ -22,7 +22,9 @@ import net.minecraft.item.* import net.minecraft.registry.Registries import net.minecraft.registry.Registry import net.minecraft.registry.RegistryKey +import net.minecraft.registry.RegistryKeys import net.minecraft.registry.entry.RegistryEntry +import net.minecraft.registry.tag.TagKey import net.minecraft.util.Identifier import net.minecraft.util.Rarity @@ -353,6 +355,19 @@ object RagiumItems { // Ingredients // + enum class Plastics(override val tier: HTMachineTier) : + HTItemContent, + HTMachineTierProvider { + PRIMITIVE(HTMachineTier.PRIMITIVE), + BASIC(HTMachineTier.BASIC), + ADVANCED(HTMachineTier.ADVANCED), + ; + + override val key: RegistryKey = HTContent.itemKey("${name.lowercase()}_plastic") + + val tagKey: TagKey = TagKey.of(RegistryKeys.ITEM, Identifier.of("c", "plastics/${name.lowercase()}")) + } + enum class CircuitBoards(override val tier: HTMachineTier) : HTItemContent, HTMachineTierProvider { @@ -448,12 +463,6 @@ object RagiumItems { @JvmField val POLYMER_RESIN: HTItemContent = HTContent.ofItem("polymer_resin") - @JvmField - val PLASTIC_PLATE: HTItemContent = HTContent.ofItem("plastic_plate") - - @JvmField - val ENGINEERING_PLASTIC_PLATE: HTItemContent = HTContent.ofItem("engineering_plastic_plate") - @JvmField val STELLA_PLATE: HTItemContent = HTContent.ofItem("stella_plate") @@ -516,8 +525,6 @@ object RagiumItems { add(SOAP) // plastic add(POLYMER_RESIN) - add(PLASTIC_PLATE) - add(ENGINEERING_PLASTIC_PLATE) add(STELLA_PLATE) // silicon add(CRUDE_SILICON) @@ -576,25 +583,14 @@ object RagiumItems { }.forEach { content -> registerItem(content) { Item(it.material(content.material, content.tagPrefix)) } } + Plastics.entries.forEach { plastic: Plastics -> + registerItem(plastic, itemSettings().tieredText(RagiumTranslationKeys.PLASTIC, plastic.tier)) + } CircuitBoards.entries.forEach { board: CircuitBoards -> - registerItem(board) { - Item( - it.tieredText( - RagiumTranslationKeys.CIRCUIT_BOARD, - board.tier, - ), - ) - } + registerItem(board, itemSettings().tieredText(RagiumTranslationKeys.CIRCUIT_BOARD, board.tier)) } Circuits.entries.forEach { circuit: Circuits -> - registerItem(circuit) { - Item( - it.tieredText( - RagiumTranslationKeys.CIRCUIT, - circuit.tier, - ), - ) - } + registerItem(circuit, itemSettings().tieredText(RagiumTranslationKeys.CIRCUIT, circuit.tier)) } Processors.entries.forEach(::registerItem) PressMolds.entries.forEach(::registerItem) diff --git a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumTranslationKeys.kt b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumTranslationKeys.kt index 93b8ed8f8..cce942c87 100644 --- a/src/main/kotlin/hiiragi283/ragium/common/init/RagiumTranslationKeys.kt +++ b/src/main/kotlin/hiiragi283/ragium/common/init/RagiumTranslationKeys.kt @@ -47,6 +47,7 @@ object RagiumTranslationKeys { const val EXPORTER = "content.ragium.exporter" const val GRATE = "content.ragium.grate" const val HULL = "content.ragium.hull" + const val PLASTIC = "content.ragium.plastic" // Fluid // diff --git a/src/main/kotlin/hiiragi283/ragium/common/internal/RagiumHardModePlugin.kt b/src/main/kotlin/hiiragi283/ragium/common/internal/RagiumHardModePlugin.kt index 97856edb1..bc8e36779 100644 --- a/src/main/kotlin/hiiragi283/ragium/common/internal/RagiumHardModePlugin.kt +++ b/src/main/kotlin/hiiragi283/ragium/common/internal/RagiumHardModePlugin.kt @@ -172,7 +172,7 @@ object RagiumHardModePlugin : RagiumPlugin { .create(RagiumMachineKeys.ASSEMBLER, HTMachineTier.ADVANCED) .itemInput(RagiumItems.Circuits.ADVANCED, 2) .itemInput(RagiumHardModeContents.DEEP_STEEL.getPrefixedTag(hardMode), 4) - .itemInput(RagiumItems.ENGINEERING_PLASTIC_PLATE, 4) + .itemInput(RagiumItems.Plastics.ADVANCED.tagKey, 4) .fluidInput(RagiumFluids.NOBLE_GAS) .itemOutput(RagiumItems.LASER_EMITTER) .offerTo(exporter, RagiumItems.LASER_EMITTER) @@ -180,7 +180,7 @@ object RagiumHardModePlugin : RagiumPlugin { HTMachineRecipeJsonBuilder .create(RagiumMachineKeys.COMPRESSOR, HTMachineTier.ADVANCED) .itemInput(RagiumHardModeContents.ALUMINUM.getPrefixedTag(hardMode)) - .itemInput(RagiumItems.ENGINEERING_PLASTIC_PLATE) + .itemInput(RagiumItems.Plastics.ADVANCED.tagKey) .itemInput(RagiumHardModeContents.DEEP_STEEL.getPrefixedTag(hardMode), 2) .itemOutput(RagiumItems.STELLA_PLATE) .offerTo(exporter, RagiumItems.STELLA_PLATE) @@ -561,17 +561,17 @@ object RagiumHardModePlugin : RagiumPlugin { HTMachineTier.BASIC to RagiumItemTags.SILICON_PLATES, HTMachineTier.ADVANCED to RagiumItemTags.REFINED_SILICON_PLATES, ) - val circuitMap: Map> = + val circuitMap: Map = mapOf( - HTMachineTier.PRIMITIVE to ConventionalItemTags.REDSTONE_DUSTS, - HTMachineTier.BASIC to ConventionalItemTags.GLOWSTONE_DUSTS, - HTMachineTier.ADVANCED to RagiumItems.Dusts.RAGI_CRYSTAL.prefixedTagKey, + HTMachineTier.PRIMITIVE to Items.REDSTONE, + HTMachineTier.BASIC to Items.GLOWSTONE_DUST, + HTMachineTier.ADVANCED to RagiumItems.LUMINESCENCE_DUST, ) RagiumItems.CircuitBoards.entries.forEach { board: RagiumItems.CircuitBoards -> val tier: HTMachineTier = board.tier val plate: TagKey = boardMap[tier] ?: return@forEach - val dope: TagKey = circuitMap[tier] ?: return@forEach + val dope: ItemConvertible = circuitMap[tier] ?: return@forEach // board HTMachineRecipeJsonBuilder .create(RagiumMachineKeys.ASSEMBLER, tier)