From a42dc7ee8f0f192f052e10b0c93c5064630ed025 Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Wed, 12 Feb 2025 13:29:37 -0600 Subject: [PATCH 1/2] Fix some references to GT++ items --- .../gthandler/recipes/CompressorRecipes.java | 8 ++++---- .../scripts/ScriptCompactKineticGenerators.java | 16 +++++++--------- .../scripts/ScriptExtraUtilities.java | 11 ++++------- .../scripts/ScriptIndustrialCraft.java | 6 +++--- .../dreammaster/scripts/ScriptThaumicBases.java | 10 +++++----- 5 files changed, 23 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java index eed34fd7e..6e632c56f 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java @@ -42,7 +42,7 @@ import gregtech.api.enums.TierEU; import gregtech.api.recipe.metadata.CompressionTierKey; import gregtech.api.util.GTOreDictUnificator; -import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtnhlanth.common.register.WerkstoffMaterialPool; public class CompressorRecipes implements Runnable { @@ -298,12 +298,12 @@ private void makeExtraUtilitiesRecipes() { private void makeGTPlusPlusRecipes() { // Compressed Glowstone GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.glowstone, 9)) - .itemOutputs(new ItemStack(ModBlocks.blockCompressedObsidian, 1, 6)).duration(15 * SECONDS).eut(2) + .itemOutputs(GregtechItemList.CompressedGlowstone.get(1)).duration(15 * SECONDS).eut(2) .addTo(compressorRecipes); // Double Compressed Glowstone - GTValues.RA.stdBuilder().itemInputs(new ItemStack(ModBlocks.blockCompressedObsidian, 9, 6)) - .itemOutputs(new ItemStack(ModBlocks.blockCompressedObsidian, 1, 7)).duration(15 * SECONDS).eut(2) + GTValues.RA.stdBuilder().itemInputs(GregtechItemList.CompressedGlowstone.get(9)) + .itemOutputs(GregtechItemList.DoubleCompressedGlowstone.get(1)).duration(15 * SECONDS).eut(2) .addTo(compressorRecipes); } diff --git a/src/main/java/com/dreammaster/scripts/ScriptCompactKineticGenerators.java b/src/main/java/com/dreammaster/scripts/ScriptCompactKineticGenerators.java index f2f82bd64..b0f9d2aa0 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptCompactKineticGenerators.java +++ b/src/main/java/com/dreammaster/scripts/ScriptCompactKineticGenerators.java @@ -8,13 +8,11 @@ import java.util.Arrays; import java.util.List; -import net.minecraft.item.ItemStack; - import com.dreammaster.gthandler.CustomItemList; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import gregtech.api.enums.ItemList; -import gtPlusPlus.xmod.ic2.item.IC2Items; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class ScriptCompactKineticGenerators implements IScriptLoader { @@ -43,7 +41,7 @@ public void loadRecipes() { "plateAlloyIridium"); addShapedRecipe( getModItem(CompactKineticGenerators.ID, "IridiumRotor", 1, 0, missing), - new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0), + GregtechItemList.IridiumShaft.get(1), getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing), "craftingToolHardHammer", getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing), @@ -51,7 +49,7 @@ public void loadRecipes() { getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing), "craftingToolWrench", getModItem(CompactKineticGenerators.ID, "IridiumBlade", 1, 0, missing), - new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0)); + GregtechItemList.IridiumShaft.get(1)); ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( getModItem(CompactKineticGenerators.ID, "BlockCkg", 1, 0, missing), @@ -283,7 +281,7 @@ public void loadRecipes() { 'a', "plateTripleTungstenSteel", 'b', - new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0), + GregtechItemList.TungstenSteelShaft.get(1), 'c', "rotorTungstenSteel", 'd', @@ -314,7 +312,7 @@ public void loadRecipes() { 'a', "plateTripleIridium", 'b', - new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0), + GregtechItemList.TungstenSteelShaft.get(1), 'c', "rotorIridium", 'd', @@ -345,7 +343,7 @@ public void loadRecipes() { 'a', "plateTripleNaquadah", 'b', - new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0), + GregtechItemList.IridiumShaft.get(1), 'c', "rotorOsmium", 'd', @@ -376,7 +374,7 @@ public void loadRecipes() { 'a', "plateTripleNeutronium", 'b', - new ItemStack(IC2Items.shaft_Material_4.getItem(), 1, 0), + GregtechItemList.IridiumShaft.get(1), 'c', "rotorNeutronium", 'd', diff --git a/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java b/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java index 359b02988..138feb11e 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java +++ b/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java @@ -54,8 +54,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; -import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -1016,7 +1015,7 @@ public void loadRecipes() { getModItem(ExtraUtilities.ID, "extractor_base", 1, 12, missing))); EnderConstructorRecipesHandler.registerRecipe( new ShapedOreRecipe( - new ItemStack(ModBlocks.blockCompressedObsidian, 1, 5), + GregtechItemList.InvertedObsidian.get(1), "abc", "def", "ghi", @@ -1414,12 +1413,10 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.screw, Materials.Tritanium, 1L), NHItemList.EngravedGoldChip.getIS(1), getModItem(ExtraUtilities.ID, "angelBlock", 1, 0, missing), - getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing), - new ItemStack(ModItems.itemMagicFeather), + getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing), GregtechItemList.MagicFeather.get(1), getModItem(Minecraft.ID, "nether_star", 1, 0, missing), getModItem(Avaritia.ID, "big_pearl", 1, 0, missing), - getModItem(Minecraft.ID, "nether_star", 1, 0, missing), - new ItemStack(ModItems.itemMagicFeather), + getModItem(Minecraft.ID, "nether_star", 1, 0, missing), GregtechItemList.MagicFeather.get(1), getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing), getModItem(ExtraUtilities.ID, "angelBlock", 1, 0, missing), NHItemList.EngravedGoldChip.getIS(1), diff --git a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java index 4499f5e72..8276d17a2 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java @@ -51,7 +51,7 @@ import gregtech.api.objects.ItemData; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; -import gtPlusPlus.xmod.ic2.item.IC2Items; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class ScriptIndustrialCraft implements IScriptLoader { @@ -313,7 +313,7 @@ public void loadRecipes() { getModItem(IndustrialCraft2.ID, "itemPartCarbonPlate", 1, 0, missing)); addShapedRecipe( getModItem(IndustrialCraft2.ID, "itemwcarbonrotor", 1, 1, missing), - new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0), + GregtechItemList.TungstenSteelShaft.get(1), getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing), "craftingToolHardHammer", getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing), @@ -321,7 +321,7 @@ public void loadRecipes() { getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing), "craftingToolWrench", getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 9, missing), - new ItemStack(IC2Items.shaft_Material_2.getItem(), 1, 0)); + GregtechItemList.TungstenSteelShaft.get(1)); addShapedRecipe( getModItem(IndustrialCraft2.ID, "blockKineticGenerator", 1, 5, missing), ItemList.Electric_Motor_MV.get(1L), diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumicBases.java b/src/main/java/com/dreammaster/scripts/ScriptThaumicBases.java index 8c3d1a841..9e90a27ff 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumicBases.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumicBases.java @@ -33,7 +33,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; -import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -664,7 +664,7 @@ public void loadRecipes() { 5, new AspectList().add(Aspect.getAspect("iter"), 32).add(Aspect.getAspect("vinculum"), 32) .add(Aspect.getAspect("desidia"), 16).add(Aspect.getAspect("sensus"), 16), - new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1), + GregtechItemList.DoubleCompressedObsidian.get(1), new ItemStack[] { getModItem(IndustrialCraft2.ID, "itemDensePlates", 1, 8, missing), getModItem(CarpentersBlocks.ID, "itemCarpentersBed", 1, 0, missing), GTOreDictUnificator.get(OrePrefixes.gemFlawless, Materials.Diamond, 1L), @@ -1137,11 +1137,11 @@ public void loadRecipes() { getModItem(Thaumcraft.ID, "blockMetalDevice", 1, 12, missing), new ItemStack[] { getModItem(Thaumcraft.ID, "FocusPrimal", 1, 0, missing), getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing), - new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1), + GregtechItemList.DoubleCompressedObsidian.get(1), getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing), - new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1), + GregtechItemList.DoubleCompressedObsidian.get(1), getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing), - new ItemStack(ModBlocks.blockCompressedObsidian, 1, 1), + GregtechItemList.DoubleCompressedObsidian.get(1), getModItem(ThaumicBases.ID, "crystalBlock", 1, 5, missing), }); ThaumcraftApi.addInfusionCraftingRecipe( "TB.NodeFoci.Efficiency", From b601565eccf38e65144743f56d5566d5adec606a Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Wed, 12 Feb 2025 13:41:16 -0600 Subject: [PATCH 2/2] fish trap as well --- .../com/dreammaster/gthandler/recipes/AssemblerRecipes.java | 3 +-- .../java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 9c7950374..e793dd639 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -11,7 +11,6 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gregtech.api.util.GTRecipeBuilder.WILDCARD; -import static gtPlusPlus.core.block.ModBlocks.blockFishTrap; import static gtPlusPlus.core.material.MaterialsAlloy.AQUATIC_STEEL; import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_C276; import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_W; @@ -1602,7 +1601,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.WroughtIron, 1L), CustomItemList.SteelBars.get(6L), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(blockFishTrap, 1, 0)).duration(10 * SECONDS).eut(64).addTo(assemblerRecipes); + .itemOutputs(GregtechItemList.FishTrap.get(1)).duration(10 * SECONDS).eut(64).addTo(assemblerRecipes); if (ExtraBees.isModLoaded()) { ItemStack alveary = GTModHandler.getModItem(Forestry.ID, "alveary", 1L, 0); diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java index 9b4850b62..22e64045b 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java @@ -35,10 +35,10 @@ import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; -import gtPlusPlus.core.block.ModBlocks; 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 { @@ -98,7 +98,7 @@ public void loadRecipes() { // Fish Trap addShapedRecipe( - new ItemStack(ModBlocks.blockFishTrap), + GregtechItemList.FishTrap.get(1), NHItemList.SteelBars.getIS(), NHItemList.SteelBars.getIS(), NHItemList.SteelBars.getIS(),