Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream #3

Merged
merged 36 commits into from
Feb 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
147173c
Added has permissions requirement type
Tanguygab Nov 17, 2024
3ae385c
Check for Has Permissions requirement minimum being lower than 1
Tanguygab Nov 17, 2024
a0ffd8d
Check for items from supported ItemHooks (added MythicLib dependency …
Tanguygab Nov 17, 2024
adb52a1
Fixed itemhooks check (BaseHead & TextureHead not yet functional)
Tanguygab Nov 17, 2024
4b263ca
Fixed BaseHeadHook & TextureHeadHook
Tanguygab Nov 17, 2024
bbbe525
Fix HasPermissionsRequirement logic for invert & add more warns
Tanguygab Nov 17, 2024
e222803
Added "minimum" in requirement options
Tanguygab Nov 17, 2024
06b50fb
Lowercase material to check for itemHook
Tanguygab Nov 17, 2024
9125d63
Extract logic to SkullUtils.getSkullOwner
Tanguygab Nov 17, 2024
e47da1c
rename isItem to itemMatchIdentifiers
Tanguygab Nov 17, 2024
5d34619
Added hide_tooltip, enchantment_glint_override, rarity, tooltip_style…
Tanguygab Nov 19, 2024
0cd983a
Updated HAS_TOOLTIP_STYLE comment
Tanguygab Nov 19, 2024
83307a6
forgot placeholders support for tooltip_style & item_model
Tanguygab Nov 20, 2024
8027cbe
Merge pull request #148 from Tanguygab/has-permissions-requirement
BlitzOffline Nov 21, 2024
b18a43b
Merge pull request #149 from Tanguygab/improved-has-item
BlitzOffline Nov 21, 2024
bfdd942
feat: add options for NBT Short tags
MemencioPerez Nov 24, 2024
77eca86
feat: add options for NBT Byte tags
MemencioPerez Nov 24, 2024
c4cb45d
Merge pull request #152 from Tanguygab/improved-item-tooltip
BlitzOffline Nov 24, 2024
fcae0e9
Upgrade adventure-platform-bukkit to fix formating in 1.21+
BlitzOffline Nov 24, 2024
2e90538
Merge pull request #154 from HelpChat/issue/140
BlitzOffline Nov 27, 2024
abd23c9
Merge pull request #153 from MemencioPerez/main
BlitzOffline Nov 27, 2024
234798f
Access to Sound#valueOf method through Reflection to avoid java.lang.…
MemencioPerez Dec 1, 2024
3a838fa
Register menu arguments even if the menu does not have an open comman…
BlitzOffline Dec 7, 2024
eba4866
Multitude of changes
BlitzOffline Jan 1, 2025
cf907d4
fixed index out of bounds issue
BlitzOffline Jan 2, 2025
813a1cb
Merge pull request #160 from HelpChat/issue/137
BlitzOffline Jan 2, 2025
ee7573d
Merge pull request #164 from HelpChat/issue/133
BlitzOffline Jan 2, 2025
a02d2e9
Fix plugin reload only reloading main command.
BlitzOffline Jan 12, 2025
63bde0d
Catch only the specific types of exceptions that may be thrown when a…
MemencioPerez Jan 12, 2025
4a0e28b
removed unnecessary comments
BlitzOffline Jan 12, 2025
44192ea
Merge pull request #167 from HelpChat/issue/3
Kqliber Jan 12, 2025
d535240
Downgrade oraxen api version to fix java incompatibility problems
BlitzOffline Jan 13, 2025
cd0b028
Downgrade oraxen api version to fix java incompatibility problems
BlitzOffline Jan 13, 2025
3a8c9d2
Merge pull request #169 from HelpChat/issue/3
Kqliber Jan 13, 2025
9ae4882
Merge pull request #158 from MemencioPerez/main
Kqliber Jan 14, 2025
d6be58f
Upstream
KaspianDev Feb 15, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
java
id("com.github.johnrengelman.shadow") version("8.1.1")
id("com.github.ben-manes.versions") version "0.48.0"
id("com.gradleup.shadow") version("8.3.5")
id("com.github.ben-manes.versions") version("0.51.0")
}

// Change to true when releasing
Expand All @@ -18,6 +18,7 @@ repositories {
maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
maven("https://repo.glaremasters.me/repository/public/")
maven("https://nexus.phoenixdevt.fr/repository/maven-public/")
maven("https://repo.oraxen.com/releases")
maven("https://jitpack.io")
}

Expand All @@ -30,6 +31,7 @@ dependencies {
compileOnly(libs.headdb)
compileOnly(libs.itemsadder)
compileOnly(libs.oraxen)
compileOnly(libs.mythiclib)
compileOnly(libs.mmoitems)
compileOnly(libs.score)

Expand Down
18 changes: 10 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
[versions]
# Compile only
spigot = "1.21-R0.1-SNAPSHOT"
spigot = "1.21.4-R0.1-SNAPSHOT"
vault = "1.7.1"
authlib = "1.5.25"
headdb = "1.3.1"
itemsadder = "3.2.5"
headdb = "1.3.2"
itemsadder = "3.6.3-beta-14"
oraxen = "1.159.0"
mmoitems = "6.9.4-SNAPSHOT"
mythiclib = "1.7.1-SNAPSHOT"
mmoitems = "6.10-SNAPSHOT"
papi = "2.11.6"
score = "4.23.10.8"
score = "4.24.3.5"

# Implementation
nashorn = "15.4"
adventure-platform = "4.3.3"
adventure-minimessage = "4.17.0"
nashorn = "15.6"
adventure-platform = "4.3.4"
adventure-minimessage = "4.18.0"
minelib = "1.2.1"

[libraries]
Expand All @@ -24,6 +25,7 @@ authlib = { module = "com.mojang:authlib", version.ref = "authlib" }
headdb = { module = "com.arcaniax:HeadDatabase-API", version.ref = "headdb" }
itemsadder = { module = "com.github.LoneDev6:api-itemsadder", version.ref = "itemsadder" }
oraxen = { module = "com.github.oraxen:oraxen", version.ref = "oraxen" }
mythiclib = { module = "io.lumine:MythicLib-dist", version.ref = "mythiclib"}
mmoitems = { module = "net.Indyuce:MMOItems-API", version.ref = "mmoitems" }
papi = { module = "me.clip:placeholderapi", version.ref = "papi" }
score = { module = "com.github.Ssomar-Developement:SCore", version.ref = "score" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
16 changes: 8 additions & 8 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/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/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 Down Expand Up @@ -145,15 +145,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=SC2039,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=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -202,11 +202,11 @@ 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
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
Loading