1.21.X Port (#28)

MeAlam1 · Sep 4, 2024 · 05075e3 · 05075e3
1 parent 433b8a7
commit 05075e3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 15 deletions.
diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -18,6 +18,9 @@ repositories {
             includeGroup("com.eliotlash.mclib")
         }
     }
+    maven {
+        url "https://cursemaven.com"
+    }
     mavenCentral()
     mavenLocal()
 }
@@ -26,7 +29,7 @@ base {
     archivesName = "${mod_id}-forge-${minecraft_version}"
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(java_version)
 
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
@@ -73,8 +76,10 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    compileOnly fg.deobf("software.bernie.geckolib:geckolib-forge-${minecraft_version}:${geckolib_version}")
-    runtimeOnly fg.deobf("software.bernie.geckolib:geckolib-forge-${minecraft_version}:${geckolib_version}")
+    //compileOnly fg.deobf("software.bernie.geckolib:geckolib-forge-${minecraft_version}:${geckolib_version}")
+    //runtimeOnly fg.deobf("software.bernie.geckolib:geckolib-forge-${minecraft_version}:${geckolib_version}")
+    runtimeOnly "curse.maven:geckolib-388172:${geckolib_file}"
+    compileOnly "curse.maven:geckolib-388172:${geckolib_file}"
 }
 
 tasks.named('processResources', ProcessResources).configure {

diff --git a/Forge/gradle.properties b/Forge/gradle.properties
@@ -3,14 +3,16 @@ org.gradle.daemon=false
 
 ## Environment Properties
 
-minecraft_version=1.20.4
-minecraft_version_range=[1.20.4,1.21)
-forge_version=49.1.4
+minecraft_version=1.21
+minecraft_version_range=[1.20,1.22)
+forge_version=51.0.33
 forge_version_range=[0,)
 loader_version_range=[0,)
 mapping_channel=official
-mapping_version=1.20.4
-geckolib_version=4.4.4
+mapping_version=1.21
+geckolib_version=4.5.8
+geckolib_file=5605712
+java_version=21
 
 ## Mod Properties
 

diff --git a/Forge/gradle/wrapper/gradle-wrapper.properties b/Forge/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
+#Tue Sep 03 15:47:51 SAST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
-networkTimeout=10000
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle
@@ -21,7 +21,7 @@ base {
     archivesName = "${mod_id}-neoforge-${minecraft_version}"
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(java_version)
 
 //minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
 //minecraft.accessTransformers.entry public net.minecraft.client.Minecraft textureManager # textureManager
@@ -62,8 +62,8 @@ configurations {
 
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
-    runtimeOnly "curse.maven:geckolib-388172:5188406"
-    compileOnly "curse.maven:geckolib-388172:5188406"
+    runtimeOnly "curse.maven:geckolib-388172:${geckolib_file}"
+    compileOnly "curse.maven:geckolib-388172:${geckolib_file}"
 }
 
 jar {

diff --git a/NeoForge/gradle.properties b/NeoForge/gradle.properties
@@ -5,11 +5,14 @@ org.gradle.debug=false
 neogradle.subsystems.parchment.minecraftVersion=1.20.3
 neogradle.subsystems.parchment.mappingsVersion=2023.12.31
 minecraft_version=1.20.4
-minecraft_version_range=[1.20.4,1.21)
+minecraft_version_range=[1.20.2,1.21)
 neo_version=20.4.237
 neo_version_range=[20.4,)
 loader_version_range=[2,)
-geckolib_version=4.4.4
+## geckolib_file is the cursemaven file you get from curseforge
+geckolib_file=5188406
+java_version=17
+
 
 ## Mod Properties