Added new item Plutonium Fuel

Added new recipes for Laser Transformer

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

@@ -124,6 +124,7 @@
   "item.ragium.minced_meat": "Minced Meat",
   "item.ragium.nuclear_waste": "Nuclear Waste",
   "item.ragium.plastic_plate": "Plastic Plate",
+  "item.ragium.plutonium_fuel": "Plutonium Fuel",
   "item.ragium.polymer_resin": "Polymer Resin",
   "item.ragium.processor_socket": "Processor Socket",
   "item.ragium.pulp": "Pulp",

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

@@ -124,6 +124,7 @@
   "item.ragium.minced_meat": "ひき肉",
   "item.ragium.nuclear_waste": "核廃棄物",
   "item.ragium.plastic_plate": "プラスチック板",
+  "item.ragium.plutonium_fuel": "プルトニウム燃料",
   "item.ragium.polymer_resin": "高分子樹脂",
   "item.ragium.processor_socket": "プロセッサソケット",
   "item.ragium.pulp": "パルプ",

src/main/generated/assets/ragium/models/block/mutated_soil.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "minecraft:block/dirt"
+    "all": "ragium:block/mutated_soil"
   }
 }

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

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

src/main/generated/data/ragium/recipe/assembler/plutonium_fuel.json

@@ -0,0 +1,30 @@
+{
+  "type": "ragium:machine",
+  "definition": {
+    "type": "ragium:assembler",
+    "tier": "advanced"
+  },
+  "fluid_inputs": [
+    {
+      "fluids": "#c:aqua_regia"
+    }
+  ],
+  "item_inputs": [
+    {
+      "items": "ragium:empty_fluid_cube"
+    },
+    {
+      "count": 64,
+      "items": "ragium:nuclear_waste"
+    },
+    {
+      "count": 64,
+      "items": "ragium:nuclear_waste"
+    }
+  ],
+  "item_outputs": [
+    {
+      "item": "ragium:plutonium_fuel"
+    }
+  ]
+}

src/main/generated/data/ragium/recipe/extractor/crude_oil_from_coal.json

@@ -0,0 +1,18 @@
+{
+  "type": "ragium:machine",
+  "definition": {
+    "type": "ragium:extractor",
+    "tier": "basic"
+  },
+  "fluid_outputs": [
+    {
+      "fluid": "ragium:crude_oil"
+    }
+  ],
+  "item_inputs": [
+    {
+      "count": 3,
+      "items": "minecraft:coal"
+    }
+  ]
+}

src/main/generated/data/ragium/recipe/laser_transformer/diamond.json

@@ -0,0 +1,18 @@
+{
+  "type": "ragium:machine",
+  "definition": {
+    "type": "ragium:laser_transformer",
+    "tier": "basic"
+  },
+  "item_inputs": [
+    {
+      "count": 64,
+      "items": "#minecraft:coals"
+    }
+  ],
+  "item_outputs": [
+    {
+      "item": "minecraft:diamond"
+    }
+  ]
+}

src/main/generated/data/ragium/recipe/laser_transformer/enchanted_golden_apple.json

@@ -0,0 +1,21 @@
+{
+  "type": "ragium:machine",
+  "definition": {
+    "type": "ragium:laser_transformer",
+    "tier": "advanced"
+  },
+  "item_inputs": [
+    {
+      "count": 8,
+      "items": "#c:storage_blocks/gold"
+    },
+    {
+      "items": "minecraft:apple"
+    }
+  ],
+  "item_outputs": [
+    {
+      "item": "minecraft:enchanted_golden_apple"
+    }
+  ]
+}

src/main/generated/data/ragium/recipe/laser_transformer/heart_of_the_sea.json

@@ -0,0 +1,18 @@
+{
+  "type": "ragium:machine",
+  "definition": {
+    "type": "ragium:laser_transformer",
+    "tier": "advanced"
+  },
+  "item_inputs": [
+    {
+      "count": 64,
+      "items": "minecraft:blue_ice"
+    }
+  ],
+  "item_outputs": [
+    {
+      "item": "minecraft:heart_of_the_sea"
+    }
+  ]
+}

src/main/generated/data/ragium/recipe/laser_transformer/prismarine_crystals.json

@@ -0,0 +1,17 @@
+{
+  "type": "ragium:machine",
+  "definition": {
+    "type": "ragium:laser_transformer",
+    "tier": "primitive"
+  },
+  "item_inputs": [
+    {
+      "items": "minecraft:ice"
+    }
+  ],
+  "item_outputs": [
+    {
+      "item": "minecraft:prismarine_crystals"
+    }
+  ]
+}

src/main/generated/data/ragium/recipe/laser_transformer/prismarine_shard.json

@@ -0,0 +1,17 @@
+{
+  "type": "ragium:machine",
+  "definition": {
+    "type": "ragium:laser_transformer",
+    "tier": "primitive"
+  },
+  "item_inputs": [
+    {
+      "items": "minecraft:packed_ice"
+    }
+  ],
+  "item_outputs": [
+    {
+      "item": "minecraft:prismarine_shard"
+    }
+  ]
+}

src/main/generated/data/ragium/recipe/laser_transformer/quartz.json

@@ -0,0 +1,18 @@
+{
+  "type": "ragium:machine",
+  "definition": {
+    "type": "ragium:laser_transformer",
+    "tier": "primitive"
+  },
+  "item_inputs": [
+    {
+      "count": 8,
+      "items": "#c:glass_blocks/colorless"
+    }
+  ],
+  "item_outputs": [
+    {
+      "item": "minecraft:quartz"
+    }
+  ]
+}

src/main/generated/data/ragium/recipe/shaped/gigant_hammer.json

@@ -6,13 +6,13 @@
       "tag": "c:gems/ragium"
     },
     "B": {
-      "tag": "c:rods/wooden"
+      "item": "ragium:shaft"
     }
   },
   "pattern": [
-    " AB",
-    " BA",
-    "B  "
+    "AAA",
+    "AB ",
+    " B "
   ],
   "result": {
     "count": 1,

src/main/kotlin/hiiragi283/ragium/common/init/RagiumFluids.kt

@@ -22,12 +22,14 @@ enum class RagiumFluids(val color: Color, val enName: String, val jaName: String
     // Molten Materials
 
     // Organics
+    SEED_OIL(Color(0x99cc33), "Seed Oil", "種油"),
+    TALLOW(Color(0xcc9933), "Tallow", "獣脂"),
+
     BIOMASS(Color(0x006600), "Biomass", "バイオマス"),
-    CRIMSON_SAP(Color(0x660000), "Crimson Sap", "深紅の樹液"),
     GLYCEROL(Color(0x99cc66), "Glycerol", "グリセロール"),
-    TALLOW(Color(0xcc9933), "Tallow", "獣脂"),
+
     SAP(Color(0x996633), "Sap", "樹液"),
-    SEED_OIL(Color(0x99cc33), "Seed Oil", "種油"),
+    CRIMSON_SAP(Color(0x660000), "Crimson Sap", "深紅の樹液"),
     WARPED_SAP(Color(0x006666), "Warped Sap", "歪んだ樹液"),
 
     // Foods
@@ -97,7 +99,7 @@ enum class RagiumFluids(val color: Color, val enName: String, val jaName: String
     val translationKey: String = Util.createTranslationKey("fluid", id)
 
     val tagKey: TagKey<Fluid> = TagKey.of(RegistryKeys.FLUID, Identifier.of(TagUtil.C_TAG_NAMESPACE, name.lowercase()))
-    
+
     val variant: FluidVariant
         get() = FluidVariant.of(value)
 }

src/main/kotlin/hiiragi283/ragium/common/init/RagiumItems.kt

@@ -478,6 +478,9 @@ object RagiumItems {
     @JvmField
     val URANIUM_FUEL = Item(itemSettings().maxDamage(1024))
 
+    @JvmField
+    val PLUTONIUM_FUEL = Item(itemSettings().maxDamage(2048))
+
     @JvmField
     val YELLOW_CAKE: Item = Item(itemSettings())
 
@@ -530,6 +533,7 @@ object RagiumItems {
         SOLAR_PANEL,
         // nuclear
         URANIUM_FUEL,
+        PLUTONIUM_FUEL,
         YELLOW_CAKE,
         YELLOW_CAKE_PIECE,
         NUCLEAR_WASTE,

src/main/kotlin/hiiragi283/ragium/common/internal/RagiumContentRegister.kt

@@ -372,6 +372,7 @@ internal object RagiumContentRegister {
         registerItem("solar_panel", RagiumItems.SOLAR_PANEL)
 
         registerItem("uranium_fuel", RagiumItems.URANIUM_FUEL)
+        registerItem("plutonium_fuel", RagiumItems.PLUTONIUM_FUEL)
         registerItem("yellow_cake", RagiumItems.YELLOW_CAKE)
         registerItem("yellow_cake_piece", RagiumItems.YELLOW_CAKE_PIECE)
         registerItem("nuclear_waste", RagiumItems.NUCLEAR_WASTE)

src/main/kotlin/hiiragi283/ragium/common/internal/RagiumHardModePlugin.kt

@@ -223,19 +223,17 @@ object RagiumHardModePlugin : RagiumPlugin {
                 .input('B', RagiumItems.ENGINE)
                 .input('C', tier.getCircuit())
                 .offerTo(exporter, tier.createId(RagiumMachineKeys.COMBUSTION_GENERATOR))
-            // solar generator
-            val solar: HTMachineBlock = RagiumMachineKeys.SOLAR_PANEL.entry.getBlock(tier)
-            HTShapedRecipeJsonBuilder
-                .create(solar)
-                .patterns(
-                    "ABA",
-                    "ACA",
-                ).input('A', tier.getSteelMetal(hardMode))
-                .input('B', RagiumItems.SOLAR_PANEL)
-                .input('C', tier.getCircuit())
-                .unlockedBy(tier.getCircuit())
-                .offerTo(exporter, tier.createId(RagiumMachineKeys.SOLAR_PANEL))
         }
+        createProcessor(
+            exporter,
+            RagiumMachineKeys.NUCLEAR_REACTOR,
+            RagiumItems.STELLA_PLATE,
+        )
+        createProcessor(
+            exporter,
+            RagiumMachineKeys.SOLAR_PANEL,
+            RagiumItems.SOLAR_PANEL,
+        )
         createProcessor(
             exporter,
             RagiumMachineKeys.STEAM_GENERATOR,

src/main/kotlin/hiiragi283/ragium/common/item/HTGigantHammerItem.kt

@@ -21,6 +21,7 @@ object HTGigantHammerItem :
     Item(
         itemSettings()
             .component(DataComponentTypes.UNBREAKABLE, UnbreakableComponent(true))
+            .maxCount(1)
             .rarity(Rarity.EPIC)
             .attributeModifiers(
                 createToolAttribute(ToolMaterials.NETHERITE, 15.0, -3.0)