Skip to content

Commit

Permalink
thorium and uranium fuel reprocessing lines
Browse files Browse the repository at this point in the history
  • Loading branch information
@funions123
funions123 committed Oct 17, 2024
1 parent 7d52e35 commit 4620b63
Show file tree
Hide file tree
Showing 9 changed files with 586 additions and 25 deletions.
11 changes: 9 additions & 2 deletions src/main/java/com/recursive_pineapple/nuclear_horizons/CommonProxy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@
import com.recursive_pineapple.nuclear_horizons.reactors.items.ItemList;
import com.recursive_pineapple.nuclear_horizons.reactors.tile.simulator.SimulationItems;

import com.recursive_pineapple.nuclear_horizons.recipes.Centrifuge;
import com.recursive_pineapple.nuclear_horizons.recipes.ChemicalReactor;
import com.recursive_pineapple.nuclear_horizons.recipes.*;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.registry.GameData;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import mcp.mobius.waila.api.IWailaRegistrar;

public class CommonProxy {

Expand Down Expand Up @@ -43,9 +45,14 @@ public void postInit(FMLPostInitializationEvent event) {
SimulationItems.registerSimulationItems();
ForeignItems.registerForeignReactorItems();

//change the owner of werkstoff materials to this mod in waila

//register recipes
new ChemicalReactor().run();
new Centrifuge().run();
new ThermalCentrifuge().run();
new Mixer().run();
new CanningMachine().run();
}

// register server commands in this event handler (Remove if not needed)
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/recursive_pineapple/nuclear_horizons/NuclearHorizons.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package com.recursive_pineapple.nuclear_horizons;

import bartworks.API.WerkstoffAPI;
import bartworks.API.WerkstoffAdderRegistry;
import com.recursive_pineapple.nuclear_horizons.reactors.items.material.MaterialsNuclear;
import gregtech.api.util.GTWaila;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand Down
65 changes: 65 additions & 0 deletions src/main/java/com/recursive_pineapple/nuclear_horizons/reactors/items/ItemList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,45 @@

public class ItemList {

public static final BasicFuelRodItem THORIUM_1X_ROD = new BasicFuelRodItem(
"fuelRodThorium",
"reactorThoriumSimple",
2.0,
4.0,
1,
false,
20_000);

public static final BasicFuelRodProductItem DEPLETED_THORIUM_1X_ROD = new BasicFuelRodProductItem(
"depletedFuelRodThorium",
"reactorDepletedFuelRodThorium");

public static final BasicFuelRodItem THORIUM_2X_ROD = new BasicFuelRodItem(
"fuelRodThoriumDual",
"reactorThoriumDual",
2.0,
4.0,
1,
false,
20_000);

public static final BasicFuelRodProductItem DEPLETED_THORIUM_2X_ROD = new BasicFuelRodProductItem(
"depletedFuelRodThoriumDual",
"reactorDepletedFuelRodThoriumDual");

public static final BasicFuelRodItem THORIUM_4X_ROD = new BasicFuelRodItem(
"fuelRodThoriumQuad",
"reactorThoriumQuad",
2.0,
4.0,
1,
false,
20_000);

public static final BasicFuelRodProductItem DEPLETED_THORIUM_4X_ROD = new BasicFuelRodProductItem(
"depletedFuelRodThoriumQuad",
"reactorDepletedFuelRodThoriumQuad");

public static final BasicFuelRodItem URANIUM_1X_ROD = new BasicFuelRodItem(
"fuelRodUranium",
"reactorUraniumSimple",
Expand All @@ -27,6 +66,11 @@ public class ItemList {
2,
false,
20_000);

public static final BasicFuelRodProductItem DEPLETED_URANIUM_2X_ROD = new BasicFuelRodProductItem(
"depletedFuelRodUraniumDual",
"reactorDepletedFuelRodUraniumDual");

public static final BasicFuelRodItem URANIUM_4X_ROD = new BasicFuelRodItem(
"quadFuelRodUranium",
"reactorUraniumQuad",
Expand All @@ -36,6 +80,10 @@ public class ItemList {
false,
20_000);

public static final BasicFuelRodProductItem DEPLETED_URANIUM_4X_ROD = new BasicFuelRodProductItem(
"depletedFuelRodUraniumQuad",
"reactorDepletedFuelRodUraniumQuad");

public static final BasicFuelRodItem MOX_1X_ROD = new BasicFuelRodItem(
"fuelRodMOX",
"reactorMOXSimple",
Expand Down Expand Up @@ -212,12 +260,29 @@ public class ItemList {
public static final MetaCellItem CELLS = new MetaCellItem();

public static void registerItems() {
THORIUM_1X_ROD.register();
DEPLETED_THORIUM_1X_ROD.register();
THORIUM_1X_ROD.setProduct(GameRegistry.findItemStack(NuclearHorizons.MODID, "depletedFuelRodThorium", 1));

THORIUM_2X_ROD.register();
DEPLETED_THORIUM_2X_ROD.register();
THORIUM_2X_ROD.setProduct(GameRegistry.findItemStack(NuclearHorizons.MODID, "depletedFuelRodThoriumDual", 1));

THORIUM_4X_ROD.register();
DEPLETED_THORIUM_4X_ROD.register();
THORIUM_4X_ROD.setProduct(GameRegistry.findItemStack(NuclearHorizons.MODID, "depletedFuelRodThoriumQuad", 1));

URANIUM_1X_ROD.register();
DEPLETED_URANIUM_1X_ROD.register();
URANIUM_1X_ROD.setProduct(GameRegistry.findItemStack(NuclearHorizons.MODID, "depletedFuelRodUranium", 1));

URANIUM_2X_ROD.register();
DEPLETED_URANIUM_2X_ROD.register();
URANIUM_2X_ROD.setProduct(GameRegistry.findItemStack(NuclearHorizons.MODID, "depletedFuelRodUraniumDual", 1));

URANIUM_4X_ROD.register();
DEPLETED_URANIUM_4X_ROD.register();
URANIUM_4X_ROD.setProduct(GameRegistry.findItemStack(NuclearHorizons.MODID, "depletedFuelRodUraniumQuad", 1));

MOX_1X_ROD.register();
MOX_2X_ROD.register();
Expand Down
201 changes: 182 additions & 19 deletions ...va/com/recursive_pineapple/nuclear_horizons/reactors/items/material/MaterialsNuclear.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ public class MaterialsNuclear implements Runnable {
new Werkstoff.GenerationFeatures().disable()
.onlyDust(),
offsetID + 1,
TextureSet.SET_DULL,

new Pair<>(NATURAL_URANIUM, 1),
new Pair<>(Materials.Fluorine, 4));
TextureSet.SET_DULL);

public static final Werkstoff NATURAL_URANIUM_HEXAFLUORIDE = new Werkstoff(
new short[] { 232, 124, 219 },
Expand All @@ -46,9 +43,7 @@ public class MaterialsNuclear implements Runnable {
new Werkstoff.GenerationFeatures().disable()
.addCells(),
offsetID + 2,
TextureSet.SET_FLUID,
new Pair<>(NATURAL_URANIUM_TETRAFLUORIDE, 1),
new Pair<>(Materials.Fluorine, 2));
TextureSet.SET_FLUID);

public static final Werkstoff DEPLETED_URANIUM_HEXAFLUORIDE = new Werkstoff(
new short[] { 232, 124, 219 },
Expand All @@ -59,9 +54,7 @@ public class MaterialsNuclear implements Runnable {
new Werkstoff.GenerationFeatures().disable()
.addCells(),
offsetID + 3,
TextureSet.SET_FLUID,
new Pair<>(NATURAL_URANIUM_TETRAFLUORIDE, 1),
new Pair<>(Materials.Fluorine, 2));
TextureSet.SET_FLUID);

public static final Werkstoff ENRICHED_URANIUM_HEXAFLUORIDE = new Werkstoff(
new short[] { 232, 124, 219 },
Expand All @@ -72,9 +65,7 @@ public class MaterialsNuclear implements Runnable {
new Werkstoff.GenerationFeatures().disable()
.addCells(),
offsetID + 4,
TextureSet.SET_FLUID,
new Pair<>(NATURAL_URANIUM_TETRAFLUORIDE, 1),
new Pair<>(Materials.Fluorine, 2));
TextureSet.SET_FLUID);

public static final Werkstoff URANIUM_238_DIOXIDE = new Werkstoff(
new short[] { 132, 224, 219 },
Expand All @@ -85,9 +76,7 @@ public class MaterialsNuclear implements Runnable {
new Werkstoff.GenerationFeatures().disable()
.onlyDust(),
offsetID + 5,
TextureSet.SET_DULL,
new Pair<>(Materials.Uranium, 1),
new Pair<>(Materials.Oxygen, 2));
TextureSet.SET_DULL);

public static final Werkstoff URANIUM_235_DIOXIDE = new Werkstoff(
new short[] { 132, 224, 219 },
Expand All @@ -98,9 +87,7 @@ public class MaterialsNuclear implements Runnable {
new Werkstoff.GenerationFeatures().disable()
.onlyDust(),
offsetID + 6,
TextureSet.SET_DULL,
new Pair<>(Materials.Uranium235, 1),
new Pair<>(Materials.Oxygen, 2));
TextureSet.SET_DULL);

public static final Werkstoff TRIBUTYL_PHOSPHATE = new Werkstoff(
new short[] { 132, 224, 219 },
Expand Down Expand Up @@ -135,6 +122,182 @@ public class MaterialsNuclear implements Runnable {
offsetID + 9,
TextureSet.SET_DULL);

public static final Werkstoff ENRICHED_URANIUM_FUEL = new Werkstoff(
new short[] { 92, 214, 92 },
"Enriched Uranium Fuel",
subscriptNumbers("235UO2(238UO2)4"),
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable()
.onlyDust(),
offsetID + 10,
TextureSet.SET_METALLIC);

public static final Werkstoff ENRICHED_THORIUM_FUEL = new Werkstoff(
new short[] { 0, 77, 0 },
"Enriched Thorium Fuel",
subscriptNumbers("235UO2(ThO2)4"),
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable()
.onlyDust(),
offsetID + 11,
TextureSet.SET_METALLIC);

public static final Werkstoff DEPLETED_URANIUM_FUEL = new Werkstoff(
new short[] { 41, 163, 41 },
"Depleted Uranium Fuel",
subscriptNumbers("??(238UO2)"),
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable()
.onlyDust(),
offsetID + 12,
TextureSet.SET_METALLIC);

public static final Werkstoff DEPLETED_THORIUM_FUEL = new Werkstoff(
new short[] { 41, 163, 41 },
"Depleted Thorium Fuel",
subscriptNumbers("??(ThO2)"),
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable()
.onlyDust(),
offsetID + 13,
TextureSet.SET_METALLIC);

public static final Werkstoff URANIUM_233_DIOXIDE = new Werkstoff(
new short[] { 132, 224, 219 },
"Uranium-233 Dioxide",
subscriptNumbers("233UO2"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable()
.onlyDust(),
offsetID + 14,
TextureSet.SET_DULL);

public static final Werkstoff DEPLETED_URANIUM_FUEL_SOLUTION = new Werkstoff(
new short[] { 132, 224, 219 },
"Depleted Uranium Fuel Solution",
subscriptNumbers("??(238UO2)(HNO3)"),
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable()
.addCells(),
offsetID + 15,
TextureSet.SET_FLUID);

public static final Werkstoff DEPLETED_THORIUM_FUEL_SOLUTION = new Werkstoff(
new short[] { 132, 224, 219 },
"Depleted Thorium Fuel Solution",
subscriptNumbers("??(ThO2)(HNO3)(HF)"),
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable()
.addCells(),
offsetID + 16,
TextureSet.SET_FLUID);

public static final Werkstoff TREATED_DEPLETED_URANIUM_FUEL_SOLUTION = new Werkstoff(
new short[] { 132, 224, 219 },
"Treated Depleted Uranium Fuel Solution",
subscriptNumbers("??(238UO2)(HNO3)(PO(OC4H9)3)"),
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable()
.addCells(),
offsetID + 17,
TextureSet.SET_FLUID);

public static final Werkstoff TREATED_DEPLETED_THORIUM_FUEL_SOLUTION = new Werkstoff(
new short[] { 132, 224, 219 },
"Treated Depleted Thorium Fuel Solution",
subscriptNumbers("??(ThO2)(HNO3)(HF)(PO(OC4H9)3)"),
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable()
.addCells(),
offsetID + 18,
TextureSet.SET_FLUID);

public static final Werkstoff AQUEOUS_PLUTONIUM_SOLUTION = new Werkstoff(
new short[] { 132, 224, 219 },
"Aqueous Plutonium Solution",
subscriptNumbers("??Pu(NO3)2"),
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable()
.addCells(),
offsetID + 19,
TextureSet.SET_FLUID);

public static final Werkstoff KEROSENE_URANIUM_SOLUTION = new Werkstoff(
new short[] { 132, 224, 219 },
"Kerosene Uranium Solution",
subscriptNumbers("238U(NO3)2"),
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable()
.addCells(),
offsetID + 20,
TextureSet.SET_FLUID);

public static final Werkstoff AQUEOUS_THORIUM_SOLUTION = new Werkstoff(
new short[] { 132, 224, 219 },
"Aqueous Thorium Solution",
subscriptNumbers("??Th(NO3)2(HF)"),
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable()
.addCells(),
offsetID + 21,
TextureSet.SET_FLUID);

public static final Werkstoff KEROSENE_URANIUM233_SOLUTION = new Werkstoff(
new short[] { 132, 224, 219 },
"Kerosene Uranium-233 Solution",
subscriptNumbers("233U(NO3)2"),
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable()
.addCells(),
offsetID + 22,
TextureSet.SET_FLUID);

public static final Werkstoff TRANSPLUTONIC_WASTE_MIXTURE = new Werkstoff(
new short[] { 132, 224, 219 },
"Transplutonic Waste Mixture",
subscriptNumbers("?Am?"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable()
.onlyDust(),
offsetID + 23,
TextureSet.SET_DULL);

public static final Werkstoff PLUTONIUM_239_DIOXIDE = new Werkstoff(
new short[] { 132, 224, 219 },
"Plutonium-239 Dioxide",
subscriptNumbers("239PuO2"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable()
.onlyDust(),
offsetID + 24,
TextureSet.SET_DULL);

public static final Werkstoff PLUTONIUM_241_DIOXIDE = new Werkstoff(
new short[] { 132, 224, 219 },
"Plutonium-241 Dioxide",
subscriptNumbers("241PuO2"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures().disable()
.onlyDust(),
offsetID + 25,
TextureSet.SET_DULL);

private static final MaterialsNuclear INSTANCE = new MaterialsNuclear();

public static MaterialsNuclear getInstance() {
Expand Down
Loading

0 comments on commit 4620b63

Please sign in to comment.