blasters module, entrypoint module, temp remove upload script from CI…

… pipeline

.github/workflows/build.yml

@@ -46,21 +46,21 @@ jobs:
       - name: build
         id: gradle
         run: ./gradlew --stacktrace --parallel clean build
-      - name: Get Id Token
-        if: github.ref == 'refs/heads/master'
-        uses: actions/github-script@v7
-        id: idtoken
-        with:
-          script: |
-            let id_token = await core.getIDToken("https://mc.pswg.dev")
-            core.setOutput('id_token', id_token)
-      - name: upload
-        if: always() && github.ref == 'refs/heads/master' && (steps.gradle.outcome == 'success' || steps.gradle.outcome == 'failure')
-        continue-on-error: true
-        run: |
-          pip install -r scripts/requirements.txt
-          mkdir -p projects/pswg/build/libs
-          cd projects/pswg/build/libs
-          python ../../../../scripts/upload_dev.py --token ${{ steps.idtoken.outputs.id_token }} --result ${{ steps.gradle.outcome }} --webhook ${{ secrets.DISCORD_DEV_FEED_WEBHOOK }} --webhook ${{ secrets.DISCORD_RCOE_WEBHOOK }} --serverupdate ${{ secrets.SERVER_UPDATER }}
-        env:
-          BUILD_NUMBER: ${{ github.run_number }}
+    #  - name: Get Id Token
+    #    if: github.ref == 'refs/heads/master'
+    #    uses: actions/github-script@v7
+    #    id: idtoken
+    #    with:
+    #      script: |
+    #        let id_token = await core.getIDToken("https://mc.pswg.dev")
+    #        core.setOutput('id_token', id_token)
+    #  - name: upload
+    #    if: always() && github.ref == 'refs/heads/master' && (steps.gradle.outcome == 'success' || steps.gradle.outcome == 'failure')
+    #    continue-on-error: true
+    #    run: |
+    #      pip install -r scripts/requirements.txt
+    #     mkdir -p projects/pswg/build/libs
+    #      cd projects/pswg/build/libs
+    #      python ../../../../scripts/upload_dev.py --token ${{ steps.idtoken.outputs.id_token }} --result ${{ steps.gradle.outcome }} --webhook ${{ secrets.DISCORD_DEV_FEED_WEBHOOK }} --webhook ${{ secrets.DISCORD_RCOE_WEBHOOK }} --serverupdate ${{ secrets.SERVER_UPDATER }}
+    #    env:
+    #      BUILD_NUMBER: ${{ github.run_number }}

projects/pswg_blasters/src/main/resources/fabric.mod.json

@@ -33,7 +33,7 @@
 		}
 	],
 	"depends": {
-		"pswg_core": "*"
+		"pswg": "*"
 	},
 	"custom": {
 		"modmenu": {

projects/pswg_core/src/client/java/dev/pswg/GalaxiesClient.java

@@ -1,6 +1,8 @@
 package dev.pswg;
 
+import dev.pswg.api.GalaxiesClientAddon;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
 
 /**
  * The main entrypoint for PSWG client-side registration
@@ -10,6 +12,9 @@ public class GalaxiesClient implements ClientModInitializer
 	@Override
 	public void onInitializeClient()
 	{
+		Galaxies.LOGGER.info("Loading PSWG modules and addons via pswg-client-addon");
+		FabricLoader.getInstance().invokeEntrypoints("pswg-client-addon", GalaxiesClientAddon.class, GalaxiesClientAddon::onGalaxiesClientReady);
+
 		Galaxies.LOGGER.info("Galaxies client initialized");
 	}
 }

projects/pswg_entrypoint/project.gradle

@@ -0,0 +1,3 @@
+dependencies {
+	api(project(path: ":projects:pswg_blasters", configuration: "namedElements"))
+}

settings.gradle.kts

@@ -15,7 +15,7 @@ include(":projects:pswg_core")
 include(":projects:pswg_blasters")
 
 // The dummy entrypoint module that depends on all other modules
-include(":projects:pswg")
+include(":projects:pswg_entrypoint")
 
 // The Aurek Tooklkit, a suite of ingame editors to add and edit base and addon features
 // include(":projects:toolkit")