Compare commits

...

3 Commits

Author SHA1 Message Date
Ryder Belserion c0e12fef9a
fuck you 2024-03-05 00:25:05 -05:00
Ryder Belserion 4a63296f99
Update CONTRIBUTING.md 2024-02-27 21:47:48 -05:00
Ryder Belserion 230ad2f5e9
Update build script 2024-02-27 21:47:40 -05:00
11 changed files with 150 additions and 44 deletions

View File

@ -1,4 +1,4 @@
# Contributing to CrazyCrates # Contributing to CrazyAuctions
Contributions to the project are always welcome, Pull Requests do have some guidelines before being approved. Contributions to the project are always welcome, Pull Requests do have some guidelines before being approved.
## You should always create the fork as a personal repository not in an organization. ## You should always create the fork as a personal repository not in an organization.

View File

@ -8,13 +8,13 @@ base {
archivesName.set("${rootProject.name}-${project.name.uppercaseFirstChar()}") archivesName.set("${rootProject.name}-${project.name.uppercaseFirstChar()}")
} }
val mcVersion = rootProject.properties["minecraftVersion"] as String val mcVersion = providers.gradleProperty("mcVersion").get()
val fabricVersion = rootProject.properties["fabricVersion"] as String val fabricVersion = providers.gradleProperty("version").get()
project.version = if (System.getenv("BUILD_NUMBER") != null) "$fabricVersion-${System.getenv("BUILD_NUMBER")}" else fabricVersion project.version = if (System.getenv("BUILD_NUMBER") != null) "$fabricVersion-${System.getenv("BUILD_NUMBER")}" else fabricVersion
tasks { tasks {
val isBeta: Boolean = rootProject.extra["isBeta"]?.toString()?.toBoolean() ?: false val isBeta: Boolean = providers.gradleProperty("isBeta").get().toBoolean()
val type = if (isBeta) "Beta" else "Release" val type = if (isBeta) "Beta" else "Release"
modrinth { modrinth {

View File

@ -30,7 +30,7 @@ repositories {
flatDir { dirs("libs") } flatDir { dirs("libs") }
} }
val mcVersion = rootProject.properties["minecraftVersion"] as String val mcVersion = providers.gradleProperty("mcVersion").get()
project.version = if (System.getenv("BUILD_NUMBER") != null) "${rootProject.version}-${System.getenv("BUILD_NUMBER")}" else rootProject.version project.version = if (System.getenv("BUILD_NUMBER") != null) "${rootProject.version}-${System.getenv("BUILD_NUMBER")}" else rootProject.version
@ -52,7 +52,7 @@ tasks {
} }
val directory = File("$rootDir/jars") val directory = File("$rootDir/jars")
val isBeta: Boolean = rootProject.extra["isBeta"]?.toString()?.toBoolean() ?: false val isBeta: Boolean = providers.gradleProperty("isBeta").get().toBoolean()
val type = if (isBeta) "Beta" else "Release" val type = if (isBeta) "Beta" else "Release"
// Publish to hangar.papermc.io. // Publish to hangar.papermc.io.

View File

@ -45,7 +45,7 @@ tasks {
} }
val directory = File("$rootDir/jars") val directory = File("$rootDir/jars")
val mcVersion = rootProject.properties["minecraftVersion"] as String val mcVersion = providers.gradleProperty("mcVersion").get()
modrinth { modrinth {
autoAddDependsOn.set(false) autoAddDependsOn.set(false)

View File

@ -7,7 +7,7 @@ dependencies {
compileOnly(libs.cluster.api) compileOnly(libs.cluster.api)
api(libs.config.me) { api(libs.configme) {
exclude(group = "org.yaml", module = "snakeyaml") exclude(group = "org.yaml", module = "snakeyaml")
} }
} }

View File

@ -1,5 +1,6 @@
org.gradle.jvmargs = '-Xmx3G' org.gradle.jvmargs = '-Xmx3G'
org.gradle.parallel = false org.gradle.caching = true
org.gradle.parallel = true
org.gradle.warning.mode = all org.gradle.warning.mode = all
authors = ["RyderBelserion, Badbones69"] authors = ["RyderBelserion, Badbones69"]
@ -12,5 +13,5 @@ description = Auction off items in style.
version = 2.0 version = 2.0
apiVersion = 1.20 apiVersion = 1.20
minecraftVersion = 1.20.4 mcVersion = 1.20.4
isBeta = true isBeta = true

View File

@ -1,8 +1,4 @@
[versions] [versions]
adventure4 = "4.14.0"
cluster_version = "6.3"
shadow_version = "8.1.1" shadow_version = "8.1.1"
paperweight_version = "1.5.9" paperweight_version = "1.5.9"
runpaper_version = "2.2.3" runpaper_version = "2.2.3"
@ -19,30 +15,9 @@ runpaper = { id = "xyz.jpenilla.run-paper", version = "2.2.2" }
shadowjar = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } shadowjar = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
[libraries] [libraries]
adventure4 = { module = "net.kyori:adventure-api", version.ref = "adventure4" }
minimessage4 = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure4" }
cluster_paper = { module = "com.ryderbelserion.cluster:paper", version.ref = "cluster_version" }
cluster_api = { module = "com.ryderbelserion.cluster:api", version.ref = "cluster_version" }
jorel_bukkit = { module = "dev.jorel:commandapi-bukkit-shade", version = "9.4.0-SNAPSHOT" }
triumph_cmds = { module = "dev.triumphteam:triumph-cmd-bukkit", version = "2.0.0-ALPHA-9" }
config_me = { module = "ch.jalu:configme", version = "1.4.1" }
hikari = { module = "com.zaxxer:HikariCP", version = "5.1.0" }
vault = { module = "com.github.MilkBowl:VaultAPI", version = "1.7.1" }
bstats = { module = "org.bstats:bstats-bukkit", version = "3.0.2" }
paperweight = { module = "io.papermc.paperweight:paperweight-userdev", version.ref = "paperweight_version" } paperweight = { module = "io.papermc.paperweight:paperweight-userdev", version.ref = "paperweight_version" }
shadowjar = { module = "com.github.johnrengelman:shadow", version.ref = "shadow_version" } shadowjar = { module = "com.github.johnrengelman:shadow", version.ref = "shadow_version" }
runpaper = { module = "xyz.jpenilla:run-task", version.ref = "runpaper_version" } runpaper = { module = "xyz.jpenilla:run-task", version.ref = "runpaper_version" }
hangar = { module = "io.papermc:hangar-publish-plugin", version.ref = "hangar_version" } hangar = { module = "io.papermc:hangar-publish-plugin", version.ref = "hangar_version" }
modrinth = { module = "com.modrinth.minotaur:Minotaur", version.ref = "modrinth_version" } modrinth = { module = "com.modrinth.minotaur:Minotaur", version.ref = "modrinth_version" }
[bundles]
adventure = ["adventure4", "minimessage4"]

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

92
gradlew.bat vendored Normal file
View File

@ -0,0 +1,92 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
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%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
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.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
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.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 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%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

View File

@ -2,16 +2,16 @@ plugins {
id("paper-plugin") id("paper-plugin")
} }
val mcVersion = rootProject.properties["minecraftVersion"] as String val mcVersion = providers.gradleProperty("mcVersion").get()
dependencies { dependencies {
api(project(":common")) api(project(":common"))
implementation(libs.cluster.paper) implementation(libs.cluster.paper)
implementation(libs.jorel.bukkit) implementation(libs.commandapi)
implementation(libs.bstats) implementation(libs.metrics)
compileOnly(libs.vault) compileOnly(libs.vault)
@ -21,7 +21,7 @@ dependencies {
tasks { tasks {
shadowJar { shadowJar {
listOf( listOf(
//"com.ryderbelserion.cluster.paper", "dev.triumphteam.cmd",
"org.bstats" "org.bstats"
).forEach { ).forEach {
relocate(it, "libs.$it") relocate(it, "libs.$it")
@ -34,9 +34,9 @@ tasks {
"version" to project.version, "version" to project.version,
"group" to rootProject.group, "group" to rootProject.group,
"description" to rootProject.description, "description" to rootProject.description,
"apiVersion" to rootProject.properties["apiVersion"], "apiVersion" to providers.gradleProperty("apiVersion").get(),
"authors" to rootProject.properties["authors"], "authors" to providers.gradleProperty("authors").get(),
"website" to rootProject.properties["website"] "website" to providers.gradleProperty("website").get()
) )
inputs.properties(properties) inputs.properties(properties)

View File

@ -7,6 +7,44 @@ pluginManagement {
} }
} }
dependencyResolutionManagement {
repositories {
maven("https://repo.papermc.io/repository/maven-public/")
gradlePluginPortal()
mavenCentral()
}
versionCatalogs {
create("libs") {
version("adventure4", "4.14.0")
version("cluster", "6.3")
library("holographicdisplays", "me.filoghost.holographicdisplays", "holographicdisplays-api").version("3.0.0")
library("decentholograms", "com.github.decentsoftware-eu", "decentholograms").version("2.8.6")
library("adventure4", "net.kyori", "adventure-text-minimessage").versionRef("adventure4")
library("minimessage4", "net.kyori", "adventure-api").versionRef("adventure4")
library("commandapi", "dev.jorel", "commandapi-bukkit-shade").version("9.4.0-SNAPSHOT")
library("triumphgui", "dev.triumphteam", "triumph-gui").version("3.1.7")
library("cluster_paper", "com.ryderbelserion.cluster", "paper").versionRef("cluster")
library("cluster_api", "com.ryderbelserion.cluster", "paper").versionRef("cluster")
library("itemsadder", "com.github.LoneDev6", "api-itemsadder").version("3.6.1")
library("placeholderapi", "me.clip", "placeholderapi").version("2.11.5")
library("vault", "com.github.MilkBowl", "VaultAPI").version("1.7.1")
library("metrics", "org.bstats", "bstats-bukkit").version("3.0.2")
library("oraxen", "io.th0rgal", "oraxen").version("1.164.0")
library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
library("configme", "ch.jalu", "configme").version("1.4.1")
bundle("adventure", listOf("adventure4", "minimessage4"))
}
}
}
rootProject.name = "CrazyAuctions" rootProject.name = "CrazyAuctions"
include("common") include("common")