Deprecate ic2 glass (#118)

gradle/gradle-daemon-jvm.properties

@@ -1,12 +1,12 @@
 #This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/46949723aaa20c7b64d7ecfed7207034/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d6690dfd71c4c91e08577437b5b2beb0/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/redirect
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect
 toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.21'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.26'
 }
 
 

src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java

@@ -1,20 +1,27 @@
 package emt.gthandler.common.loader;
 
 import static emt.command.CommandOutputs.mkbook;
+import static emt.util.EMTRandomHelper.getChargedItem;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static thaumcraft.api.ThaumcraftApi.addInfusionCraftingRecipe;
 import static thaumcraft.api.ThaumcraftApi.registerObjectTag;
 
+import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
+import emt.init.EMTItems;
+import emt.init.EMTRecipes;
+import emt.util.EMTCraftingAspects;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
 import gregtech.api.util.GTOreDictUnificator;
+import ic2.api.item.IC2Items;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.common.config.ConfigItems;
@@ -29,10 +36,34 @@ public class EMT_GT_Loader {
                         new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE))
                 .itemOutputs(mkbook()).duration(6 * SECONDS).eut(TierEU.RECIPE_MV / 2).addTo(assemblerRecipes);
 
+        registerObjectTag(ItemList.ReinforcedGlass.get(1L), new AspectList().add(Aspect.METAL, 2).add(Aspect.COLD, 2));
         registerObjectTag(
                 ItemList.FenceIron.get(1L),
                 new AspectList().add(Aspect.ENERGY, 1).add(Aspect.METAL, 2).add(Aspect.WEATHER, 1));
         registerObjectTag(ItemList.PadBouncy.get(1L), new AspectList().add(Aspect.AIR, 5));
         registerObjectTag(ItemList.PadSticky.get(1L), new AspectList().add(Aspect.TRAP, 5).add(Aspect.SLIME, 2));
+
+        EMTRecipes.shieldFocus = addInfusionCraftingRecipe(
+                "Shield Focus",
+                new ItemStack(EMTItems.shieldFocus),
+                4,
+                EMTCraftingAspects.shieldFocusCrafting,
+                new ItemStack(ConfigItems.itemFocusPortableHole, 1),
+                new ItemStack[] { ItemList.Block_ReinforcedConcrete.get(1L), ItemList.ReinforcedGlass.get(1L),
+                        ItemList.Block_ReinforcedConcrete.get(1L), ItemList.ReinforcedGlass.get(1L),
+                        new ItemStack(Blocks.soul_sand), new ItemStack(Blocks.obsidian),
+                        new ItemStack(Blocks.obsidian) });
+
+        EMTRecipes.rockbreakerDrill = addInfusionCraftingRecipe(
+                "Drill of the Rockbreaker",
+                getChargedItem(EMTItems.rockbreakerDrill, 10),
+                6,
+                EMTCraftingAspects.rockbreakerDrillCrafting,
+                new ItemStack(EMTItems.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE),
+                new ItemStack[] { new ItemStack(Items.flint_and_steel), new ItemStack(Items.fire_charge),
+                        new ItemStack(ConfigItems.itemPickElemental), new ItemStack(ConfigItems.itemShovelElemental),
+                        new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
+                        ItemList.Block_ReinforcedConcrete.get(1L), IC2Items.getItem("iridiumPlate"),
+                        IC2Items.getItem("overclockerUpgrade") });
     }
 }

src/main/java/emt/init/EMTBlocks.java

@@ -47,9 +47,6 @@ public class EMTBlocks {
     }
 
     public static void addAspects() {
-        registerObjectTag(
-                IC2Items.getItem("reinforcedGlass"),
-                new AspectList().add(Aspect.METAL, 2).add(Aspect.COLD, 2));
         registerObjectTag(IC2Items.getItem("scaffold"), new AspectList().add(Aspect.TREE, 4));
         registerObjectTag(IC2Items.getItem("ironScaffold"), new AspectList().add(Aspect.METAL, 4));
         registerObjectTag(

src/main/java/emt/init/EMTRecipes.java

@@ -501,7 +501,7 @@ public class EMTRecipes {
                         new ItemStack(Items.arrow), new ItemStack(Items.gunpowder),
                         new ItemStack(Items.firework_charge), new ItemStack(ConfigItems.itemResource, 1, 1) });
 
-        shieldFocus = addInfusionCraftingRecipe(
+        if (!Registry.enableGTCompat) shieldFocus = addInfusionCraftingRecipe(
                 "Shield Focus",
                 new ItemStack(EMTItems.shieldFocus),
                 4,
@@ -547,7 +547,7 @@ public class EMTRecipes {
                         new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE),
                         IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade") });
 
-        rockbreakerDrill = addInfusionCraftingRecipe(
+        if (!Registry.enableGTCompat) rockbreakerDrill = addInfusionCraftingRecipe(
                 "Drill of the Rockbreaker",
                 getChargedItem(EMTItems.rockbreakerDrill, 10),
                 6,