Fix some references to GT++ items (#1196)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

Author: serenibyss

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);

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);
     }
 

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,15 +41,15 @@ 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),
                 "ringChrome",
                 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',

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),

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(),

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,15 +313,15 @@ 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),
                 "ringIridium",
                 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),

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",