Skip to content

Commit

Permalink
PhatLoots v5.6.0
Browse files Browse the repository at this point in the history
- Official support for 1.20.x
- Fixed SampleLoot causing legacy loads
- Fixed chest opening de-syncs for players who are not opening a chest
- Fixed bug with the seconds value appearing wrong when a loot table could not be opened
- Removed hook for legacy RegionTools plugin
- Moved to Gradle for building
  • Loading branch information
Redned235 committed Jun 23, 2024
1 parent 4f0a9d3 commit 92cf8d0
Show file tree
Hide file tree
Showing 96 changed files with 14,549 additions and 14,467 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Build

on:
push:
branches: [ master ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '17'
distribution: 'adopt'
cache: gradle
- name: Build with Gradle
run: ./gradlew build
- name: Publish to Modrinth
if: ${{ success() && github.repository == 'Redned235/PhatLoots' && github.ref_name == 'master' }}
env:
CHANGELOG: ${{ github.event.head_commit.message }}
BUILD_NUMBER: ${{ github.run_number }}
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
run: ./gradlew modrinth
32 changes: 0 additions & 32 deletions .github/workflows/maven.yml

This file was deleted.

63 changes: 39 additions & 24 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,30 +1,45 @@
### Java template
# Compiled class file
*.class
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/

#Log files
*.log
### IntelliJ IDEA ###
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/

# BlueJ files
*.ctxt
### Eclipse ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/

# Mobile Tools for Java (J2ME)
.mtj.tmp/
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
### VS Code ###
.vscode/

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
### Mac OS ###
.DS_Store

*target
.idea
*.iml
dependency-reduced-pom.xml
.DS_Store
### Run Server ###
run/
87 changes: 87 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
plugins {
id("java")
id("java-library")
id("com.github.johnrengelman.shadow") version "8.1.1"
id("xyz.jpenilla.run-paper") version "2.3.0"
id("com.modrinth.minotaur") version "2.+"
}

val supportedVersions = listOf("1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21")

group = "com.codisimus.plugins"
version = "5.6.0"

java {
toolchain.languageVersion.set(JavaLanguageVersion.of(17))
}

repositories {
maven("https://repo.papermc.io/repository/maven-public/")
maven("https://jitpack.io")
maven("https://oss.sonatype.org/content/groups/public")
maven("https://repo.citizensnpcs.co")
maven("https://maven.enginehub.org/repo/")
maven("https://dl.auranode.com/repo/")
maven("https://repo.codemc.io/repository/maven-public")
maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
maven("https://mvn.lumine.io/repository/maven-public/")
}

dependencies {
compileOnly(libs.paper.api)

// Plugin dependencies
compileOnly(libs.citizens.api)
compileOnly(libs.worldguard.core)
compileOnly(libs.worldedit.bukkit)
compileOnly(libs.vault.api)
compileOnly(libs.nuvotifier)
compileOnly(libs.mythicdrops)
compileOnly(libs.placeholder.api)
compileOnly(libs.mythicmobs)

// Shaded libs
implementation(libs.bstats.bukkit)
}

tasks {
runServer {
minecraftVersion("1.20.4")
}

shadowJar {
from("src/main/java/resources") {
include("*")
}

// Relocate metrics
relocate("org.bstats", "com.codisimus.plugins.phatloots.shaded.bstats")

archiveFileName.set("PhatLoots.jar")
archiveClassifier.set("")
}

jar {
archiveClassifier.set("unshaded")
}

processResources {
expand("version" to rootProject.version)
}

named("build") {
dependsOn(shadowJar)
}
}

modrinth {
val snapshot = "SNAPSHOT" in rootProject.version.toString()

token.set(System.getenv("MODRINTH_TOKEN") ?: "")
projectId.set("phatloots")
versionNumber.set(rootProject.version as String + if (snapshot) "-" + System.getenv("BUILD_NUMBER") else "")
versionType.set(if (snapshot) "beta" else "release")
changelog.set(System.getenv("CHANGELOG") ?: "")
uploadFile.set(tasks.shadowJar)
gameVersions.set(supportedVersions)
}
23 changes: 23 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[versions]
paper-api = "1.20.4-R0.1-SNAPSHOT"
citizens-api = "2.0.30-SNAPSHOT"
worldguard-core = "7.0.7"
worldedit-bukkit = "7.2.9"
vault-api = "1.7"
nuvotifier = "2.7.2"
mythicdrops = "8.4.8"
placeholder-api = "2.11.3"
mythicmobs = "5.2.1"
bstats-bukkit = "2.2.1"

[libraries]
paper-api = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper-api" }
citizens-api = { group = "net.citizensnpcs", name = "citizensapi", version.ref = "citizens-api" }
worldguard-core = { group = "com.sk89q.worldguard", name = "worldguard-core", version.ref = "worldguard-core" }
worldedit-bukkit = { group = "com.sk89q.worldedit", name = "worldedit-bukkit", version.ref = "worldedit-bukkit" }
vault-api = { group = "net.milkbowl.vault", name = "VaultAPI", version.ref = "vault-api" }
nuvotifier = { group = "com.github.NuVotifier", name = "NuVotifier", version.ref = "nuvotifier" }
mythicdrops = { group = "io.pixeloutlaw", name = "mythicdrops", version.ref = "mythicdrops" }
placeholder-api = { group = "me.clip", name = "placeholderapi", version.ref = "placeholder-api" }
mythicmobs = { group = "io.lumine", name = "Mythic-Dist", version.ref = "mythicmobs" }
bstats-bukkit = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats-bukkit" }
6 changes: 6 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#Thu Jun 20 20:02:26 CDT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 92cf8d0

Please sign in to comment.