From 0ef9066dd84c4312bd440e32d2b7dcbd4f39927a Mon Sep 17 00:00:00 2001 From: Aton-Kish <38515249+Aton-Kish@users.noreply.github.com> Date: Wed, 7 Jun 2023 22:27:27 +0900 Subject: [PATCH] [v2.3.3+1.19] bump dependencies (#56) * bump deps * bump version * add quick shulker deps --- build.gradle | 2 +- gradle.properties | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 11 ++++++----- .../java/atonkish/reinfshulker/item/ModItems.java | 5 +++-- src/main/resources/fabric.mod.json | 2 +- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 610868c..d6e1956 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "fabric-loom" version "1.1-SNAPSHOT" + id "fabric-loom" version "1.2-SNAPSHOT" id "maven-publish" id "com.matthewprenger.cursegradle" version "1.4.0" id "com.modrinth.minotaur" version "2.+" diff --git a/gradle.properties b/gradle.properties index d748dc7..771dde8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,21 +5,21 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop minecraft_version=1.19.4 - yarn_mappings=1.19.4+build.1 - loader_version=0.14.17 + yarn_mappings=1.19.4+build.2 + loader_version=0.14.21 # Mod Properties - mod_version=2.3.2+1.19 + mod_version=2.3.3+1.19 mod_id=reinfshulker maven_group=atonkish.reinfshulker archives_base_name=reinforced-shulker-boxes # Dependencies - fabric_version=0.76.0+1.19.4 - reinforced_core_version=3.0.6+1.19 - reinforced_chests_version=2.3.2+1.19 + fabric_version=0.83.0+1.19.4 + reinforced_core_version=3.1.0+1.19 + reinforced_chests_version=2.3.3+1.19 quick_shulker_version=1.3.10-1.19.4 - shulker_box_tooltip_version=3.2.5+1.19.4 + shulker_box_tooltip_version=3.3.1+1.19.4 # Quick Shulker deps shulkerutils_version=1.0.4-1.19 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc10b60..37aef8d 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.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68..aeb74cb 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -144,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/src/main/java/atonkish/reinfshulker/item/ModItems.java b/src/main/java/atonkish/reinfshulker/item/ModItems.java index d4ca153..74ca7cf 100644 --- a/src/main/java/atonkish/reinfshulker/item/ModItems.java +++ b/src/main/java/atonkish/reinfshulker/item/ModItems.java @@ -14,6 +14,7 @@ import net.minecraft.util.Identifier; import atonkish.reinfcore.item.ModItemGroup; +import atonkish.reinfcore.item.ModItemGroups; import atonkish.reinfcore.util.ReinforcingMaterial; import atonkish.reinfshulker.block.ModBlocks; @@ -39,7 +40,7 @@ public static Item registerMaterialDyeColor(ReinforcingMaterial material, DyeCol Item item = ModItems.register( new BlockItem(ModBlocks.REINFORCED_SHULKER_BOX_MAP.get(material).get(color), REINFORCED_SHULKER_BOX_SETTINGS_MAP.get(material).get(color))); - ItemGroupEvents.modifyEntriesEvent(ModItemGroup.REINFORCED_STORAGE).register(content -> content.add(item)); + ItemGroupEvents.modifyEntriesEvent(ModItemGroups.REINFORCED_STORAGE).register(content -> content.add(item)); REINFORCED_SHULKER_BOX_MAP.get(material).put(color, item); } @@ -48,7 +49,7 @@ public static Item registerMaterialDyeColor(ReinforcingMaterial material, DyeCol public static void registerMaterialDyeColorItemGroupIcon(ReinforcingMaterial material, DyeColor color) { Item item = REINFORCED_SHULKER_BOX_MAP.get(material).get(color); - ModItemGroup.setIcon(ModItemGroup.REINFORCED_STORAGE, item); + ModItemGroup.setIcon(ModItemGroups.REINFORCED_STORAGE, item); } private static Item register(BlockItem item) { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8de8f73..fb58ee3 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -33,7 +33,7 @@ "mixins": ["reinfshulker.mixins.json"], "depends": { - "fabricloader": ">=0.14.17", + "fabricloader": ">=0.14.19", "fabric-api": "*", "minecraft": "~1.19.4", "java": ">=17"