add stuff i dont know anymore

Discusser · Discusser · commit 7510f6f9bc32 · 2024-08-06T20:18:49.000+02:00
diff --git a/builds/Too Many Entities 1.20.1 Fabric v1.0.1.jar b/builds/Too Many Entities 1.20.1 Fabric v1.0.1.jar
diff --git a/builds/Too Many Entities 1.20.1 Forge v1.0.1.jar b/builds/Too Many Entities 1.20.1 Forge v1.0.1.jar
diff --git a/common/build.gradle b/common/build.gradle
@@ -10,4 +10,6 @@ dependencies {
 
     // Architectury API. This is optional, and you can comment it out if you don't need it.
     modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"
+
+    modCompileOnlyApi("me.shedaniel.cloth:cloth-config:$project.clothconfig_version")
 }
diff --git a/common/src/main/java/io/github/discusser/toomanyentities/TooManyEntities.java b/common/src/main/java/io/github/discusser/toomanyentities/TooManyEntities.java
@@ -1,10 +1,16 @@
 package io.github.discusser.toomanyentities;
 
 import dev.architectury.injectables.annotations.ExpectPlatform;
+import io.github.discusser.toomanyentities.config.MapGuiProvider;
+import io.github.discusser.toomanyentities.config.TooManyEntitiesConfig;
+import me.shedaniel.autoconfig.AutoConfig;
+import me.shedaniel.autoconfig.gui.registry.GuiRegistry;
+import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
+import java.util.Map;
 
 public final class TooManyEntities {
     public static final Logger LOGGER = LoggerFactory.getLogger("too_many_entities");
@@ -15,7 +21,10 @@ public static void init() {
     }
 
     public static void initClient() {
-
+        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();
     }
 
     @ExpectPlatform
diff --git a/common/src/main/java/io/github/discusser/toomanyentities/config/MapGuiProvider.java b/common/src/main/java/io/github/discusser/toomanyentities/config/MapGuiProvider.java
@@ -1,4 +1,4 @@
-package io.github.discusser.toomanyentities.forge.config;
+package io.github.discusser.toomanyentities.config;
 
 import io.github.discusser.toomanyentities.TooManyEntities;
 import me.shedaniel.autoconfig.gui.registry.api.GuiProvider;
diff --git a/common/src/main/java/io/github/discusser/toomanyentities/config/TooManyEntitiesConfig.java b/common/src/main/java/io/github/discusser/toomanyentities/config/TooManyEntitiesConfig.java
@@ -1,4 +1,4 @@
-package io.github.discusser.toomanyentities.fabric.config;
+package io.github.discusser.toomanyentities.config;
 
 import io.github.discusser.toomanyentities.TooManyEntities;
 import me.shedaniel.autoconfig.ConfigData;
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -33,9 +33,7 @@ dependencies {
     // Architectury API. This is optional, and you can comment it out if you don't need it.
     modImplementation "dev.architectury:architectury-fabric:$rootProject.architectury_api_version"
 
-    modApi("me.shedaniel.cloth:cloth-config-fabric:$project.clothconfig_version") {
-        exclude(group: "net.fabricmc.fabric-api")
-    }
+    modApi("me.shedaniel.cloth:cloth-config-fabric:$project.clothconfig_version")
     modImplementation("com.terraformersmc:modmenu:$project.modmenu_version")
     modImplementation("maven.modrinth:entityculling:$project.entityculling_version-fabric")
 
diff --git a/fabric/src/main/java/io/github/discusser/toomanyentities/fabric/TooManyEntitiesClientFabric.java b/fabric/src/main/java/io/github/discusser/toomanyentities/fabric/TooManyEntitiesClientFabric.java
@@ -1,23 +1,11 @@
 package io.github.discusser.toomanyentities.fabric;
 
 import io.github.discusser.toomanyentities.TooManyEntities;
-import io.github.discusser.toomanyentities.fabric.config.MapGuiProvider;
-import io.github.discusser.toomanyentities.fabric.config.TooManyEntitiesConfig;
-import me.shedaniel.autoconfig.AutoConfig;
-import me.shedaniel.autoconfig.gui.registry.GuiRegistry;
-import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
 import net.fabricmc.api.ClientModInitializer;
 
-import java.util.Map;
-
 public final class TooManyEntitiesClientFabric implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
-        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();
-
         TooManyEntities.initClient();
     }
 }
diff --git a/fabric/src/main/java/io/github/discusser/toomanyentities/fabric/TooManyEntitiesModMenuApiImpl.java b/fabric/src/main/java/io/github/discusser/toomanyentities/fabric/TooManyEntitiesModMenuApiImpl.java
@@ -2,7 +2,7 @@
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
-import io.github.discusser.toomanyentities.fabric.config.TooManyEntitiesConfig;
+import io.github.discusser.toomanyentities.config.TooManyEntitiesConfig;
 import me.shedaniel.autoconfig.AutoConfig;
 
 public class TooManyEntitiesModMenuApiImpl implements ModMenuApi {
diff --git a/fabric/src/main/java/io/github/discusser/toomanyentities/fabric/config/MapGuiProvider.java b/fabric/src/main/java/io/github/discusser/toomanyentities/fabric/config/MapGuiProvider.java
diff --git a/fabric/src/main/java/io/github/discusser/toomanyentities/fabric/mixin/client/CommonWorldRendererMixin.java b/fabric/src/main/java/io/github/discusser/toomanyentities/fabric/mixin/client/CommonWorldRendererMixin.java
@@ -2,7 +2,7 @@
 
 import com.llamalad7.mixinextras.sugar.Local;
 import io.github.discusser.toomanyentities.TooManyEntities;
-import io.github.discusser.toomanyentities.fabric.config.TooManyEntitiesConfig;
+import io.github.discusser.toomanyentities.config.TooManyEntitiesConfig;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/fabric/src/main/java/io/github/discusser/toomanyentities/fabric/mixin/client/EntityCullingWorldRendererMixin.java b/fabric/src/main/java/io/github/discusser/toomanyentities/fabric/mixin/client/EntityCullingWorldRendererMixin.java
@@ -3,7 +3,7 @@
 import com.llamalad7.mixinextras.sugar.Local;
 import dev.tr7zw.entityculling.EntityCullingModBase;
 import io.github.discusser.toomanyentities.TooManyEntities;
-import io.github.discusser.toomanyentities.fabric.config.TooManyEntitiesConfig;
+import io.github.discusser.toomanyentities.config.TooManyEntitiesConfig;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     implementation(include("io.github.llamalad7:mixinextras-forge:0.4.0"))
 
     modApi("me.shedaniel.cloth:cloth-config-forge:$project.clothconfig_version")
+    modImplementation "net.fabricmc:fabric-loader:$project.fabric_loader_version"
     modImplementation("maven.modrinth:entityculling:$project.entityculling_version-forge")
 
     common(project(path: ':common', configuration: 'namedElements')) { transitive false }
diff --git a/forge/src/main/java/io/github/discusser/toomanyentities/forge/TooManyEntitiesForge.java b/forge/src/main/java/io/github/discusser/toomanyentities/forge/TooManyEntitiesForge.java
@@ -2,37 +2,25 @@
 
 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 io.github.discusser.toomanyentities.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.IEventBus;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
-import java.util.Map;
-
 @Mod(TooManyEntities.MODID)
 public final class TooManyEntitiesForge {
     public TooManyEntitiesForge() {
         IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
-
         modEventBus.addListener(this::clientSetup);
-
         EventBuses.registerModEventBus(TooManyEntities.MODID, modEventBus);
 
         TooManyEntities.init();
     }
 
     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();
diff --git a/forge/src/main/java/io/github/discusser/toomanyentities/forge/config/TooManyEntitiesConfig.java b/forge/src/main/java/io/github/discusser/toomanyentities/forge/config/TooManyEntitiesConfig.java
diff --git a/forge/src/main/java/io/github/discusser/toomanyentities/forge/mixin/client/CommonWorldRendererMixin.java b/forge/src/main/java/io/github/discusser/toomanyentities/forge/mixin/client/CommonWorldRendererMixin.java
@@ -2,7 +2,7 @@
 
 import com.llamalad7.mixinextras.sugar.Local;
 import io.github.discusser.toomanyentities.TooManyEntities;
-import io.github.discusser.toomanyentities.forge.config.TooManyEntitiesConfig;
+import io.github.discusser.toomanyentities.config.TooManyEntitiesConfig;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/forge/src/main/java/io/github/discusser/toomanyentities/forge/mixin/client/EntityCullingWorldRendererMixin.java b/forge/src/main/java/io/github/discusser/toomanyentities/forge/mixin/client/EntityCullingWorldRendererMixin.java
@@ -3,7 +3,7 @@
 import com.llamalad7.mixinextras.sugar.Local;
 import dev.tr7zw.entityculling.EntityCullingModBase;
 import io.github.discusser.toomanyentities.TooManyEntities;
-import io.github.discusser.toomanyentities.forge.config.TooManyEntitiesConfig;
+import io.github.discusser.toomanyentities.config.TooManyEntitiesConfig;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,6 @@ dependencies {`
`10`	`10`
`11`	`11`	`// Architectury API. This is optional, and you can comment it out if you don't need it.`
`12`	`12`	`modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"`
	`13`	`+`
	`14`	`+ modCompileOnlyApi("me.shedaniel.cloth:cloth-config:$project.clothconfig_version")`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.github.discusser.toomanyentities.forge.config;`
	`1`	`+package io.github.discusser.toomanyentities.config;`
`2`	`2`
`3`	`3`	`import io.github.discusser.toomanyentities.TooManyEntities;`
`4`	`4`	`import me.shedaniel.autoconfig.gui.registry.api.GuiProvider;`