Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Coremod updates for Refactoring GT++ 2025-02-17 #1204

Merged
merged 2 commits into from
Feb 20, 2025
Merged

Coremod updates for Refactoring GT++ 2025-02-17 #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28e15ed
Coremod updates for Refactoring GT++ 2025-02-17
serenibyss Feb 17, 2025
84d5aef
Merge branch 'master' into gtpp-refactor-updates-20250217
Dream-Master Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
import static gtPlusPlus.api.recipe.GTPPRecipeMaps.vacuumFurnaceRecipes;
import static gtPlusPlus.core.item.chemistry.MilledOreProcessing.ChalcopyriteFlotationFroth;
import static gtPlusPlus.core.item.chemistry.MilledOreProcessing.SphaleriteFlotationFroth;

import net.minecraftforge.fluids.FluidStack;

import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
import gregtech.common.items.CombType;
import gregtech.loaders.misc.GTBees;
import gtPlusPlus.core.item.chemistry.AgriculturalChem;
import gtPlusPlus.core.fluids.GTPPFluids;
import gtPlusPlus.core.material.MaterialsElements;
import gtPlusPlus.core.util.minecraft.FluidUtils;

public class VacuumFurnaceRecipes implements Runnable {

Expand All @@ -42,8 +42,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 64L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 64L),
MaterialsElements.getInstance().GERMANIUM.getDust(15))
.fluidInputs(FluidUtils.getFluidStack(SphaleriteFlotationFroth, 4000))
.fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
.fluidInputs(new FluidStack(GTPPFluids.SphaleriteFlotationFroth, 4000))
.fluidOutputs(new FluidStack(GTPPFluids.RedMud, 2000), GTModHandler.getWater(2000))
.eut((int) TierEU.RECIPE_LuV).metadata(COIL_HEAT, 5500).duration(2 * MINUTES)
.addTo(vacuumFurnaceRecipes);

Expand All @@ -57,8 +57,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 56L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 50L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 30L))
.fluidInputs(FluidUtils.getFluidStack(ChalcopyriteFlotationFroth, 4000))
.fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
.fluidInputs(new FluidStack(GTPPFluids.ChalcopyriteFlotationFroth, 4000))
.fluidOutputs(new FluidStack(GTPPFluids.RedMud, 2000), GTModHandler.getWater(2000))
.eut((int) TierEU.RECIPE_IV).metadata(COIL_HEAT, 4500).duration(2 * MINUTES)
.addTo(vacuumFurnaceRecipes);
}
Expand Down
56 changes: 23 additions & 33 deletions src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import java.util.Arrays;
import java.util.List;

import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;

import com.dreammaster.gthandler.CustomItemList;
Expand All @@ -34,10 +33,7 @@
import gregtech.api.enums.TierEU;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
import gtPlusPlus.core.item.chemistry.GenericChem;
import gtPlusPlus.core.material.MaterialsAlloy;
import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;

public class ScriptGregtechPlusPlus implements IScriptLoader {
Expand Down Expand Up @@ -117,9 +113,8 @@ public void loadRecipes() {
.itemOutputs(GTOreDictUnificator.get("dustShirabon", 64), ItemList.Timepiece.get(1))
.fluidInputs(MaterialsUEVplus.PrimordialMatter.getFluid(1152))
.fluidOutputs(MaterialsUEVplus.Eternity.getMolten(9216), MaterialsUEVplus.Time.getMolten(18432))
.metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.TemporalHarmonyCatalyst))
.metadata(QFT_FOCUS_TIER, 4).duration(20 * SECONDS).eut(TierEU.RECIPE_UMV)
.addTo(quantumForceTransformerRecipes);
.metadata(QFT_CATALYST, GregtechItemList.TemporalHarmonyCatalyst.get(0)).metadata(QFT_FOCUS_TIER, 4)
.duration(20 * SECONDS).eut(TierEU.RECIPE_UMV).addTo(quantumForceTransformerRecipes);
addForestryRecipes();
}

Expand All @@ -133,9 +128,8 @@ private void addForestryRecipes() {
GTOreDictUnificator.get(OrePrefixes.stick, Materials.WoodSealed, 4),
GTModHandler.getModItem(Minecraft.ID, "paper", 1, 0, missing),
GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing))
.fluidInputs(Materials.Redstone.getMolten(576))
.itemOutputs(new ItemStack(FRItemRegistry.hiveFrameArborist)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);
.fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(GregtechItemList.HiveFrameArborist.get(1))
.duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);

// Stabilization Frame
GTValues.RA.stdBuilder()
Expand All @@ -144,9 +138,8 @@ private void addForestryRecipes() {
GTOreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 4),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1),
GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing))
.fluidInputs(Materials.Redstone.getMolten(576))
.itemOutputs(new ItemStack(FRItemRegistry.hiveFrameStalilize)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);
.fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(GregtechItemList.HiveFrameStabilize.get(1))
.duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);

// Slowing Frame
GTValues.RA.stdBuilder()
Expand All @@ -155,9 +148,8 @@ private void addForestryRecipes() {
MaterialsAlloy.TUMBAGA.getRod(4),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1),
GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing))
.fluidInputs(Materials.Redstone.getMolten(576))
.itemOutputs(new ItemStack(FRItemRegistry.hiveFrameSlow, 1, 0)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);
.fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(GregtechItemList.HiveFrameSlow.get(1))
.duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);

// Decaying Frame
GTValues.RA.stdBuilder()
Expand All @@ -166,9 +158,8 @@ private void addForestryRecipes() {
GTOreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 4),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.WroughtIron, 1),
GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing))
.fluidInputs(Materials.Redstone.getMolten(576))
.itemOutputs(new ItemStack(FRItemRegistry.hiveFrameDecay)).duration(30 * SECONDS).eut(TierEU.RECIPE_HV)
.addTo(assemblerRecipes);
.fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(GregtechItemList.HiveFrameDecay.get(1))
.duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);

// Working Frame
GTValues.RA.stdBuilder()
Expand All @@ -177,7 +168,7 @@ private void addForestryRecipes() {
GTOreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4),
GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1),
GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing))
.fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(new ItemStack(FRItemRegistry.hiveFrameBusy))
.fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(GregtechItemList.HiveFrameBusy.get(1))
.duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);

// Mutagenic Frame
Expand All @@ -187,9 +178,8 @@ private void addForestryRecipes() {
GTOreDictUnificator.get(OrePrefixes.stick, Materials.Plutonium241, 4),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Plutonium241, 1),
GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing))
.fluidInputs(Materials.Redstone.getMolten(576))
.itemOutputs(new ItemStack(FRItemRegistry.hiveFrameMutagenic)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);
.fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(GregtechItemList.HiveFrameMutagenic.get(1))
.duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);

// Accelerated Frame
GTValues.RA.stdBuilder()
Expand All @@ -199,15 +189,15 @@ private void addForestryRecipes() {
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1),
GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing))
.fluidInputs(Materials.Redstone.getMolten(576))
.itemOutputs(new ItemStack(FRItemRegistry.hiveFrameAccelerated)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);
.itemOutputs(GregtechItemList.HiveFrameAccelerated.get(1)).duration(30 * SECONDS).eut(TierEU.RECIPE_HV)
.addTo(assemblerRecipes);

addShapelessRecipe(CustomItemList.CoinBeesI.get(16L), new ItemStack(FRItemRegistry.hiveFrameVoid));
addShapelessRecipe(CustomItemList.CoinBeesI.get(16L), GregtechItemList.HiveFrameVoid.get(1));
RecipeManagers.carpenterManager.addRecipe(
60,
FluidRegistry.getFluidStack("molten.redstone", 576),
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
new ItemStack(FRItemRegistry.hiveFrameAccelerated, 1, 0),
GregtechItemList.HiveFrameAccelerated.get(1),
"abc",
"def",
"ghi",
Expand All @@ -233,7 +223,7 @@ private void addForestryRecipes() {
60,
FluidRegistry.getFluidStack("molten.redstone", 576),
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
new ItemStack(FRItemRegistry.hiveFrameMutagenic, 1, 0),
GregtechItemList.HiveFrameMutagenic.get(1),
"abc",
"def",
"ghi",
Expand All @@ -259,7 +249,7 @@ private void addForestryRecipes() {
60,
FluidRegistry.getFluidStack("molten.redstone", 576),
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
new ItemStack(FRItemRegistry.hiveFrameBusy),
GregtechItemList.HiveFrameBusy.get(1),
"abc",
"def",
"ghi",
Expand All @@ -285,7 +275,7 @@ private void addForestryRecipes() {
60,
FluidRegistry.getFluidStack("molten.redstone", 576),
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
new ItemStack(FRItemRegistry.hiveFrameDecay),
GregtechItemList.HiveFrameDecay.get(1),
"abc",
"def",
"ghi",
Expand All @@ -311,7 +301,7 @@ private void addForestryRecipes() {
60,
FluidRegistry.getFluidStack("molten.redstone", 576),
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
new ItemStack(FRItemRegistry.hiveFrameSlow),
GregtechItemList.HiveFrameSlow.get(1),
"abc",
"def",
"ghi",
Expand All @@ -337,7 +327,7 @@ private void addForestryRecipes() {
60,
FluidRegistry.getFluidStack("molten.redstone", 576),
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
new ItemStack(FRItemRegistry.hiveFrameStalilize),
GregtechItemList.HiveFrameStabilize.get(1),
"abc",
"def",
"ghi",
Expand All @@ -363,7 +353,7 @@ private void addForestryRecipes() {
60,
FluidRegistry.getFluidStack("molten.redstone", 576),
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
new ItemStack(FRItemRegistry.hiveFrameArborist),
GregtechItemList.HiveFrameArborist.get(1),
"abc",
"def",
"ghi",
Expand Down
Loading