diff --git a/.github/workflows/gradle-ci.yaml b/.github/workflows/gradle-ci.yaml index 68a0264..f62bcac 100644 --- a/.github/workflows/gradle-ci.yaml +++ b/.github/workflows/gradle-ci.yaml @@ -34,4 +34,5 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ steps.build_info.outputs.repository_name }}-build-artifacts-${{ steps.build_info.outputs.sha_short }} - path: build/libs/ + path: | + fabric-mod/build/libs/ diff --git a/.gitignore b/.gitignore index d6abf87..8cf66d6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ build/ # Loom -/run/ +run/ diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/build.gradle.kts b/fabric-mod/build.gradle.kts similarity index 71% rename from build.gradle.kts rename to fabric-mod/build.gradle.kts index d167d66..1a442d6 100644 --- a/build.gradle.kts +++ b/fabric-mod/build.gradle.kts @@ -23,8 +23,13 @@ java { loom { serverOnlyMinecraftJar() + + runs.configureEach { + ideConfigGenerated(true) + } } tasks.named("jar") { - from("LICENSE") + base.archivesName = "${rootProject.name}-${base.archivesName.get()}" + from(rootDir.toPath().resolve("LICENSE.txt")) } diff --git a/src/main/java/net/bytzo/sessility/SessilePlayer.java b/fabric-mod/src/main/java/net/bytzo/sessility/SessilePlayer.java similarity index 100% rename from src/main/java/net/bytzo/sessility/SessilePlayer.java rename to fabric-mod/src/main/java/net/bytzo/sessility/SessilePlayer.java diff --git a/src/main/java/net/bytzo/sessility/Sessility.java b/fabric-mod/src/main/java/net/bytzo/sessility/Sessility.java similarity index 100% rename from src/main/java/net/bytzo/sessility/Sessility.java rename to fabric-mod/src/main/java/net/bytzo/sessility/Sessility.java diff --git a/src/main/java/net/bytzo/sessility/SessilityProperties.java b/fabric-mod/src/main/java/net/bytzo/sessility/SessilityProperties.java similarity index 100% rename from src/main/java/net/bytzo/sessility/SessilityProperties.java rename to fabric-mod/src/main/java/net/bytzo/sessility/SessilityProperties.java diff --git a/src/main/java/net/bytzo/sessility/SessilitySettings.java b/fabric-mod/src/main/java/net/bytzo/sessility/SessilitySettings.java similarity index 100% rename from src/main/java/net/bytzo/sessility/SessilitySettings.java rename to fabric-mod/src/main/java/net/bytzo/sessility/SessilitySettings.java diff --git a/src/main/java/net/bytzo/sessility/mixins/BoatMixin.java b/fabric-mod/src/main/java/net/bytzo/sessility/mixins/BoatMixin.java similarity index 100% rename from src/main/java/net/bytzo/sessility/mixins/BoatMixin.java rename to fabric-mod/src/main/java/net/bytzo/sessility/mixins/BoatMixin.java diff --git a/src/main/java/net/bytzo/sessility/mixins/ClientboundPlayerInfoUpdatePacketEntryMixin.java b/fabric-mod/src/main/java/net/bytzo/sessility/mixins/ClientboundPlayerInfoUpdatePacketEntryMixin.java similarity index 100% rename from src/main/java/net/bytzo/sessility/mixins/ClientboundPlayerInfoUpdatePacketEntryMixin.java rename to fabric-mod/src/main/java/net/bytzo/sessility/mixins/ClientboundPlayerInfoUpdatePacketEntryMixin.java diff --git a/src/main/java/net/bytzo/sessility/mixins/MinecraftServerMixin.java b/fabric-mod/src/main/java/net/bytzo/sessility/mixins/MinecraftServerMixin.java similarity index 100% rename from src/main/java/net/bytzo/sessility/mixins/MinecraftServerMixin.java rename to fabric-mod/src/main/java/net/bytzo/sessility/mixins/MinecraftServerMixin.java diff --git a/src/main/java/net/bytzo/sessility/mixins/PlayerMixin.java b/fabric-mod/src/main/java/net/bytzo/sessility/mixins/PlayerMixin.java similarity index 100% rename from src/main/java/net/bytzo/sessility/mixins/PlayerMixin.java rename to fabric-mod/src/main/java/net/bytzo/sessility/mixins/PlayerMixin.java diff --git a/src/main/java/net/bytzo/sessility/mixins/ServerPlayerMixin.java b/fabric-mod/src/main/java/net/bytzo/sessility/mixins/ServerPlayerMixin.java similarity index 100% rename from src/main/java/net/bytzo/sessility/mixins/ServerPlayerMixin.java rename to fabric-mod/src/main/java/net/bytzo/sessility/mixins/ServerPlayerMixin.java diff --git a/src/main/java/net/bytzo/sessility/mixins/SettingsMixin.java b/fabric-mod/src/main/java/net/bytzo/sessility/mixins/SettingsMixin.java similarity index 100% rename from src/main/java/net/bytzo/sessility/mixins/SettingsMixin.java rename to fabric-mod/src/main/java/net/bytzo/sessility/mixins/SettingsMixin.java diff --git a/src/main/java/net/bytzo/sessility/mixins/SleepStatusMixin.java b/fabric-mod/src/main/java/net/bytzo/sessility/mixins/SleepStatusMixin.java similarity index 100% rename from src/main/java/net/bytzo/sessility/mixins/SleepStatusMixin.java rename to fabric-mod/src/main/java/net/bytzo/sessility/mixins/SleepStatusMixin.java diff --git a/src/main/resources/assets/sessility/icon.png b/fabric-mod/src/main/resources/assets/sessility/icon.png similarity index 100% rename from src/main/resources/assets/sessility/icon.png rename to fabric-mod/src/main/resources/assets/sessility/icon.png diff --git a/src/main/resources/fabric.mod.json b/fabric-mod/src/main/resources/fabric.mod.json similarity index 100% rename from src/main/resources/fabric.mod.json rename to fabric-mod/src/main/resources/fabric.mod.json diff --git a/src/main/resources/sessility.mixins.json b/fabric-mod/src/main/resources/sessility.mixins.json similarity index 100% rename from src/main/resources/sessility.mixins.json rename to fabric-mod/src/main/resources/sessility.mixins.json diff --git a/settings.gradle.kts b/settings.gradle.kts index ea1b9d1..cf4eb4a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,3 +9,5 @@ pluginManagement { } rootProject.name = "sessility" + +include(":fabric-mod")