feat: port to 1.20.1

Author: MichaelHillcox

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [20.1.0]
+
+### Added
+
+- Back ported the mod to 1.20.1
+
 ## [21.1.2]
 
 ### Fixed

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'net.neoforged.moddev' version '2.0.78'
+    id 'net.neoforged.moddev.legacyforge' version '2.0.78'
     id "me.modmuss50.mod-publish-plugin" version "0.8.4"
     id 'idea'
     id 'pro.mikey.plugins.insaniam' version "0.1-SNAPSHOT"
@@ -22,10 +22,10 @@ base {
     archivesName = mod_id
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-neoForge {
-    version = project.neo_version
+legacyForge {
+    version = project.minecraft_version + "-" + project.neo_version
 
     parchment {
         mappingsVersion = project.parchment_mappings_version
@@ -97,7 +97,7 @@ var generateModMetadata = tasks.register("generateModMetadata", ProcessResources
 }
 
 sourceSets.main.resources.srcDir generateModMetadata
-neoForge.ideSyncTask generateModMetadata
+legacyForge.ideSyncTask generateModMetadata
 
 publishing {
     publications {
@@ -138,30 +138,28 @@ publishMods {
     version = "${mod_version}"
     type = STABLE
 
-    file = jar.archiveFile
+    file = reobfJar.archiveFile
     displayName = "Pop ${mod_version}"
     modLoaders.add("neoforge")
+    modLoaders.add("forge")
 
     // Get the commit message from the environment variable
     def commitMessage = providers.environmentVariable("COMMIT_MESSAGE").orElse("No commit message provided")
 
     curseforge {
-        dryRun = commitMessage.get().contains("[skip-curse]")
         accessToken = curseToken.orElse("dryRun")
         projectId = "1231826"
         minecraftVersions.add("${minecraft_version}")
     }
 
     modrinth {
-        dryRun = commitMessage.get().contains("[skip-modrinth]")
         accessToken = providers.environmentVariable("MODRINTH_TOKEN")
         projectId = "uu63G4RC"
         minecraftVersions.add("${minecraft_version}")
     }
 
     github {
-        dryRun = commitMessage.get().contains("[skip-github]")
-        file = jar.archiveFile
+        file = reobfJar.archiveFile
 
         repository = "nanite/pop"
         accessToken = providers.environmentVariable("GITHUB_TOKEN")

gradle.properties

@@ -4,19 +4,19 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.configuration-cache=true
 
-parchment_minecraft_version=1.21.1
-parchment_mappings_version=2024.11.17
+parchment_minecraft_version=1.20.1
+parchment_mappings_version=2023.09.03
 
-minecraft_version=1.21.1
-minecraft_version_range=[1.21.1, 1.21.2)
-neo_version=21.1.133
-neo_version_range=[21.1.0,)
-loader_version_range=[4,)
+minecraft_version=1.20.1
+minecraft_version_range=[1.20.1,1.20.2)
+neo_version=47.4.1
+neo_version_range=[47.2.0,48.0.0)
+loader_version_range=[47,)
 
 mod_id=pop
 mod_name=Pop
 mod_license=Mozilla Public License 2.0
-mod_version=21.1.2
+mod_version=20.1.0
 mod_group_id=pro.mikey.mods
 mod_authors=ErrorMikey
 mod_description=Pop is a small helper mod for modpack developers to allow for more screen locations to display information on screen in a command driven, or kubejs driven way.

src/main/java/pro/mikey/mods/pop/Config.java

@@ -1,16 +1,10 @@
 package pro.mikey.mods.pop;
 
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.EventBusSubscriber;
-import net.neoforged.fml.event.config.ModConfigEvent;
-import net.neoforged.neoforge.common.ModConfigSpec;
+import net.minecraftforge.common.ForgeConfigSpec;
+import net.minecraftforge.fml.common.Mod;
 
-@EventBusSubscriber(modid = Pop.MODID, bus = EventBusSubscriber.Bus.MOD)
+@Mod.EventBusSubscriber(modid = Pop.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class Config {
-    private static final ModConfigSpec.Builder BUILDER = new ModConfigSpec.Builder();
-    static final ModConfigSpec SPEC = BUILDER.build();
-
-    @SubscribeEvent
-    static void onLoad(final ModConfigEvent event) {
-    }
+    private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
+    static final ForgeConfigSpec SPEC = BUILDER.build();
 }

src/main/java/pro/mikey/mods/pop/Pop.java

@@ -1,19 +1,17 @@
 package pro.mikey.mods.pop;
 
 import net.minecraft.resources.ResourceLocation;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
-import net.neoforged.fml.loading.FMLEnvironment;
-import net.neoforged.neoforge.common.NeoForge;
-import net.neoforged.neoforge.event.RegisterCommandsEvent;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.RegisterCommandsEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.loading.FMLEnvironment;
 import org.slf4j.Logger;
 
 import com.mojang.logging.LogUtils;
 
-import net.neoforged.bus.api.IEventBus;
-import net.neoforged.fml.ModContainer;
-import net.neoforged.fml.common.Mod;
-import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
 import pro.mikey.mods.pop.client.ClientInit;
 import pro.mikey.mods.pop.net.Networking;
 
@@ -22,33 +20,31 @@ public class Pop {
     public static final String MODID = "pop";
     private static final Logger LOGGER = LogUtils.getLogger();
 
-    public Pop(IEventBus modEventBus, ModContainer modContainer) {
-        modEventBus.addListener(this::commonSetup);
+    public Pop() {
+        var modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+
         modEventBus.addListener(this::onClientSetup);
-        modEventBus.addListener(Networking::register);
 
-        NeoForge.EVENT_BUS.register(this);
+        MinecraftForge.EVENT_BUS.register(this);
 
         if (FMLEnvironment.dist.isClient()) {
             modEventBus.addListener(ClientInit::onScreenRender);
         }
 
-//        modContainer.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
+        Networking.register();
     }
 
-    private void commonSetup(final FMLCommonSetupEvent event) {
-    }
 
     private void onClientSetup(final FMLClientSetupEvent event) {
         ClientInit.init();
     }
 
     @SubscribeEvent
-    private void onRegisterCommands(final RegisterCommandsEvent event) {
+    public void onRegisterCommands(final RegisterCommandsEvent event) {
         event.getDispatcher().register(PopCommands.register(event.getBuildContext()));
     }
 
     public static ResourceLocation id(String path) {
-        return ResourceLocation.fromNamespaceAndPath(MODID, path);
+        return new ResourceLocation(MODID, path);
     }
 }

src/main/java/pro/mikey/mods/pop/PopBuilder.java

@@ -3,15 +3,15 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.loading.FMLEnvironment;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.fml.loading.FMLEnvironment;
 import pro.mikey.mods.pop.client.pops.AnimTracker;
 import pro.mikey.mods.pop.client.pops.FadeInFadeOutRender;
 import pro.mikey.mods.pop.data.Placement;
 import pro.mikey.mods.pop.client.pops.PopManager;
 import pro.mikey.mods.pop.data.PopData;
 import pro.mikey.mods.pop.net.ClientCreatePopPacket;
+import pro.mikey.mods.pop.net.Networking;
 
 /**
  * This class is almost exclusively added for KubeJS support.
@@ -60,7 +60,7 @@ public void sendToPlayer(Player player) {
         var packet = new ClientCreatePopPacket(content, placement, durationInSeconds);
 
         // Send the packet to the player
-        PacketDistributor.sendToPlayer((ServerPlayer) player, packet);
+        Networking.sendTo(packet, (ServerPlayer) player);
     }
 
     public void display() {

src/main/java/pro/mikey/mods/pop/PopCommands.java

@@ -12,10 +12,10 @@
 import net.minecraft.commands.arguments.ComponentArgument;
 import net.minecraft.commands.arguments.EntityArgument;
 import net.minecraft.network.chat.Component;
-import net.neoforged.neoforge.network.PacketDistributor;
-import net.neoforged.neoforge.server.command.EnumArgument;
+import net.minecraftforge.server.command.EnumArgument;
 import pro.mikey.mods.pop.data.Placement;
 import pro.mikey.mods.pop.net.ClientCreatePopPacket;
+import pro.mikey.mods.pop.net.Networking;
 
 public class PopCommands {
     // TODO: Translate
@@ -28,12 +28,12 @@ public static LiteralArgumentBuilder<CommandSourceStack> register(CommandBuildCo
                 .then(Commands.argument("target", EntityArgument.players())
                     .then(Commands.argument("placement", EnumArgument.enumArgument(Placement.class))
                             .then(Commands.argument("duration", IntegerArgumentType.integer(1))
-                                    .then(Commands.argument("content", ComponentArgument.textComponent(context)).executes(PopCommands::sendPop))
+                                    .then(Commands.argument("content", ComponentArgument.textComponent()).executes(PopCommands::sendPop))
                                     .then(Commands.argument("text", StringArgumentType.greedyString()).executes(PopCommands::sendPop))
                             )
                     )
                     .then(Commands.argument("duration", IntegerArgumentType.integer(1))
-                            .then(Commands.argument("content", ComponentArgument.textComponent(context)).executes(PopCommands::sendPop))
+                            .then(Commands.argument("content", ComponentArgument.textComponent()).executes(PopCommands::sendPop))
                             .then(Commands.argument("text", StringArgumentType.greedyString()).executes(PopCommands::sendPop))
                     )
                 )
@@ -65,7 +65,7 @@ private static int sendPop(CommandContext<CommandSourceStack> stack) throws Comm
 
         var packet = new ClientCreatePopPacket(content, placement, duration);
         for (var target : targets) {
-            PacketDistributor.sendToPlayer(target, packet);
+            Networking.sendTo(packet, target);
         }
         return 0;
     }

src/main/java/pro/mikey/mods/pop/client/ClientInit.java

@@ -1,15 +1,15 @@
 package pro.mikey.mods.pop.client;
 
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.neoforge.client.event.RegisterGuiLayersEvent;
+import net.minecraftforge.client.event.RegisterGuiOverlaysEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 public class ClientInit {
     public static void init() {
 
     }
 
     @SubscribeEvent
-    public static void onScreenRender(RegisterGuiLayersEvent event) {
+    public static void onScreenRender(RegisterGuiOverlaysEvent event) {
         event.registerAboveAll(PopLayer.LAYER_ID, new PopLayer());
     }
 }

src/main/java/pro/mikey/mods/pop/client/PopLayer.java

@@ -1,19 +1,18 @@
 package pro.mikey.mods.pop.client;
 
-import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.LayeredDraw;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.client.gui.overlay.ForgeGui;
+import net.minecraftforge.client.gui.overlay.IGuiOverlay;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pro.mikey.mods.pop.Pop;
 import pro.mikey.mods.pop.client.pops.PopManager;
 import pro.mikey.mods.pop.data.PopData;
 
 import javax.annotation.Nullable;
 
-public class PopLayer implements LayeredDraw.Layer {
-    public static final ResourceLocation LAYER_ID = Pop.id("pop_layer");
+public class PopLayer implements IGuiOverlay {
+    public static final String LAYER_ID = "overlay-layer";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PopLayer.class);
 
@@ -38,7 +37,7 @@ private PopData getNextOrCurrent() {
     }
 
     @Override
-    public void render(GuiGraphics guiGraphics, DeltaTracker deltaTracker) {
+    public void render(ForgeGui forgeGui, GuiGraphics guiGraphics, float partialTicks, int screenWidth, int screenHeigh) {
         var pop = getNextOrCurrent();
         if (pop == null) {
             return;
@@ -52,6 +51,6 @@ public void render(GuiGraphics guiGraphics, DeltaTracker deltaTracker) {
             return;
         }
 
-        renderer.render(currentPop, guiGraphics, deltaTracker);
+        renderer.render(currentPop, guiGraphics, partialTicks);
     }
 }

src/main/java/pro/mikey/mods/pop/client/pops/FadeInFadeOutRender.java

@@ -2,7 +2,6 @@
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.util.Mth;
@@ -16,20 +15,18 @@ public class FadeInFadeOutRender implements IPopRender {
     float lastOpacity = 0.0F;
 
     @Override
-    public void render(PopData pop, GuiGraphics graphics, DeltaTracker deltaTracker) {
+    public void render(PopData pop, GuiGraphics graphics, float partialTicks) {
         pop.tracker().onRenderFrame();
         var stage = pop.tracker().getStage();
         var currentStageCompletion = pop.tracker().currentStageCompletion();
 
-        var delta = deltaTracker.getGameTimeDeltaTicks();
-
         // Fade in and out, smoothly by lerping the opacity
         float opacity = 1.0f;
         float xOffset = 0.0f;
         if (stage != AnimStage.IDLE) {
             float nextOpacity = stage == AnimStage.IN ? currentStageCompletion / 100.0F : 1.0F - (currentStageCompletion / 100.0F);
             lastOpacity = nextOpacity;
-            opacity = Mth.lerp(delta, lastOpacity, nextOpacity);
+            opacity = Mth.lerp(partialTicks, lastOpacity, nextOpacity);
         }
 
         PoseStack pose = graphics.pose();