Remove universal jar and add bukkit/bungee jar for spigot resources, …

…also reorganize project directory structure
jpenilla · Aug 28, 2022 · 4cad4d4 · 4cad4d4
1 parent fc7b78f
commit 4cad4d4
Show file tree

Hide file tree

Showing 29 changed files with 17 additions and 15 deletions.
diff --git a/universal/build.gradle.kts → dist/bukkit-bungeecord/build.gradle.kts b/universal/build.gradle.kts → dist/bukkit-bungeecord/build.gradle.kts
@@ -9,13 +9,9 @@ tasks.jar {
 val platforms = setOf(
   projects.minimotdBukkit,
   projects.minimotdBungeecord,
-  projects.minimotdVelocity,
-  projects.minimotdFabric,
-  projects.minimotdSponge7,
-  projects.minimotdSponge8
 ).map { it.dependencyProject }
 
-val universal = tasks.register<Jar>("universal") {
+val dist = tasks.register<Jar>("bukkitAndBungeeJar") {
   artifacts.add("archives", this)
   archiveClassifier.set(null as String?)
   duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -27,5 +23,5 @@ val universal = tasks.register<Jar>("universal") {
 }
 
 miniMOTDPlatform {
-  jarTask.set(universal)
+  jarTask.set(dist)
 }
diff --git a/bukkit/build.gradle.kts → platform/bukkit/build.gradle.kts b/bukkit/build.gradle.kts → platform/bukkit/build.gradle.kts
@@ -18,6 +18,7 @@ tasks {
     minecraftVersion("1.19.2")
   }
   shadowJar {
+    platformRelocation("bukkit", "xyz.jpenilla.minimotd.common")
     commonRelocation("org.slf4j")
     commonRelocation("io.leangen.geantyref")
     commonRelocation("net.kyori")

diff --git a/...enilla/minimotd/bukkit/BukkitCommand.java → ...enilla/minimotd/bukkit/BukkitCommand.java b/...enilla/minimotd/bukkit/BukkitCommand.java → ...enilla/minimotd/bukkit/BukkitCommand.java
diff --git a/...nilla/minimotd/bukkit/MiniMOTDPlugin.java → ...nilla/minimotd/bukkit/MiniMOTDPlugin.java b/...nilla/minimotd/bukkit/MiniMOTDPlugin.java → ...nilla/minimotd/bukkit/MiniMOTDPlugin.java
diff --git a/...la/minimotd/bukkit/PaperPingListener.java → ...la/minimotd/bukkit/PaperPingListener.java b/...la/minimotd/bukkit/PaperPingListener.java → ...la/minimotd/bukkit/PaperPingListener.java
diff --git a/...penilla/minimotd/bukkit/PingListener.java → ...penilla/minimotd/bukkit/PingListener.java b/...penilla/minimotd/bukkit/PingListener.java → ...penilla/minimotd/bukkit/PingListener.java
diff --git a/bungeecord/build.gradle.kts → platform/bungeecord/build.gradle.kts b/bungeecord/build.gradle.kts → platform/bungeecord/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
 
 tasks {
   shadowJar {
+    platformRelocation("bungee", "xyz.jpenilla.minimotd.common")
     commonRelocation("io.leangen.geantyref")
     commonRelocation("net.kyori")
     commonRelocation("org.bstats")

diff --git a/...enilla/minimotd/bungee/BungeeCommand.java → ...enilla/minimotd/bungee/BungeeCommand.java b/...enilla/minimotd/bungee/BungeeCommand.java → ...enilla/minimotd/bungee/BungeeCommand.java
diff --git a/...nilla/minimotd/bungee/MiniMOTDPlugin.java → ...nilla/minimotd/bungee/MiniMOTDPlugin.java b/...nilla/minimotd/bungee/MiniMOTDPlugin.java → ...nilla/minimotd/bungee/MiniMOTDPlugin.java
diff --git a/...penilla/minimotd/bungee/PingListener.java → ...penilla/minimotd/bungee/PingListener.java b/...penilla/minimotd/bungee/PingListener.java → ...penilla/minimotd/bungee/PingListener.java
diff --git a/fabric/build.gradle.kts → platform/fabric/build.gradle.kts b/fabric/build.gradle.kts → platform/fabric/build.gradle.kts
@@ -37,7 +37,6 @@ tasks {
     configurations = listOf(shade)
     commonConfiguration()
     commonRelocation("io.leangen.geantyref")
-    platformRelocation("fabric", "xyz.jpenilla.minimotd.common")
   }
   remapJar {
     archiveFileName.set("${project.name}-mc$minecraftVersion-${project.version}.jar")

diff --git a/...nilla/minimotd/fabric/MiniMOTDFabric.java → ...nilla/minimotd/fabric/MiniMOTDFabric.java b/...nilla/minimotd/fabric/MiniMOTDFabric.java → ...nilla/minimotd/fabric/MiniMOTDFabric.java
diff --git a/...imotd/fabric/access/ConnectionAccess.java → ...imotd/fabric/access/ConnectionAccess.java b/...imotd/fabric/access/ConnectionAccess.java → ...imotd/fabric/access/ConnectionAccess.java
diff --git a/...inimotd/fabric/mixin/ConnectionMixin.java → ...inimotd/fabric/mixin/ConnectionMixin.java b/...inimotd/fabric/mixin/ConnectionMixin.java → ...inimotd/fabric/mixin/ConnectionMixin.java
diff --git a/...rverHandshakePacketListenerImplMixin.java → ...rverHandshakePacketListenerImplMixin.java b/...rverHandshakePacketListenerImplMixin.java → ...rverHandshakePacketListenerImplMixin.java
diff --git a/.../ServerStatusPacketListenerImplMixin.java → .../ServerStatusPacketListenerImplMixin.java b/.../ServerStatusPacketListenerImplMixin.java → .../ServerStatusPacketListenerImplMixin.java
diff --git a/fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json → ...fabric/src/main/resources/fabric.mod.json
diff --git a/...ain/resources/minimotd-fabric.mixins.json → ...ain/resources/minimotd-fabric.mixins.json b/...ain/resources/minimotd-fabric.mixins.json → ...ain/resources/minimotd-fabric.mixins.json
diff --git a/sponge7/build.gradle.kts → platform/sponge7/build.gradle.kts b/sponge7/build.gradle.kts → platform/sponge7/build.gradle.kts
diff --git a/...ponge7/ClientPingServerEventListener.java → ...ponge7/ClientPingServerEventListener.java b/...ponge7/ClientPingServerEventListener.java → ...ponge7/ClientPingServerEventListener.java
diff --git a/...illa/minimotd/sponge7/MiniMOTDPlugin.java → ...illa/minimotd/sponge7/MiniMOTDPlugin.java b/...illa/minimotd/sponge7/MiniMOTDPlugin.java → ...illa/minimotd/sponge7/MiniMOTDPlugin.java
diff --git a/sponge7/src/main/resources/mcmod.info → ...orm/sponge7/src/main/resources/mcmod.info b/sponge7/src/main/resources/mcmod.info → ...orm/sponge7/src/main/resources/mcmod.info
diff --git a/sponge8/build.gradle.kts → platform/sponge8/build.gradle.kts b/sponge8/build.gradle.kts → platform/sponge8/build.gradle.kts
@@ -41,7 +41,6 @@ sponge {
 tasks {
   shadowJar {
     configureForNativeAdventurePlatform()
-    platformRelocation("sponge8", "xyz.jpenilla.minimotd.common")
     dependencies {
       exclude(dependency("io.leangen.geantyref:geantyref"))
     }

diff --git a/...ponge8/ClientPingServerEventListener.java → ...ponge8/ClientPingServerEventListener.java b/...ponge8/ClientPingServerEventListener.java → ...ponge8/ClientPingServerEventListener.java
diff --git a/...illa/minimotd/sponge8/MiniMOTDPlugin.java → ...illa/minimotd/sponge8/MiniMOTDPlugin.java b/...illa/minimotd/sponge8/MiniMOTDPlugin.java → ...illa/minimotd/sponge8/MiniMOTDPlugin.java
diff --git a/velocity/build.gradle.kts → platform/velocity/build.gradle.kts b/velocity/build.gradle.kts → platform/velocity/build.gradle.kts
@@ -14,7 +14,6 @@ tasks {
   shadowJar {
     configureForNativeAdventurePlatform()
     commonRelocation("io.leangen.geantyref")
-    platformRelocation("velocity", "xyz.jpenilla.minimotd.common")
     commonRelocation("org.bstats")
   }
 }

diff --git a/...lla/minimotd/velocity/MiniMOTDPlugin.java → ...lla/minimotd/velocity/MiniMOTDPlugin.java b/...lla/minimotd/velocity/MiniMOTDPlugin.java → ...lla/minimotd/velocity/MiniMOTDPlugin.java
diff --git a/...nilla/minimotd/velocity/PingListener.java → ...nilla/minimotd/velocity/PingListener.java b/...nilla/minimotd/velocity/PingListener.java → ...nilla/minimotd/velocity/PingListener.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -32,16 +32,23 @@ plugins {
 
 rootProject.name = "MiniMOTD"
 
+fun setup(name: String, dir: String) {
+  include(name)
+  project(":$name").projectDir = file(dir)
+}
+
+fun platform(name: String) = setup("minimotd-$name", "platform/$name")
+fun dist(name: String) = setup("minimotd-$name", "dist/$name")
+
+setup("minimotd-common", "common")
+
 sequenceOf(
-  "common",
   "bukkit",
   "sponge8",
   "sponge7",
   "bungeecord",
   "velocity",
   "fabric",
-  "universal"
-).forEach {
-  include("minimotd-$it")
-  project(":minimotd-$it").projectDir = file(it)
-}
+).forEach(::platform)
+
+dist("bukkit-bungeecord")