Skip to content

Commit 9e44156

Browse files
StaffiXStaffiX
authored
Merge branch 'master' into removerecipeoptimization
2 parents bc58fdc + 8caf122 commit 9e44156

10 files changed

+49
-38
lines changed

‎dependencies.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Add your dependencies here
22

33
dependencies {
4-
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.126:dev")
4+
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.134:dev")
55
api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
66
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
77

@@ -23,7 +23,7 @@ dependencies {
2323
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
2424
compileOnly("com.github.GTNewHorizons:amunra:0.8.1:dev") { transitive = false }
2525
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.4-GTNH:dev") { transitive = false }
26-
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false }
26+
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.2:dev") { transitive = false }
2727
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.1-GTNH:dev")
2828

2929
runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
1212
import static gregtech.api.util.GTRecipeBuilder.TICKS;
1313
import static gregtech.api.util.GTRecipeBuilder.WILDCARD;
14-
import static gtPlusPlus.core.block.ModBlocks.blockFishTrap;
1514
import static gtPlusPlus.core.material.MaterialsAlloy.AQUATIC_STEEL;
1615
import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_C276;
1716
import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_W;
@@ -1602,7 +1601,7 @@ public void run() {
16021601
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.WroughtIron, 1L),
16031602
CustomItemList.SteelBars.get(6L),
16041603
GTUtility.getIntegratedCircuit(1))
1605-
.itemOutputs(new ItemStack(blockFishTrap, 1, 0)).duration(10 * SECONDS).eut(64).addTo(assemblerRecipes);
1604+
.itemOutputs(GregtechItemList.FishTrap.get(1)).duration(10 * SECONDS).eut(64).addTo(assemblerRecipes);
16061605

16071606
if (ExtraBees.isModLoaded()) {
16081607
ItemStack alveary = GTModHandler.getModItem(Forestry.ID, "alveary", 1L, 0);

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -545,9 +545,9 @@ public void run() {
545545
new Object[] { ItemList.Hull_UEV.get(1), ItemList.Quantum_Chest_IV.get(1),
546546
MaterialsAlloy.QUANTUM.getFrameBox(16), ItemList.Field_Generator_UEV.get(1),
547547
GregtechItemList.Laser_Lens_Special.get(4),
548-
GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.TengamAttuned, 32),
549-
GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.InfinityCatalyst, 16),
550-
GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Infinity, 8) },
548+
GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.CosmicNeutronium, 64),
549+
GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.InfinityCatalyst, 32),
550+
GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Infinity, 16) },
551551
new FluidStack[] { new FluidStack(solderUEV, 9_216), MaterialsAlloy.ABYSSAL.getFluidStack(144 * 128),
552552
MaterialsAlloy.OCTIRON.getFluidStack(144 * 256) },
553553
ItemList.Hatch_Catalyst_Bulk.get(1),

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import gregtech.api.enums.TierEU;
4343
import gregtech.api.recipe.metadata.CompressionTierKey;
4444
import gregtech.api.util.GTOreDictUnificator;
45-
import gtPlusPlus.core.block.ModBlocks;
45+
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
4646
import gtnhlanth.common.register.WerkstoffMaterialPool;
4747

4848
public class CompressorRecipes implements Runnable {
@@ -298,12 +298,12 @@ private void makeExtraUtilitiesRecipes() {
298298
private void makeGTPlusPlusRecipes() {
299299
// Compressed Glowstone
300300
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.glowstone, 9))
301-
.itemOutputs(new ItemStack(ModBlocks.blockCompressedObsidian, 1, 6)).duration(15 * SECONDS).eut(2)
301+
.itemOutputs(GregtechItemList.CompressedGlowstone.get(1)).duration(15 * SECONDS).eut(2)
302302
.addTo(compressorRecipes);
303303

304304
// Double Compressed Glowstone
305-
GTValues.RA.stdBuilder().itemInputs(new ItemStack(ModBlocks.blockCompressedObsidian, 9, 6))
306-
.itemOutputs(new ItemStack(ModBlocks.blockCompressedObsidian, 1, 7)).duration(15 * SECONDS).eut(2)
305+
GTValues.RA.stdBuilder().itemInputs(GregtechItemList.CompressedGlowstone.get(9))
306+
.itemOutputs(GregtechItemList.DoubleCompressedGlowstone.get(1)).duration(15 * SECONDS).eut(2)
307307
.addTo(compressorRecipes);
308308
}
309309

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

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
package com.dreammaster.gthandler.recipes;
22

3+
import static com.dreammaster.scripts.IScriptLoader.missing;
4+
import static gregtech.api.enums.Mods.Automagy;
5+
import static gregtech.api.enums.Mods.PamsHarvestCraft;
36
import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes;
7+
import static gregtech.api.util.GTModHandler.getModItem;
48
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
9+
import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
510

611
import gregtech.api.enums.GTValues;
712
import gregtech.api.enums.TierEU;
13+
import gregtech.api.util.GTUtility;
814
import gtPlusPlus.core.util.minecraft.FluidUtils;
915

1016
public class FluidHeaterRecipes implements Runnable {
@@ -15,6 +21,17 @@ public void run() {
1521
GTValues.RA.stdBuilder().fluidInputs(FluidUtils.getSteam(3840))
1622
.fluidOutputs(FluidUtils.getSuperHeatedSteam(3840)).duration(5 * SECONDS).eut(TierEU.RECIPE_LuV)
1723
.addTo(fluidHeaterRecipes);
18-
24+
if (PamsHarvestCraft.isModLoaded()) {
25+
GTValues.RA.stdBuilder().fluidInputs(getFluidStack("milk", 250))
26+
.itemInputs(GTUtility.getIntegratedCircuit(24))
27+
.itemOutputs(getModItem(PamsHarvestCraft.ID, "freshmilkItem", 1, 0, missing)).duration(2 * SECONDS)
28+
.eut(TierEU.RECIPE_ULV).addTo(fluidHeaterRecipes);
29+
if (Automagy.isModLoaded()) {
30+
GTValues.RA.stdBuilder().fluidInputs(getFluidStack("fluidmilk", 250))
31+
.itemInputs(GTUtility.getIntegratedCircuit(24))
32+
.itemOutputs(getModItem(PamsHarvestCraft.ID, "freshmilkItem", 1, 0, missing))
33+
.duration(2 * SECONDS).eut(TierEU.RECIPE_ULV).addTo(fluidHeaterRecipes);
34+
}
35+
}
1936
}
2037
}

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

+7-9
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88
import java.util.Arrays;
99
import java.util.List;
1010

11-
import net.minecraft.item.ItemStack;
12-
1311
import com.dreammaster.gthandler.CustomItemList;
1412

1513
import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
1614
import gregtech.api.enums.ItemList;
17-
import gtPlusPlus.xmod.ic2.item.IC2Items;
15+
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
1816

1917
public class ScriptCompactKineticGenerators implements IScriptLoader {
2018

@@ -43,15 +41,15 @@ public void loadRecipes() {
4341
"plateAlloyIridium");
4442
addShapedRecipe(
4543
getModItem(CompactKineticGenerators.ID, "IridiumRotor", 1, 0, missing),
46-
new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0),
44+
GregtechItemList.IridiumShaft.get(1),
4745
getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing),
4846
"craftingToolHardHammer",
4947
getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing),
5048
"ringChrome",
5149
getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing),
5250
"craftingToolWrench",
5351
getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing),
54-
new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0));
52+
GregtechItemList.IridiumShaft.get(1));
5553

5654
ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
5755
getModItem(CompactKineticGenerators.ID, "BlockCkg", 1, 0, missing),
@@ -283,7 +281,7 @@ public void loadRecipes() {
283281
'a',
284282
"plateTripleTungstenSteel",
285283
'b',
286-
new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0),
284+
GregtechItemList.TungstenSteelShaft.get(1),
287285
'c',
288286
"rotorTungstenSteel",
289287
'd',
@@ -314,7 +312,7 @@ public void loadRecipes() {
314312
'a',
315313
"plateTripleIridium",
316314
'b',
317-
new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0),
315+
GregtechItemList.TungstenSteelShaft.get(1),
318316
'c',
319317
"rotorIridium",
320318
'd',
@@ -345,7 +343,7 @@ public void loadRecipes() {
345343
'a',
346344
"plateTripleNaquadah",
347345
'b',
348-
new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0),
346+
GregtechItemList.IridiumShaft.get(1),
349347
'c',
350348
"rotorOsmium",
351349
'd',
@@ -376,7 +374,7 @@ public void loadRecipes() {
376374
'a',
377375
"plateTripleNeutronium",
378376
'b',
379-
new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0),
377+
GregtechItemList.IridiumShaft.get(1),
380378
'c',
381379
"rotorNeutronium",
382380
'd',

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

+4-7
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@
5454
import gregtech.api.enums.OrePrefixes;
5555
import gregtech.api.util.GTOreDictUnificator;
5656
import gregtech.api.util.GTUtility;
57-
import gtPlusPlus.core.block.ModBlocks;
58-
import gtPlusPlus.core.item.ModItems;
57+
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
5958
import thaumcraft.api.ThaumcraftApi;
6059
import thaumcraft.api.aspects.Aspect;
6160
import thaumcraft.api.aspects.AspectList;
@@ -1016,7 +1015,7 @@ public void loadRecipes() {
10161015
getModItem(ExtraUtilities.ID, "extractor_base", 1, 12, missing)));
10171016
EnderConstructorRecipesHandler.registerRecipe(
10181017
new ShapedOreRecipe(
1019-
new ItemStack(ModBlocks.blockCompressedObsidian, 1, 5),
1018+
GregtechItemList.InvertedObsidian.get(1),
10201019
"abc",
10211020
"def",
10221021
"ghi",
@@ -1414,12 +1413,10 @@ public void loadRecipes() {
14141413
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Tritanium, 1L),
14151414
NHItemList.EngravedGoldChip.getIS(1),
14161415
getModItem(ExtraUtilities.ID, "angelBlock", 1, 0, missing),
1417-
getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing),
1418-
new ItemStack(ModItems.itemMagicFeather),
1416+
getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing), GregtechItemList.MagicFeather.get(1),
14191417
getModItem(Minecraft.ID, "nether_star", 1, 0, missing),
14201418
getModItem(Avaritia.ID, "big_pearl", 1, 0, missing),
1421-
getModItem(Minecraft.ID, "nether_star", 1, 0, missing),
1422-
new ItemStack(ModItems.itemMagicFeather),
1419+
getModItem(Minecraft.ID, "nether_star", 1, 0, missing), GregtechItemList.MagicFeather.get(1),
14231420
getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing),
14241421
getModItem(ExtraUtilities.ID, "angelBlock", 1, 0, missing),
14251422
NHItemList.EngravedGoldChip.getIS(1),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
import gregtech.api.util.GTModHandler;
3636
import gregtech.api.util.GTOreDictUnificator;
3737
import gregtech.api.util.GTUtility;
38-
import gtPlusPlus.core.block.ModBlocks;
3938
import gtPlusPlus.core.item.chemistry.GenericChem;
4039
import gtPlusPlus.core.material.MaterialsAlloy;
4140
import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry;
41+
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
4242

4343
public class ScriptGregtechPlusPlus implements IScriptLoader {
4444

@@ -98,7 +98,7 @@ public void loadRecipes() {
9898

9999
// Fish Trap
100100
addShapedRecipe(
101-
new ItemStack(ModBlocks.blockFishTrap),
101+
GregtechItemList.FishTrap.get(1),
102102
NHItemList.SteelBars.getIS(),
103103
NHItemList.SteelBars.getIS(),
104104
NHItemList.SteelBars.getIS(),

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import gregtech.api.objects.ItemData;
5252
import gregtech.api.util.GTOreDictUnificator;
5353
import gregtech.api.util.GTUtility;
54-
import gtPlusPlus.xmod.ic2.item.IC2Items;
54+
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
5555

5656
public class ScriptIndustrialCraft implements IScriptLoader {
5757

@@ -313,15 +313,15 @@ public void loadRecipes() {
313313
getModItem(IndustrialCraft2.ID, "itemPartCarbonPlate", 1, 0, missing));
314314
addShapedRecipe(
315315
getModItem(IndustrialCraft2.ID, "itemwcarbonrotor", 1, 1, missing),
316-
new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0),
316+
GregtechItemList.TungstenSteelShaft.get(1),
317317
getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing),
318318
"craftingToolHardHammer",
319319
getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing),
320320
"ringIridium",
321321
getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing),
322322
"craftingToolWrench",
323323
getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing),
324-
new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0));
324+
GregtechItemList.TungstenSteelShaft.get(1));
325325
addShapedRecipe(
326326
getModItem(IndustrialCraft2.ID, "blockKineticGenerator", 1, 5, missing),
327327
ItemList.Electric_Motor_MV.get(1L),

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import gregtech.api.enums.OrePrefixes;
3434
import gregtech.api.util.GTModHandler;
3535
import gregtech.api.util.GTOreDictUnificator;
36-
import gtPlusPlus.core.block.ModBlocks;
36+
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
3737
import thaumcraft.api.ThaumcraftApi;
3838
import thaumcraft.api.aspects.Aspect;
3939
import thaumcraft.api.aspects.AspectList;
@@ -664,7 +664,7 @@ public void loadRecipes() {
664664
5,
665665
new AspectList().add(Aspect.getAspect("iter"), 32).add(Aspect.getAspect("vinculum"), 32)
666666
.add(Aspect.getAspect("desidia"), 16).add(Aspect.getAspect("sensus"), 16),
667-
new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1),
667+
GregtechItemList.DoubleCompressedObsidian.get(1),
668668
new ItemStack[] { getModItem(IndustrialCraft2.ID, "itemDensePlates", 1, 8, missing),
669669
getModItem(CarpentersBlocks.ID, "itemCarpentersBed", 1, 0, missing),
670670
GTOreDictUnificator.get(OrePrefixes.gemFlawless, Materials.Diamond, 1L),
@@ -1137,11 +1137,11 @@ public void loadRecipes() {
11371137
getModItem(Thaumcraft.ID, "blockMetalDevice", 1, 12, missing),
11381138
new ItemStack[] { getModItem(Thaumcraft.ID, "FocusPrimal", 1, 0, missing),
11391139
getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing),
1140-
new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1),
1140+
GregtechItemList.DoubleCompressedObsidian.get(1),
11411141
getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing),
1142-
new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1),
1142+
GregtechItemList.DoubleCompressedObsidian.get(1),
11431143
getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing),
1144-
new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1),
1144+
GregtechItemList.DoubleCompressedObsidian.get(1),
11451145
getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing), });
11461146
ThaumcraftApi.addInfusionCraftingRecipe(
11471147
"TB.NodeFoci.Efficiency",

0 commit comments

Comments
 (0)