Skip to content

Commit

Permalink
Update dependencies and remove unneeded
Browse files Browse the repository at this point in the history
  • Loading branch information
Hoid2 committed Feb 13, 2024
1 parent 922ee36 commit f0bd7d0
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 158 deletions.
41 changes: 1 addition & 40 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.4-SNAPSHOT'
id 'fabric-loom' version '1.5-SNAPSHOT'
id 'maven-publish'
}

Expand All @@ -16,35 +16,6 @@ repositories {
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories.

//AdditionZ, Supplementaries
exclusiveContent {
forRepository {
maven {url "https://api.modrinth.com/maven"}
}
filter {
includeGroup "maven.modrinth"
}
}

//Supplementaries Squared
exclusiveContent {
forRepository {
maven {url "https://cursemaven.com"}
}
filter {
includeGroup "curse.maven"
}
}

maven {url "https://raw.githubusercontent.com/Aton-Kish/mcmod/maven"} //ReinforcedShulker

//Notes from ReinforcedShulker build.gradle
maven {url "https://maven.terraformersmc.com/releases/"} // ModMenu (Reinforced Core deps)
maven {url "https://maven.shedaniel.me/"} // Cloth Config (Reinforced Core deps)
maven {url "https://maven.kyrptonaught.dev"} // Quick Shulker
maven {url "https://www.cursemaven.com"; content {includeGroup "curse.maven"}} //Quick Shulker (workaround)
maven {url "https://maven.misterpemodder.com/libs-release"} // Shulker Box Tooltip
}

dependencies {
Expand All @@ -55,16 +26,6 @@ dependencies {

// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modCompileOnly "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" //Override old versions until other mods have updated

//Reinforced Shulkers
modCompileOnly "atonkish.reinfshulker:reinforced-shulker-boxes:${project.reinforced_shulker_version}"
modCompileOnly "atonkish.reinfcore:reinforced-core:${project.reinforced_core_version}"

modCompileOnly "maven.modrinth:additionz:${project.additionz_version}"
// modCompileOnly "maven.modrinth:supplementaries:${project.supplementaries_version}"
// modCompileOnly "curse.maven:supplementaries-squared-838411:${project.supp_squared_version}"
modCompileOnly "maven.modrinth:carpet-ams-addition:${project.carpet_ams_addition_version}"
}

processResources {
Expand Down
8 changes: 2 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@ org.gradle.jvmargs=-Xmx1G
# check these on https://fabricmc.net/develop
minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10
loader_version=0.15.0
loader_version=0.15.6

# Mod Properties
mod_version = 3.0.3+1.20.1
maven_group = megaminds.clickopener
archives_base_name = clickopener

# Dependencies
fabric_version=0.91.0+1.20.1
reinforced_shulker_version=2.4.0+1.20
reinforced_core_version=3.1.1+1.20
additionz_version=1.1.10+1.20.1
carpet_ams_addition_version=mc1.20.1-v2.28.0
fabric_version=0.91.1+1.20.1

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
19 changes: 12 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
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"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,26 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
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 +198,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
104 changes: 0 additions & 104 deletions src/main/java/megaminds/clickopener/compat/SupplementariesCompat.java

This file was deleted.

0 comments on commit f0bd7d0

Please sign in to comment.