Move Fabric mod into subproject

bytzo · Oct 19, 2024 · c9814f3 · c9814f3
1 parent c1d0b4e
commit c9814f3
Show file tree

Hide file tree

Showing 19 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -3,4 +3,4 @@
 build/
 
 # Loom
-/run/
+run/
diff --git a/LICENSE → LICENSE.txt b/LICENSE → LICENSE.txt
diff --git a/build.gradle.kts → fabric-mod/build.gradle.kts b/build.gradle.kts → fabric-mod/build.gradle.kts
@@ -23,8 +23,13 @@ java {
 
 loom {
 	serverOnlyMinecraftJar()
+
+	runs.configureEach {
+		ideConfigGenerated(true)
+	}
 }
 
 tasks.named<Jar>("jar") {
-	from("LICENSE")
+	base.archivesName = "${rootProject.name}-${base.archivesName.get()}"
+	from(rootDir.toPath().resolve("LICENSE.txt"))
 }
diff --git a/...va/net/bytzo/sessility/SessilePlayer.java → ...va/net/bytzo/sessility/SessilePlayer.java b/...va/net/bytzo/sessility/SessilePlayer.java → ...va/net/bytzo/sessility/SessilePlayer.java
diff --git a/...n/java/net/bytzo/sessility/Sessility.java → ...n/java/net/bytzo/sessility/Sessility.java b/...n/java/net/bytzo/sessility/Sessility.java → ...n/java/net/bytzo/sessility/Sessility.java
diff --git a/.../bytzo/sessility/SessilityProperties.java → .../bytzo/sessility/SessilityProperties.java b/.../bytzo/sessility/SessilityProperties.java → .../bytzo/sessility/SessilityProperties.java
diff --git a/...et/bytzo/sessility/SessilitySettings.java → ...et/bytzo/sessility/SessilitySettings.java b/...et/bytzo/sessility/SessilitySettings.java → ...et/bytzo/sessility/SessilitySettings.java
diff --git a/...net/bytzo/sessility/mixins/BoatMixin.java → ...net/bytzo/sessility/mixins/BoatMixin.java b/...net/bytzo/sessility/mixins/BoatMixin.java → ...net/bytzo/sessility/mixins/BoatMixin.java
diff --git a/...oundPlayerInfoUpdatePacketEntryMixin.java → ...oundPlayerInfoUpdatePacketEntryMixin.java b/...oundPlayerInfoUpdatePacketEntryMixin.java → ...oundPlayerInfoUpdatePacketEntryMixin.java
diff --git a/...essility/mixins/MinecraftServerMixin.java → ...essility/mixins/MinecraftServerMixin.java b/...essility/mixins/MinecraftServerMixin.java → ...essility/mixins/MinecraftServerMixin.java
diff --git a/...t/bytzo/sessility/mixins/PlayerMixin.java → ...t/bytzo/sessility/mixins/PlayerMixin.java b/...t/bytzo/sessility/mixins/PlayerMixin.java → ...t/bytzo/sessility/mixins/PlayerMixin.java
diff --git a/...o/sessility/mixins/ServerPlayerMixin.java → ...o/sessility/mixins/ServerPlayerMixin.java b/...o/sessility/mixins/ServerPlayerMixin.java → ...o/sessility/mixins/ServerPlayerMixin.java
diff --git a/...bytzo/sessility/mixins/SettingsMixin.java → ...bytzo/sessility/mixins/SettingsMixin.java b/...bytzo/sessility/mixins/SettingsMixin.java → ...bytzo/sessility/mixins/SettingsMixin.java
diff --git a/...zo/sessility/mixins/SleepStatusMixin.java → ...zo/sessility/mixins/SleepStatusMixin.java b/...zo/sessility/mixins/SleepStatusMixin.java → ...zo/sessility/mixins/SleepStatusMixin.java
diff --git a/src/main/resources/assets/sessility/icon.png → .../main/resources/assets/sessility/icon.png b/src/main/resources/assets/sessility/icon.png → .../main/resources/assets/sessility/icon.png
diff --git a/src/main/resources/fabric.mod.json → ...ic-mod/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json → ...ic-mod/src/main/resources/fabric.mod.json
diff --git a/src/main/resources/sessility.mixins.json → .../src/main/resources/sessility.mixins.json b/src/main/resources/sessility.mixins.json → .../src/main/resources/sessility.mixins.json
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,3 +9,5 @@ pluginManagement {
 }
 
 rootProject.name = "sessility"
+
+include(":fabric-mod")
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ @@
     build/
     # Loom
-    /run/
+    run/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,5 @@ pluginManagement {
		}

		rootProject.name = "sessility"

		include(":fabric-mod")