Skip to content

Commit

Permalink
feat!: use Patbox/TextPlaceholderAPI for templating (#70)
Browse files Browse the repository at this point in the history
deps: upgrade all dependencies to Minecraft 1.19.4

build: fix shadow-jar distribution

feat(chat): separate advancement config into task, goal and challenge
  • Loading branch information
axieum authored Jun 4, 2023
1 parent c351b26 commit a570d0a
Show file tree
Hide file tree
Showing 42 changed files with 1,320 additions and 857 deletions.
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ plugins {
id 'java'
id 'checkstyle'
id 'maven-publish'
id 'com.modrinth.minotaur' version '2.3.1'
id 'com.modrinth.minotaur' version '2.7.5'
id 'com.matthewprenger.cursegradle' version '1.4.0'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'fabric-loom' version '1.0-SNAPSHOT'
id 'fabric-loom' version '1.2-SNAPSHOT'
}

allprojects {
Expand All @@ -30,6 +30,7 @@ allprojects {
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

// Mods
// modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

// Code Quality
compileOnly "org.jetbrains:annotations:${project.jetbrains_annotations_version}"
Expand Down Expand Up @@ -95,6 +96,7 @@ allprojects {
mavenCentral()
maven { name 'dv8tion'; url 'https://m2.dv8tion.net/releases' }
maven { name 'Fabric'; url 'https://maven.fabricmc.net/' }
maven { name 'Nucleoid'; url 'https://maven.nucleoid.xyz/' }
maven { name 'Shedaniel'; url 'https://maven.shedaniel.me/' }
}

Expand Down Expand Up @@ -162,7 +164,7 @@ allprojects {
dependencies {
subprojects.each {
implementation project(path: ":${it.name}", configuration: 'namedElements')
implementation project(path: ":${it.name}", configuration: 'shadow')
implementation project(path: ":${it.name}", configuration: 'shade')
include project("${it.name}:")
}
}
Expand Down
20 changes: 10 additions & 10 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ mod_version = 1.1.0-beta.3
## {x-release-please-end}

# Fabric
minecraft_version = 1.19.2
loader_version = 0.14.9
yarn_mappings = 1.19.2+build.20
fabric_version = 0.62.0+1.19.2
minecraft_version = 1.19.4
loader_version = 0.14.18
yarn_mappings = 1.19.4+build.1
fabric_version = 0.76.0+1.19.4

# Dependencies
checkstyle_version = 10.3.4
jetbrains_annotations_version = 23.0.0
junit_jupiter_version = 5.9.1
checkstyle_version = 10.9.3
jetbrains_annotations_version = 24.0.1
junit_jupiter_version = 5.9.2

# CurseForge
cf_project_id = 502254
cf_game_versions = Fabric, Java 17, 1.19.1, 1.19.2
cf_game_versions = Fabric, Java 17, 1.19.1, 1.19.2, 1.19.3, 1.19.4
cf_relations_required = fabric-api
cf_relations_optional =
cf_relations_embedded = cloth-config
Expand All @@ -28,7 +28,7 @@ cf_relations_incompatible =

# Modrinth
mr_project_id = DoVQa3oa
mr_game_versions = 1.19.1, 1.19.2
mr_game_versions = 1.19.1, 1.19.2, 1.19.3, 1.19.4
mr_relations_required = P7dR8mSH
mr_relations_optional =
mr_relations_incompatible =
Expand All @@ -38,4 +38,4 @@ maven_group = me.axieum.mcmod.minecord
github_repo = axieum/minecord

# Other
org.gradle.jvmargs=-Xmx2G
org.gradle.jvmargs=-Xmx3G
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
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 @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# 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"'
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -143,12 +140,16 @@ fi
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
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
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,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
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down
3 changes: 2 additions & 1 deletion minecord-api/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// Declare dependencies
dependencies {
api include(fabricApi.module("fabric-api-base", project.fabric_version))
modApi include(fabricApi.module("fabric-api-base", project.fabric_version))
modApi include(fabricApi.module("fabric-lifecycle-events-v1", project.fabric_version))
modApi include("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") {
exclude module: 'modmenu'
}
modApi include("eu.pb4:placeholder-api:${project.placeholder_api_version}")
implementation shade("com.vdurmont:emoji-java:${project.emoji_java_version}")
implementation shade("net.dv8tion:JDA:${project.jda_version}") {
exclude module: 'opus-java' // exclude audio
Expand Down
7 changes: 4 additions & 3 deletions minecord-api/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ mod_version = 1.1.0-beta.3
## {x-release-please-end}

# Dependencies
cloth_config_version = 8.2.88
cloth_config_version = 10.0.96
emoji_java_version = 5.1.1
jda_version = 5.0.0-alpha.21
log4j_version = 2.19.0
jda_version = 5.0.0-beta.9
log4j_version = 2.20.0
placeholder_api_version = 2.1.0+1.19.4
Loading

0 comments on commit a570d0a

Please sign in to comment.