Skip to content

Cleanup getModItem #1646

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

Open
Nikolay-Sitnikov wants to merge 6 commits into
base: master
Choose a base branch
from
+34,202 −36,044
Open

Cleanup getModItem #1646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87d641e
Replace all usages of `GTModHandler.getModItem` with `IngredientFactory`
Nikolay-Sitnikov Mar 13, 2026
56613af
Apply spotless
Nikolay-Sitnikov Mar 13, 2026
3a55afc
Add flag to enable debug mode.
Nikolay-Sitnikov Mar 13, 2026
81e4b1b
Make flag the only control and enable it in dev environments.
Nikolay-Sitnikov Mar 13, 2026
8002762
Remove another allocation and add Javadocs
Nikolay-Sitnikov Mar 13, 2026
352901d
Comment out broken reference to `Railcraft:dust` (because Railcraft d…
Nikolay-Sitnikov Mar 13, 2026
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
5 changes: 5 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ tasks.test.configure {
}
}

minecraft {
// Use fire placeholders in recipes instead of crashing the game. (See `IngredientFactory.java`)
extraRunJvmArguments.add("-Ddreamcraft.debug.recipe=true")
}

configurations {
testImplementation.get().extendsFrom(compileOnly.get())
}
Expand Down
20 changes: 10 additions & 10 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.346:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.354:dev")
api("com.github.GTNewHorizons:Yamcl:0.7.4:dev")
api("com.github.GTNewHorizons:Baubles-Expanded:2.2.11-GTNH:dev")

implementation("com.github.GTNewHorizons:GTNHLib:0.9.39:dev")
implementation("com.github.GTNewHorizons:GTNHLib:0.9.41:dev")

implementation("net.glease:tc4recipelib:1.5.37:dev")

Expand All @@ -15,7 +15,7 @@ dependencies {
compileOnly("secondderivative.irontankminecarts:IronTankMinecarts:1.0.5:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.23:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Mantle:0.5.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.34-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.35-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.4.11:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
Expand All @@ -24,9 +24,9 @@ dependencies {
compileOnly("com.github.GTNewHorizons:BloodMagic:1.8.14:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
compileOnly("com.github.GTNewHorizons:amunra:0.8.7:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galacticraft:3.4.19-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.11.8:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:amunra:0.8.8:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galacticraft:3.4.20-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.11.9:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:MatterManipulator:0.1.15-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:IguanaTweaksTConstruct:2.7.1:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.10-GTNH:dev")
Expand All @@ -35,14 +35,14 @@ dependencies {
compileOnly("com.github.GTNewHorizons:BetterQuesting:3.8.32-GTNH:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
//compileOnly("com.github.Roadhog360:Et-Futurum-Requiem:2.6.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Postea:1.2.3:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Postea:1.2.4:dev") { transitive = false }

runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.3.4-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Galacticraft:3.4.19-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Galacticraft:3.4.20-GTNH:dev")

//uncomment to test RC and Forestry recipes
//runtimeOnlyNonPublishable("com.github.GTNewHorizons:Railcraft:9.17.24:dev")
//runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.11.8:dev")
//runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.11.9:dev")

// RecEx, for testing purposes
//runtimeOnlyNonPublishable("com.github.GTNewHorizons:RecEx:1.1.5:dev")
Expand All @@ -58,4 +58,4 @@ dependencies {
testImplementation('org.assertj:assertj-core:3.+')
testImplementation('org.mockito:mockito-core:5.+')
testImplementation('org.mockito:mockito-junit-jupiter:5.+')
}
}
101 changes: 50 additions & 51 deletions src/main/java/com/dreammaster/TwilightForest/TF_Loot_Chests.java
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions src/main/java/com/dreammaster/auxiliary/NEIGTNewHorizonsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.dreammaster.auxiliary;

import static com.dreammaster.scripts.IScriptLoader.missing;
import static com.dreammaster.scripts.IngredientFactory.getModItem;
import static gregtech.api.enums.Mods.*;

import net.minecraft.item.ItemStack;
Expand All @@ -11,15 +11,14 @@
import com.dreammaster.main.MainRegistry;

import codechicken.nei.api.IConfigureNEI;
import gregtech.api.util.GTModHandler;

public class NEIGTNewHorizonsConfig implements IConfigureNEI {

@Override
public void loadConfig() {

if (EnderIO.isModLoaded()) {
ItemStack creativeBank = GTModHandler.getModItem(EnderIO.ID, "blockCapBank", 1, 0, missing);
ItemStack creativeBank = getModItem(EnderIO.ID, "blockCapBank", 1, 0);
creativeBank.setTagInfo("type", new NBTTagString("CREATIVE"));
creativeBank.setTagInfo("storedEnergyRF", new NBTTagInt(2500000));
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/dreammaster/bartworksHandler/BW_Recipe_Loader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.dreammaster.bartworksHandler;

import static bartworks.system.material.WerkstoffLoader.Ruridit;
import static com.dreammaster.scripts.IngredientFactory.getModItem;
import static gregtech.api.enums.Mods.GalacticraftMars;
import static gregtech.api.enums.OrePrefixes.bolt;
import static gregtech.api.enums.OrePrefixes.dustTiny;
Expand All @@ -17,7 +18,6 @@

import gregtech.api.enums.GTValues;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTRecipeConstants;
import gregtech.api.util.recipe.Scanning;

Expand All @@ -32,10 +32,10 @@ public void run() {

// Heavy Duty Alloy Ingot T4
GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, GTModHandler.getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 0))
.metadata(RESEARCH_ITEM, getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1, 0))
.metadata(SCANNING, new Scanning(1 * MINUTES + 30 * SECONDS, TierEU.RECIPE_EV))
.itemInputs(
GTModHandler.getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 0),
getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1, 0),
NHItemList.IceCompressedPlate.get(3),
NHItemList.IceCompressedPlate.get(3),
Ruridit.get(bolt, 4))
Expand Down
40 changes: 17 additions & 23 deletions src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import static bartworks.API.BioObjectAdder.regenerateBioFluids;
import static bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes;
import static bartworks.API.recipe.BartWorksRecipeMaps.bioLabRecipes;
import static com.dreammaster.scripts.IngredientFactory.getModItem;
import static gregtech.api.enums.Materials.Aluminium;
import static gregtech.api.enums.Materials.AntimonyTrioxide;
import static gregtech.api.enums.Materials.Ash;
Expand Down Expand Up @@ -249,7 +250,7 @@ private void runAdditionalFuelRecipes() {
}

private void runGTRecipes() {
GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(GalaxySpace.ID, "barnardaClog", 64L)).circuit(24)
GTValues.RA.stdBuilder().itemInputs(getModItem(GalaxySpace.ID, "barnardaClog", 64)).circuit(24)
.itemOutputs(Ash.getDust(8)).fluidInputs(Materials.Xenoxene.getFluid(1000))
.fluidOutputs(Materials.RadoxRaw.getFluid(1000)).duration(3 * MINUTES).eut(TierEU.RECIPE_UV)
.addTo(pyrolyseRecipes);
Expand Down Expand Up @@ -307,7 +308,7 @@ private void bacterialVatRecipes() {
GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Chip_Stemcell.get(64L),
GTModHandler.getModItem(GalaxySpace.ID, "item.UnknowCrystal", 16L),
getModItem(GalaxySpace.ID, "item.UnknowCrystal", 16),
NHItemList.TCetiESeaweedExtract.get(4),
Tritanium.getDust(4))
.special(BioItemList.getPetriDish(CultureSet.get("StemCellBac")))
Expand All @@ -318,7 +319,7 @@ private void bacterialVatRecipes() {
GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Chip_Stemcell.get(16L),
GTModHandler.getModItem(GalaxySpace.ID, "item.UnknowCrystal", 16L),
getModItem(GalaxySpace.ID, "item.UnknowCrystal", 16),
NHItemList.TCetiESeaweedExtract.get(8),
InfinityCatalyst.getDustTiny(4))
.special(BioItemList.getPetriDish(CultureSet.get("BioCellBac")))
Expand All @@ -337,7 +338,7 @@ private void bacterialVatRecipes() {
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Naquadria), true)).requiresCleanRoom()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Genetics.ID, "misc", 2L, 4))
GTValues.RA.stdBuilder().itemInputs(getModItem(Genetics.ID, "misc", 2, 4))
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
.fluidInputs(GTModHandler.getDistilledWater(4L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 2)).duration(7 * SECONDS + 10 * TICKS)
Expand All @@ -364,7 +365,7 @@ private void bacterialVatRecipes() {
.duration(9 * (7 * SECONDS + 10 * TICKS)).eut(TierEU.RECIPE_IV).metadata(GLASS, 5)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(IndustrialCraft2.ID, "itemBiochaff", 4L, 0))
GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "itemBiochaff", 4, 0))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(GTModHandler.getDistilledWater(4L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 2)).duration(15 * SECONDS)
Expand Down Expand Up @@ -445,7 +446,7 @@ private void bacterialVatRecipes() {

GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(Thaumcraft.ID, "ItemZombieBrain", 4L, 0),
getModItem(Thaumcraft.ID, "ItemZombieBrain", 4, 0),
new ItemStack(Items.fermented_spider_eye, 4))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(FluidRegistry.getFluidStack("potion.mineralwater", 40))
Expand All @@ -465,9 +466,7 @@ private void bacterialVatRecipes() {
.eut(TierEU.RECIPE_EV).metadata(GLASS, 2).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(Blocks.glowstone, 4),
GTModHandler.getModItem(Botania.ID, "quartz", 4L, 6))
.itemInputs(new ItemStack(Blocks.glowstone, 4), getModItem(Botania.ID, "quartz", 4, 6))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(FluidRegistry.getFluidStack("fire_water", 10))
.fluidOutputs(FluidRegistry.getFluidStack("liquid_sunshine", 10)).duration(30 * SECONDS)
Expand All @@ -487,17 +486,17 @@ private void bacterialVatRecipes() {

GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(EnderIO.ID, "itemMaterial", 4L, 14),
GTModHandler.getModItem(EnderIO.ID, "itemMaterial", 4L, 16))
getModItem(EnderIO.ID, "itemMaterial", 4, 14),
getModItem(EnderIO.ID, "itemMaterial", 4, 16))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(FluidRegistry.getFluidStack("nutrient_distillation", 40))
.fluidOutputs(FluidRegistry.getFluidStack("ender_distillation", 40)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_EV).metadata(GLASS, 2).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(EnderIO.ID, "itemMaterial", 4L, 15),
GTModHandler.getModItem(EnderIO.ID, "itemMaterial", 4L, 17))
getModItem(EnderIO.ID, "itemMaterial", 4, 15),
getModItem(EnderIO.ID, "itemMaterial", 4, 17))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(FluidRegistry.getFluidStack("ender_distillation", 10))
.fluidOutputs(FluidRegistry.getFluidStack("vapor_of_levity", 10)).duration(30 * SECONDS)
Expand All @@ -508,7 +507,7 @@ private void bacterialVatRecipes() {

private void bioLabRecipes() {
GTValues.RA.stdBuilder()
.itemInputs(BioItemList.getPetriDish(null), GTModHandler.getModItem(GalaxySpace.ID, "barnardaClog", 1L))
.itemInputs(BioItemList.getPetriDish(null), getModItem(GalaxySpace.ID, "barnardaClog", 1))
.itemOutputs(BioItemList.getPetriDish(CultureSet.get("BarnadaCBac"))).outputChances(2_50)
.fluidInputs(FluidRegistry.getFluidStack("unknowwater", 8000)).duration(25 * SECONDS)
.eut(TierEU.RECIPE_UV).addTo(bioLabRecipes);
Expand Down Expand Up @@ -536,20 +535,17 @@ private void bioLabRecipes() {
.fluidInputs(Materials.BioMediumRaw.getFluid(1000)).duration(3 * MINUTES).eut(TierEU.RECIPE_UV)
.requiresCleanRoom().addTo(bioLabRecipes);

GTValues.RA.stdBuilder()
.itemInputs(BioItemList.getPetriDish(null), GTModHandler.getModItem(Genetics.ID, "misc", 1L, 4))
GTValues.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), getModItem(Genetics.ID, "misc", 1, 4))
.itemOutputs(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))).outputChances(50_00)
.fluidInputs(Water.getFluid(4000)).duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV)
.addTo(bioLabRecipes);

GTValues.RA.stdBuilder()
.itemInputs(BioItemList.getPetriDish(null), GTModHandler.getModItem(Genetics.ID, "misc", 1L, 4))
GTValues.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), getModItem(Genetics.ID, "misc", 1, 4))
.itemOutputs(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))).outputChances(75_00)
.fluidInputs(GTModHandler.getDistilledWater(2000L)).duration(7 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_HV).addTo(bioLabRecipes);

GTValues.RA.stdBuilder()
.itemInputs(BioItemList.getPetriDish(null), GTModHandler.getModItem(Genetics.ID, "misc", 1L, 4))
GTValues.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), getModItem(Genetics.ID, "misc", 1, 4))
.itemOutputs(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))).outputChances(90_00)
.fluidInputs(FluidRegistry.getFluidStack("binnie.growthmedium", 1000))
.duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV).addTo(bioLabRecipes);
Expand All @@ -560,9 +556,7 @@ private void bioLabRecipes() {
.eut(TierEU.RECIPE_EV).addTo(bioLabRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
BioItemList.getPetriDish(null),
GTModHandler.getModItem(IndustrialCraft2.ID, "itemBiochaff", 16L, 0))
.itemInputs(BioItemList.getPetriDish(null), getModItem(IndustrialCraft2.ID, "itemBiochaff", 16, 0))
.itemOutputs(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))).outputChances(60_00)
.fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 1000)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_HV).addTo(bioLabRecipes);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes;
import static com.dreammaster.bartworksHandler.BacteriaRegistry.CultureSet;
import static com.dreammaster.scripts.IngredientFactory.getModItem;
import static gregtech.api.enums.GTValues.*;
import static gregtech.api.enums.Materials.NaquadahEnriched;
import static gregtech.api.enums.Materials.Plutonium;
Expand Down Expand Up @@ -120,7 +121,7 @@ public static void registerRecipes() {
.itemInputs(
ItemList.IC2_Energium_Dust.get(8),
Materials.Mytryl.getDust(1),
GTModHandler.getModItem(PamsHarvestCraft.ID, "seaweedItem", 64))
getModItem(PamsHarvestCraft.ID, "seaweedItem", 64))
.special(BioItemList.getPetriDish(CultureSet.get("TcetiEBac")))
.fluidInputs(new FluidStack(BIOFLUIDS[2], 50)).fluidOutputs(new FluidStack(BIOFLUIDS[3], 50))
.duration(1 * MINUTES).eut(TierEU.RECIPE_UV).metadata(GLASS, 8)
Expand Down
Loading
Loading