Skip to content

Commit

Permalink
chore: remove testing and update deps to 8.0.2 gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
BrycensRanch committed Mar 18, 2023
1 parent a67d29c commit 1bd2525
Show file tree
Hide file tree
Showing 22 changed files with 447 additions and 212 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ jobs:
release:
if: contains('
refs/heads/master
refs/heads/rc
refs/heads/alpha
refs/heads/beta
', github.ref)
Expand Down Expand Up @@ -168,7 +167,7 @@ jobs:
uses: gradle/gradle-build-action@v2

- name: Gradle Wrapper Validation
if: ${{ needs.changes.outputs.gradle == 'true' }}
if: needs.changes.outputs.gradle == 'true'
uses: gradle/wrapper-validation-action@v1

- name: Set up Node.js
Expand Down Expand Up @@ -253,7 +252,7 @@ jobs:
version-type: ${{ github.head_ref || github.ref_name }}
fail-mode: warn
- name: Publish to Polymart
uses: BrycensRanch/plugin-publish@fc861911f56c6ea9c28e3caa4360c4e4cba6369c
uses: BrycensRanch/plugin-publish@728fda9059fd392d44213414e2f79d1bc2e980eb
with:
polymart-id: 2057
polymart-token: ${{ secrets.POLYMART_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ tasks:
echo 'pinentry-mode loopback' >> ~/.gnupg/gpg.conf &&
git config --global user.signingkey $GNUPG_SIGNING_KEY &&
git config --global commit.gpgsign true
- init: sdk install java 17.0.6-tem && sdk install gradle 8.0.1
- init: sdk install java 17.0.6-tem && sdk install gradle 8.0.2
command: ./gradlew

# security issues, unauthorised commits to our repository
Expand Down
5 changes: 0 additions & 5 deletions .releaserc.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@
"name": "alpha",
"channel": "alpha",
"prerelease": true
},
{
"name": "rc",
"channel": "rc",
"prerelease": true
}
],
"plugins": [
Expand Down
17 changes: 0 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -242,14 +242,6 @@ dependencies {
implementation "net.kyori:adventure-api:4.12.0"
implementation "net.kyori:adventure-platform-bukkit:4.2.0"
implementation "net.kyori:adventure-text-minimessage:4.12.0"

// Test dependencies
// spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0'
// testCompileOnly 'com.github.spotbugs:spotbugs-annotations:4.7.3'
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
testImplementation 'org.mockito:mockito-core:5.1.1'
testImplementation 'com.github.seeseemelk:MockBukkit-v1.19:2.145.0'
testImplementation 'org.assertj:assertj-core:3.24.2'
}
shadowJar {
archiveClassifier.set("")
Expand Down Expand Up @@ -306,15 +298,6 @@ runServer {
minecraftVersion(project.property("testServerMCVersion"))
}

test {
useJUnitPlatform()
testLogging {
events "skipped", "failed"
}
// md5: Honestly no one writes plugins with such a focus on testing/quality.
ignoreFailures = true
}

processResources {
project.properties.put("version", version)
expand project.properties
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pluginName = TownyPlus
author = Romvnly
description = It's time to upgrade your Towny server
mcVersion = 1.13
testServerMCVersion = 1.18.2
testServerMCVersion = 1.19.2
apiVersion = 1.13
version = 1.0.11-alpha.3
org.gradle.caching = true
Expand Down
1 change: 1 addition & 0 deletions run/bukkit.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
settings:
use-map-color-cache: true
allow-end: true
warn-on-overload: true
permissions-file: permissions.yml
Expand Down
File renamed without changes.
132 changes: 132 additions & 0 deletions run/config/paper-global.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
# This is the global configuration file for Paper.
# As you can see, there's a lot to configure. Some options may impact gameplay, so use
# with caution, and make sure you know what each option does before configuring.
#
# If you need help with the configuration or have any questions related to Paper,
# join us in our Discord or check the docs page.
#
# The world configuration options have been moved inside
# their respective world folder. The files are named paper-world.yml
#
# Docs: https://docs.papermc.io/
# Discord: https://discord.gg/papermc
# Website: https://papermc.io/

_version: 28
async-chunks:
threads: -1
chunk-loading:
autoconfig-send-distance: true
enable-frustum-priority: false
global-max-chunk-load-rate: -1.0
global-max-chunk-send-rate: -1.0
global-max-concurrent-loads: 500.0
max-concurrent-sends: 2
min-load-radius: 2
player-max-chunk-load-rate: -1.0
player-max-concurrent-loads: 20.0
target-player-chunk-send-rate: 100.0
chunk-system:
gen-parallelism: default
io-threads: -1
worker-threads: -1
collisions:
enable-player-collisions: true
send-full-pos-for-hard-colliding-entities: true
commands:
fix-target-selector-tag-completion: true
suggest-player-names-when-null-tab-completions: true
time-command-affects-all-worlds: false
console:
enable-brigadier-completions: true
enable-brigadier-highlighting: true
has-all-permissions: false
item-validation:
book:
author: 8192
page: 16384
title: 8192
book-size:
page-max: 2560
total-multiplier: 0.98
display-name: 8192
lore-line: 8192
resolve-selectors-in-books: false
logging:
deobfuscate-stacktraces: true
log-player-ip-addresses: true
use-rgb-for-named-text-colors: true
messages:
kick:
authentication-servers-down: <lang:multiplayer.disconnect.authservers_down>
connection-throttle: Connection throttled! Please wait before reconnecting.
flying-player: <lang:multiplayer.disconnect.flying>
flying-vehicle: <lang:multiplayer.disconnect.flying>
no-permission: <red>I'm sorry, but you do not have permission to perform this command.
Please contact the server administrators if you believe that this is in error.
use-display-name-in-quit-message: false
misc:
chat-threads:
chat-executor-core-size: -1
chat-executor-max-size: -1
fix-entity-position-desync: true
lag-compensate-block-breaking: true
load-permissions-yml-before-plugins: true
max-joins-per-tick: 3
region-file-cache-size: 256
strict-advancement-dimension-check: false
use-alternative-luck-formula: false
use-dimension-type-for-custom-spawners: false
packet-limiter:
all-packets:
action: KICK
interval: 7.0
max-packet-rate: 500.0
kick-message: <red><lang:disconnect.exceeded_packet_rate>
overrides:
ServerboundPlaceRecipePacket:
action: DROP
interval: 4.0
max-packet-rate: 5.0
player-auto-save:
max-per-tick: -1
rate: -1
proxies:
bungee-cord:
online-mode: true
proxy-protocol: false
velocity:
enabled: false
online-mode: false
secret: ''
scoreboards:
save-empty-scoreboard-teams: false
track-plugin-scoreboards: false
spam-limiter:
incoming-packet-threshold: 300
recipe-spam-increment: 1
recipe-spam-limit: 20
tab-spam-increment: 1
tab-spam-limit: 500
timings:
enabled: true
hidden-config-entries:
- database
- settings.bungeecord-addresses
- settings.velocity-support.secret
- proxies.velocity.secret
history-interval: 300
history-length: 3600
server-name: Unknown Server
server-name-privacy: false
url: https://timings.aikar.co/
verbose: true
unsupported-settings:
allow-grindstone-overstacking: false
allow-headless-pistons: false
allow-permanent-block-break-exploits: false
allow-piston-duplication: false
perform-username-validation: true
watchdog:
early-warning-delay: 10000
early-warning-every: 5000
Loading

0 comments on commit 1bd2525

Please sign in to comment.