Skip to content

Commit

Permalink
cleanup fluid and itemstack creation, additional recipes
Browse files Browse the repository at this point in the history 
recipe stubs for basic components and blocks, going to add the regular GTNH recipes to these
  • Loading branch information
@funions123
funions123 committed Oct 18, 2024
1 parent 4620b63 commit 7e98b9f
Show file tree
Hide file tree
Showing 7 changed files with 203 additions and 19 deletions.
1 change: 1 addition & 0 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 @@ -53,6 +53,7 @@ public void postInit(FMLPostInitializationEvent event) {
new ThermalCentrifuge().run();
new Mixer().run();
new CanningMachine().run();
new AssemblingMachine().run();
}

// register server commands in this event handler (Remove if not needed)
Expand Down
13 changes: 7 additions & 6 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 @@ -3,6 +3,7 @@
import com.recursive_pineapple.nuclear_horizons.NuclearHorizons;
import com.recursive_pineapple.nuclear_horizons.reactors.items.basic.*;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.item.ItemStack;

public class ItemList {

Expand Down Expand Up @@ -262,27 +263,27 @@ public class ItemList {
public static void registerItems() {
THORIUM_1X_ROD.register();
DEPLETED_THORIUM_1X_ROD.register();
THORIUM_1X_ROD.setProduct(GameRegistry.findItemStack(NuclearHorizons.MODID, "depletedFuelRodThorium", 1));
THORIUM_1X_ROD.setProduct(new ItemStack(ItemList.DEPLETED_THORIUM_1X_ROD, 1));

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

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

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

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

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

MOX_1X_ROD.register();
MOX_2X_ROD.register();
Expand Down
157 changes: 157 additions & 0 deletions src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/AssemblingMachine.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
package com.recursive_pineapple.nuclear_horizons.recipes;

import com.recursive_pineapple.nuclear_horizons.NuclearHorizons;
import com.recursive_pineapple.nuclear_horizons.reactors.blocks.BlockList;
import com.recursive_pineapple.nuclear_horizons.reactors.items.ItemList;
import com.recursive_pineapple.nuclear_horizons.reactors.items.material.MaterialsNuclear;
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;

import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;

public class AssemblingMachine {
public void run() {

//basic components
GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(ItemList.BASIC_HEAT_EXCHANGER, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(ItemList.ADVANCED_HEAT_EXCHANGER, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(ItemList.REACTOR_HEAT_EXCHANGER, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(ItemList.COMPONENT_HEAT_EXCHANGER, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(ItemList.BASIC_HEAT_VENT, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(ItemList.COMPONENT_HEAT_VENT, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(ItemList.ADVANCED_HEAT_VENT, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(ItemList.REACTOR_HEAT_VENT, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(ItemList.OVERCLOCKED_HEAT_VENT, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(BlockList.REACTOR_CORE, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(BlockList.REACTOR_CHAMBER, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(BlockList.PRESSURE_VESSEL, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(BlockList.REACTOR_FLUID_PORT, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(BlockList.REACTOR_ACCESS_HATCH, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(BlockList.REACTOR_REDSTONE_PORT, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(BlockList.REACTOR_THERMAL_SENSOR, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs()
.fluidInputs()
.itemOutputs(new ItemStack(BlockList.REACTOR_SIMULATOR, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);
}
}
12 changes: 8 additions & 4 deletions src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/CanningMachine.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
package com.recursive_pineapple.nuclear_horizons.recipes;

import com.recursive_pineapple.nuclear_horizons.NuclearHorizons;
import com.recursive_pineapple.nuclear_horizons.reactors.items.ItemList;
import com.recursive_pineapple.nuclear_horizons.reactors.items.material.MaterialsNuclear;
import cpw.mods.fml.common.registry.GameRegistry;
import goodgenerator.loader.Loaders;
import goodgenerator.main.GoodGenerator;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import net.minecraft.item.ItemStack;

import static gregtech.api.recipe.RecipeMaps.cannerRecipes;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
Expand All @@ -14,20 +18,20 @@ public class CanningMachine {
public void run() {
GTValues.RA.stdBuilder()
.itemInputs(
GameRegistry.findItemStack("GoodGenerator", "advancedFuelRod", 1),
new ItemStack(Loaders.advancedFuelRod, 1),
MaterialsNuclear.ENRICHED_URANIUM_FUEL.get(OrePrefixes.dust, 4))
.itemOutputs(
GameRegistry.findItemStack(NuclearHorizons.MODID, "fuelRodUranium", 1))
new ItemStack(ItemList.URANIUM_1X_ROD, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_MV)
.addTo(cannerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GameRegistry.findItemStack("GoodGenerator", "advancedFuelRod", 1),
new ItemStack(Loaders.advancedFuelRod, 1),
MaterialsNuclear.ENRICHED_THORIUM_FUEL.get(OrePrefixes.dust, 4))
.itemOutputs(
GameRegistry.findItemStack(NuclearHorizons.MODID, "fuelRodThorium", 1))
new ItemStack(ItemList.THORIUM_1X_ROD, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_MV)
.addTo(cannerRecipes);
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/ChemicalReactor.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package com.recursive_pineapple.nuclear_horizons.recipes;

import bartworks.system.material.WerkstoffLoader;
import com.recursive_pineapple.nuclear_horizons.reactors.items.material.MaterialsNuclear;
import gregtech.api.enums.*;
import gregtech.api.util.GTOreDictUnificator;

import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.block.material.Material;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;

import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
Expand Down Expand Up @@ -199,7 +201,7 @@ public void run() {

GTValues.RA.stdBuilder()
.fluidInputs(MaterialsNuclear.AQUEOUS_THORIUM_SOLUTION.getFluidOrGas(22000))
.itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustThorianite", 7))
.itemOutputs(WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 7))
.fluidOutputs(
MaterialsNuclear.TRIBUTYL_PHOSPHATE.getFluidOrGas(9000),
Materials.Fluorine.getGas(1000),
Expand All @@ -212,7 +214,7 @@ public void run() {
.fluidInputs(MaterialsNuclear.KEROSENE_URANIUM233_SOLUTION.getFluidOrGas(9000))
.itemOutputs(MaterialsNuclear.URANIUM_233_DIOXIDE.get(OrePrefixes.dust, 3))
.fluidOutputs(
FluidRegistry.getFluidStack("fluid.kerosene", 9000),
new FluidStack(FluidRegistry.getFluid("fluid.kerosene"), 3000), //gt++ moment
Materials.NitrogenDioxide.getGas(3000))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_HV)
Expand All @@ -224,7 +226,7 @@ public void run() {
MaterialsNuclear.URANIUM_235_DIOXIDE.get(OrePrefixes.dust, 1),
MaterialsNuclear.URANIUM_238_DIOXIDE.get(OrePrefixes.dust, 6))
.fluidOutputs(
FluidRegistry.getFluidStack("fluid.kerosene", 8000),
new FluidStack(FluidRegistry.getFluid("fluid.kerosene"), 8000), //gt++ moment
MaterialsNuclear.TRIBUTYL_PHOSPHATE.getFluidOrGas(6000),
Materials.NitrogenDioxide.getGas(7000))
.duration(20 * SECONDS)
Expand Down
20 changes: 18 additions & 2 deletions src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/Mixer.java
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,35 @@
package com.recursive_pineapple.nuclear_horizons.recipes;

import bartworks.system.material.Werkstoff;
import bartworks.system.material.WerkstoffLoader;
import com.recursive_pineapple.nuclear_horizons.NuclearHorizons;
import com.recursive_pineapple.nuclear_horizons.reactors.fluids.FluidList;
import com.recursive_pineapple.nuclear_horizons.reactors.items.material.MaterialsNuclear;
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;

import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;

public class Mixer {
public void run() {
GTValues.RA.stdBuilder()
.fluidInputs(
new FluidStack(FluidList.DISTILLED_WATER, 1000))
.itemInputs(
Materials.Lapis.getDust(1))
.fluidOutputs(
new FluidStack(FluidList.COOLANT, 1000))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(mixerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
MaterialsNuclear.URANIUM_235_DIOXIDE.get(OrePrefixes.dust, 1),
Expand All @@ -37,7 +53,7 @@ public void run() {
GTValues.RA.stdBuilder()
.itemInputs(
MaterialsNuclear.URANIUM_235_DIOXIDE.get(OrePrefixes.dust, 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustThorianite", 4))
WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 4))
.itemOutputs(
MaterialsNuclear.ENRICHED_THORIUM_FUEL.get(OrePrefixes.dust, 5))
.duration(20 * SECONDS)
Expand All @@ -47,7 +63,7 @@ public void run() {
GTValues.RA.stdBuilder()
.itemInputs(
MaterialsNuclear.URANIUM_233_DIOXIDE.get(OrePrefixes.dust, 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustThorianite", 4))
WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 4))
.itemOutputs(
MaterialsNuclear.ENRICHED_THORIUM_FUEL.get(OrePrefixes.dust, 5))
.duration(20 * SECONDS)
Expand Down
11 changes: 7 additions & 4 deletions src/main/java/com/recursive_pineapple/nuclear_horizons/recipes/ThermalCentrifuge.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
package com.recursive_pineapple.nuclear_horizons.recipes;

import com.recursive_pineapple.nuclear_horizons.NuclearHorizons;
import com.recursive_pineapple.nuclear_horizons.reactors.items.ItemList;
import com.recursive_pineapple.nuclear_horizons.reactors.items.material.MaterialsNuclear;
import cpw.mods.fml.common.registry.GameRegistry;
import goodgenerator.loader.Loaders;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GTOreDictUnificator;

import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.item.ItemStack;

import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
Expand All @@ -20,20 +23,20 @@ public class ThermalCentrifuge {
public void run() {
GTValues.RA.stdBuilder()
.itemInputs(
GameRegistry.findItemStack(NuclearHorizons.MODID, "depletedFuelRodUranium", 1))
new ItemStack(ItemList.DEPLETED_URANIUM_1X_ROD, 1))
.itemOutputs(
MaterialsNuclear.DEPLETED_URANIUM_FUEL.get(OrePrefixes.dust, 4),
GameRegistry.findItemStack("GoodGenerator", "advancedFuelRod", 1))
new ItemStack(Loaders.advancedFuelRod, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_MV)
.addTo(thermalCentrifugeRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GameRegistry.findItemStack(NuclearHorizons.MODID, "depletedFuelRodThorium", 1))
new ItemStack(ItemList.DEPLETED_THORIUM_1X_ROD, 1))
.itemOutputs(
MaterialsNuclear.DEPLETED_THORIUM_FUEL.get(OrePrefixes.dust, 4),
GameRegistry.findItemStack("GoodGenerator", "advancedFuelRod", 1))
new ItemStack(Loaders.advancedFuelRod, 1))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_MV)
.addTo(thermalCentrifugeRecipes);
Expand Down

0 comments on commit 7e98b9f

Please sign in to comment.