Update betterF3 to latest version and use new module loading system for the betterF3 module

build.gradle

@@ -1,20 +1,23 @@
 plugins {
     id 'maven-publish'
-    id 'fabric-loom' version '1.9.2'
-    id 'babric-loom-extension' version '1.9.4'
+    id 'fabric-loom' version '1.14.9'
+    id 'babric-loom-extension' version '1.14.1'
 }
 
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
-
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
-loom {
-    customMinecraftManifest.set("https://babric.github.io/manifest-polyfill/${minecraft_version}.json")
-    intermediaryUrl.set("https://maven.glass-launcher.net/babric/babric/intermediary/%1\$s/intermediary-%1\$s-v2.jar")
+base {
+    archivesName = project.archives_base_name
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }
 
+
 repositories {
     maven {
         name = 'Babric'
@@ -80,7 +83,7 @@ dependencies {
     }
 
     // Optional, but convenient mods for mod creators and users alike.
-    modImplementation("net.glasslauncher.mods:ModMenu:${project.modmenu_version}") {
+    modImplementation("net.danygames2014:modmenu:${project.modmenu_version}") {
         transitive false
     }
 
@@ -124,7 +127,7 @@ java {
 
 jar {
     from("LICENSE") {
-        rename { "${it}_${archivesBaseName}" }
+        rename { "${it}_" + base.archivesName.get() }
     }
 }
 

gradle.properties

@@ -11,20 +11,20 @@ yarn_mappings=b1.7.3+2f404bc
 loader_version=0.16.10
 
 # Mod Properties
-mod_version = 1.7.0
+mod_version = 1.8.0
 maven_group = io.github.viciscat
 archives_base_name = entityculling-fabric-babric
 
 # Dependencies
 stapi_version=2.0.0-alpha.5.2
 
 # Extra Dependencies
-modmenu_version=1.8.5-beta.11
+modmenu_version=1.1.1
 glass_networking_version=1.0.7
 gcapi_version=3.2.5
 alwaysmoreitems_version=1.7.1
 
 occlusionculling_version=0.0.8-SNAPSHOT
 
 # Mod compatibility
-betterf3_version=0.5.2
+betterf3_version=0.6.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/dev/tr7zw/entityculling/betterf3/EntityCullingModule.java

@@ -3,21 +3,23 @@
 import dev.tr7zw.entityculling.Config;
 import dev.tr7zw.entityculling.EntityCullingMod;
 import net.minecraft.client.Minecraft;
+import net.modificationstation.stationapi.api.util.Identifier;
 import ralf2oo2.betterf3.modules.BaseModule;
 import ralf2oo2.betterf3.utils.DebugLine;
 
 public class EntityCullingModule extends BaseModule {
 
-    public EntityCullingModule() {
+    public EntityCullingModule(Identifier id) {
+        super(id);
         this.defaultNameColor = 0xFF5555;
         this.defaultValueColor = 0xFFFF55;
 
         this.nameColor = defaultNameColor;
         this.valueColor = defaultValueColor;
 
-        lines.add(new DebugLine("cullinglastpass"));
-        lines.add(new DebugLine("cullingrenderedblockentities"));
-        lines.add(new DebugLine("cullingrenderedentities"));
+        lines.add(new DebugLine("cullinglastpass").withNamespace(ModuleListener.NAMESPACE));
+        lines.add(new DebugLine("cullingrenderedblockentities").withNamespace(ModuleListener.NAMESPACE));
+        lines.add(new DebugLine("cullingrenderedentities").withNamespace(ModuleListener.NAMESPACE));
     }
 
     @Override

src/main/java/dev/tr7zw/entityculling/betterf3/ModuleListener.java

@@ -0,0 +1,17 @@
+package dev.tr7zw.entityculling.betterf3;
+
+import net.mine_diver.unsafeevents.listener.EventListener;
+import net.modificationstation.stationapi.api.mod.entrypoint.Entrypoint;
+import net.modificationstation.stationapi.api.util.Namespace;
+import ralf2oo2.betterf3.registry.ModuleRegisterEvent;
+import ralf2oo2.betterf3.utils.ModulePosition;
+
+public class ModuleListener {
+    @Entrypoint.Namespace
+    public static Namespace NAMESPACE;
+
+    @EventListener
+    public void registerModules(ModuleRegisterEvent event){
+        event.register(NAMESPACE.id("culling_module"), EntityCullingModule::new, ModulePosition.LEFT, "culling");
+    }
+}

src/main/resources/assets/minecraft/stationapi/lang/en_US.lang

@@ -1,4 +1,4 @@
-text.betterf3.module.entityculling=Entity Culling
-text.betterf3.line.cullinglastpass=[Culling] Last pass
-text.betterf3.line.cullingrenderedblockentities=[Culling] Rendered Block Entities
-text.betterf3.line.cullingrenderedentities=[Culling] Rendered Entities
+text.entityculling.module.culling=Entity Culling
+text.entityculling.line.cullinglastpass=[Culling] Last pass
+text.entityculling.line.cullingrenderedblockentities=[Culling] Rendered Block Entities
+text.entityculling.line.cullingrenderedentities=[Culling] Rendered Entities

src/main/resources/entityculling.mixins.json

@@ -3,10 +3,8 @@
   "minVersion": "0.8",
   "package": "dev.tr7zw.entityculling.mixin",
   "compatibilityLevel": "JAVA_16",
-  "plugin": "dev.tr7zw.entityculling.EntityCullingMixinPlugin",
   "mixins": [],
   "client": [
-    "BetterF3Mixin",
     "BlockEntityRenderDispatcherMixin",
     "ClientPlayerEntityMixin",
     "CullableMixin",

src/main/resources/fabric.mod.json

@@ -22,6 +22,9 @@
         ],
         "gcapi3": [
             "dev.tr7zw.entityculling.Config"
+        ],
+        "betterf3:event_bus_client": [
+            "dev.tr7zw.entityculling.betterf3.ModuleListener"
         ]
     },
     "mixins": [