- Grateを削除

- Burner, Drumの管理方法を変更
- クリエタブを一部統合
- HTMachineTier.ktから完全に脱却

Author: Hiiragi283

gradle/libs.versions.toml

@@ -19,7 +19,7 @@ cyclops = "6125969"
 delight = "1.21.1-1.2.6"
 evil = "6152878"
 if = "1.21-3.6.22"
-immersive = "1.21.1-12.0.0-182.+"
+immersive = "1.21.1-12.0.0-182.88"
 jade = "15.9.2+neoforge"
 jei = "19.21.0.247"
 mek = "1.21.1-10.7.8.70"

src/generated/resources/assets/ragium/blockstates/advanced_burner.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "ragium:block/copper_drum"
+    }
+  }
+}

src/generated/resources/assets/ragium/blockstates/advanced_drum.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "ragium:block/fiery_burner"
+    }
+  }
+}

src/generated/resources/assets/ragium/blockstates/advanced_grate.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "ragium:block/magma_burner"
+    }
+  }
+}

src/generated/resources/assets/ragium/blockstates/basic_drum.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "ragium:block/soul_burner"
+    }
+  }
+}

src/generated/resources/assets/ragium/blockstates/basic_grate.json

@@ -5,8 +5,10 @@
   "block.ragium.crude_oil": "Crude Oil",
   "block.ragium.cyan_led_block": "Cyan LED Block",
   "block.ragium.energy_network_interface": "E.N.I.",
+  "block.ragium.fiery_burner": "Fiery Burner",
   "block.ragium.green_led_block": "Green LED Block",
   "block.ragium.magenta_led_block": "Magenta LED Block",
+  "block.ragium.magma_burner": "Magma Burner",
   "block.ragium.manual_grinder": "Manual Grinder",
   "block.ragium.obsidian_glass": "Obsidian Glass",
   "block.ragium.plastic_block": "Plastic Block",
@@ -15,18 +17,14 @@
   "block.ragium.shaft": "Shaft",
   "block.ragium.slag_block": "Block of Slag",
   "block.ragium.slag_collector": "Slag Collector",
+  "block.ragium.soul_burner": "Soul Burner",
   "block.ragium.soul_magma_block": "Soul Magma Block",
   "block.ragium.sponge_cake": "Sponge Cake",
   "block.ragium.sweet_berries_cake": "Sweet Berries Cake",
   "block.ragium.white_led_block": "LED Block",
   "block.ragium.yellow_led_block": "Yellow LED Block",
   "config.jade.plugin_ragium.energy_network": "Energy Network",
   "config.jade.plugin_ragium.machine_info": "Machine Info",
-  "content.ragium.burner": "Burner",
-  "content.ragium.circuit": "Circuit",
-  "content.ragium.crate": "Crate",
-  "content.ragium.drum": "Drum",
-  "content.ragium.grate": "Grate",
   "enchantment.ragium.capacity": "Capacity",
   "fluid_type.ragium.biodiesel": "Biodiesel",
   "fluid_type.ragium.biomass": "Biomass",
@@ -44,8 +42,10 @@
   "fluid_type.ragium.snow": "Powder Snow",
   "fluid_type.ragium.sulfuric_acid": "Blaze Acid",
   "fluid_type.ragium.warped_sap": "Warped Sap",
+  "item.ragium.advanced_circuit": "Advanced Circuit",
   "item.ragium.alkali_reagent": "Alkali Reagent",
   "item.ragium.ambrosia": "Ambrosia",
+  "item.ragium.basic_circuit": "Basic Circuit",
   "item.ragium.bee_wax": "Bee Wax",
   "item.ragium.blaze_reagent": "Blaze Reagent",
   "item.ragium.butter": "Butter",
@@ -67,6 +67,7 @@
   "item.ragium.deepant_reagent": "Deepant Reagent",
   "item.ragium.dough": "Dough",
   "item.ragium.dynamite": "Dynamite",
+  "item.ragium.elite_circuit": "Elite Circuit",
   "item.ragium.ender_reagent": "Ender Reagent",
   "item.ragium.engine": "V8 Engine",
   "item.ragium.flour": "Flour",
@@ -93,25 +94,19 @@
   "item.ragium.sculk_reagent": "Sculk Reagent",
   "item.ragium.silky_crystal": "Silky Crystal",
   "item.ragium.silky_pickaxe": "Silky Pickaxe",
+  "item.ragium.slag": "Slag",
   "item.ragium.slot_lock": "Slot Lock",
   "item.ragium.soap": "Soap",
   "item.ragium.solar_panel": "Solar Panel",
   "item.ragium.soul_reagent": "Soul Reagent",
   "item.ragium.sweet_berries_cake_piece": "A piece of Sweet Berries Cake",
+  "item.ragium.ultimate_circuit": "Ultimate Circuit",
   "item.ragium.uranium_fuel": "Uranium Fuel",
   "item.ragium.warped_crystal": "Warped Crystal",
   "item.ragium.wire_press_mold": "Press Mold (Wire)",
   "item.ragium.wither_reagent": "Wither Reagent",
   "item.ragium.yellow_cake": "Yellow Cake",
   "item.ragium.yellow_cake_piece": "A piece of Yellow Cake",
-  "machine_tier.ragium.advanced": "Advanced",
-  "machine_tier.ragium.advanced.prefix": "Advanced %s",
-  "machine_tier.ragium.basic": "Basic",
-  "machine_tier.ragium.basic.prefix": "Basic %s",
-  "machine_tier.ragium.elite": "Elite",
-  "machine_tier.ragium.elite.prefix": "Elite %s",
-  "machine_tier.ragium.ultimate": "Ultimate",
-  "machine_tier.ragium.ultimate.prefix": "Ultimate %s",
   "machine_type.assembler": "Assembler",
   "machine_type.assembler.description": "You are the genius!",
   "machine_type.bedrock_miner": "Bedrock Miner",

src/generated/resources/assets/ragium/blockstates/copper_drum.json

@@ -5,8 +5,10 @@
   "block.ragium.crude_oil": "原油",
   "block.ragium.cyan_led_block": "LEDブロック（シアン）",
   "block.ragium.energy_network_interface": "E.N.I.",
+  "block.ragium.fiery_burner": "燃え盛るバーナー",
   "block.ragium.green_led_block": "LEDブロック（緑）",
   "block.ragium.magenta_led_block": "LEDブロック（マゼンタ）",
+  "block.ragium.magma_burner": "マグマバーナー",
   "block.ragium.manual_grinder": "らぎ臼",
   "block.ragium.obsidian_glass": "黒曜石ガラス",
   "block.ragium.plastic_block": "プラスチックブロック",
@@ -15,18 +17,14 @@
   "block.ragium.shaft": "シャフト",
   "block.ragium.slag_block": "スラグブロック",
   "block.ragium.slag_collector": "スラグ回収器",
+  "block.ragium.soul_burner": "ソウルバーナー",
   "block.ragium.soul_magma_block": "ソウルマグマブロック",
   "block.ragium.sponge_cake": "スポンジケーキ",
   "block.ragium.sweet_berries_cake": "スイートベリーケーキ",
   "block.ragium.white_led_block": "LEDブロック",
   "block.ragium.yellow_led_block": "LEDブロック（黄色）",
   "config.jade.plugin_ragium.energy_network": "エネルギーネットワーク",
   "config.jade.plugin_ragium.machine_info": "機械の情報",
-  "content.ragium.burner": "バーナー",
-  "content.ragium.circuit": "回路",
-  "content.ragium.crate": "クレート",
-  "content.ragium.drum": "ドラム",
-  "content.ragium.grate": "格子",
   "enchantment.ragium.capacity": "容量増加",
   "fluid_type.ragium.biodiesel": "バイオディーゼル",
   "fluid_type.ragium.biomass": "バイオマス",
@@ -44,8 +42,10 @@
   "fluid_type.ragium.snow": "粉雪",
   "fluid_type.ragium.sulfuric_acid": "ブレイズ酸",
   "fluid_type.ragium.warped_sap": "歪んだ樹液",
+  "item.ragium.advanced_circuit": "発展回路",
   "item.ragium.alkali_reagent": "アルカリ試薬",
   "item.ragium.ambrosia": "アンブロシア",
+  "item.ragium.basic_circuit": "基本回路",
   "item.ragium.bee_wax": "蜜蠟",
   "item.ragium.blaze_reagent": "ブレイズ試薬",
   "item.ragium.butter": "バター",
@@ -67,6 +67,7 @@
   "item.ragium.deepant_reagent": "ディーパント試薬",
   "item.ragium.dough": "生地",
   "item.ragium.dynamite": "ダイナマイト",
+  "item.ragium.elite_circuit": "精鋭回路",
   "item.ragium.ender_reagent": "エンダー試薬",
   "item.ragium.engine": "V8エンジン",
   "item.ragium.flour": "小麦粉",
@@ -93,25 +94,19 @@
   "item.ragium.sculk_reagent": "スカルク試薬",
   "item.ragium.silky_crystal": "シルキー結晶",
   "item.ragium.silky_pickaxe": "シルキーピッケル",
+  "item.ragium.slag": "スラグ",
   "item.ragium.slot_lock": "スロットロック",
   "item.ragium.soap": "石鹸",
   "item.ragium.solar_panel": "太陽光パネル",
   "item.ragium.soul_reagent": "ソウル試薬",
   "item.ragium.sweet_berries_cake_piece": "一切れのスイートベリーケーキ",
+  "item.ragium.ultimate_circuit": "究極回路",
   "item.ragium.uranium_fuel": "ウラン燃料",
   "item.ragium.warped_crystal": "歪んだ結晶",
   "item.ragium.wire_press_mold": "プレス型（ワイヤー）",
   "item.ragium.wither_reagent": "ウィザー試薬",
   "item.ragium.yellow_cake": "イエローケーキ",
   "item.ragium.yellow_cake_piece": "一切れのイエローケーキ",
-  "machine_tier.ragium.advanced": "発展",
-  "machine_tier.ragium.advanced.prefix": "発展%s",
-  "machine_tier.ragium.basic": "基本",
-  "machine_tier.ragium.basic.prefix": "基本%s",
-  "machine_tier.ragium.elite": "精鋭",
-  "machine_tier.ragium.elite.prefix": "精鋭%s",
-  "machine_tier.ragium.ultimate": "究極",
-  "machine_tier.ragium.ultimate.prefix": "究極%s",
   "machine_type.assembler": "組立機",
   "machine_type.assembler.description": "君こそが天才だ!",
   "machine_type.bedrock_miner": "岩盤採掘機",

src/generated/resources/assets/ragium/blockstates/elite_burner.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_top",
+  "textures": {
+    "side": "ragium:block/copper_drum_side",
+    "top": "ragium:block/copper_drum_top"
+  }
+}

src/generated/resources/assets/ragium/blockstates/elite_drum.json

@@ -2,7 +2,7 @@
   "parent": "ragium:block/burner",
   "render_type": "minecraft:cutout",
   "textures": {
-    "bars": "ragium:block/ultimate_grate",
+    "bars": "minecraft:block/iron_bars",
     "core": "ragium:block/ultimate_burner",
     "side": "minecraft:block/red_nether_bricks",
     "top": "minecraft:block/red_nether_bricks"

src/generated/resources/assets/ragium/blockstates/elite_grate.json

@@ -2,7 +2,7 @@
   "parent": "ragium:block/burner",
   "render_type": "minecraft:cutout",
   "textures": {
-    "bars": "ragium:block/advanced_grate",
+    "bars": "minecraft:block/iron_bars",
     "core": "minecraft:block/magma",
     "side": "minecraft:block/polished_blackstone_bricks",
     "top": "minecraft:block/polished_blackstone_bricks"

src/generated/resources/assets/ragium/blockstates/fiery_burner.json

@@ -2,7 +2,7 @@
   "parent": "ragium:block/burner",
   "render_type": "minecraft:cutout",
   "textures": {
-    "bars": "ragium:block/elite_grate",
+    "bars": "minecraft:block/iron_bars",
     "core": "ragium:block/soul_magma_block",
     "side": "minecraft:block/end_stone_bricks",
     "top": "minecraft:block/end_stone_bricks"