Backport to mc1.20.1

.github/workflows/release.yml

@@ -34,9 +34,9 @@ jobs:
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: Build
-#        run: ./gradlew build neoforge:publishGithub fabric:publishGithub --stacktrace
-#        run: ./gradlew build neoforge:publishGithub neoforge:publishModrinth fabric:publishGithub fabric:publishModrinth --stacktrace
-        run: ./gradlew build neoforge:publishGithub neoforge:publishModrinth neoforge:publishCurseforge fabric:publishGithub fabric:publishModrinth fabric:publishCurseforge --stacktrace
+#        run: ./gradlew build forge:publishGithub fabric:publishGithub --stacktrace
+#        run: ./gradlew build forge:publishGithub forge:publishModrinth fabric:publishGithub fabric:publishModrinth --stacktrace
+        run: ./gradlew build forge:publishGithub forge:publishModrinth forge:publishCurseforge fabric:publishGithub fabric:publishModrinth fabric:publishCurseforge --stacktrace
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

build.gradle

@@ -1,6 +1,8 @@
 plugins {
     id("fabric-loom") version("${loom_version}") apply(false)
-    id("net.neoforged.moddev") version("${moddev_version}") apply(false)
+    id("net.minecraftforge.gradle") version("${forgegradle_version}") apply(false)
+    id("org.spongepowered.gradle.vanilla") version("${vanillagradle_version}") apply(false)
+    id("org.spongepowered.mixin") version("${mixingradle_version}") apply(false)
     id("org.cadixdev.licenser") version("${licenser_version}") apply(false)
     id("me.modmuss50.mod-publish-plugin") version("${mpp_version}")
     id("org.ajoberstar.grgit.service") version("${grgitservice_version}")
@@ -31,7 +33,8 @@ subprojects {
 
         afterEvaluate {
             publishMods {
-                file = project.name == "fabric" ? remapJar.archiveFile : jar.archiveFile
+                file = project.name == "fabric" ? remapJar.archiveFile : name == "forge"
+                        ? project.file("build/libs/${mod_id}-${name}-${mod_version}.jar") : jar.archiveFile
                 version = mod_version
                 type = me.modmuss50.mpp.ReleaseType.of(release_type)
                 displayName = "v${mod_version}-${capsLoader(project.name)}"

buildSrc/src/main/groovy/multiloader-common.gradle

@@ -25,18 +25,9 @@ repositories {
         }
         filter { includeGroupAndSubgroups("org.spongepowered") }
     }
-    exclusiveContent {
-        forRepositories(
-            maven {
-                name = "ParchmentMC"
-                url = "https://maven.parchmentmc.org"
-            },
-            maven {
-                name = "NeoForge"
-                url = "https://maven.neoforged.net/releases"
-            }
-        )
-        filter { includeGroup("org.parchmentmc.data") }
+    maven {
+        name = "ParchmentMC"
+        url = "https://maven.parchmentmc.org"
     }
     maven {
         name = "Modrinth"
@@ -94,7 +85,7 @@ processResources {
             "mod_version": mod_version,
             "mod_group": mod_group,
             "mod_id": mod_id,
-            "mod_id_neoforge": mod_id.replace('-', '_'),
+            "mod_id_forge": mod_id.replace('-', '_'),
             "mod_name": mod_name,
             "mod_description": mod_description,
             "mod_icon": "assets/${mod_id}/icon.png",
@@ -112,19 +103,19 @@ processResources {
             // Java
             "java_version": java_version,
             "java_versions_fabric_list": asJsonList(java_versions_fabric),
-            "java_versions_neoforge": java_versions_neoforge,
+            "java_versions_forge": java_versions_forge,
             // Minecraft
             "minecraft_versions_fabric_list": asJsonList(minecraft_versions_fabric),
-            "minecraft_versions_neoforge": minecraft_versions_neoforge,
+            "minecraft_versions_forge": minecraft_versions_forge,
             // Fabric
             "fabric_loader_versions_list": asJsonList(fabric_loader_versions),
             "fabric_api_versions_list": asJsonList(fabric_api_versions),
-            // NeoForge
-            "neoforge_loader_versions": neoforge_loader_versions,
-            "neoforge_versions": neoforge_versions,
+            // Forge
+            "forge_loader_versions": forge_loader_versions,
+            "forge_versions": forge_versions,
             // Dependencies
             "clothconfig_versions_fabric_list": asJsonList(clothconfig_versions_fabric),
-            "clothconfig_versions_neoforge": clothconfig_versions_neoforge,
+            "clothconfig_versions_forge": clothconfig_versions_forge,
             "modmenu_versions_fabric_list": asJsonList(modmenu_versions_fabric),
     ]
     filesMatching(["pack.mcmeta", "*.mod.json", "META-INF/*mods.toml", "*.mixins.json"]) {

common/build.gradle

@@ -1,25 +1,24 @@
+buildscript {
+    dependencies.add("classpath", "org.spongepowered:vanillagradle:${vanillagradle_version}")
+}
+
 plugins {
     id("multiloader-common")
-    id("net.neoforged.moddev")
+    id("org.spongepowered.gradle.vanilla")
 }
 
 dependencies {
     compileOnly("org.spongepowered:mixin:${mixin_version}")
     compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}"))
-    
+
     // Cloth Config API
-    api("me.shedaniel.cloth:cloth-config-neoforge:${clothconfig_version}")
+    api("me.shedaniel.cloth:cloth-config-forge:${clothconfig_version}")
 }
 
-neoForge {
-    version = neoforge_version // Shut up
-    neoFormVersion = neoform_version
-    // Automatically enable AccessTransformers if the file exists
-    def at = file("src/main/resources/META-INF/accesstransformer.cfg")
-    if (at.exists()) accessTransformers.from(at.absolutePath)
-    parchment {
-        minecraftVersion = parchment_minecraft_version
-        mappingsVersion = parchment_version
+minecraft {
+    version(minecraft_version)
+    if (file("src/main/resources/${mod_id}.accesswidener").exists()) {
+        accessWideners(file("src/main/resources/${mod_id}.accesswidener"))
     }
 }
 

common/src/main/java/com/github/scotsguy/nowplaying/NowPlaying.java

@@ -47,7 +47,7 @@
 
 public class NowPlaying {
     public static final String MOD_ID = "now-playing";
-    public static final String MOD_ID_NEOFORGE = "now_playing";
+    public static final String MOD_ID_FORGE = "now_playing";
     public static final String MOD_NAME = "Now Playing";
     public static final ModLogger LOG = new ModLogger(MOD_NAME);
     public static final KeyMapping DISPLAY_KEY = new KeyMapping(

common/src/main/java/com/github/scotsguy/nowplaying/gui/screen/ConfigScreenProvider.java

@@ -23,11 +23,13 @@
 package com.github.scotsguy.nowplaying.gui.screen;
 
 import net.minecraft.Util;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.MultiLineTextWidget;
 import net.minecraft.client.gui.screens.ConfirmLinkScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
+import org.jetbrains.annotations.NotNull;
 
 import static com.github.scotsguy.nowplaying.util.Localization.localized;
 
@@ -86,5 +88,11 @@ public void init() {
                     .build();
             addRenderableWidget(exitButton);
         }
+
+        @Override
+        public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+            renderDirtBackground(graphics);
+            super.render(graphics, mouseX, mouseY, delta);
+        }
     }
 }

common/src/main/java/com/github/scotsguy/nowplaying/gui/toast/NowPlayingToast.java

@@ -37,18 +37,16 @@
 import static com.github.scotsguy.nowplaying.util.Localization.localized;
 
 public class NowPlayingToast implements Toast {
-    private static final ResourceLocation BACKGROUND_SPRITE_LIGHT = ResourceLocation.withDefaultNamespace("toast/recipe");
     private static final int NOW_PLAYING_COLOR_LIGHT = 0xFF800080;
     private static final int TITLE_COLOR_LIGHT = 0xFF000000;
-    private static final ResourceLocation BACKGROUND_SPRITE_DARK = ResourceLocation.withDefaultNamespace("toast/advancement");
     private static final int NOW_PLAYING_COLOR_DARK = 0xFF993299;
     private static final int TITLE_COLOR_DARK = 0xFFD1D1D1;
 
     private final Component description;
     private final ResourceLocation discSprite;
     private final long displayTime;
     private final float scale;
-    private final ResourceLocation sprite;
+    private final int spriteY;
     private final int nowPlayingColor;
     private final int titleColor;
 
@@ -61,11 +59,11 @@ public NowPlayingToast(Component description, ResourceLocation discSprite, long
         this.displayTime = displayTime;
         this.scale = scale;
         if (darkMode) {
-            sprite = BACKGROUND_SPRITE_DARK;
+            spriteY = 0;
             nowPlayingColor = NOW_PLAYING_COLOR_DARK;
             titleColor = TITLE_COLOR_DARK;
         } else {
-            sprite = BACKGROUND_SPRITE_LIGHT;
+            spriteY = 32;
             nowPlayingColor = NOW_PLAYING_COLOR_LIGHT;
             titleColor = TITLE_COLOR_LIGHT;
         }
@@ -86,7 +84,7 @@ public NowPlayingToast(Component description, ResourceLocation discSprite, long
 
         if (width == 160 && textLines.size() <= 1) {
             // Text fits, draw the whole toast from the texture
-            graphics.blitSprite(sprite, 0, 0, width, height);
+            graphics.blit(TEXTURE, 0, 0, 0, spriteY, width, height);
         } else {
             // Stretch toast by drawing the sprite multiple times
             height = height + Math.max(0, textLines.size() - (Config.options().simpleToast ? 2 : 1)) * 12;
@@ -129,13 +127,12 @@ public NowPlayingToast(Component description, ResourceLocation discSprite, long
     private void renderBackgroundRow(GuiGraphics graphics, int i, int vOffset, int y, int vHeight) {
         int uWidth = vOffset == 0 ? 20 : 5;
         int n = Math.min(60, i - uWidth);
-
-        graphics.blitSprite(sprite, 160, 32, 0, vOffset, 0, y, uWidth, vHeight);
+        graphics.blit(TEXTURE, 0, y, 0, spriteY + vOffset, uWidth, vHeight);
 
         for (int o = uWidth; o < i - n; o += 64) {
-            graphics.blitSprite(sprite, 160, 32, 32, vOffset, o, y, Math.min(64, i - o - n), vHeight);
+            graphics.blit(TEXTURE, o, y, 32, spriteY + vOffset, Math.min(64, i - o - n), vHeight);
         }
 
-        graphics.blitSprite(sprite, 160, 32, 160 - n, vOffset, i - n, y, n, vHeight);
+        graphics.blit(TEXTURE, i - n, y, 160 - n, spriteY + vOffset, n, vHeight);
     }
 }

common/src/main/java/com/github/scotsguy/nowplaying/mixin/MixinMinecraft.java

@@ -25,19 +25,18 @@
 import com.github.scotsguy.nowplaying.sound.NowPlayingListener;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.sounds.SoundManager;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Minecraft.class)
-public class MixinMinecraft {
-    @Shadow @Final private SoundManager soundManager;
+public abstract class MixinMinecraft {
+    @Shadow public abstract SoundManager getSoundManager();
 
     @Inject(method = "<init>", at = @At("TAIL"))
     void registerSoundInstanceListener(CallbackInfo ci) {
-        soundManager.addListener(new NowPlayingListener());
+        getSoundManager().addListener(new NowPlayingListener());
     }
 }

common/src/main/java/com/github/scotsguy/nowplaying/sound/NowPlayingListener.java

@@ -36,7 +36,7 @@
 public class NowPlayingListener implements SoundEventListener {
     @Override
     public void onPlaySound(@NotNull SoundInstance soundInstance, 
-                            @NotNull WeighedSoundEvents soundSet, float f) {
+                            @NotNull WeighedSoundEvents soundSet) {
         if (soundInstance.getSource() == SoundSource.MUSIC) {
             ResourceLocation location = soundInstance.getSound().getLocation();
             NowPlaying.lastMusic = location;

common/src/main/java/com/github/scotsguy/nowplaying/sound/SpriteProvider.java

@@ -37,9 +37,9 @@
 
 public class SpriteProvider {
     private static final ResourceLocation SPRITES_FILE = 
-            ResourceLocation.fromNamespaceAndPath(NowPlaying.MOD_ID, "sprites.json");
+            new ResourceLocation(NowPlaying.MOD_ID, "sprites.json");
     public static final ResourceLocation DISC_SPRITE_DEFAULT =
-            ResourceLocation.parse("minecraft:textures/item/music_disc_cat.png");
+            new ResourceLocation("minecraft:textures/item/music_disc_cat.png");
 
     private static final HashMap<String, ResourceLocation> CACHE = new HashMap<>();
     private static boolean hasAttemptedLoad;
@@ -113,6 +113,6 @@ public static ResourceLocation getMusicSprite(ResourceLocation location) {
 
     public static ResourceLocation getDiscSprite(ResourceLocation location) {
         String discId = location.getPath().replaceAll("\\.", "_");
-        return ResourceLocation.parse("textures/item/" + discId + ".png");
+        return new ResourceLocation("textures/item/" + discId + ".png");
     }
 }

common/src/main/resources/assets/now-playing/lang/en_us.json

@@ -44,60 +44,60 @@
   "now-playing.minecraft:music/game/an_ordinary_day": "Kumi Tanioka - An Ordinary Day",
   "now-playing.minecraft:music/game/ancestry": "Lena Raine - Ancestry",
   "now-playing.minecraft:music/game/bromeliad": "Aaron Cherof - Bromeliad",
-  "now-playing.minecraft:music/game/clark": "C418 - Clark",
+  "now-playing.minecraft:music/game/calm2": "C418 - Clark",
   "now-playing.minecraft:music/game/comforting_memories": "Kumi Tanioka - Comforting Memories",
-  "now-playing.minecraft:music/game/creative/aria_math": "C418 - Aria Math",
-  "now-playing.minecraft:music/game/creative/biome_fest": "C418 - Biome Fest",
-  "now-playing.minecraft:music/game/creative/blind_spots": "C418 - Blind Spots",
-  "now-playing.minecraft:music/game/creative/dreiton": "C418 - Dreiton",
-  "now-playing.minecraft:music/game/creative/haunt_muskie": "C418 - Haunt Muskie",
-  "now-playing.minecraft:music/game/creative/taswell": "C418 - Taswell",
+  "now-playing.minecraft:music/game/creative/creative4": "C418 - Aria Math",
+  "now-playing.minecraft:music/game/creative/creative1": "C418 - Biome Fest",
+  "now-playing.minecraft:music/game/creative/creative2": "C418 - Blind Spots",
+  "now-playing.minecraft:music/game/creative/creative5": "C418 - Dreiton",
+  "now-playing.minecraft:music/game/creative/creative3": "C418 - Haunt Muskie",
+  "now-playing.minecraft:music/game/creative/creative6": "C418 - Taswell",
   "now-playing.minecraft:music/game/crescent_dunes": "Aaron Cherof - Crescent Dunes",
-  "now-playing.minecraft:music/game/danny": "C418 - Danny",
+  "now-playing.minecraft:music/game/hal4": "C418 - Danny",
   "now-playing.minecraft:music/game/deeper": "Lena Raine - Deeper",
-  "now-playing.minecraft:music/game/dry_hands": "C418 - Dry Hands",
+  "now-playing.minecraft:music/game/piano1": "C418 - Dry Hands",
   "now-playing.minecraft:music/game/echo_in_the_wind": "Aaron Cherof - Echo in the Wind",
   "now-playing.minecraft:music/game/eld_unknown": "Lena Raine - Eld Unknown",
-  "now-playing.minecraft:music/game/end/alpha": "C418 - Alpha",
+  "now-playing.minecraft:music/game/end/credits": "C418 - Alpha",
   "now-playing.minecraft:music/game/end/boss": "C418 - Boss",
-  "now-playing.minecraft:music/game/end/the_end": "C418 - The End",
+  "now-playing.minecraft:music/game/end/end": "C418 - The End",
   "now-playing.minecraft:music/game/endless": "Lena Raine - Endless",
   "now-playing.minecraft:music/game/featherfall": "Aaron Cherof - Featherfall",
   "now-playing.minecraft:music/game/floating_dream": "Kumi Tanioka - Floating Dream",
-  "now-playing.minecraft:music/game/haggstrom": "C418 - Haggstrom",
+  "now-playing.minecraft:music/game/hal3": "C418 - Haggstrom",
   "now-playing.minecraft:music/game/infinite_amethyst": "Lena Raine - Infinite Amethyst",
-  "now-playing.minecraft:music/game/key": "C418 - Key",
+  "now-playing.minecraft:music/game/nuance1": "C418 - Key",
   "now-playing.minecraft:music/game/komorebi": "Kumi Tanioka - komorebi",
   "now-playing.minecraft:music/game/left_to_bloom": "Lena Raine - Left to Bloom",
-  "now-playing.minecraft:music/game/living_mice": "C418 - Living Mice",
-  "now-playing.minecraft:music/game/mice_on_venus": "C418 - Mice on Venus",
-  "now-playing.minecraft:music/game/minecraft": "C418 - Minecraft",
-  "now-playing.minecraft:music/game/nether/ballad_of_the_cats": "C418 - Ballad of the Cats",
-  "now-playing.minecraft:music/game/nether/concrete_halls": "C418 - Concrete Halls",
+  "now-playing.minecraft:music/game/hal2": "C418 - Living Mice",
+  "now-playing.minecraft:music/game/piano3": "C418 - Mice on Venus",
+  "now-playing.minecraft:music/game/calm1": "C418 - Minecraft",
+  "now-playing.minecraft:music/game/nether/nether4": "C418 - Ballad of the Cats",
+  "now-playing.minecraft:music/game/nether/nether1": "C418 - Concrete Halls",
   "now-playing.minecraft:music/game/nether/crimson_forest/chrysopoeia": "Lena Raine - Chrysopoeia",
-  "now-playing.minecraft:music/game/nether/dead_voxel": "C418 - Dead Voxel",
+  "now-playing.minecraft:music/game/nether/nether2": "C418 - Dead Voxel",
   "now-playing.minecraft:music/game/nether/nether_wastes/rubedo": "Lena Raine - Rubedo",
   "now-playing.minecraft:music/game/nether/soulsand_valley/so_below": "Lena Raine - So Below",
-  "now-playing.minecraft:music/game/nether/warmth": "C418 - Warmth",
+  "now-playing.minecraft:music/game/nether/nether3": "C418 - Warmth",
   "now-playing.minecraft:music/game/one_more_day": "Lena Raine - One More Day",
-  "now-playing.minecraft:music/game/oxygene": "C418 - Oxygène",
+  "now-playing.minecraft:music/game/nuance2": "C418 - Oxygène",
   "now-playing.minecraft:music/game/pokopoko": "Kumi Tanioka - pokopoko",
   "now-playing.minecraft:music/game/puzzlebox": "Aaron Cherof - Puzzlebox",
   "now-playing.minecraft:music/game/stand_tall": "Lena Raine - Stand Tall",
-  "now-playing.minecraft:music/game/subwoofer_lullaby": "C418 - Subwoofer Lullaby",
+  "now-playing.minecraft:music/game/hal1": "C418 - Subwoofer Lullaby",
   "now-playing.minecraft:music/game/swamp/aerie": "Lena Raine - Aerie",
   "now-playing.minecraft:music/game/swamp/firebugs": "Lena Raine - Firebugs",
   "now-playing.minecraft:music/game/swamp/labyrinthine": "Lena Raine - Labyrinthine",
-  "now-playing.minecraft:music/game/sweden": "C418 - Sweden",
+  "now-playing.minecraft:music/game/calm3": "C418 - Sweden",
   "now-playing.minecraft:music/game/watcher": "Aaron Cherof - Watcher",
   "now-playing.minecraft:music/game/water/axolotl": "C418 - Axolotl",
   "now-playing.minecraft:music/game/water/dragon_fish": "C418 - Dragon Fish",
   "now-playing.minecraft:music/game/water/shuniji": "C418 - Shuniji",
   "now-playing.minecraft:music/game/wending": "Lena Raine - Wending",
-  "now-playing.minecraft:music/game/wet_hands": "C418 - Wet Hands",
+  "now-playing.minecraft:music/game/piano2": "C418 - Wet Hands",
   "now-playing.minecraft:music/game/yakusoku": "Kumi Tanioka - yakusoku",
-  "now-playing.minecraft:music/menu/beginning_2": "C418 - Beginning 2",
-  "now-playing.minecraft:music/menu/floating_trees": "C418 - Floating Trees",
-  "now-playing.minecraft:music/menu/moog_city_2": "C418 - Moog City 2",
-  "now-playing.minecraft:music/menu/mutation": "C418 - Mutation"
+  "now-playing.minecraft:music/menu/menu3": "C418 - Beginning 2",
+  "now-playing.minecraft:music/menu/menu4": "C418 - Floating Trees",
+  "now-playing.minecraft:music/menu/menu2": "C418 - Moog City 2",
+  "now-playing.minecraft:music/menu/menu1": "C418 - Mutation"
 }