Reworked around petrochemistry

src/client/kotlin/hiiragi283/ragium/data/RagiumLangProviders.kt

@@ -82,6 +82,7 @@ object RagiumLangProviders {
         // items
         buildList {
             addAll(RagiumContents.Dusts.entries)
+            addAll(RagiumContents.Gems.entries)
             addAll(RagiumContents.Ingots.entries)
             addAll(RagiumContents.Plates.entries)
             addAll(RagiumContents.RawMaterials.entries)
@@ -184,11 +185,9 @@ object RagiumLangProviders {
             builder.add(RagiumContents.Misc.ENGINE, "V8 Engine")
             builder.add(RagiumContents.Misc.FORGE_HAMMER, "Forge Hammer")
             builder.add(RagiumContents.Misc.HEART_OF_THE_NETHER, "Heart of the Nether")
-            builder.add(RagiumContents.Misc.OBLIVION_CRYSTAL, "Oblivion Crystal")
             builder.add(RagiumContents.Misc.OBLIVION_CUBE_SPAWN_EGG, "Spawn Oblivion Cube")
             builder.add(RagiumContents.Misc.PROCESSOR_SOCKET, "Processor Socket")
             builder.add(RagiumContents.Misc.RAGI_ALLOY_COMPOUND, "Ragi-Alloy Compound")
-            builder.add(RagiumContents.Misc.RAGI_CRYSTAL, "Ragi-Crystal")
             builder.add(RagiumContents.Misc.RAGI_CRYSTAL_PROCESSOR, "Ragi-Crystal Processor")
             builder.add(RagiumContents.Misc.REMOVER_DYNAMITE, "Remover Dynamite")
             builder.add(RagiumContents.Misc.SOAP_INGOT, "Soap Ingot")
@@ -327,11 +326,9 @@ object RagiumLangProviders {
             builder.add(RagiumContents.Misc.ENGINE, "V8エンジン")
             builder.add(RagiumContents.Misc.FORGE_HAMMER, "鍛造ハンマー")
             builder.add(RagiumContents.Misc.HEART_OF_THE_NETHER, "地獄の心臓")
-            builder.add(RagiumContents.Misc.OBLIVION_CRYSTAL, "忘却の結晶")
             builder.add(RagiumContents.Misc.OBLIVION_CUBE_SPAWN_EGG, "スポーン 忘却の箱")
             builder.add(RagiumContents.Misc.PROCESSOR_SOCKET, "プロセッサソケット")
             builder.add(RagiumContents.Misc.RAGI_ALLOY_COMPOUND, "ラギ合金混合物")
-            builder.add(RagiumContents.Misc.RAGI_CRYSTAL, "ラギクリスタリル")
             builder.add(RagiumContents.Misc.RAGI_CRYSTAL_PROCESSOR, "ラギクリスタリルプロセッサ")
             builder.add(RagiumContents.Misc.REMOVER_DYNAMITE, "削除用ダイナマイト")
             builder.add(RagiumContents.Misc.SOAP_INGOT, "石鹸インゴット")

src/client/kotlin/hiiragi283/ragium/data/RagiumModelProvider.kt

@@ -265,6 +265,7 @@ class RagiumModelProvider(output: FabricDataOutput) : FabricModelProvider(output
         // contents
         buildList {
             addAll(RagiumContents.Dusts.entries)
+            addAll(RagiumContents.Gems.entries)
             addAll(RagiumContents.Ingots.entries)
             addAll(RagiumContents.Plates.entries)
             addAll(RagiumContents.RawMaterials.entries)

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

@@ -41,14 +41,8 @@
   "advancement.ragium.tier3.distillation_tower.description": "Build Distillation Tower",
   "advancement.ragium.tier3.electrolyzer": "",
   "advancement.ragium.tier3.electrolyzer.description": "Craft Electrolyzer",
-  "advancement.ragium.tier3.pe": "Star of the star of the plastic",
-  "advancement.ragium.tier3.pe.description": "Craft PE Plate",
   "advancement.ragium.tier3.petroleum": "",
-  "advancement.ragium.tier3.petroleum.description": "Get Petroleum",
-  "advancement.ragium.tier3.ptfe": "Polytetrafluoroethylene",
-  "advancement.ragium.tier3.ptfe.description": "Craft PTFE Plate",
-  "advancement.ragium.tier3.pvc": "Permanent Void Core",
-  "advancement.ragium.tier3.pvc.description": "Craft PVC Plate",
+  "advancement.ragium.tier3.petroleum.description": "Get Crude Oil",
   "advancement.ragium.tier3.refined_steel_hull": "Not made of steeeeel!!",
   "advancement.ragium.tier3.refined_steel_hull.description": "Craft Refined Ragi-Steel Hull",
   "advancement.ragium.tier3.root": "Ragium - Tier 3",
@@ -127,16 +121,19 @@
   "enchantment.ragium.smelting": "Smelting",
   "item.ragium.advanced_circuit": "Advanced Circuits",
   "item.ragium.alchemy_stuff": "Alchemy Stuff",
+  "item.ragium.alumina_dust": "Alumina Dust",
   "item.ragium.aluminum_ingot": "Aluminum Ingot",
   "item.ragium.aluminum_plate": "Aluminum Plate",
+  "item.ragium.aromatic_compounds_fluid_cube": "Fluid Cube (Aromatic Compounds)",
   "item.ragium.ash_dust": "Ash Dust",
+  "item.ragium.asphalt_fluid_cube": "Fluid Cube (Asphalt)",
   "item.ragium.axe_module": "Hammer Module (Axe)",
   "item.ragium.backpack": "Backpack",
   "item.ragium.basalt_mesh": "Basalt Mesh",
   "item.ragium.basic_circuit": "Basic Circuits",
   "item.ragium.batter_fluid_cube": "Fluid Cube (Batter)",
   "item.ragium.bee_wax": "Bee Wax",
-  "item.ragium.benzene_fluid_cube": "Fluid Cube (Benzene)",
+  "item.ragium.bio_fuel_fluid_cube": "Fluid Cube (Bio Fuel)",
   "item.ragium.butter": "Butter",
   "item.ragium.candy_apple": "Candy Apple",
   "item.ragium.canola_seeds": "Canola Seeds",
@@ -152,20 +149,21 @@
   "item.ragium.crude_oil_fluid_cube": "Fluid Cube (Crude Oil)",
   "item.ragium.crude_raginite_dust": "Crude Raginite Dust",
   "item.ragium.default_module": "Hammer Module (Default)",
-  "item.ragium.diesel_fluid_cube": "Fluid Cube (Diesel)",
   "item.ragium.dough": "Dough",
   "item.ragium.dynamite": "Dynamite",
   "item.ragium.empty_fluid_cube": "Fluid Cube (Empty)",
   "item.ragium.engine": "V8 Engine",
+  "item.ragium.engineering_plastic_plate": "Engineering Plastic Plate",
+  "item.ragium.ethanol_fluid_cube": "Fluid Cube (Ethanol)",
   "item.ragium.ethylene_fluid_cube": "Fluid Cube (Ethylene)",
   "item.ragium.flour": "Flour",
-  "item.ragium.fluorine_fluid_cube": "Fluid Cube (Fluorine)",
+  "item.ragium.fluorite": "Fluorite",
   "item.ragium.forge_hammer": "Forge Hammer",
+  "item.ragium.fuel_fluid_cube": "Fluid Cube (Fuel)",
   "item.ragium.glycerol_fluid_cube": "Fluid Cube (Glycerol)",
   "item.ragium.gold_dust": "Gold Dust",
   "item.ragium.gold_plate": "Gold Plate",
   "item.ragium.heart_of_the_nether": "Heart of the Nether",
-  "item.ragium.helium_fluid_cube": "Fluid Cube (Helium)",
   "item.ragium.hoe_module": "Hammer Module (Hoe)",
   "item.ragium.honey_fluid_cube": "Fluid Cube (Honey)",
   "item.ragium.hydrogen_fluid_cube": "Fluid Cube (Hydrogen)",
@@ -175,31 +173,27 @@
   "item.ragium.iron_plate": "Iron Plate",
   "item.ragium.lava_fluid_cube": "Fluid Cube (Lava)",
   "item.ragium.lpg_fluid_cube": "Fluid Cube (LPG)",
+  "item.ragium.lubricant_fluid_cube": "Fluid Cube (Lubricant)",
   "item.ragium.methane_fluid_cube": "Fluid Cube (Methane)",
   "item.ragium.methanol_fluid_cube": "Fluid Cube (Methanol)",
   "item.ragium.milk_fluid_cube": "Fluid Cube (Milk)",
   "item.ragium.minced_meat": "Minced Meat",
-  "item.ragium.mixture_acid_fluid_cube": "Fluid Cube (Mixture Acid)",
   "item.ragium.naphtha_fluid_cube": "Fluid Cube (Naphtha)",
   "item.ragium.nickel_dust": "Nickel Dust",
   "item.ragium.nickel_ingot": "Nickel Ingot",
-  "item.ragium.niter_dust": "Niter Dust",
   "item.ragium.nitric_acid_fluid_cube": "Fluid Cube (Nitric Acid)",
+  "item.ragium.nitro_fuel_fluid_cube": "Fluid Cube (Nitro Fuel)",
   "item.ragium.nitro_glycerin_fluid_cube": "Fluid Cube (Nitroglycerin)",
   "item.ragium.nitrogen_fluid_cube": "Fluid Cube (Nitrogen)",
   "item.ragium.oblivion_crystal": "Oblivion Crystal",
   "item.ragium.oblivion_cube_spawn_egg": "Spawn Oblivion Cube",
   "item.ragium.oxygen_fluid_cube": "Fluid Cube (Oxygen)",
-  "item.ragium.pe_plate": "PE Plate",
   "item.ragium.petroleum_bucket": "Petroleum Bucket",
-  "item.ragium.petroleum_fluid_cube": "Fluid Cube (Petroleum)",
-  "item.ragium.phenol_fluid_cube": "Fluid Cube (Phenol)",
   "item.ragium.pickaxe_module": "Hammer Module (Pickaxe)",
+  "item.ragium.plastic_plate": "Plastic Plate",
   "item.ragium.primitive_circuit": "Primitive Circuits",
   "item.ragium.processor_socket": "Processor Socket",
-  "item.ragium.ptfe_plate": "PTFE Plate",
   "item.ragium.pulp": "Pulp",
-  "item.ragium.pvc_plate": "PVC Plate",
   "item.ragium.ragi_alloy_compound": "Ragi-Alloy Compound",
   "item.ragium.ragi_alloy_ingot": "Ragi-Alloy Ingot",
   "item.ragium.ragi_alloy_plate": "Ragi-Alloy Plate",
@@ -222,6 +216,7 @@
   "item.ragium.regium_pendant": "Regium Pendant",
   "item.ragium.regium_ring": "Regium Ring",
   "item.ragium.remover_dynamite": "Remover Dynamite",
+  "item.ragium.residual_oil_fluid_cube": "Fluid Cube (Residual Oil)",
   "item.ragium.rigium_dust": "Rigium Dust",
   "item.ragium.rigium_pendant": "Rigium Pendant",
   "item.ragium.rigium_ring": "Rigium Ring",
@@ -255,16 +250,11 @@
   "item.ragium.stella_jacket": "S.T.E.L.L.A Jacket",
   "item.ragium.stella_leggings": "S.T.E.L.L.A Leggings",
   "item.ragium.stella_plate": "S.T.E.L.L.A Plate",
-  "item.ragium.sulfur_dust": "Sulfur Dust",
   "item.ragium.sulfuric_acid_fluid_cube": "Fluid Cube (Sulfuric Acid)",
   "item.ragium.sweet_berries_fluid_cube": "Fluid Cube (Sweet Berries)",
   "item.ragium.sweet_potato": "Sweet Potato",
   "item.ragium.tallow_fluid_cube": "Fluid Cube (Tallow)",
-  "item.ragium.tar_fluid_cube": "Fluid Cube (Tar)",
-  "item.ragium.tetra_fluoro_ethylene_fluid_cube": "Fluid Cube (Tetra Fluoro Ethylene)",
-  "item.ragium.toluene_fluid_cube": "Fluid Cube (Toluene)",
   "item.ragium.trinitrotoluene_fluid_cube": "Fluid Cube (Trinitrotoluene)",
-  "item.ragium.vinyl_chloride_fluid_cube": "Fluid Cube (Vinyl Chloride)",
   "item.ragium.water_fluid_cube": "Fluid Cube (Water)",
   "itemGroup.ragium.item": "Ragium - Items",
   "itemGroup.ragium.machine": "Ragium - Machines",

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

@@ -39,14 +39,8 @@
   "advancement.ragium.tier3.distillation_tower.description": "蒸留塔を建てる",
   "advancement.ragium.tier3.electrolyzer": "",
   "advancement.ragium.tier3.electrolyzer.description": "電解槽を作る",
-  "advancement.ragium.tier3.pe": "スター・オブ・ザ・スター・オブ・ザ・プラスチック",
-  "advancement.ragium.tier3.pe.description": "ポリエチレン板を作る",
   "advancement.ragium.tier3.petroleum": "",
   "advancement.ragium.tier3.petroleum.description": "石油を手に入れる",
-  "advancement.ragium.tier3.ptfe": "ポリテトラフルオロエチレン",
-  "advancement.ragium.tier3.ptfe.description": "テフロン板を作る",
-  "advancement.ragium.tier3.pvc": "塩ビマヨネーズ",
-  "advancement.ragium.tier3.pvc.description": "塩化ビニル板を作る",
   "advancement.ragium.tier3.refined_steel_hull": "スチール製ではなあああい!!",
   "advancement.ragium.tier3.refined_steel_hull.description": "精製ラギスチール筐体を作る",
   "advancement.ragium.tier3.root.description": "電気時代",
@@ -123,16 +117,19 @@
   "enchantment.ragium.smelting": "精錬",
   "item.ragium.advanced_circuit": "発展回路",
   "item.ragium.alchemy_stuff": "錬金の杖",
+  "item.ragium.alumina_dust": "アルミナの粉",
   "item.ragium.aluminum_ingot": "アルミニウムインゴット",
   "item.ragium.aluminum_plate": "アルミニウム板",
+  "item.ragium.aromatic_compounds_fluid_cube": "液体キューブ（芳香族化合物）",
   "item.ragium.ash_dust": "灰の粉",
+  "item.ragium.asphalt_fluid_cube": "液体キューブ（アスファルト）",
   "item.ragium.axe_module": "ハンマーモジュール（アックス）",
   "item.ragium.backpack": "パックパック",
   "item.ragium.basalt_mesh": "玄武岩メッシュ",
   "item.ragium.basic_circuit": "基本回路",
   "item.ragium.batter_fluid_cube": "液体キューブ（バッター液）",
   "item.ragium.bee_wax": "蜜蠟",
-  "item.ragium.benzene_fluid_cube": "液体キューブ（ベンゼン）",
+  "item.ragium.bio_fuel_fluid_cube": "液体キューブ（バイオ燃料）",
   "item.ragium.butter": "バター",
   "item.ragium.candy_apple": "りんご飴",
   "item.ragium.canola_seeds": "菜種",
@@ -148,20 +145,21 @@
   "item.ragium.crude_oil_fluid_cube": "液体キューブ（原油）",
   "item.ragium.crude_raginite_dust": "粗製ラギナイトの粉",
   "item.ragium.default_module": "ハンマーモジュール（デフォルト）",
-  "item.ragium.diesel_fluid_cube": "液体キューブ（ディーゼル）",
   "item.ragium.dough": "生地",
   "item.ragium.dynamite": "ダイナマイト",
   "item.ragium.empty_fluid_cube": "液体キューブ（なし）",
   "item.ragium.engine": "V8エンジン",
+  "item.ragium.engineering_plastic_plate": "エンジニアリングプラスチック板",
+  "item.ragium.ethanol_fluid_cube": "液体キューブ（エタノール）",
   "item.ragium.ethylene_fluid_cube": "液体キューブ（エチレン）",
   "item.ragium.flour": "小麦粉",
-  "item.ragium.fluorine_fluid_cube": "液体キューブ（フッ素）",
+  "item.ragium.fluorite": "蛍石",
   "item.ragium.forge_hammer": "鍛造ハンマー",
+  "item.ragium.fuel_fluid_cube": "液体キューブ（燃料）",
   "item.ragium.glycerol_fluid_cube": "液体キューブ（グリセロール）",
   "item.ragium.gold_dust": "金の粉",
   "item.ragium.gold_plate": "金板",
   "item.ragium.heart_of_the_nether": "地獄の心臓",
-  "item.ragium.helium_fluid_cube": "液体キューブ（ヘリウム）",
   "item.ragium.hoe_module": "ハンマーモジュール（クワ）",
   "item.ragium.honey_fluid_cube": "液体キューブ（蜂蜜）",
   "item.ragium.hydrogen_fluid_cube": "液体キューブ（水素）",
@@ -171,31 +169,27 @@
   "item.ragium.iron_plate": "鉄板",
   "item.ragium.lava_fluid_cube": "液体キューブ（溶岩）",
   "item.ragium.lpg_fluid_cube": "液体キューブ（LGP）",
+  "item.ragium.lubricant_fluid_cube": "液体キューブ（潤滑油）",
   "item.ragium.methane_fluid_cube": "液体キューブ（メタン）",
   "item.ragium.methanol_fluid_cube": "液体キューブ（メタノール）",
   "item.ragium.milk_fluid_cube": "液体キューブ（牛乳）",
   "item.ragium.minced_meat": "ひき肉",
-  "item.ragium.mixture_acid_fluid_cube": "液体キューブ（混酸）",
   "item.ragium.naphtha_fluid_cube": "液体キューブ（ナフサ）",
   "item.ragium.nickel_dust": "ニッケルの粉",
   "item.ragium.nickel_ingot": "ニッケルインゴット",
-  "item.ragium.niter_dust": "硝石の粉",
   "item.ragium.nitric_acid_fluid_cube": "液体キューブ（硝酸）",
+  "item.ragium.nitro_fuel_fluid_cube": "液体キューブ（ニトロ燃料）",
   "item.ragium.nitro_glycerin_fluid_cube": "液体キューブ（ニトログリセリン）",
   "item.ragium.nitrogen_fluid_cube": "液体キューブ（窒素）",
   "item.ragium.oblivion_crystal": "忘却の結晶",
   "item.ragium.oblivion_cube_spawn_egg": "スポーン 忘却の箱",
   "item.ragium.oxygen_fluid_cube": "液体キューブ（酸素）",
-  "item.ragium.pe_plate": "ポリエチレン板",
   "item.ragium.petroleum_bucket": "石油バケツ",
-  "item.ragium.petroleum_fluid_cube": "液体キューブ（石油）",
-  "item.ragium.phenol_fluid_cube": "液体キューブ（フェノール）",
   "item.ragium.pickaxe_module": "ハンマーモジュール（ピッケル）",
+  "item.ragium.plastic_plate": "プラスチック板",
   "item.ragium.primitive_circuit": "簡易回路",
   "item.ragium.processor_socket": "プロセッサソケット",
-  "item.ragium.ptfe_plate": "テフロン板",
   "item.ragium.pulp": "パルプ",
-  "item.ragium.pvc_plate": "塩化ビニル板",
   "item.ragium.ragi_alloy_compound": "ラギ合金混合物",
   "item.ragium.ragi_alloy_ingot": "ラギ合金インゴット",
   "item.ragium.ragi_alloy_plate": "ラギ合金板",
@@ -218,6 +212,7 @@
   "item.ragium.regium_pendant": "レギウムのペンダント",
   "item.ragium.regium_ring": "レギウムの指輪",
   "item.ragium.remover_dynamite": "削除用ダイナマイト",
+  "item.ragium.residual_oil_fluid_cube": "液体キューブ（残渣油）",
   "item.ragium.rigium_dust": "リギウムの粉",
   "item.ragium.rigium_pendant": "リギウムのペンダント",
   "item.ragium.rigium_ring": "リギウムの指輪",
@@ -251,16 +246,11 @@
   "item.ragium.stella_jacket": "S.T.E.L.L.A ジャケット",
   "item.ragium.stella_leggings": "S.T.E.L.L.A レギンス",
   "item.ragium.stella_plate": "S.T.E.L.L.A板",
-  "item.ragium.sulfur_dust": "硫黄の粉",
   "item.ragium.sulfuric_acid_fluid_cube": "液体キューブ（硫酸）",
   "item.ragium.sweet_berries_fluid_cube": "液体キューブ（スイートベリー）",
   "item.ragium.sweet_potato": "サツマイモ",
   "item.ragium.tallow_fluid_cube": "液体キューブ（獣脂）",
-  "item.ragium.tar_fluid_cube": "液体キューブ（タール）",
-  "item.ragium.tetra_fluoro_ethylene_fluid_cube": "液体キューブ（テトラフルオロエチレン）",
-  "item.ragium.toluene_fluid_cube": "液体キューブ（トルエン）",
   "item.ragium.trinitrotoluene_fluid_cube": "液体キューブ（トリニトロトルエン）",
-  "item.ragium.vinyl_chloride_fluid_cube": "液体キューブ（塩化ビニル）",
   "item.ragium.water_fluid_cube": "液体キューブ（水）",
   "itemGroup.ragium.item": "Ragium - アイテム",
   "itemGroup.ragium.machine": "Ragium - 機械",

src/main/generated/assets/ragium/models/item/niter_dust.json → src/main/generated/assets/ragium/models/item/alumina_dust.json

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

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

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

src/main/generated/assets/ragium/models/item/pe_plate.json → src/main/generated/assets/ragium/models/item/fluorite.json

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

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

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

src/main/generated/data/c/tags/item/dusts.json

@@ -3,13 +3,12 @@
     "ragium:crude_raginite_dust",
     "ragium:raginite_dust",
     "ragium:ragi_crystal_dust",
+    "ragium:alumina_dust",
     "ragium:ash_dust",
     "ragium:copper_dust",
     "ragium:gold_dust",
     "ragium:iron_dust",
     "ragium:nickel_dust",
-    "ragium:niter_dust",
-    "ragium:sulfur_dust",
     "ragium:bee_wax",
     "ragium:flour",
     "ragium:minced_meat",

src/main/generated/data/c/tags/item/gems.json

@@ -1,5 +1,6 @@
 {
   "values": [
+    "ragium:fluorite",
     "ragium:oblivion_crystal",
     "ragium:ragi_crystal"
   ]

src/main/generated/data/c/tags/item/plates.json

@@ -7,12 +7,11 @@
     "ragium:aluminum_plate",
     "ragium:gold_plate",
     "ragium:invar_plate",
+    "ragium:plastic_plate",
     "ragium:silicon_plate",
     "ragium:steel_plate",
     "ragium:refined_ragi_steel_plate",
-    "ragium:pe_plate",
-    "ragium:pvc_plate",
-    "ragium:ptfe_plate",
+    "ragium:engineering_plastic_plate",
     "ragium:stella_plate"
   ]
 }

src/main/generated/data/ragium/advancement/recipes/misc/assembler/advanced_circuit.json

@@ -5,7 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": "ragium:ptfe_plate"
+            "items": "ragium:engineering_plastic_plate"
           }
         ]
       },