More recipes, textures, lang cleanup

RecursivePineapple · Nov 4, 2024 · 940f001 · 940f001
1 parent 25e9bc2
commit 940f001
Show file tree

Hide file tree

Showing 30 changed files with 425 additions and 96 deletions.
diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/CommonProxy.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/CommonProxy.java
@@ -54,6 +54,8 @@ public void postInit(FMLPostInitializationEvent event) {
         new Mixer().run();
         new CanningMachine().run();
         new AssemblingMachine().run();
+        new Electrolyzer().run();
+        new Distillery().run();
     }
 
     // register server commands in this event handler (Remove if not needed)

diff --git a/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/ItemList.java b/src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/ItemList.java
@@ -9,7 +9,7 @@ public class ItemList {
 
     public static final BasicFuelRodItem THORIUM_1X_ROD = new BasicFuelRodItem(
         "fuelRodThorium",
-        "reactorThoriumSimple",
+        "reactorThoriumSingle",
         2.0,
         4.0,
         1,
@@ -18,7 +18,7 @@ public class ItemList {
 
     public static final BasicFuelRodProductItem DEPLETED_THORIUM_1X_ROD = new BasicFuelRodProductItem(
         "depletedFuelRodThorium",
-        "reactorDepletedFuelRodThorium");
+        "reactorThoriumSingleDepleted");
 
     public static final BasicFuelRodItem THORIUM_2X_ROD = new BasicFuelRodItem(
         "fuelRodThoriumDual",
@@ -31,7 +31,7 @@ public class ItemList {
 
     public static final BasicFuelRodProductItem DEPLETED_THORIUM_2X_ROD = new BasicFuelRodProductItem(
         "depletedFuelRodThoriumDual",
-        "reactorDepletedFuelRodThoriumDual");
+        "reactorThoriumDualDepleted");
 
     public static final BasicFuelRodItem THORIUM_4X_ROD = new BasicFuelRodItem(
         "fuelRodThoriumQuad",
@@ -44,11 +44,11 @@ public class ItemList {
 
     public static final BasicFuelRodProductItem DEPLETED_THORIUM_4X_ROD = new BasicFuelRodProductItem(
         "depletedFuelRodThoriumQuad",
-        "reactorDepletedFuelRodThoriumQuad");
+        "reactorThoriumQuadDepleted");
 
     public static final BasicFuelRodItem URANIUM_1X_ROD = new BasicFuelRodItem(
         "fuelRodUranium",
-        "reactorUraniumSimple",
+        "reactorUraniumSingle",
         2.0,
         4.0,
         1,
@@ -57,7 +57,7 @@ public class ItemList {
 
     public static final BasicFuelRodProductItem DEPLETED_URANIUM_1X_ROD = new BasicFuelRodProductItem(
         "depletedFuelRodUranium",
-        "reactorDepletedFuelRodUranium");
+        "reactorUraniumSingleDepleted");
 
     public static final BasicFuelRodItem URANIUM_2X_ROD = new BasicFuelRodItem(
         "dualFuelRodUranium",
@@ -70,7 +70,7 @@ public class ItemList {
 
     public static final BasicFuelRodProductItem DEPLETED_URANIUM_2X_ROD = new BasicFuelRodProductItem(
         "depletedFuelRodUraniumDual",
-        "reactorDepletedFuelRodUraniumDual");
+        "reactorUraniumDualDepleted");
 
     public static final BasicFuelRodItem URANIUM_4X_ROD = new BasicFuelRodItem(
         "quadFuelRodUranium",
@@ -83,16 +83,20 @@ public class ItemList {
 
     public static final BasicFuelRodProductItem DEPLETED_URANIUM_4X_ROD = new BasicFuelRodProductItem(
         "depletedFuelRodUraniumQuad",
-        "reactorDepletedFuelRodUraniumQuad");
+        "reactorUraniumQuadDepleted");
 
     public static final BasicFuelRodItem MOX_1X_ROD = new BasicFuelRodItem(
         "fuelRodMOX",
-        "reactorMOXSimple",
+        "reactorMOXSingle",
         2.0,
         4.0,
         1,
         true,
         10_000);
+
+    public static final BasicFuelRodProductItem DEPLETED_MOX_ROD = new BasicFuelRodProductItem(
+        "depletedFuelRodMOX",
+        "reactorMOXSingleDepleted");
     public static final BasicFuelRodItem MOX_2X_ROD = new BasicFuelRodItem(
         "dualFuelRodMOX",
         "reactorMOXDual",
@@ -101,6 +105,10 @@ public class ItemList {
         2,
         true,
         10_000);
+
+    public static final BasicFuelRodProductItem DEPLETED_MOX_2X_ROD = new BasicFuelRodProductItem(
+        "depletedFuelRodMOXDual",
+        "reactorMOXDualDepleted");
     public static final BasicFuelRodItem MOX_4X_ROD = new BasicFuelRodItem(
         "quadFuelRodMOX",
         "reactorMOXQuad",
@@ -110,6 +118,10 @@ public class ItemList {
         true,
         10_000);
 
+    public static final BasicFuelRodProductItem DEPLETED_MOX_4X_ROD = new BasicFuelRodProductItem(
+        "depletedFuelRodMOXQuad",
+        "reactorMOXQuadDepleted");
+
     public static final BasicHeatVentItem BASIC_HEAT_VENT = new BasicHeatVentItem(
         "heatVent",
         "reactorVent",
@@ -286,8 +298,16 @@ public static void registerItems() {
         URANIUM_4X_ROD.setProduct(new ItemStack(ItemList.DEPLETED_URANIUM_4X_ROD, 1));
 
         MOX_1X_ROD.register();
+        DEPLETED_MOX_ROD.register();
+        MOX_1X_ROD.setProduct(new ItemStack(ItemList.DEPLETED_MOX_ROD, 1));
+
         MOX_2X_ROD.register();
+        DEPLETED_MOX_2X_ROD.register();
+        MOX_2X_ROD.setProduct(new ItemStack(ItemList.DEPLETED_MOX_2X_ROD, 1));
+
         MOX_4X_ROD.register();
+        DEPLETED_MOX_4X_ROD.register();
+        MOX_4X_ROD.setProduct(new ItemStack(ItemList.DEPLETED_MOX_4X_ROD, 1));
 
         BASIC_HEAT_VENT.register();
         ADVANCED_HEAT_VENT.register();