Merge pull request #54 from GTNewHorizons/master

Merge

Author: RecursivePineapple

dependencies.gradle

@@ -38,32 +38,32 @@ def asmVersion = "9.7"
 
 dependencies {
     implementation("com.github.GTNewHorizons:StructureLib:1.4.2:dev")
-    implementation("com.github.GTNewHorizons:GTNHLib:0.6.10:dev")
-    implementation("com.github.GTNewHorizons:ModularUI:1.2.17:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.6.11:dev")
+    implementation("com.github.GTNewHorizons:ModularUI:1.2.18:dev")
 
-    compileOnly('com.github.GTNewHorizons:Angelica:1.0.0-beta33:api') { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-538-GTNH:dev") { transitive = false }
+    compileOnly('com.github.GTNewHorizons:Angelica:1.0.0-beta35:api') { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-547-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:ArchitectureCraft:1.10.2") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.8.4-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.5:dev") { transitive = false }
     compileOnly("curse.maven:cofh-lib-220333:2388748") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:EnderIO:2.9.3:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:EnderIO:2.9.4:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.121:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.24:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.148:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.26:dev") { transitive = false }
     compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") { transitive = false }
     compileOnly("curse.maven:mekanism-268560:2475797") { transitive = false }
     compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.7.29-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:OpenComputers:1.11.7-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:OpenComputers:1.11.8-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:waila:1.8.2:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:FloodLights:1.5.3:dev") { transitive = false }
 
-    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-538-GTNH:dev")
-    runtimeOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.121:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-547-GTNH:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.148:dev")
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:ArchitectureCraft:1.10.2")
     runtimeOnlyNonPublishable("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.29-GTNH:dev")
-    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.6.24:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.6.26:dev")
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev")
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:FloodLights:1.5.3:dev")
 

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.32'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.33'
 }

src/main/java/com/recursive_pineapple/matter_manipulator/common/building/GTAnalysisResult.java

@@ -45,9 +45,7 @@
 import com.recursive_pineapple.matter_manipulator.common.building.BlockAnalyzer.IBlockApplyContext;
 import com.recursive_pineapple.matter_manipulator.common.items.manipulator.Transform;
 import com.recursive_pineapple.matter_manipulator.common.utils.MMUtils;
-import com.recursive_pineapple.matter_manipulator.common.utils.Mods;
 
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoTunnel;
 import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyTunnel;
 import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase;
@@ -176,12 +174,7 @@ public GTAnalysisResult(IGregTechTileEntity igte) {
                 mGTGhostCircuit = 0;
             } else if (circuit.getItem() == ItemList.Circuit_Integrated.getItem()) {
                 mGTGhostCircuit = (byte) Items.feather.getDamage(circuit);
-            } else if (Mods.GTPlusPlus.isModLoaded()) {
-                if (circuit.getItem() == GregtechItemList.Circuit_BioRecipeSelector.getItem()) {
-                    mGTGhostCircuit = (byte) (Items.feather.getDamage(circuit) + 24);
-                } else if (circuit.getItem() == GregtechItemList.Circuit_T3RecipeSelector.getItem()) {
-                    mGTGhostCircuit = (byte) (Items.feather.getDamage(circuit) + 48);
-                }
+
             }
         }
 
@@ -360,11 +353,7 @@ public boolean apply(IBlockApplyContext ctx) {
             if (mte instanceof IConfigurationCircuitSupport ghostCircuit && ghostCircuit.allowSelectCircuit()) {
                 ItemStack circuit = null;
 
-                if (mGTGhostCircuit > 48) {
-                    circuit = GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(0, mGTGhostCircuit - 48);
-                } else if (mGTGhostCircuit > 24) {
-                    circuit = GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(0, mGTGhostCircuit - 24);
-                } else if (mGTGhostCircuit > 0) {
+                if (mGTGhostCircuit > 0) {
                     circuit = ItemList.Circuit_Integrated.getWithDamage(0, mGTGhostCircuit);
                 }