Skip to content

Commit 5536751

Browse files
Disable Ad Mod if Essential Container is installed
1 parent 4e2c2ff commit 5536751

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

src/main/java/gg/essential/ad/EssentialAd.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private void createButton(
9090
//#endif
9191
BiConsumer<GuiButton, Integer> adder
9292
) {
93-
if (EssentialUtil.isEssentialLoaded()) return;
93+
if (EssentialUtil.isEssentialOrContainerLoaded()) return;
9494
if (CONFIG.shouldHideButtons()) return;
9595

9696
int width = screen.width;

src/main/java/gg/essential/ad/EssentialUtil.java

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,29 @@
1010
public class EssentialUtil {
1111

1212
private static boolean installationCompleted = false;
13-
private static Boolean isEssentiaLoaded = null;
13+
private static Boolean isEssentialLoaded = null;
1414

15-
public static boolean isEssentialLoaded() {
16-
if (isEssentiaLoaded == null) {
17-
isEssentiaLoaded = ModLoaderUtil.isModLoaded("essential");
15+
public static boolean isEssentialOrContainerLoaded() {
16+
if (isEssentialLoaded == null) {
17+
isEssentialLoaded = ModLoaderUtil.isModLoaded("essential") || isEssentialContainerLoaded();
1818
}
19-
return isEssentiaLoaded;
19+
return isEssentialLoaded;
20+
}
21+
22+
// From: https://github.com/EssentialGG/EssentialDev/blob/8c17244b8ad2e4058578487a16018b17376ba150/src/main/java/gg/essential/util/EssentialContainerUtil.java#L18-L31
23+
private static boolean isEssentialContainerLoaded() {
24+
//#if FABRIC
25+
//$$ return net.fabricmc.loader.api.FabricLoader.getInstance().isModLoaded("essential-container");
26+
//#elseif MC>=11700
27+
//$$ return cpw.mods.modlauncher.Launcher.INSTANCE.findLayerManager()
28+
//$$ .flatMap(it -> it.getLayer(cpw.mods.modlauncher.api.IModuleLayerManager.Layer.SERVICE))
29+
//$$ .map(ModuleLayer::modules)
30+
//$$ .orElseGet(java.util.Collections::emptySet)
31+
//$$ .stream()
32+
//$$ .anyMatch(it -> it.getClassLoader().getResource("essential_container_marker.txt") != null);
33+
//#else
34+
return EssentialUtil.class.getClassLoader().getResource("essential_container_marker.txt") != null;
35+
//#endif
2036
}
2137

2238
public static boolean installationCompleted() {

0 commit comments

Comments
 (0)