Restore Forge support (#143)

Author: PaintNinja

build.gradle.kts

@@ -16,7 +16,7 @@ version = GMUtils.updatingVersion(Versions.MOD)
 
 tasks.create("postDiscord") {
     val taskName = "publishCurseForge"
-    dependsOn(":fabric:${taskName}",/* ":forge:${taskName}",*/ ":neoforge:${taskName}")
+    dependsOn(":fabric:${taskName}", ":forge:${taskName}", ":neoforge:${taskName}")
     doLast {
         try {
 
@@ -32,13 +32,13 @@ tasks.create("postDiscord") {
             val embed = Embed()
             val downloadSources = StringJoiner("\n")
 
-            mapOf(Pair("fabric", "<:fabric:932163720568782878>"), /*Pair("forge", "<:forge:932163698003443804>"),*/ Pair("neoforge", "<:neoforged:1184738260371644446>"))
+            mapOf(Pair("fabric", "<:fabric:932163720568782878>"), Pair("forge", "<:forge:932163698003443804>"), Pair("neoforge", "<:neoforged:1184738260371644446>"))
                     .filter {
                         project(":${it.key}").ext.has("curse_file_url")
                     }.map { "${it.value} [${it.key.capitalize(Locale.ENGLISH)}](${project(":${it.key}").ext.get("curse_file_url")})" }
                     .forEach { downloadSources.add(it) }
 
-            listOf("common", "fabric", /*"forge",*/ "neoforge")
+            listOf("common", "fabric", "forge", "neoforge")
                     .map { project(":${it}") }
                     .map { "<:maven:932165250738970634> `\"${it.group}:${it.base.archivesName.get()}:${it.version}\"`" }
                     .forEach { downloadSources.add(it) }

buildSrc/src/main/kotlin/com/blamejared/Versions.kt

@@ -6,8 +6,8 @@ object Versions {
     const val MINECRAFT = "1.21"
     const val FABRIC_LOADER = "0.15.11"
     const val FABRIC = "0.100.1+1.21"
-    const val FORGE = "49.0.19" // 1.20.4
-    const val FORGE_LOADER = "[49,)" // 1.20.4
+    const val FORGE = "51.0.17"
+    const val FORGE_LOADER = "[51,)"
     const val NEO_FORGE = "21.0.0-beta"
     const val NEO_FORGE_LOADER= "[4,)"
 }

common/src/main/resources/clumps.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "com.blamejared.clumps.mixin",
-  "compatibilityLevel": "JAVA_21",
+  "compatibilityLevel": "JAVA_18",
   "mixins": [
     "ExperienceOrbAccess",
     "MixinExperienceOrb"

forge/build.gradle.kts

@@ -1,24 +1,23 @@
-import com.blamejared.clumps.gradle.Properties
-import com.blamejared.clumps.gradle.Versions
+import com.blamejared.Properties
+import com.blamejared.Versions
 import com.blamejared.gradle.mod.utils.GMUtils
 import net.darkhax.curseforgegradle.TaskPublishCurseForge
 import net.darkhax.curseforgegradle.Constants as CFG_Constants
 
 plugins {
-    id("com.blamejared.clumps.default")
-    id("com.blamejared.clumps.loader")
-    id("net.minecraftforge.gradle") version ("[6.0,6.2)")
+    id("blamejared-modloader-conventions")
+    id("net.minecraftforge.gradle") version ("[6.0.24,6.2)")
     id("org.spongepowered.mixin") version ("0.7-SNAPSHOT")
     id("com.modrinth.minotaur")
 }
 
 mixin {
-    add(sourceSets.main.get(), "${Properties.MODID}.refmap.json")
     config("${Properties.MODID}.mixins.json")
 }
 
 minecraft {
     mappings("official", Versions.MINECRAFT)
+    reobf = false
     runs {
         create("client") {
             taskName("Client")
@@ -28,7 +27,6 @@ minecraft {
             mods {
                 create(Properties.MODID) {
                     source(sourceSets.main.get())
-                    source(project(":common").sourceSets.main.get())
                 }
             }
         }
@@ -37,8 +35,8 @@ minecraft {
 
 dependencies {
     "minecraft"("net.minecraftforge:forge:${Versions.MINECRAFT}-${Versions.FORGE}")
-    compileOnly(project(":common"))
     annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT:processor")
+    implementation("net.sf.jopt-simple:jopt-simple:5.0.4") { version { strictly("5.0.4") } }
 }
 
 sourceSets.configureEach {
@@ -56,6 +54,8 @@ tasks.create<TaskPublishCurseForge>("publishCurseForge") {
     mainFile.changelog = GMUtils.smallChangelog(project, Properties.GIT_REPO)
     mainFile.releaseType = CFG_Constants.RELEASE_TYPE_RELEASE
     mainFile.addJavaVersion("Java ${Versions.JAVA}")
+    mainFile.addGameVersion(Versions.MINECRAFT)
+    mainFile.addModLoader("Forge")
 
     doLast {
         project.ext.set("curse_file_url", "${Properties.CURSE_HOMEPAGE}/files/${mainFile.curseFileId}")
@@ -68,6 +68,8 @@ modrinth {
     changelog.set(GMUtils.smallChangelog(project, Properties.GIT_REPO))
     versionName.set("Forge-${Versions.MINECRAFT}-$version")
     versionType.set("release")
+    gameVersions.set(listOf(Versions.MINECRAFT))
     uploadFile.set(tasks.jar.get())
+    loaders.add("forge")
 }
 tasks.modrinth.get().dependsOn(tasks.jar)

forge/src/main/java/com/blamejared/clumps/Clumps.java

@@ -1,14 +1,15 @@
 package com.blamejared.clumps;
 
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.PlayerXpEvent;
 import net.minecraftforge.fml.common.Mod;
 
 @Mod("clumps")
 public class Clumps {
 
     public Clumps() {
 
-        ClumpsCommon.pickupXPEvent = (player, experienceOrb) -> MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.player.PlayerXpEvent.PickupXp(player, experienceOrb));
+        ClumpsCommon.pickupXPEvent = (player, experienceOrb) -> MinecraftForge.EVENT_BUS.post(new PlayerXpEvent.PickupXp(player, experienceOrb));
     }
 
 }

forge/src/main/java/com/blamejared/clumps/platform/ForgePlatformHelper.java

@@ -1,15 +1,5 @@
 package com.blamejared.clumps.platform;
 
-import net.minecraft.world.item.ItemStack;
-
-import java.util.function.BiFunction;
-
 public class ForgePlatformHelper implements IPlatformHelper {
 
-    @Override
-    public BiFunction<ItemStack, Integer, Float> getRepairRatio(BiFunction<ItemStack, Integer, Float> defaultRepairRatio) {
-        
-        return (itemStack, integer) -> itemStack.getXpRepairRatio();
-    }
-    
 }

settings.gradle.kts

@@ -17,5 +17,5 @@ plugins {
 rootProject.name = "Clumps"
 include("common")
 include("fabric")
-//include("forge")
+include("forge")
 include("neoforge")