Skip to content

Commit

Permalink
bump to 1.5
Browse files Browse the repository at this point in the history
- update paper to 1.19.3 and drop older.
- update nms package 1_19_R1 to 1_19_R2
- update gradlew scripts
  • Loading branch information
LazyGon committed Dec 9, 2022
1 parent 3f1650a commit 4666f3d
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 25 deletions.
1 change: 1 addition & 0 deletions .gitattribute
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.bat text eol = crlf
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 0 additions & 6 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
14 changes: 6 additions & 8 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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%

Expand All @@ -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.
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/net/okocraft/boxtradestick/NMSUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 4666f3d

Please sign in to comment.