feat: added kubejs support back in for Neoforge

CHANGELOG.md

@@ -1,5 +1,5 @@
-## 6.0.0
+## 6.0.1
 
-### Changed
+### Added
 
-- Updated to 1.20.4
+- Added kubejs support back in for NeoForge as KubeJS no longer supports Forge or Fabric

build.gradle

@@ -33,6 +33,12 @@ allprojects {
     group = rootProject.maven_group
 
     repositories {
+        maven {
+            url "https://maven.latvian.dev/releases"
+            content {
+                includeGroup "dev.latvian.mods"
+            }
+        }
         maven {
             url "https://maven.saps.dev/releases"
             content {

common/build.gradle

@@ -24,9 +24,6 @@ dependencies {
     modApi("me.shedaniel.cloth:cloth-config:${rootProject.cloth_config_version}")
 
     modApi "dev.architectury:architectury:${rootProject.architectury_version}"
-
-//    modImplementation "dev.latvian.mods:kubejs:${rootProject.kubejs_version}"
-//    modImplementation "dev.latvian.mods:rhino:${rootProject.rhino_version}"
 }
 
 def ENV = System.getenv()

fabric/build.gradle

@@ -43,9 +43,6 @@ dependencies {
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
-
-//    modImplementation "dev.latvian.mods:kubejs-fabric:${rootProject.kubejs_version}"
-//    modImplementation "dev.latvian.mods:rhino-fabric:${rootProject.rhino_version}"
 }
 
 processResources {

forge/build.gradle

@@ -42,9 +42,6 @@ dependencies {
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
-
-//    modImplementation "dev.latvian.mods:kubejs-forge:${rootProject.kubejs_version}"
-//    modImplementation "dev.latvian.mods:rhino-forge:${rootProject.rhino_version}"
 }
 
 processResources {

gradle.properties

@@ -4,22 +4,22 @@ minecraft_version=1.20.4
 enabled_platforms=fabric,forge,neoforge
 
 archives_base_name=SimpleDiscordRichPresence
-mod_version=6.0.0
+mod_version=6.0.1
 maven_group=com.sunekaer.mods
 
 curseforge_id=334853
 modrinth_id=SCAopByd
 maven_url=https://maven.nanite.dev/
 
-architectury_version=11.0.8
+architectury_version=11.1.17
 
 fabric_loader_version=0.15.2
 fabric_api_version=0.91.3+1.20.4
 
 forge_version=49.0.9
-neoforge_version=20.4.43-beta
+neoforge_version=20.4.234
 
-#kubejs_version=2001.6.4-build.114
-#rhino_version=1902.2.3-build.284
+kubejs_version=2004.7.0-build.16
+rhino_version=2004.2.3-build.4
 
-cloth_config_version=13.0.114
+cloth_config_version=13.0.121

neoforge/build.gradle

@@ -38,8 +38,8 @@ dependencies {
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }
 
-//    modImplementation "dev.latvian.mods:kubejs-forge:${rootProject.kubejs_version}"
-//    modImplementation "dev.latvian.mods:rhino-forge:${rootProject.rhino_version}"
+    modImplementation("dev.latvian.mods:kubejs-neoforge:${rootProject.kubejs_version}") { transitive = false }
+    modImplementation("dev.latvian.mods:rhino-neoforge:${rootProject.rhino_version}") { transitive = false }
 }
 
 processResources {

neoforge/src/main/java/com/sunekaer/sdrp/neoforge/kubejs/SDRPKubeJSIntegration.java

@@ -0,0 +1,63 @@
+package com.sunekaer.sdrp.integration.kubejs;
+
+
+import com.sunekaer.sdrp.neoforge.kubejs.SDRPKubeJSWrapper;
+import dev.architectury.event.EventResult;
+import dev.architectury.event.events.common.EntityEvent;
+import dev.latvian.mods.kubejs.KubeJSPlugin;
+import dev.latvian.mods.kubejs.event.EventGroup;
+import dev.latvian.mods.kubejs.event.EventHandler;
+import dev.latvian.mods.kubejs.event.EventJS;
+import dev.latvian.mods.kubejs.script.BindingsEvent;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.dimension.DimensionType;
+
+public class SDRPKubeJSIntegration extends KubeJSPlugin {
+    static EventGroup GROUP = EventGroup.of("sdrp");
+    static EventHandler DIMENSION_CHANGE = GROUP.client("dimension_change", () -> ClientDimensionChangeEvent.class);
+
+    public static void setup() {
+        EntityEvent.ADD.register(SDRPKubeJSIntegration::clientJoinEvent);
+    }
+
+    @Override
+    public void registerBindings(BindingsEvent event) {
+        event.add("SDRP", SDRPKubeJSWrapper.class);
+    }
+
+    @Override
+    public void registerEvents() {
+        GROUP.register();
+    }
+
+    private static EventResult clientJoinEvent(Entity entity, Level level) {
+        if (!(entity instanceof Player player)) {
+            return EventResult.pass();
+        }
+
+        if (!level.isClientSide) {
+            return EventResult.pass();
+        }
+
+        DIMENSION_CHANGE.post(new ClientDimensionChangeEvent(level.dimensionType(), player, level));
+        return EventResult.pass();
+    }
+
+    public static class ClientDimensionChangeEvent extends EventJS {
+        public DimensionType dimensionType;
+        public Player player;
+        public Level level;
+
+        public ClientDimensionChangeEvent(DimensionType dimensionType, Player player, Level level) {
+            this.dimensionType = dimensionType;
+            this.player = player;
+            this.level = level;
+        }
+
+        public void updateSDRPState(String message, String imageName, String imageKey) {
+            SDRPKubeJSWrapper.setState(message, imageName, imageKey);
+        }
+    }
+}

common/src/main/java/com/sunekaer/sdrp/integration/kubejs/SDRPKubeJSWrapper.java → neoforge/src/main/java/com/sunekaer/sdrp/neoforge/kubejs/SDRPKubeJSWrapper.java

@@ -1,4 +1,4 @@
-package com.sunekaer.sdrp.integration.kubejs;
+package com.sunekaer.sdrp.neoforge.kubejs;
 
 import com.jagrosh.discordipc.entities.RichPresence;
 import com.sunekaer.sdrp.discord.State;