Closes GH-66 Add support for the new grass id

dexman545 · Dec 9, 2023 · 55eb098 · 55eb098
1 parent 5715fd1
commit 55eb098
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,10 +5,8 @@ buildscript {
 }
 
 plugins {
-    id 'fabric-loom' version '1.3.+'
+    id 'fabric-loom' version '1.4.+'
     //id 'org.gradle.toolchains.foojay-resolver-convention' version "0.5.0"
-    //id "com.github.fudge.forgedflowerloom" version "2.0.0"
-    id 'io.github.juuxel.loom-vineflower' version '1.+'
     id 'maven-publish'
     id "com.modrinth.minotaur" version "2.+"
     id 'com.matthewprenger.cursegradle' version '1.4.+'

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Mod Properties
-mod_version = 8.0.0
+mod_version = 8.0.1
 maven_group = dex.autoswitch
 archives_base_name = autoswitch
 
@@ -20,9 +20,9 @@ range = >=1.20.2-alpha.23.31.a
 # Added to mod.json and used for curseforge publishing
 java = 17
 
-minecraft_version=1.20.2-pre4
-yarn_mappings=1.20.2-pre4+build.3
-loader_version=0.14.22
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.1
+loader_version=0.15.1
 
 #Fabric api
-fabric_version=0.88.4+1.20.2
+fabric_version=0.91.2+1.20.4
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/generated/data/autoswitch/tags/blocks/shears_efficient.json b/src/main/generated/data/autoswitch/tags/blocks/shears_efficient.json
@@ -26,7 +26,7 @@
       "required": false
     },
     {
-      "id": "minecraft:grass",
+      "id": "minecraft:short_grass",
       "required": false
     },
     {

diff --git a/src/main/java/autoswitch/datagen/providers/BlockTagProvider.java b/src/main/java/autoswitch/datagen/providers/BlockTagProvider.java
@@ -31,7 +31,8 @@ protected void configure(RegistryWrapper.WrapperLookup arg) {
                 .addOptionalTag(BlockTags.LEAVES)
                 .addOptionalTag(BlockTags.WOOL)
                 .addOptional(Registries.BLOCK.getId(Blocks.COBWEB))
-                .addOptional(Registries.BLOCK.getId(Blocks.GRASS))
+                .addOptional(Registries.BLOCK.getId(Blocks.SHORT_GRASS))
+                .addOptional(new Identifier("grass")) // This was renamed to short_grass in ~1.20.4
                 .addOptional(Registries.BLOCK.getId(Blocks.FERN))
                 .addOptional(Registries.BLOCK.getId(Blocks.DEAD_BUSH))
                 .addOptional(Registries.BLOCK.getId(Blocks.HANGING_ROOTS))