Skip to content

Commit

Permalink
[v2.3.3+1.19] bump dependencies (#56)
Browse files Browse the repository at this point in the history
* bump deps

* bump version

* add quick shulker deps
  • Loading branch information
Aton-Kish committed Jun 7, 2023
1 parent 267f7d3 commit 0ef9066
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -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.+"
Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
11 changes: 6 additions & 5 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -144,15 +141,15 @@ 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
case $MAX_FD in #(
'' | 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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/atonkish/reinfshulker/item/ModItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
}

Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 0ef9066

Please sign in to comment.