Skip to content

Commit 4cc759c

Browse files
serenibyssDream-Master
serenibyss
and
Dream-Master
authored
Coremod updates for Refactoring GT++ 2025-02-17 (#1204)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
1 parent 9667d15 commit 4cc759c

File tree

2 files changed

+31
-41
lines changed

2 files changed

+31
-41
lines changed

‎src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
55
import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
66
import static gtPlusPlus.api.recipe.GTPPRecipeMaps.vacuumFurnaceRecipes;
7-
import static gtPlusPlus.core.item.chemistry.MilledOreProcessing.ChalcopyriteFlotationFroth;
8-
import static gtPlusPlus.core.item.chemistry.MilledOreProcessing.SphaleriteFlotationFroth;
7+
8+
import net.minecraftforge.fluids.FluidStack;
99

1010
import gregtech.api.enums.GTValues;
1111
import gregtech.api.enums.Materials;
1212
import gregtech.api.enums.OrePrefixes;
1313
import gregtech.api.enums.TierEU;
14+
import gregtech.api.util.GTModHandler;
1415
import gregtech.api.util.GTOreDictUnificator;
1516
import gregtech.api.util.GTUtility;
1617
import gregtech.common.items.CombType;
1718
import gregtech.loaders.misc.GTBees;
18-
import gtPlusPlus.core.item.chemistry.AgriculturalChem;
19+
import gtPlusPlus.core.fluids.GTPPFluids;
1920
import gtPlusPlus.core.material.MaterialsElements;
20-
import gtPlusPlus.core.util.minecraft.FluidUtils;
2121

2222
public class VacuumFurnaceRecipes implements Runnable {
2323

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

@@ -57,8 +57,8 @@ public void run() {
5757
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 56L),
5858
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 50L),
5959
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 30L))
60-
.fluidInputs(FluidUtils.getFluidStack(ChalcopyriteFlotationFroth, 4000))
61-
.fluidOutputs(FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), FluidUtils.getWater(2000))
60+
.fluidInputs(new FluidStack(GTPPFluids.ChalcopyriteFlotationFroth, 4000))
61+
.fluidOutputs(new FluidStack(GTPPFluids.RedMud, 2000), GTModHandler.getWater(2000))
6262
.eut((int) TierEU.RECIPE_IV).metadata(COIL_HEAT, 4500).duration(2 * MINUTES)
6363
.addTo(vacuumFurnaceRecipes);
6464
}

‎src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java

+23-33
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import java.util.Arrays;
1818
import java.util.List;
1919

20-
import net.minecraft.item.ItemStack;
2120
import net.minecraftforge.fluids.FluidRegistry;
2221

2322
import com.dreammaster.gthandler.CustomItemList;
@@ -34,10 +33,7 @@
3433
import gregtech.api.enums.TierEU;
3534
import gregtech.api.util.GTModHandler;
3635
import gregtech.api.util.GTOreDictUnificator;
37-
import gregtech.api.util.GTUtility;
38-
import gtPlusPlus.core.item.chemistry.GenericChem;
3936
import gtPlusPlus.core.material.MaterialsAlloy;
40-
import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry;
4137
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
4238

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

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

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

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

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

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

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

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

205-
addShapelessRecipe(CustomItemList.CoinBeesI.get(16L), new ItemStack(FRItemRegistry.hiveFrameVoid));
195+
addShapelessRecipe(CustomItemList.CoinBeesI.get(16L), GregtechItemList.HiveFrameVoid.get(1));
206196
RecipeManagers.carpenterManager.addRecipe(
207197
60,
208198
FluidRegistry.getFluidStack("molten.redstone", 576),
209199
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
210-
new ItemStack(FRItemRegistry.hiveFrameAccelerated, 1, 0),
200+
GregtechItemList.HiveFrameAccelerated.get(1),
211201
"abc",
212202
"def",
213203
"ghi",
@@ -233,7 +223,7 @@ private void addForestryRecipes() {
233223
60,
234224
FluidRegistry.getFluidStack("molten.redstone", 576),
235225
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
236-
new ItemStack(FRItemRegistry.hiveFrameMutagenic, 1, 0),
226+
GregtechItemList.HiveFrameMutagenic.get(1),
237227
"abc",
238228
"def",
239229
"ghi",
@@ -259,7 +249,7 @@ private void addForestryRecipes() {
259249
60,
260250
FluidRegistry.getFluidStack("molten.redstone", 576),
261251
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
262-
new ItemStack(FRItemRegistry.hiveFrameBusy),
252+
GregtechItemList.HiveFrameBusy.get(1),
263253
"abc",
264254
"def",
265255
"ghi",
@@ -285,7 +275,7 @@ private void addForestryRecipes() {
285275
60,
286276
FluidRegistry.getFluidStack("molten.redstone", 576),
287277
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
288-
new ItemStack(FRItemRegistry.hiveFrameDecay),
278+
GregtechItemList.HiveFrameDecay.get(1),
289279
"abc",
290280
"def",
291281
"ghi",
@@ -311,7 +301,7 @@ private void addForestryRecipes() {
311301
60,
312302
FluidRegistry.getFluidStack("molten.redstone", 576),
313303
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
314-
new ItemStack(FRItemRegistry.hiveFrameSlow),
304+
GregtechItemList.HiveFrameSlow.get(1),
315305
"abc",
316306
"def",
317307
"ghi",
@@ -337,7 +327,7 @@ private void addForestryRecipes() {
337327
60,
338328
FluidRegistry.getFluidStack("molten.redstone", 576),
339329
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
340-
new ItemStack(FRItemRegistry.hiveFrameStalilize),
330+
GregtechItemList.HiveFrameStabilize.get(1),
341331
"abc",
342332
"def",
343333
"ghi",
@@ -363,7 +353,7 @@ private void addForestryRecipes() {
363353
60,
364354
FluidRegistry.getFluidStack("molten.redstone", 576),
365355
getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing),
366-
new ItemStack(FRItemRegistry.hiveFrameArborist),
356+
GregtechItemList.HiveFrameArborist.get(1),
367357
"abc",
368358
"def",
369359
"ghi",

0 commit comments

Comments
 (0)