From 9f42531f37b61739ceab40e08c7237808e5d847c Mon Sep 17 00:00:00 2001 From: Marlo Greisser Date: Sun, 4 Oct 2026 16:00:00 +0200 Subject: [PATCH] Solegnolia applies to dislocators (#114) --- dependencies.gradle | 1 + gradle.properties | 5 +++++ gradle/gradle-daemon-jvm.properties | 20 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- .../common/items/tools/Magnet.java | 7 +++++++ 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 6482f49..ed0c84b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -10,6 +10,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.12:dev") {transitive = false} compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.1:dev") {transitive = false} compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.11-GTNH:dev') {transitive = false} + compileOnly("com.github.GTNewHorizons:Botania:1.13.36-GTNH:dev") {transitive = false} compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.461:dev") {transitive = false} compileOnly("com.github.GTNewHorizons:Backhand:1.8.8:dev") {transitive = false} diff --git a/gradle.properties b/gradle.properties index bdfb470..ae79ade 100644 --- a/gradle.properties +++ b/gradle.properties @@ -186,6 +186,11 @@ modrinthRelations = # Leave this empty if you don't want to publish on CurseForge. curseForgeProjectId = +# Comma-separated supported CurseForge environments: client, server (case-insensitive). +# Use client or server for mods that only support one environment. Defaults to client,server. +# These tags describe where the mod can run, not whether installation is required on both sides. +curseForgeEnvironments = client,server + # The project's relations on CurseForge. You can use this to refer to other projects on CurseForge. # Syntax: type1:name1;type2:name2;... # Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible], diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index 58206c6..1924b05 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/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/1630f7ebef05444cb27a2709ea0249b3/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/1630f7ebef05444cb27a2709ea0249b3/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/1630f7ebef05444cb27a2709ea0249b3/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/8e1d9ee5d0f13e442218f6884a306da1/redirect +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9064f22734b42ac03e85df04b632e167/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/4d0277c49991306ac78048580fe34bcf/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a9fa3b809e484a1e1ac4308a5dda661a/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/aa99913fa6d767d899ffc96082da01ca/redirect toolchainVersion=25 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dbc3ce4..c42672d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 407aea2..bbc1785 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.34' } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java index e67659b..1ed2cb8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java @@ -39,9 +39,11 @@ import com.gtnewhorizon.gtnhlib.GTNHLib; import baubles.api.BaubleType; import baubles.api.IBauble; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; /** * Created by brandon3055 on 9/3/2016. @@ -50,6 +52,8 @@ import cpw.mods.fml.relauncher.SideOnly; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public class Magnet extends ItemDE implements IBauble, IConfigurableItem { + private static final boolean BOTANIA_LOADED = Loader.isModLoaded("Botania"); + private IIcon draconium; private IIcon awakened; @@ -120,6 +124,9 @@ public class Magnet extends ItemDE implements IBauble, IConfigurableItem { if (IConfigurableItem.ProfileHelper.getBoolean(stack, References.MAGNET_SNEAK, true) && entity.isSneaking()) { return; } + if (BOTANIA_LOADED && SubTileSolegnolia.hasSolegnoliaAround(player)) { + return; + } int range = stack.getItemDamage() == 0 ? 8 : 32; List items = world.getEntitiesWithinAABB(