Skip to content

Commit

Permalink
refactor: significantly refactor internals, remove Sponge (#708)
Browse files Browse the repository at this point in the history
* feat: start database refactor

Adds database migrations

* refactor: refactor database system

Now supports migrations

* refactor: begin major internals rewrite

move to using provider-style interfaces similar to huskclaims
bukkit done, still need to do fabric and sponge

* refactor: remove sponge, checkstyle

Low usage and high maintenance time cost. We will examine Forge instead in the future.

* refactor: implement refactoring changes on fabric

also fix various refactor quirks on Bukkit

* refactor: tidy metrics logic

* build: bump deps
  • Loading branch information
WiIIiam278 authored Oct 28, 2024
1 parent 05bcad9 commit ffe995e
Show file tree
Hide file tree
Showing 162 changed files with 3,829 additions and 5,669 deletions.
24 changes: 0 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,15 @@ jobs:
changelog: ${{ github.event.head_commit.message }}
distro-names: |
paper
sponge-10
fabric-1.21.3
distro-groups: |
paper
sponge
fabric
distro-descriptions: |
Paper
Sponge API 10
Fabric 1.21.3
files: |
target/HuskHomes-Paper-${{ env.version_name }}.jar
target/HuskHomes-Sponge-${{ env.version_name }}.jar
target/HuskHomes-Fabric-${{ env.version_name }}+mc.1.21.3.jar
- name: 'Spigot: Publish to Modrinth & Hangar 🚰'
uses: WiIIiam278/mc-publish@hangar
Expand Down Expand Up @@ -112,26 +108,6 @@ jobs:
1.21.2
1.21.3
java: 17
- name: 'Sponge: Publish to Modrinth 🧽'
uses: WiIIiam278/mc-publish@hangar
if: success() || failure()
with:
modrinth-id: J6U9o3JG
modrinth-featured: false
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
modrinth-dependencies: |
bluemap | suggests | *
plan | suggests | *
files-primary: target/HuskHomes-Sponge-${{ env.version_name }}.jar
name: HuskHomes (Sponge) v${{ env.version_name }}
version: ${{ env.version_name }}
version-type: alpha
changelog: ${{ github.event.head_commit.message }}
loaders: |
sponge
game-versions: |
1.19.4
java: 17
- name: 'Fabric: Publish to Modrinth & CurseForge 🧵'
uses: WiIIiam278/mc-publish@hangar
if: success() || failure()
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,15 @@ jobs:
changelog: ${{ github.event.release.body }}
distro-names: |
paper
sponge-10
fabric-1.21.3
distro-groups: |
paper
sponge
fabric
distro-descriptions: |
Paper
Sponge API 10
Fabric 1.21.3
files: |
target/HuskHomes-Paper-${{ github.event.release.tag_name }}.jar
target/HuskHomes-Sponge-${{ github.event.release.tag_name }}.jar
target/HuskHomes-Fabric-${{ github.event.release.tag_name }}+mc.1.21.3.jar
- name: 'Spigot: Publish to Modrinth & Hangar 🚰'
uses: WiIIiam278/mc-publish@hangar
Expand Down Expand Up @@ -100,25 +96,6 @@ jobs:
1.21.2
1.21.3
java: 17
- name: 'Sponge: Publish to Modrinth 🧽'
uses: WiIIiam278/mc-publish@hangar
with:
modrinth-id: J6U9o3JG
modrinth-featured: false
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
modrinth-dependencies: |
bluemap | suggests | *
plan | suggests | *
files-primary: target/HuskHomes-Sponge-${{ github.event.release.tag_name }}.jar
name: HuskHomes (Sponge) v${{ github.event.release.tag_name }}
version: ${{ env.version_name }}
version-type: release
changelog: ${{ github.event.release.body }}
loaders: |
sponge
game-versions: |
1.19.4
java: 17
- name: 'Fabric: Publish to Modrinth & CurseForge 🧵'
uses: WiIIiam278/mc-publish@hangar
with:
Expand Down
19 changes: 0 additions & 19 deletions .scripts/ensure-java-17

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

**HuskHomes** is a powerful, intuitive and flexible teleportation plugin for _Minecraft: Java Edition_ servers. HuskHomes contains a meaty—but not bloated—set of player teleportation features, including set homes, warps, public homes, teleport requests, previous and offline position teleporting—and more.

HuskHomes can be used on your Spigot, Sponge or Fabric server, and with a MySQL Database even works cross-server, letting players teleport across your proxy (Bungee or Velocity) network!
HuskHomes can be used on your Spigot or Fabric server, and with a MySQL Database even works cross-server, letting players teleport across your proxy (Bungee or Velocity) network!

## Features
**⭐ Works cross-server** — Let players seamlessly teleport and set homes across your proxies network of servers using MySQL/MariaDB.
Expand Down Expand Up @@ -66,7 +66,7 @@ Translations of the plugin locales are welcome to help make the plugin more acce
- [Modrinth](https://modrinth.com/plugin/huskhomes) — View the plugin Modrinth page (Also: [Spigot](https://www.spigotmc.org/resources/huskhomes.83767/), [Polymart](https://polymart.org/resource/huskhomes.284/), [Hangar](https://hangar.papermc.io/William278/HuskHomes), & [CurseForge](https://www.curseforge.com/minecraft/mc-mods/huskhomes/))
- [Issues](https://github.com/WiIIiam278/HuskHomes/issues) — File a bug report or feature request
- [Discord](https://discord.gg/tVYhJfyDWG) — Get help, ask questions
- [bStats](https://bstats.org/plugin/bukkit/HuskHomes/8430) — View plugin metrics (Also: [Sponge](https://bstats.org/plugin/sponge/HuskHomes/18423))
- [bStats](https://bstats.org/plugin/bukkit/HuskHomes/8430) — View plugin metrics

---
© [William278](https://william278.net/), 2023. Licensed under the Apache-2.0 License.
32 changes: 6 additions & 26 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@ plugins {
id 'io.github.goooler.shadow' version '8.1.8'
id 'org.cadixdev.licenser' version '0.6.1' apply false
id 'fabric-loom' version "$fabric_loom_version" apply false
id 'org.ajoberstar.grgit' version '5.2.2'
id 'checkstyle'
id 'org.ajoberstar.grgit' version '5.3.0'
id 'maven-publish'
id 'java'
}

group 'net.william278'
version "$ext.plugin_version${versionMetadata()}"
description "$ext.plugin_description"
defaultTasks 'licenseFormat', 'check', 'build'
defaultTasks 'licenseFormat', 'build'

ext {
set 'version', version.toString()
Expand Down Expand Up @@ -60,7 +59,6 @@ publishing {
allprojects {
apply plugin: 'io.github.goooler.shadow'
apply plugin: 'org.cadixdev.licenser'
apply plugin: 'checkstyle'
apply plugin: 'java'

compileJava.options.encoding = 'UTF-8'
Expand All @@ -78,7 +76,6 @@ allprojects {
maven { url 'https://repo.papermc.io/repository/maven-public/' }
maven { url 'https://mvn-repo.arim.space/lesser-gpl3/' }
maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
maven { url 'https://repo.spongepowered.org/repository/maven-public/' }
maven { url 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
maven { url 'https://repo.minebench.de/' }
maven { url 'https://repo.alessiodp.com/releases/' }
Expand All @@ -89,9 +86,9 @@ allprojects {
}

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.0'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.11.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.3'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.11.3'

testCompileOnly 'org.jetbrains:annotations:24.1.0'
}
Expand All @@ -102,10 +99,6 @@ allprojects {
newLine = true
}

checkstyle {
toolVersion = '10.12.0'
}

test {
useJUnitPlatform()
}
Expand Down Expand Up @@ -139,7 +132,7 @@ subprojects {
}

// API publishing
if (['common', 'bukkit', 'fabric', 'sponge'].contains(project.name)) {
if (['common', 'bukkit', 'fabric'].contains(project.name)) {
java {
withSourcesJar()
withJavadocJar()
Expand Down Expand Up @@ -191,19 +184,6 @@ subprojects {
}
}
}

if (['sponge'].contains(project.name)) {
publications {
mavenJavaSponge(MavenPublication) {
groupId = 'net.william278.huskhomes'
artifactId = 'huskhomes-sponge'
version = "$rootProject.version"
artifact shadowJar
artifact sourcesJar
artifact javadocJar
}
}
}
}
}

Expand Down
Loading

0 comments on commit ffe995e

Please sign in to comment.