1.21 port [Fabric]

.gitignore

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

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.2-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -66,7 +66,7 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
 	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
@@ -75,8 +75,8 @@ java {
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.20.1
-	yarn_mappings=1.20.1+build.5
-	loader_version=0.14.21
+	minecraft_version=1.21
+	yarn_mappings=1.21+build.2
+	loader_version=0.15.11
 
 # Mod Properties
-	mod_version = 3.1.0
+	mod_version = 3.2.0
 	maven_group = com.ninni
 	archives_base_name = twigs
 
 # Dependencies
-	fabric_version=0.84.0+1.20.1
+	fabric_version=0.100.7+1.21

gradle/wrapper/gradle-wrapper.properties

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

src/main/resources/data/minecraft/tags/blocks/crystal_sound_blocks.json → src/main/generated/data/minecraft/tags/block/crystal_sound_blocks.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "twigs:polished_amethyst",
     "twigs:cut_amethyst"

src/main/generated/data/minecraft/tags/block/flower_pots.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "twigs:potted_azalea_flowers"
+  ]
+}

src/main/resources/data/minecraft/tags/blocks/inside_step_sound_blocks.json → src/main/generated/data/minecraft/tags/block/inside_step_sound_blocks.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "twigs:petrified_lichen",
     "twigs:brick_trail",

src/main/resources/data/minecraft/tags/blocks/mineable/axe.json → src/main/generated/data/minecraft/tags/block/mineable/axe.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "#twigs:tables",
     "twigs:crimson_shroomlamp",

src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json → src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "twigs:lamp",
     "twigs:soul_lamp",
@@ -35,9 +34,6 @@
     "twigs:weeping_polished_blackstone_brick_stairs",
     "twigs:weeping_polished_blackstone_brick_slab",
     "twigs:weeping_polished_blackstone_brick_wall",
-    "twigs:tuff_stairs",
-    "twigs:tuff_slab",
-    "twigs:tuff_wall",
     "twigs:polished_tuff",
     "twigs:polished_tuff_stairs",
     "twigs:polished_tuff_slab",

src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json → src/main/generated/data/minecraft/tags/block/mineable/shovel.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "twigs:rocky_dirt",
     "twigs:silt"

src/main/generated/data/minecraft/tags/block/piglin_repellents.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "twigs:soul_lamp"
+  ]
+}

src/main/generated/data/minecraft/tags/block/replaceable.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "twigs:azalea_flowers",
+    "twigs:petrified_lichen"
+  ]
+}

src/main/generated/data/minecraft/tags/block/replaceable_by_trees.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "twigs:azalea_flowers",
+    "twigs:petrified_lichen"
+  ]
+}

src/main/generated/data/minecraft/tags/block/slabs.json

@@ -0,0 +1,45 @@
+{
+  "values": [
+    "twigs:bamboo_thatch_slab",
+    "twigs:smooth_basalt_brick_slab",
+    "twigs:mossy_brick_slab",
+    "twigs:gravel_brick_slab",
+    "twigs:smooth_stone_brick_slab",
+    "twigs:cobblestone_brick_slab",
+    "twigs:mossy_cobblestone_brick_slab",
+    "twigs:twisting_polished_blackstone_brick_slab",
+    "twigs:weeping_polished_blackstone_brick_slab",
+    "twigs:polished_tuff_slab",
+    "twigs:polished_tuff_brick_slab",
+    "twigs:calcite_slab",
+    "twigs:polished_calcite_slab",
+    "twigs:polished_calcite_brick_slab",
+    "twigs:schist_slab",
+    "twigs:polished_schist_slab",
+    "twigs:polished_schist_brick_slab",
+    "twigs:rhyolite_slab",
+    "twigs:polished_rhyolite_slab",
+    "twigs:polished_rhyolite_brick_slab",
+    "twigs:bloodstone_slab",
+    "twigs:polished_bloodstone_slab",
+    "twigs:polished_bloodstone_brick_slab",
+    "twigs:silt_brick_slab",
+    "twigs:silt_shingle_slab",
+    "twigs:white_silt_shingle_slab",
+    "twigs:orange_silt_shingle_slab",
+    "twigs:magenta_silt_shingle_slab",
+    "twigs:light_blue_silt_shingle_slab",
+    "twigs:yellow_silt_shingle_slab",
+    "twigs:lime_silt_shingle_slab",
+    "twigs:pink_silt_shingle_slab",
+    "twigs:gray_silt_shingle_slab",
+    "twigs:light_gray_silt_shingle_slab",
+    "twigs:cyan_silt_shingle_slab",
+    "twigs:purple_silt_shingle_slab",
+    "twigs:blue_silt_shingle_slab",
+    "twigs:brown_silt_shingle_slab",
+    "twigs:green_silt_shingle_slab",
+    "twigs:red_silt_shingle_slab",
+    "twigs:black_silt_shingle_slab"
+  ]
+}

src/main/generated/data/minecraft/tags/block/small_flowers.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "twigs:azalea_flowers"
+  ]
+}

src/main/generated/data/minecraft/tags/block/stairs.json

@@ -0,0 +1,44 @@
+{
+  "values": [
+    "twigs:smooth_basalt_brick_stairs",
+    "twigs:mossy_brick_stairs",
+    "twigs:gravel_brick_stairs",
+    "twigs:smooth_stone_brick_stairs",
+    "twigs:cobblestone_brick_stairs",
+    "twigs:mossy_cobblestone_brick_stairs",
+    "twigs:twisting_polished_blackstone_brick_stairs",
+    "twigs:weeping_polished_blackstone_brick_stairs",
+    "twigs:polished_tuff_stairs",
+    "twigs:polished_tuff_brick_stairs",
+    "twigs:calcite_stairs",
+    "twigs:polished_calcite_stairs",
+    "twigs:polished_calcite_brick_stairs",
+    "twigs:schist_stairs",
+    "twigs:polished_schist_stairs",
+    "twigs:polished_schist_brick_stairs",
+    "twigs:rhyolite_stairs",
+    "twigs:polished_rhyolite_stairs",
+    "twigs:polished_rhyolite_brick_stairs",
+    "twigs:bloodstone_stairs",
+    "twigs:polished_bloodstone_stairs",
+    "twigs:polished_bloodstone_brick_stairs",
+    "twigs:silt_brick_stairs",
+    "twigs:silt_shingle_stairs",
+    "twigs:white_silt_shingle_stairs",
+    "twigs:orange_silt_shingle_stairs",
+    "twigs:magenta_silt_shingle_stairs",
+    "twigs:light_blue_silt_shingle_stairs",
+    "twigs:yellow_silt_shingle_stairs",
+    "twigs:lime_silt_shingle_stairs",
+    "twigs:pink_silt_shingle_stairs",
+    "twigs:gray_silt_shingle_stairs",
+    "twigs:light_gray_silt_shingle_stairs",
+    "twigs:cyan_silt_shingle_stairs",
+    "twigs:purple_silt_shingle_stairs",
+    "twigs:blue_silt_shingle_stairs",
+    "twigs:brown_silt_shingle_stairs",
+    "twigs:green_silt_shingle_stairs",
+    "twigs:red_silt_shingle_stairs",
+    "twigs:black_silt_shingle_stairs"
+  ]
+}