feat: port to 1.21.4

Author: MichaelHillcox

CHANGELOG.md

@@ -1,5 +1,9 @@
-## 87.0.1
+## 91.0.0
 
 ### Added
 
-- Added KubeJS Support back to the NeoForge version
+- Ported to 1.21.4
+
+### Changed
+
+- Removed KubeJS support in preference for configs.

README.md

@@ -35,7 +35,6 @@ We always will attempt to use an image called `loading` and an image called `men
 - `menu` When the main menu is showing
 - `loading` When the game is loading
 
-
 ## Using custom images
 
 If you are not using the KubeJS integration then you will need to follow the our convention for naming images and language keys. The convention is as follows:
@@ -135,64 +134,4 @@ If you do not want to have buttons, you can leave the buttons array empty.
     }
   ]
 }
-```
-
-## KubeJS Integration
-
-> **Note!**
-> 
-> KubeJS Support is only support in 3.0.0+ for `1.19.2` and `4.0.3+` for `1.20.1+`.
-> 
-> KubeJS no longer supports Forge or Fabric so support for KubeJS as of `1.20.4+` is limited to just the `NeoForge` version of our mod
-> 
-> Only `KubeJS 6+` is supported!
-
-Via KubeJS we expose the following methods:
-
-- `SDRP.setState( String message, String imageName, String imageKey )`
-  - `message`: message to show under the packname aka "In Overworld" or "In Nether", can be passed a string with the text to show or a lang key. 
-  - `imageName`: the text to show when hovering over the small image aka "Overworld" or "Nether", can be passed a string with the text to show or a lang key.
-  - `imageKey` : the name Rich Present Art Asset to show, like loading, overworld, menu and so on.
-
-- `SDRP.getCurrentState()`
-  - Gets the current state the client is set to.
-
-### 3.0.6+ and 4.0.3+
-
-In 3.0.6+ and 4.0.3+ we expose a couple of new events to help with some KubeJS weirdness as well as the above methods.
-
-`kubejs/startup_script/sdrp.js`
-
-```js
-sdrp.dimension_change((event) => {
-  const dimPath = event.level.dimension().location().getPath();
-  event.updateSDRPState(`sdrp.${dimPath}.in`, `sdrp.${dimPath}`, "dimPath");
-});
-```
-
-*File path for illustration purposes only, you can put this file anywhere in the `kubejs` folder.*
-
-The `event` object has the following properties:
-
-- `dimensionType`: The dimension the player is in
-- `player`: The player object
-- `level`: The level object
-
-#### Without our events
-
-Example of how to change the state when a player joins a world.
-
-`kubejs/startup_script/sdrp.js`
-
-```js
-// KubeJS 6+
-// This might be the wrong event class for 1.20+, I didn't check
-ForgeEvents.onEvent('net.minecraftforge.event.entity.EntityJoinWorldEvent', event => {
-  if (event.getEntity().type === "entity.minecraft.player") {
-    if (event.getWorld().isClientSide()) {
-      const dimPath = event.getWorld().dimension().location().getPath();
-      SDRP.setState(`sdrp.${dimPath}.in`, `sdrp.${dimPath}`, "dimPath");
-    }
-  }
-})
-```
+```

build.gradle

@@ -1,7 +1,9 @@
+import groovy.json.JsonSlurper
+
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
-    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
+    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+    id "me.modmuss50.mod-publish-plugin" version "0.8.3"
 }
 
 architectury {
@@ -29,28 +31,24 @@ allprojects {
     def ENV = System.getenv()
 
     archivesBaseName = rootProject.archives_base_name
-    version = "${mod_version}-build.${ENV.GITHUB_RUN_NUMBER ?: 9999}+mc${minecraft_version}"
+    version = "${mod_version}+mc${minecraft_version}"
     group = rootProject.maven_group
 
     repositories {
         maven {
-            url "https://maven.saps.dev/releases"
+            url "https://maven.ftb.dev/releases"
             content {
                 includeGroup "dev.ftb.mods"
-                includeGroup "dev.latvian.mods"
             }
         }
-        maven { url "https://maven.saps.dev/mirror" }
-        maven { url 'https://jitpack.io'
+        maven {
+            url 'https://jitpack.io'
             content {
                 includeGroup "com.github.jagrosh"
             }
         }
         maven {
-            url "https://maven.blamejared.com"
-            content {
-                includeGroup "com.faux.ingredientextension"
-            }
+            url 'https://maven.neoforged.net/releases'
         }
     }
 
@@ -90,12 +88,6 @@ publishMods {
         modLoaders.add("fabric")
     }
 
-//    def forgeOptions = publishOptions {
-//        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
-//        displayName = "[FORGE][${minecraft_version}] ${project.name} ${mod_version}"
-//        modLoaders.add("forge")
-//    }
-
     def neoforgeOptions = publishOptions {
         file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
         displayName = "[NEOFORGE][${minecraft_version}] ${project.name} ${mod_version}"
@@ -127,16 +119,6 @@ publishMods {
         }
     }
 
-//    curseforge("curseforgeForge") {
-//        from(curseForgeOptions, forgeOptions)
-//        requires {
-//            slug = "cloth-config"
-//        }
-//        requires {
-//            slug = "architectury-api"
-//        }
-//    }
-
     curseforge("curseforgeNeoforge") {
         from(curseForgeOptions, neoforgeOptions)
         requires {
@@ -162,16 +144,6 @@ publishMods {
             }
         }
 
-//        modrinth("modrinthForge") {
-//            from(modrinthOptions, forgeOptions)
-//            requires {
-//                slug = "cloth-config"
-//            }
-//            requires {
-//                slug = "architectury-api"
-//            }
-//        }
-
         modrinth("modrinthNeoforge") {
             from(modrinthOptions, neoforgeOptions)
             requires {
@@ -183,3 +155,32 @@ publishMods {
         }
     }
 }
+
+
+tasks.register("getMinecraftIncrementalId") {
+    group = "other"
+
+    doLast {
+        // Load the versions data
+        def url = "https://launchermeta.mojang.com/mc/game/version_manifest_v2.json"
+        def json = new JsonSlurper().parseText(url.toURL().text)
+        def versions = json.versions
+
+        // Reverse the list so the oldest version is first
+        versions = versions.reverse()
+
+        def currentNumber = 0;
+        for (version in versions) {
+            if (version.type != "release") {
+                continue
+            }
+
+            currentNumber++
+            if (version.id == rootProject.minecraft_version) {
+                break
+            }
+        }
+
+        println("Minecraft incremental ID: ${currentNumber}")
+    }
+}

common/src/main/java/com/sunekaer/sdrp/SDRP.java

@@ -1,7 +1,6 @@
 package com.sunekaer.sdrp;
 
 import com.jagrosh.discordipc.entities.pipe.PipeStatus;
-import com.mojang.realmsclient.RealmsMainScreen;
 import com.sunekaer.sdrp.config.SDRPConfig;
 import com.sunekaer.sdrp.discord.RPClient;
 import com.sunekaer.sdrp.discord.State;
@@ -14,9 +13,6 @@
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.TitleScreen;
-import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
-import net.minecraft.client.gui.screens.worldselection.SelectWorldScreen;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.world.entity.Entity;
@@ -48,24 +44,35 @@ public static void init() {
      * When the screen is part of the main menu screens, attempt to update discord about it
      */
     private static void screenEvent(Screen screen, ScreenAccess screenAccess) {
-        if (!config.enabled || !State.PRESETS.containsKey("menu") || !config.screenEvent) {
+        if (!config.enabled || !config.enableUpdateScreenPresence) {
             return;
         }
 
-        if (screen instanceof TitleScreen || screen instanceof JoinMultiplayerScreen || screen instanceof SelectWorldScreen || screen instanceof RealmsMainScreen) {
-            var menuState = State.PRESETS.get("menu").createPresence();
-            var currentState = RP_CLIENT.getCurrentState();
-            if (currentState != menuState) {
-                RP_CLIENT.setState(menuState);
-            }
+        updateScreen(screen);
+    }
+
+    private static void updateScreen(Screen screen) {
+        var screenClassName = screen.getClass().getName();
+        var screenPresence = config.screens.stream()
+                .filter(e -> e.screenClass.contains(screenClassName))
+                .findFirst();
+
+        if (screenPresence.isEmpty()) {
+            return;
+        }
+
+        var state = screenPresence.get().createPresence();
+        var currentState = RP_CLIENT.getCurrentState();
+        if (currentState != state) {
+            RP_CLIENT.setState(state);
         }
     }
 
     /**
      * When the client joins, send out a setDim event to discord
      */
     private static EventResult clientJoinEvent(Entity entity, Level level) {
-        if (!config.enabled || !config.clientJoinEvent) {
+        if (!config.enabled || !config.enableUpdateDimensionPresence) {
             return EventResult.pass();
         }
 
@@ -82,16 +89,19 @@ private static EventResult clientJoinEvent(Entity entity, Level level) {
      * Dynamically create an entry on a dimension change
      */
     public static void setDimension(Level level) {
-        State dim = State.PRESETS.get(level.dimension().toString());
-        if (dim != null) {
-            RP_CLIENT.setState(dim.createPresence());
-        } else {
-            String name = I18n.get("sdrp." + level.dimension().location().getPath());
-            String in = I18n.get("sdrp." + level.dimension().location().getPath() + ".in");
-            String key = level.dimension().location().getPath();
-
-            RP_CLIENT.setState(new State(in,  name, key).createPresence());
+        var dimensionName = level.dimension().location().toString();
+        var isInverted = config.invertWhitelist;
+
+        // Does the whitelist contain the dimension? But invert the check if we're using a blacklist
+        if (config.dimensionsWhitelist.contains(dimensionName) == isInverted) {
+            return;
         }
+
+        String name = I18n.get("sdrp." + level.dimension().location().getPath());
+        String in = I18n.get("sdrp." + level.dimension().location().getPath() + ".in");
+        String key = level.dimension().location().getPath();
+
+        RP_CLIENT.setState(new State(in,  name, key).createPresence());
     }
 
     /**