diff --git a/build.gradle b/build.gradle index df487fd..e5493db 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.3-SNAPSHOT' + id 'fabric-loom' version '1.6-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index aa9af0b..4c560ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.20.1 - yarn_mappings=1.20.1+build.10 - loader_version=0.14.21 + minecraft_version=1.20.6 + yarn_mappings=1.20.6+build.1 + loader_version=0.15.10 # Mod Properties - mod_version = 6.0.0+j1.2.3 + mod_version = 7.0.0+j1.2.3 maven_group = io.github.cottonmc archives_base_name = Jankson diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17a8ddc..20db9ad 100644 --- 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.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/io/github/cottonmc/jankson/JanksonFactory.java b/src/main/java/io/github/cottonmc/jankson/JanksonFactory.java index 29e0cb4..4c6289d 100644 --- a/src/main/java/io/github/cottonmc/jankson/JanksonFactory.java +++ b/src/main/java/io/github/cottonmc/jankson/JanksonFactory.java @@ -2,7 +2,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BannerPattern; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.command.argument.serialize.ArgumentSerializer; import net.minecraft.enchantment.Enchantment; @@ -94,7 +93,6 @@ public static Jankson.Builder builder() { //Note: specifically excludes dynamic registries since we can't have static access to them. register(builder, Activity.class, Registries.ACTIVITY); register(builder, ArgumentSerializer.class, Registries.COMMAND_ARGUMENT_TYPE); - register(builder, BannerPattern.class, Registries.BANNER_PATTERN); register(builder, Block.class, Registries.BLOCK); register(builder, BlockEntityType.class, Registries.BLOCK_ENTITY_TYPE); register(builder, BlockPredicateType.class, Registries.BLOCK_PREDICATE_TYPE); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 75e2955..da43f11 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -14,7 +14,7 @@ "sources": "https://github.com/CottonMC/Jankson-Fabric" }, "depends": { - "minecraft": ">=1.20.1" + "minecraft": ">=1.20.6" }, "license": "MIT",