From 0d5f682d3a2e66997ca0ca32ec2a80a1ae054bb4 Mon Sep 17 00:00:00 2001 From: danyadev Date: Tue, 11 Nov 2025 22:57:27 +0300 Subject: [PATCH] don't integrate certus quartz tank with waila if WailaPlugins is present (#361) --- .../com/glodblock/github/crossmod/waila/WailaInit.java | 8 +++++--- .../java/com/glodblock/github/util/ModAndClassUtil.java | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glodblock/github/crossmod/waila/WailaInit.java b/src/main/java/com/glodblock/github/crossmod/waila/WailaInit.java index 8cbf4293..820cb660 100644 --- a/src/main/java/com/glodblock/github/crossmod/waila/WailaInit.java +++ b/src/main/java/com/glodblock/github/crossmod/waila/WailaInit.java @@ -1,6 +1,7 @@ package com.glodblock.github.crossmod.waila; import com.glodblock.github.common.tile.TileCertusQuartzTank; +import com.glodblock.github.util.ModAndClassUtil; import appeng.api.parts.IPartHost; import appeng.tile.AEBaseTile; @@ -26,8 +27,9 @@ public class WailaInit { registrar.registerBodyProvider(tile, AEBaseTile.class); registrar.registerNBTProvider(tile, AEBaseTile.class); - final IWailaDataProvider certusQuartzTank = new CertusQuartzTankWailaDataProvider(); - registrar.registerBodyProvider(certusQuartzTank, TileCertusQuartzTank.class); - + if (!ModAndClassUtil.WAILA_PLUGINS) { + final IWailaDataProvider certusQuartzTank = new CertusQuartzTankWailaDataProvider(); + registrar.registerBodyProvider(certusQuartzTank, TileCertusQuartzTank.class); + } } } diff --git a/src/main/java/com/glodblock/github/util/ModAndClassUtil.java b/src/main/java/com/glodblock/github/util/ModAndClassUtil.java index 147f2d1b..6cdded95 100644 --- a/src/main/java/com/glodblock/github/util/ModAndClassUtil.java +++ b/src/main/java/com/glodblock/github/util/ModAndClassUtil.java @@ -32,6 +32,7 @@ public final class ModAndClassUtil { public static boolean COFH = false; public static boolean GTPP = false; public static boolean WAILA = false; + public static boolean WAILA_PLUGINS = false; public static boolean AVARITIA = false; public static boolean NEW_HORIZONS_CORE_MOD = false; @@ -146,6 +147,7 @@ public final class ModAndClassUtil { if (Loader.isModLoaded("CoFHCore")) COFH = true; if (Loader.isModLoaded("miscutils")) GTPP = true; if (Loader.isModLoaded("Waila")) WAILA = true; + if (Loader.isModLoaded("wailaplugins")) WAILA_PLUGINS = true; if (Loader.isModLoaded("Avaritia")) AVARITIA = true; if (Loader.isModLoaded("dreamcraft")) NEW_HORIZONS_CORE_MOD = true; }