1.21 port [Forge]

.gitignore

@@ -31,3 +31,6 @@ bin/
 # fabric
 
 run/
+
+
+src/main/generated/.cache

build.gradle

@@ -1,37 +1,28 @@
-buildscript {
-	repositories {
-		maven { url = 'https://maven.minecraftforge.net' }
-		maven { url = "https://files.minecraftforge.net/maven" }
-		maven { url = "https://repo.spongepowered.org/repository/maven-public/" }
-		maven { url = 'https://maven.parchmentmc.org' }
-		mavenCentral()
-	}
-	dependencies {
-		classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: "${project.forgegradle_version}", changing: true
-		classpath 'org.parchmentmc:librarian:1.+'
-		classpath group: "org.spongepowered", name: "mixingradle", version: "0.7-SNAPSHOT"
-	}
+plugins {
+    id 'eclipse'
+    id 'idea'
+    id 'maven-publish'
+	id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
+	id 'org.spongepowered.mixin' version '0.7-SNAPSHOT'
 }
 
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'eclipse'
-apply plugin: 'maven-publish'
-apply plugin: "org.spongepowered.mixin"
-apply plugin: 'org.parchmentmc.librarian.forgegradle'
-
 mixin {
 	add sourceSets.main, "twigs.refmap.json"
+	config "twigs.mixins.json"
 }
 
 version = "${project.minecraft_version}-${project.mod_version}"
 group = 'com.ninni.twigs'
 archivesBaseName = 'Twigs'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
-	mappings channel: "${project.mappings_channel}", version: "${project.mappings_version}"
+	mappings channel: 'official', version: "${project.mappings_version}"
+
+	copyIdeResources = true //Calls processResources when in dev
+	reobf = false // Forge 1.20.6+ uses official mappings at runtime, so we shouldn't reobf from official to SRG
 
 	accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -95,6 +86,9 @@ repositories {
 
 dependencies {
 	minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
+	// this fixes the problem of forge not booting, i dont know why this is needed, thanks forge :) (I learnt why this is need, its a hacky fix for dependency hell)
+	implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
+
 	annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
 }
 
@@ -111,10 +105,8 @@ jar {
 				"MixinConfigs"            : "twigs.mixins.json"
 		])
 	}
-	finalizedBy 'reobfJar'
 }
 
-jar.finalizedBy('reobfJar')
 
 publishing {
 	publications {
@@ -128,3 +120,10 @@ publishing {
 		}
 	}
 }
+
+// if this is not here "resources" will not be included
+sourceSets.each {
+	def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+	it.output.resourcesDir = dir
+	it.java.destinationDirectory = dir
+}

gradle.properties

@@ -2,10 +2,10 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 mappings_channel=official
-mappings_version=1.20.1
+mappings_version=1.21
 
-minecraft_version = 1.20.1
-mod_version = 3.1.0
+minecraft_version=1.21
+mod_version=3.2.0
 
-forge_version = 47.0.18
-forgegradle_version = 5.1.+
+forge_version=51.0.32
+forgegradle_version=6.0.+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -0,0 +1,17 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            name = 'MinecraftForge'
+            url = 'https://maven.minecraftforge.net/'
+        }
+        maven {
+            name = 'Sponge Snapshots'
+            url = 'https://repo.spongepowered.org/repository/maven-public/'
+        }
+    }
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+}

src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924

@@ -1,4 +1,4 @@
-// 1.19.4	2023-04-28T14:29:20.7182308	Registries
+// 1.21	2024-08-07T22:38:51.481749216	Registries
 1246e6708b1ac69de3a251babbdb88477531893c data/twigs/forge/biome_modifier/add_azalea_flowers.json
 382365853e501e7b34de18d2828f4ac61dcac0fe data/twigs/forge/biome_modifier/add_land_sea_shells.json
 a752cd0e73ccc35946e328f7ba0e319140a74fc9 data/twigs/forge/biome_modifier/add_ore_bloodstone.json
@@ -8,7 +8,7 @@ cd8396b910a27713e74acfaf124358c44f908aa4 data/twigs/forge/biome_modifier/add_ore
 b306508f371e96c8818ff0428ab88c087fd275f2 data/twigs/forge/biome_modifier/add_silt_strip.json
 4891225a361b9985a30270bc15efc33090e86c4a data/twigs/forge/biome_modifier/add_twigs.json
 7f84e82208a60f31f8f8cf4559b6b31d07fd0fc7 data/twigs/forge/biome_modifier/add_water_sea_shells.json
-09e0201edab89fd7fba389b7cca09abd471581ce data/twigs/worldgen/configured_feature/azalea_flowers.json
+e4669ddf2a31414026412f7e9e48d08cd365c95f data/twigs/worldgen/configured_feature/azalea_flowers.json
 e308fd61a81759900fdb310b07ec8f0c2e02803b data/twigs/worldgen/configured_feature/ore_bloodstone.json
 534ea1ec9b2782a5850075ceeefd6b5c1f16a07d data/twigs/worldgen/configured_feature/ore_rhyolite.json
 81c6417bd09b9276f7887820a725f23c730c9b52 data/twigs/worldgen/configured_feature/ore_schist.json
@@ -26,3 +26,6 @@ d90ee40d61f84ef43e150f35251693ba2ca6418b data/twigs/worldgen/configured_feature/
 221d679bce3faa8159775ef7b679a6e32649751c data/twigs/worldgen/placed_feature/patch_seashell_water.json
 ff4b07b0a6d9862b29b8a10d3b497b3dff57ea21 data/twigs/worldgen/placed_feature/patch_twig.json
 7966b3b727cfa0de202323e424e20c9cd8177810 data/twigs/worldgen/placed_feature/silt_strip.json
+d604d7e2ef33dcfc85fffd2eb9fc6747e6ebfd35 data/twigs/worldgen/structure/bloodstone_obelisk.json
+68025930cceb188a48d93a4eaf0c9de2ac1a2719 data/twigs/worldgen/structure_set/bloodstone_obelisk.json
+679fed52c2b62c7cede6aadd635b35b92b367027 data/twigs/worldgen/template_pool/bloodstone_obelisk.json

src/generated/resources/.cache/446b0c55bc0b6c92a46db4ea9e152c17e70b73ec

@@ -0,0 +1,21 @@
+// 1.21	2024-08-07T22:38:51.459962999	Tags for minecraft:block mod id twigs
+342d1c926630cb925d6eb9d820022ee45fe6c2e2 data/minecraft/tags/block/crystal_sound_blocks.json
+09620d4cf563c8fc87466bca3f0530140f260de3 data/minecraft/tags/block/flower_pots.json
+8b4f9b6d93b1e42c523e8a141df3682e8133e79e data/minecraft/tags/block/inside_step_sound_blocks.json
+d98f5087086b742d3310c4356bbf4ef824764bb6 data/minecraft/tags/block/mineable/axe.json
+09b092c64fc5ef3fb0fd55e2f2d5549a3adf47a9 data/minecraft/tags/block/mineable/pickaxe.json
+24d2ac804c89467a50f2f26ab923ac79d8b58ed0 data/minecraft/tags/block/mineable/shovel.json
+599791d5ff829d9bc2c89986df8bf789dca7e962 data/minecraft/tags/block/piglin_repellents.json
+0f272983a157bea31392a17708ff6cae52275e01 data/minecraft/tags/block/replaceable.json
+0f272983a157bea31392a17708ff6cae52275e01 data/minecraft/tags/block/replaceable_by_trees.json
+bb490d6298d60add7923fd01e6b2279cef2909d0 data/minecraft/tags/block/slabs.json
+33e68d4e3e1958c8ef642f2af2ae761bb67b7ad3 data/minecraft/tags/block/small_flowers.json
+96c4fae30aa703fb8bb48d3c8dfb126468677f35 data/minecraft/tags/block/stairs.json
+b149ca0af955728398901a109a265985c8148fef data/minecraft/tags/block/walls.json
+be04783777713d461327c38454be43107254bf71 data/twigs/tags/block/bloodstone.json
+e6076b519f016d5b5e38c00c9e224e9e20756ad9 data/twigs/tags/block/offset_remover.json
+6b2fbd51696b24130e7b9082e8c2bba4ae324a22 data/twigs/tags/block/packed_silt.json
+2d36e807a9494cb31437d5a846b38ea081b7a75a data/twigs/tags/block/rhyolite.json
+555634d44bd366e8aa29df9dde35d30b3eac87b8 data/twigs/tags/block/schist.json
+53b99d8c0c4c77ea2142b8553858d2954d7beb25 data/twigs/tags/block/silt_pots.json
+f76b491c1b4e07e5dec76430704d4721fdbd0969 data/twigs/tags/block/tables.json

src/generated/resources/.cache/49c24cc48d90b8939ce80f1f0976afa87be2f0ae

@@ -0,0 +1,2 @@
+// 1.21	2024-08-07T22:38:51.468772158	Tags for minecraft:entity_type mod id twigs
+f5e3d6f269dfd9702db5227b3112bddfc254c56a data/twigs/tags/entity_type/bamboo_leaves_slow_immune.json

src/generated/resources/.cache/55d077429bd7139b01b1cf429e11a3d8c81cda38

@@ -0,0 +1,9 @@
+// 1.21	2024-08-07T22:38:51.496559958	Tags for minecraft:worldgen/biome mod id twigs
+0f241c94b10e4b16b4304f66ad949bb089955b1e data/twigs/tags/worldgen/biome/azalea_flowers_generate.json
+a47da4790ef580393967ae893b28e5c20640ed1b data/twigs/tags/worldgen/biome/bloodstone_generates.json
+b9d88eebe73b1ad63bb30d2153848ee9e14f6c0a data/twigs/tags/worldgen/biome/has_structure/bloodstone_obelisk.json
+8f5101d01c0043b32b309193648315ac92299f76 data/twigs/tags/worldgen/biome/schist_generates.json
+7d5941e8e3343232ad51784184e6ad28a4dc2047 data/twigs/tags/worldgen/biome/silt_generates.json
+631e18ec5c16f890d3431266b8ddf2952a2a33c2 data/twigs/tags/worldgen/biome/spawns_pebble.json
+748e4376bf3caef7e7ebc931facb73402fba5617 data/twigs/tags/worldgen/biome/spawns_sea_shell.json
+950a462e8cad10e32b7e2fda0c01efe349b71ca6 data/twigs/tags/worldgen/biome/spawns_twig.json