feat: Port 1.20.1

Author: tonimatasdev

build.gradle.kts

@@ -1,109 +1,122 @@
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+
 plugins {
+    id("eclipse")
     id("idea")
-    id("java-library")
-    id("net.neoforged.moddev") version "2.0.78"
-}
-
-tasks.named<Wrapper>("wrapper").configure {
-    distributionType = Wrapper.DistributionType.BIN
+    id("net.minecraftforge.gradle") version "[6.0,6.2)"
+    id("org.parchmentmc.librarian.forgegradle") version "1.+"
+    id("org.spongepowered.mixin") version "0.7.+"
 }
 
 val modVersion: String by extra
-val neoVersion: String by extra
+val forgeVersion: String by extra
 val parchmentMappingsVersion: String by extra
-val parchmentMinecraftVersion: String by extra
 val minecraftVersion: String by extra
-val neoVersionRange: String by extra
+val forgeVersionRange: String by extra
 val loaderVersionRange: String by extra
 val mekanismVersion: String by extra
 val mekanismVersionRange: String by extra
 val curiosVersion: String by extra
 val curiosVersionRange: String by extra
 
-version = modVersion
+version = "$minecraftVersion-$modVersion"
 group = "dev.tonimatas.mekanismcurios"
 
 base {
     archivesName = "mekanismcurios"
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-neoForge {
-    version = neoVersion
+minecraft {
+    mappings("parchment", "$parchmentMappingsVersion-$minecraftVersion")
 
-    parchment {
-        mappingsVersion = parchmentMappingsVersion
-        minecraftVersion = parchmentMinecraftVersion
-    }
+    copyIdeResources = true
 
     runs {
         create("client") {
-            client()
-            systemProperty("neoforge.enabledGameTestNamespaces", "mekanismcurios")
+            property("forge.enabledGameTestNamespaces", "mekanismcurios")
         }
 
         create("server") {
-            server()
-            programArgument("--nogui")
-            systemProperty("neoforge.enabledGameTestNamespaces", "mekanismcurios")
+            property("forge.enabledGameTestNamespaces", "mekanismcurios")
+            args("--nogui")
         }
 
         create("data") {
-            data()
-            programArguments.addAll("--mod", "mekanismcurios", "--all", "--output", file("src/generated/resources/").absolutePath, "--existing", file("src/main/resources/").absolutePath)
+            workingDirectory(project.file("run-data"))
+            args("--mod", "mekanismcurios", "--all", "--output", file("src/generated/resources/").absolutePath, "--existing", file("src/main/resources/").absolutePath)
         }
 
         configureEach {
-            systemProperty("forge.logging.markers", "REGISTRIES")
-            logLevel = org.slf4j.event.Level.DEBUG
-        }
-    }
-
-    mods {
-        create("mekanismcurios") {
-            sourceSet(sourceSets.main.get())
+            workingDirectory(project.file("run"))
+            property("forge.logging.markers", "REGISTRIES")
+            property("forge.logging.console.level", "debug")
+            property("mixin.env.remapRefMap", "true")
+            property("mixin.env.refMapRemappingFile", "${projectDir}/build/createSrgToMcp/output.srg")
+
+            mods {
+                create("mekanismcurios") {
+                    source(sourceSets.main.get())
+                }
+            }
         }
     }
 }
 
 sourceSets.main.get().resources { srcDir("src/generated/resources") }
 
-val localRuntime: Configuration by configurations.creating
-
-configurations["runtimeClasspath"].extendsFrom(localRuntime)
+mixin {
+    add(sourceSets.main.get(), "mekanismcurios.refmap.json")
+    config("mekanismcurios.mixins.json")
+}
 
 repositories {
     maven("https://modmaven.dev/")
     maven("https://maven.theillusivec4.top/")
 }
 
 dependencies {
-    compileOnly("mekanism:Mekanism:$minecraftVersion-$mekanismVersion:api")
-    compileOnly("mekanism:Mekanism:$minecraftVersion-$mekanismVersion")
-    compileOnly("top.theillusivec4.curios:curios-neoforge:$curiosVersion+$minecraftVersion:api")
-    localRuntime("mekanism:Mekanism:$minecraftVersion-$mekanismVersion")
-    runtimeOnly("top.theillusivec4.curios:curios-neoforge:$curiosVersion+$minecraftVersion")
+    minecraft("net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}")
+    annotationProcessor("org.spongepowered:mixin:0.8.5:processor")
+    compileOnly(fg.deobf("mekanism:Mekanism:$minecraftVersion-$mekanismVersion:api"))
+    compileOnly(fg.deobf("mekanism:Mekanism:$minecraftVersion-$mekanismVersion"))
+    compileOnly(fg.deobf("top.theillusivec4.curios:curios-forge:$curiosVersion+$minecraftVersion:api"))
+    runtimeOnly(fg.deobf("mekanism:Mekanism:$minecraftVersion-$mekanismVersion"))
+    runtimeOnly(fg.deobf("top.theillusivec4.curios:curios-forge:$curiosVersion+$minecraftVersion"))
 }
 
 tasks.processResources {
     var replaceProperties = mapOf("modVersion" to modVersion, "loaderVersionRange" to loaderVersionRange,
-        "neoVersionRange" to neoVersionRange, "minecraftVersion" to minecraftVersion,
+        "forgeVersionRange" to forgeVersionRange, "minecraftVersion" to minecraftVersion,
         "mekanismVersionRange" to mekanismVersionRange, "curiosVersionRange" to curiosVersionRange)
 
     inputs.properties(replaceProperties)
-    filesMatching("META-INF/neoforge.mods.toml") {
+    filesMatching("META-INF/mods.toml") {
         expand(replaceProperties)
     }
 }
 
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
+tasks.named<Jar>("jar") {
+    manifest {
+        attributes(
+            mapOf(
+                "Specification-Title"     to "mekanismcurios", 
+                "Specification-Vendor"    to "TonimatasDEV", 
+                "Specification-Version"   to "1", 
+                "Implementation-Title"    to "Mekanism Curios", 
+                "Implementation-Version"  to project.tasks.jar.get().archiveVersion.get(), 
+                "Implementation-Vendor" to "TonimatasDEV", 
+                "Implementation-Timestamp" to ZonedDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssZ")),
+                "MixinConfigs" to "mekanismcurios.mixins.json"
+            )
+        )
+    }
+
+    finalizedBy("reobfJar")
 }
 
-idea {
-    module {
-        isDownloadSources = true
-        isDownloadJavadoc = true
-    }
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
 }

gradle.properties

@@ -1,23 +1,19 @@
 # Gradle Properties
 org.gradle.jvmargs=-Xmx5G
-org.gradle.daemon=true
-org.gradle.parallel=true
-org.gradle.caching=true
-org.gradle.configuration-cache=true
+org.gradle.daemon=false
 
 # Minecraft Properties
-minecraftVersion=1.21.1
-parchmentMinecraftVersion=1.21.1
-parchmentMappingsVersion=2024.11.17
+minecraftVersion=1.20.1
+parchmentMappingsVersion=2023.09.03
 
-# NeoForge Properties
-neoVersion=21.1.159
-neoVersionRange=[21.1.0,)
-loaderVersionRange=[4,)
+# Forge Properties
+forgeVersion=47.4.0
+forgeVersionRange=[47,)
+loaderVersionRange=[47,)
 
 ## Mod Properties
 modVersion=1.0.0
-mekanismVersion=10.7.13.78
+mekanismVersion=10.4.15.75
 mekanismVersionRange=[10,)
-curiosVersion=9.4.2
-curiosVersionRange=[9,)
+curiosVersion=5.14.1
+curiosVersionRange=[5,)

settings.gradle.kts

@@ -2,10 +2,11 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        maven("https://maven.neoforged.net/releases")
+        maven("https://maven.minecraftforge.net/")
+        maven("https://maven.parchmentmc.org/")
     }
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
 }

src/main/java/dev/tonimatas/mekanismcurios/MekanismCurios.java

@@ -1,53 +1,31 @@
 package dev.tonimatas.mekanismcurios;
 
 import com.mojang.logging.LogUtils;
-import dev.tonimatas.mekanismcurios.networking.OpenPortableQIOPacket;
-import mekanism.common.registries.MekanismItems;
+import dev.tonimatas.mekanismcurios.networking.ModMessages;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.neoforged.bus.api.IEventBus;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.Mod;
-import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
-import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
-import net.neoforged.neoforge.network.handling.MainThreadPayloadHandler;
-import net.neoforged.neoforge.network.registration.PayloadRegistrar;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.slf4j.Logger;
 import top.theillusivec4.curios.api.CuriosApi;
-import top.theillusivec4.curios.api.CuriosCapability;
 
 @Mod(MekanismCurios.MODID)
 public class MekanismCurios {
     public static final String MODID = "mekanismcurios";
     public static final Logger LOGGER = LogUtils.getLogger();
 
-    public MekanismCurios(final IEventBus modBus) {
-        modBus.addListener(this::registerCapabilities);
-        modBus.addListener(this::registerNetworking);
-        LOGGER.info("Mekanism Curios initialized successfully.");
-    }
-
-    public void registerCapabilities(final RegisterCapabilitiesEvent event) {
-        event.registerItem(CuriosCapability.ITEM, (stack, context) -> () -> stack, MekanismItems.PORTABLE_QIO_DASHBOARD.get());
-    }
+    public MekanismCurios(FMLJavaModLoadingContext context) {
+        ModMessages.register();
 
-    @SubscribeEvent
-    public void registerNetworking(final RegisterPayloadHandlersEvent event) {
-        final PayloadRegistrar registrar = event.registrar("1");
-        registrar.commonToServer(OpenPortableQIOPacket.TYPE, OpenPortableQIOPacket.STREAM_CODEC, new MainThreadPayloadHandler<>(OpenPortableQIOPacket::handle));
+        LOGGER.info("Mekanism Curios initialized successfully.");
     }
 
     public static ItemStack getQIO(Player player) {
         return CuriosApi.getCuriosInventory(player).map(iCuriosItemHandler -> 
                 iCuriosItemHandler.getCurios().get("qio").getStacks().getStackInSlot(0)).orElse(ItemStack.EMPTY);
     }
 
-    public static void setQIO(Player player, ItemStack stack) {
-        CuriosApi.getCuriosInventory(player).ifPresent(curiosInventory -> 
-                curiosInventory.setEquippedCurio("qio", 0, stack));
-    }
-
     public static ItemStack getHandOrCuriosItem(Player player, InteractionHand hand) {
         if (hand == null) {
             return MekanismCurios.getQIO(player);

src/main/java/dev/tonimatas/mekanismcurios/MekanismCuriosClient.java

@@ -1,26 +1,26 @@
 package dev.tonimatas.mekanismcurios;
 
-import dev.tonimatas.mekanismcurios.networking.OpenPortableQIOPacket;
+import dev.tonimatas.mekanismcurios.networking.ModMessages;
+import dev.tonimatas.mekanismcurios.networking.packet.OpenPortableQIOPacket;
 import dev.tonimatas.mekanismcurios.util.KeyBinding;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.EventBusSubscriber;
-import net.neoforged.neoforge.client.event.ClientTickEvent;
-import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.event.InputEvent;
+import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
 
 public class MekanismCuriosClient {
-    @EventBusSubscriber(modid = MekanismCurios.MODID, value = Dist.CLIENT)
+    @Mod.EventBusSubscriber(modid = MekanismCurios.MODID, value = Dist.CLIENT)
     public static class ClientForgeEvents {
         @SubscribeEvent
-        public static void onClientTick(ClientTickEvent.Post event) {
+        public static void onClientTick(InputEvent event) {
             while (KeyBinding.PORTABLE_QIO_MAPPING.get().consumeClick()) {
-                PacketDistributor.sendToServer(new OpenPortableQIOPacket());
+                ModMessages.sendToServer(new OpenPortableQIOPacket());
             }
         }
     }
 
-    @EventBusSubscriber(modid = MekanismCurios.MODID, value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD)
+    @Mod.EventBusSubscriber(modid = MekanismCurios.MODID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD)
     public static class ClientModBusEvents {
         @SubscribeEvent
         public static void onKeyRegister(RegisterKeyMappingsEvent event) {

src/main/java/dev/tonimatas/mekanismcurios/mixins/ContainerTypeRegistryObjectMixin.java

@@ -2,16 +2,15 @@
 
 import mekanism.common.registration.impl.ContainerTypeRegistryObject;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.RegistryFriendlyByteBuf;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(ContainerTypeRegistryObject.class)
 public class ContainerTypeRegistryObjectMixin {
-    @Redirect(method = "lambda$tryOpenGui$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/RegistryFriendlyByteBuf;writeEnum(Ljava/lang/Enum;)Lnet/minecraft/network/FriendlyByteBuf;"))
-    private static FriendlyByteBuf mci$tryOpenGui(RegistryFriendlyByteBuf instance, Enum<?> anEnum) {
-        instance.writeNullable(anEnum, FriendlyByteBuf::writeEnum);
+    @Redirect(method = "lambda$tryOpenGui$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/FriendlyByteBuf;writeEnum(Ljava/lang/Enum;)Lnet/minecraft/network/FriendlyByteBuf;"))
+    private static FriendlyByteBuf mci$tryOpenGui(FriendlyByteBuf instance, Enum<?> pValue) {
+        instance.writeNullable(pValue, FriendlyByteBuf::writeEnum);
         return instance;
     }
 }

src/main/java/dev/tonimatas/mekanismcurios/mixins/MekanismItemContainerMixin.java

@@ -2,19 +2,14 @@
 
 import dev.tonimatas.mekanismcurios.MekanismCurios;
 import mekanism.common.inventory.container.item.MekanismItemContainer;
-import mekanism.common.inventory.container.sync.SyncableItemStack;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
 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;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(MekanismItemContainer.class)
@@ -23,6 +18,7 @@ public class MekanismItemContainerMixin {
     @Final
     protected InteractionHand hand;
 
+    @Final
     @Shadow protected ItemStack stack;
 
     @Inject(method = "stillValid", at = @At("HEAD"), cancellable = true)
@@ -33,18 +29,4 @@ public class MekanismItemContainerMixin {
             cir.setReturnValue(validCurios);
         }
     }
-    
-    @Inject(method = "addInventorySlots", at = @At(value = "INVOKE", target = "Lmekanism/common/inventory/container/MekanismContainer;addInventorySlots(Lnet/minecraft/world/entity/player/Inventory;)V", shift = At.Shift.AFTER), cancellable = true)
-    private void mci$addInventorySlots(Inventory inventory, CallbackInfo ci) {
-        if (this.hand == null) {
-            for (int i = 0; i < Inventory.getSelectionSize(); i++) {
-                if (i != inventory.selected) {
-                    int index = i;
-                    ((MekanismItemContainer) (Object) this).track(SyncableItemStack.create(() -> inventory.getItem(index), item -> inventory.setItem(index, item)));
-                }
-            }
-            
-            ci.cancel();
-        }
-    }
 }