Add forge

Author: Discusser

benchmark/200CowsVs100Cows.png

@@ -1,5 +1,6 @@
 package io.github.discusser.toomanyentities;
 
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,4 +17,9 @@ public static void init() {
     public static void initClient() {
 
     }
+
+    @ExpectPlatform
+    public static boolean isModPresent(String modid) {
+        throw new AssertionError();
+    }
 }

benchmark/700CowsVs100Cows.png

@@ -1,8 +1,8 @@
 package io.github.discusser.toomanyentities.mixin;
 
 import com.google.common.collect.ImmutableMap;
-import dev.architectury.injectables.targets.ArchitecturyTarget;
 import dev.architectury.platform.Platform;
+import io.github.discusser.toomanyentities.TooManyEntities;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
@@ -13,7 +13,7 @@
 import java.util.function.Supplier;
 
 public class TooManyEntitiesMixinPlugin implements IMixinConfigPlugin {
-    private static final Supplier<Boolean> entityCullingLoaded = () -> Platform.isModLoaded("entityculling");
+    private static final Supplier<Boolean> entityCullingLoaded = () -> TooManyEntities.isModPresent("entityculling");
     private static final boolean isFabric = Platform.isFabric();
 
     private static final Map<String, Supplier<Boolean>> CONDITIONS = ImmutableMap.of(

benchmark/Untitled.xcf

@@ -0,0 +1,9 @@
+package io.github.discusser.toomanyentities.fabric;
+
+import net.fabricmc.loader.api.FabricLoader;
+
+public class TooManyEntitiesImpl {
+    public static boolean isModPresent(String modid) {
+        return FabricLoader.getInstance().isModLoaded(modid);
+    }
+}

common/src/main/java/io/github/discusser/toomanyentities/TooManyEntities.java

@@ -1,38 +1,40 @@
 package io.github.discusser.toomanyentities.forge;
 
 import dev.architectury.platform.forge.EventBuses;
+import io.github.discusser.toomanyentities.TooManyEntities;
 import io.github.discusser.toomanyentities.forge.config.MapGuiProvider;
 import io.github.discusser.toomanyentities.forge.config.TooManyEntitiesConfig;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.gui.registry.GuiRegistry;
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
-import io.github.discusser.toomanyentities.TooManyEntities;
-import net.minecraftforge.fml.loading.LoadingModList;
-
 import java.util.Map;
 
 @Mod(TooManyEntities.MODID)
-@Mod.EventBusSubscriber(modid = TooManyEntities.MODID)
 public final class TooManyEntitiesForge {
     public TooManyEntitiesForge() {
-        EventBuses.registerModEventBus(TooManyEntities.MODID, FMLJavaModLoadingContext.get().getModEventBus());
+        IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+
+        modEventBus.addListener(this::clientSetup);
+
+        EventBuses.registerModEventBus(TooManyEntities.MODID, modEventBus);
 
         TooManyEntities.init();
     }
 
-    @SubscribeEvent
-    public static void clientInit(FMLClientSetupEvent ignoredEvent) {
+    private void clientSetup(FMLClientSetupEvent ignoredEvent) {
         AutoConfig.register(TooManyEntitiesConfig.class, GsonConfigSerializer::new);
         GuiRegistry registry = AutoConfig.getGuiRegistry(TooManyEntitiesConfig.class);
         registry.registerPredicateProvider(new MapGuiProvider(), field -> Map.class.isAssignableFrom(field.getType()));
         TooManyEntitiesConfig.instance = AutoConfig.getConfigHolder(TooManyEntitiesConfig.class).getConfig();
 
+        MinecraftForge.registerConfigScreen(screen -> AutoConfig.getConfigScreen(TooManyEntitiesConfig.class, screen).get());
+
         TooManyEntities.initClient();
     }
 }

common/src/main/java/io/github/discusser/toomanyentities/mixin/TooManyEntitiesMixinPlugin.java

@@ -0,0 +1,12 @@
+package io.github.discusser.toomanyentities.forge;
+
+import net.minecraftforge.fml.ModList;
+import net.minecraftforge.fml.loading.LoadingModList;
+
+public class TooManyEntitiesImpl {
+    public static boolean isModPresent(String modid) {
+        return ModList.get() == null
+                ? LoadingModList.get().getModFileById(modid) != null
+                : ModList.get().isLoaded(modid);
+    }
+}

fabric/src/main/java/io/github/discusser/toomanyentities/fabric/TooManyEntitiesImpl.java

@@ -1,6 +1,6 @@
 modLoader = "javafml"
 loaderVersion = "[47,)"
-#issueTrackerURL = ""
+issueTrackerURL = "https://github.com/Discusser/TooManyEntities/issues"
 license = "MIT"
 
 [[mods]]

forge/src/main/java/io/github/discusser/toomanyentities/forge/TooManyEntitiesForge.java

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # Mod properties
-mod_version = 1.0.0
+mod_version = 1.0.1
 maven_group = io.github.discusser.toomanyentities
 archives_name = too_many_entities
 enabled_platforms = fabric,forge