From 4666f3dd462289711dc77ba7cdf9e06be06aabd5 Mon Sep 17 00:00:00 2001
From: LazyGon <26216029+LazyGon@users.noreply.github.com>
Date: Sat, 10 Dec 2022 02:31:50 +0900
Subject: [PATCH] bump to 1.5 - update paper to 1.19.3 and drop older. - update
 nms package 1_19_R1 to 1_19_R2 - update gradlew scripts

---
 .gitattribute                                      |  1 +
 build.gradle.kts                                   | 12 ++++++------
 gradlew                                            |  6 ------
 gradlew.bat                                        | 14 ++++++--------
 .../java/net/okocraft/boxtradestick/NMSUtil.java   | 10 +++++-----
 5 files changed, 18 insertions(+), 25 deletions(-)
 create mode 100644 .gitattribute

diff --git a/.gitattribute b/.gitattribute
new file mode 100644
index 0000000..82ea9a9
--- /dev/null
+++ b/.gitattribute
@@ -0,0 +1 @@
+*.bat text eol = crlf
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 723b063..cfb7732 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,23 +7,23 @@ plugins {
 }
 
 group = "net.okocraft.boxtradestick"
-version = "1.4"
+version = "1.5"
 
 repositories {
     mavenCentral()
     maven(url = "https://papermc.io/repo/repository/maven-public/")
-    maven(url = "https://okocraft.github.io/Box/maven/")
+    maven(url = "https://okocraft.github.io/Box/maven-snapshot/")
 }
 
 dependencies {
-    paperDevBundle("1.19.2-R0.1-SNAPSHOT")
+    paperDevBundle("1.19.3-R0.1-SNAPSHOT")
 
     implementation("com.github.siroshun09.configapi:configapi-yaml:4.6.0")
     implementation("com.github.siroshun09.translationloader:translationloader:2.0.2")
 
-    compileOnly("net.okocraft.box:box-api:5.0.0-rc.6")
-    compileOnly("net.okocraft.box:box-storage-api:5.0.0-rc.6")
-    compileOnly("net.okocraft.box:box-stick-feature:5.0.0-rc.6")
+    compileOnly("net.okocraft.box:box-api:5.1.0-SNAPSHOT")
+    compileOnly("net.okocraft.box:box-storage-api:5.1.0-SNAPSHOT")
+    compileOnly("net.okocraft.box:box-stick-feature:5.1.0-SNAPSHOT")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
diff --git a/gradlew b/gradlew
index a69d9cb..1b6c787 100644
--- a/gradlew
+++ b/gradlew
@@ -205,12 +205,6 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index f127cfd..107acd3 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/src/main/java/net/okocraft/boxtradestick/NMSUtil.java b/src/main/java/net/okocraft/boxtradestick/NMSUtil.java
index d8172e5..9e3d028 100644
--- a/src/main/java/net/okocraft/boxtradestick/NMSUtil.java
+++ b/src/main/java/net/okocraft/boxtradestick/NMSUtil.java
@@ -7,11 +7,11 @@
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.item.trading.MerchantOffer;
 import org.bukkit.Statistic;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftAbstractVillager;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftVillager;
-import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftMerchant;
-import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftMerchantRecipe;
+import org.bukkit.craftbukkit.v1_19_R2.entity.CraftAbstractVillager;
+import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R2.entity.CraftVillager;
+import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftMerchant;
+import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftMerchantRecipe;
 import org.bukkit.entity.AbstractVillager;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Villager;