From 219b2ececec84d28562fafa4b2cfb00889da026b Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Tue, 13 Oct 2026 16:05:22 +0200 Subject: [PATCH] add setting to disable flan compat --- .../mekanism/defense/common/Settings.java | 5 ++++ .../integration/FlansModIntegration.java | 24 ++++++++++++++----- .../flans/EntityDefenseTechBomb.java | 4 +++- .../integration/flans/FlansModCompat.java | 3 ++- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/main/java/mekanism/defense/common/Settings.java b/src/main/java/mekanism/defense/common/Settings.java index 3d4d0b098..de0640a3e 100644 --- a/src/main/java/mekanism/defense/common/Settings.java +++ b/src/main/java/mekanism/defense/common/Settings.java @@ -28,6 +28,7 @@ public class Settings public static boolean POLLUTIVE_NUCLEAR = true; public static boolean CREATE_NETHERRACK = true; public static double REDUCE_OBSIDIAN_RESISTANCE = 45F; + public static boolean ENABLE_FLANS_MOD_INTEGRATION = true; public static void initiate() { @@ -47,5 +48,9 @@ public class Settings POLLUTIVE_NUCLEAR = Settings.CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Pollutive Nuclear", true).getBoolean(true); CREATE_NETHERRACK = Settings.CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Exothermic Create Netherrack", true).getBoolean(true); REDUCE_OBSIDIAN_RESISTANCE = Settings.CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Reduce Obsidian Resistance", 45F).getDouble(45F); + ENABLE_FLANS_MOD_INTEGRATION = Settings.CONFIGURATION.get(Configuration.CATEGORY_GENERAL, + "Enable Flan's Mod Integration", true, + "Registers DefenseTech aircraft bombs with Flan's Mod and allows radar and anti-ballistic missiles to detect Flan aircraft. This setting must match on the client and server.") + .setRequiresMcRestart(true).getBoolean(true); } } diff --git a/src/main/java/mekanism/defense/common/integration/FlansModIntegration.java b/src/main/java/mekanism/defense/common/integration/FlansModIntegration.java index 9677d48bd..af54fcb61 100644 --- a/src/main/java/mekanism/defense/common/integration/FlansModIntegration.java +++ b/src/main/java/mekanism/defense/common/integration/FlansModIntegration.java @@ -8,6 +8,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import cpw.mods.fml.common.Loader; import defense.common.DefenseTech; +import defense.common.Settings; import defense.common.entity.EntityMissile; /** Optional loader that never resolves a Flan class unless Flan is installed. */ @@ -30,6 +31,12 @@ public final class FlansModIntegration attempted = true; + if(!Settings.ENABLE_FLANS_MOD_INTEGRATION) + { + DefenseTech.LOGGER.info("Optional Flan's Mod integration is disabled by configuration."); + return; + } + if(!Loader.isModLoaded("flansmod")) { return; @@ -50,7 +57,7 @@ public final class FlansModIntegration public static void init() { - if(bridge != null) + if(isEnabled()) { bridge.init(); } @@ -58,7 +65,7 @@ public final class FlansModIntegration public static void postInit() { - if(bridge != null) + if(isEnabled()) { bridge.postInit(); } @@ -66,7 +73,7 @@ public final class FlansModIntegration public static void clientInit() { - if(bridge == null) + if(!isEnabled()) { return; } @@ -85,19 +92,24 @@ public final class FlansModIntegration public static Entity findNearestAircraft(World world, AxisAlignedBB bounds, Entity excluded) { - return bridge == null ? null : bridge.findNearestAircraft(world, bounds, excluded); + return isEnabled() ? bridge.findNearestAircraft(world, bounds, excluded) : null; } public static boolean isAircraft(Entity entity) { - return bridge != null && bridge.isAircraft(entity); + return isEnabled() && bridge.isAircraft(entity); } public static void interceptAircraft(Entity aircraft, EntityMissile interceptor) { - if(bridge != null) + if(isEnabled()) { bridge.interceptAircraft(aircraft, interceptor); } } + + public static boolean isEnabled() + { + return Settings.ENABLE_FLANS_MOD_INTEGRATION && bridge != null; + } } diff --git a/src/main/java/mekanism/defense/common/integration/flans/EntityDefenseTechBomb.java b/src/main/java/mekanism/defense/common/integration/flans/EntityDefenseTechBomb.java index 4256e1415..9be0aae7a 100644 --- a/src/main/java/mekanism/defense/common/integration/flans/EntityDefenseTechBomb.java +++ b/src/main/java/mekanism/defense/common/integration/flans/EntityDefenseTechBomb.java @@ -14,6 +14,7 @@ import defense.api.ExplosionEvent.ExplosivePreDetonationEvent; import defense.api.ExplosiveType; import defense.common.explosive.Explosive; import defense.common.explosive.ExplosiveRegistry; +import defense.common.integration.FlansModIntegration; /** Flan projectile physics with DefenseTech detonation behavior. */ public class EntityDefenseTechBomb extends EntityBullet @@ -52,7 +53,8 @@ public class EntityDefenseTechBomb extends EntityBullet double x = posX; double y = posY; double z = posZ; - boolean dispatch = !payloadDispatched && world != null && !world.isRemote && explosiveId >= 0; + boolean dispatch = FlansModIntegration.isEnabled() && !payloadDispatched + && world != null && !world.isRemote && explosiveId >= 0; Explosive explosive = dispatch ? ExplosiveRegistry.get(explosiveId) : null; if(explosive == null || !explosive.hasBlockForm()) diff --git a/src/main/java/mekanism/defense/common/integration/flans/FlansModCompat.java b/src/main/java/mekanism/defense/common/integration/flans/FlansModCompat.java index d3866309b..38e668744 100644 --- a/src/main/java/mekanism/defense/common/integration/flans/FlansModCompat.java +++ b/src/main/java/mekanism/defense/common/integration/flans/FlansModCompat.java @@ -36,6 +36,7 @@ import defense.common.entity.EntityMissile; import defense.common.explosive.Explosive; import defense.common.explosive.ExplosiveRegistry; import defense.common.integration.IFlansModIntegration; +import defense.common.integration.FlansModIntegration; /** Implementation loaded only after the optional {@code flansmod} mod is found. */ public class FlansModCompat implements IFlansModIntegration @@ -207,7 +208,7 @@ public class FlansModCompat implements IFlansModIntegration @SubscribeEvent public void onEntityJoinWorld(EntityJoinWorldEvent event) { - if(event.entity instanceof EntityPlane) + if(FlansModIntegration.isEnabled() && event.entity instanceof EntityPlane) { RadarRegistry.register(event.entity); }