Merge pull request #39 from FTBTeam/dev

Dev

Author: desht

.github/workflows/build.yml

@@ -1,42 +1,23 @@
-name: Java CI
+name: Java CI - Build on Push
 
 on:
   push:
-    branches:
-      # main and dev versions for each mc ver here
-      - "1.19/main"
-      - "1.19/dev"
+    branches: [ main, dev, "1.*" ]
+  workflow_dispatch:
+    inputs:
+      skip_maven_publish:
+        description: 'Skip Maven publishing'
+        required: true
+        default: 'false'
 
 jobs:
   build:
-    runs-on: ubuntu-latest
     if: |
-      !contains(github.event.head_commit.message, '[ci skip]')
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 30 # Gets the last 30 commits so the changelog might work
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-      - name: Build and Publish with Gradle
-        uses: gradle/gradle-build-action@v2
-        env:
-          FTB_MAVEN_TOKEN: ${{ secrets.FTB_MAVEN_TOKEN }}
-          SAPS_TOKEN: ${{ secrets.SAPS_TOKEN }}
-        with:
-          arguments: build publish --stacktrace --no-daemon
-      - name: Release to CurseForge
-        uses: gradle/gradle-build-action@v2
-        if: |
-          contains(github.ref, 'main') && !contains(github.event.head_commit.message, '[norelease]') && github.event.inputs.norelease != 'true'
-        env:
-          GIT_COMMIT: ${{ github.event.after }}
-          GIT_PREVIOUS_COMMIT: ${{ github.event.before }}
-          CURSEFORGE_KEY: ${{ secrets.CURSEFORGE_KEY }}
-        with:
-          arguments: build curseforge --stacktrace --no-daemon
+      !contains(github.event.head_commit.message, '[ciskip]')
+    uses: FTBTeam/mods-meta/.github/workflows/standard-release.yml@main
+    with:
+      curse-publish-task: ""
+      maven-snapshots: true
+    secrets:
+      ftb-maven-token: ${{ secrets.FTB_MAVEN_TOKEN }}
+      saps-token: ${{ secrets.SAPS_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,17 @@
+name: Java CI - Build Release
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  build:
+    if: |
+      !contains(github.event.head_commit.message, '[ciskip]')
+    uses: FTBTeam/mods-meta/.github/workflows/standard-release.yml@main
+    with:
+      curse-publish-task: curseforge
+    secrets:
+      ftb-maven-token: ${{ secrets.FTB_MAVEN_TOKEN }}
+      saps-token: ${{ secrets.SAPS_TOKEN }}
+      curse-token: ${{ secrets.CURSEFORGE_KEY }}

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.2-SNAPSHOT" apply false
 }
 
 architectury {
@@ -24,20 +24,25 @@ allprojects {
 	apply plugin: "java"
 	apply plugin: "architectury-plugin"
 	apply plugin: "maven-publish"
-	apply from: "https://files.latmod.com/public/markdown-git-changelog.gradle"
+	apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/git-md-changelog.gradle"
 
 	def ENV = System.getenv()
 	version = "${mod_version}-build.${ENV.GITHUB_RUN_NUMBER ?: 9999}"
 	group = project.maven_group
 	archivesBaseName = project.archives_base_name
 
+	// needs to be done AFTER version is set
+	apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/publishing.gradle"
+
 	sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = 17
 
 	compileJava {
 		options.encoding = "UTF-8"
 	}
 
 	repositories {
+		mavenLocal()
+
 		maven {
 			url "https://maven.architectury.dev/"
 		}
@@ -56,6 +61,13 @@ allprojects {
 				includeGroup "dev.ftb.mods"
 			}
 		}
+		maven {
+			url "https://maven.saps.dev/snapshots"
+			content {
+				includeGroup "dev.latvian.mods"
+				includeGroup "dev.ftb.mods"
+			}
+		}
 	}
 
 	java {

common/build.gradle

@@ -16,27 +16,28 @@ publishing {
 	publications {
 		mavenCommon(MavenPublication) {
 			artifactId = rootProject.archivesBaseName
+			version ftbPublishing.mavenVersion
 			from components.java
 		}
 	}
 
 	repositories {
-		if (ENV.FTB_MAVEN_TOKEN) {
+		if (ftbPublishing.ftbToken) {
 			maven {
-				url "https://maven.ftb.dev/release"
+				url ftbPublishing.ftbURL
 				credentials {
-					username = "ftb"
-					password = "${ENV.FTB_MAVEN_TOKEN}"
+					username = ftbPublishing.ftbUser
+					password = ftbPublishing.ftbToken
 				}
 			}
 		}
 
-		if (ENV.SAPS_TOKEN) {
+		if (ftbPublishing.sapsToken) {
 			maven {
-				url "https://maven.saps.dev/minecraft"
+				url ftbPublishing.sapsURL
 				credentials {
-					username = "ftb"
-					password = "${ENV.SAPS_TOKEN}"
+					username = ftbPublishing.sapsUser
+					password = ftbPublishing.sapsToken
 				}
 			}
 		}

common/src/main/java/dev/ftb/mods/ftbteams/FTBTeams.java

@@ -4,14 +4,16 @@
 import dev.architectury.event.events.common.CommandRegistrationEvent;
 import dev.architectury.event.events.common.LifecycleEvent;
 import dev.architectury.event.events.common.PlayerEvent;
+import dev.architectury.utils.Env;
 import dev.architectury.utils.EnvExecutor;
+import dev.ftb.mods.ftbteams.api.FTBTeamsAPI;
+import dev.ftb.mods.ftbteams.api.event.TeamCollectPropertiesEvent;
+import dev.ftb.mods.ftbteams.api.event.TeamEvent;
+import dev.ftb.mods.ftbteams.api.event.TeamManagerEvent;
+import dev.ftb.mods.ftbteams.api.property.TeamProperties;
 import dev.ftb.mods.ftbteams.client.FTBTeamsClient;
 import dev.ftb.mods.ftbteams.data.FTBTeamsCommands;
-import dev.ftb.mods.ftbteams.data.TeamBase;
-import dev.ftb.mods.ftbteams.data.TeamManager;
-import dev.ftb.mods.ftbteams.event.TeamCollectPropertiesEvent;
-import dev.ftb.mods.ftbteams.event.TeamEvent;
-import dev.ftb.mods.ftbteams.event.TeamManagerEvent;
+import dev.ftb.mods.ftbteams.data.TeamManagerImpl;
 import dev.ftb.mods.ftbteams.net.FTBTeamsNet;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
@@ -23,62 +25,62 @@
 import org.apache.logging.log4j.Logger;
 
 public class FTBTeams {
-	public static final String MOD_ID = "ftbteams";
-	public static final String MOD_NAME = "FTB Teams";
-	public static final Logger LOGGER = LogManager.getLogger(MOD_NAME);
-	public static FTBTeamsCommon PROXY;
+	public static final Logger LOGGER = LogManager.getLogger(FTBTeamsAPI.MOD_NAME);
 
 	public FTBTeams() {
+		FTBTeamsAPI._init(FTBTeamsAPIImpl.INSTANCE);
+
 		LifecycleEvent.SERVER_BEFORE_START.register(this::serverAboutToStart);
 		CommandRegistrationEvent.EVENT.register(this::registerCommands);
 		LifecycleEvent.SERVER_STOPPED.register(this::serverStopped);
 		LifecycleEvent.SERVER_LEVEL_SAVE.register(this::worldSaved);
 		TeamEvent.COLLECT_PROPERTIES.register(this::teamConfig);
 		PlayerEvent.PLAYER_JOIN.register(this::playerLoggedIn);
 		PlayerEvent.PLAYER_QUIT.register(this::playerLoggedOut);
+
+		EnvExecutor.runInEnv(Env.CLIENT, () -> FTBTeamsClient::init);
+
 		FTBTeamsNet.init();
-		PROXY = EnvExecutor.getEnvSpecific(() -> FTBTeamsClient::new, () -> FTBTeamsCommon::new);
 	}
 
-
 	private void serverAboutToStart(MinecraftServer server) {
-		TeamManager.INSTANCE = new TeamManager(server);
-		TeamManagerEvent.CREATED.invoker().accept(new TeamManagerEvent(TeamManager.INSTANCE));
-		TeamManager.INSTANCE.load();
+		TeamManagerImpl.INSTANCE = new TeamManagerImpl(server);
+		TeamManagerEvent.CREATED.invoker().accept(new TeamManagerEvent(TeamManagerImpl.INSTANCE));
+		TeamManagerImpl.INSTANCE.load();
 	}
 
 	private void registerCommands(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext commandBuildContext, Commands.CommandSelection selection) {
 		new FTBTeamsCommands().register(dispatcher);
 	}
 
 	private void serverStopped(MinecraftServer server) {
-		TeamManagerEvent.DESTROYED.invoker().accept(new TeamManagerEvent(TeamManager.INSTANCE));
-		TeamManager.INSTANCE = null;
+		TeamManagerEvent.DESTROYED.invoker().accept(new TeamManagerEvent(TeamManagerImpl.INSTANCE));
+		TeamManagerImpl.INSTANCE = null;
 	}
 
 	private void worldSaved(ServerLevel level) {
-		if (TeamManager.INSTANCE != null) {
-			TeamManager.INSTANCE.saveNow();
+		if (TeamManagerImpl.INSTANCE != null) {
+			TeamManagerImpl.INSTANCE.saveNow();
 		}
 	}
 
 	private void teamConfig(TeamCollectPropertiesEvent event) {
-		event.add(TeamBase.DISPLAY_NAME);
-		event.add(TeamBase.DESCRIPTION);
-		event.add(TeamBase.COLOR);
-		event.add(TeamBase.FREE_TO_JOIN);
-		event.add(TeamBase.MAX_MSG_HISTORY_SIZE);
+		event.add(TeamProperties.DISPLAY_NAME);
+		event.add(TeamProperties.DESCRIPTION);
+		event.add(TeamProperties.COLOR);
+		event.add(TeamProperties.FREE_TO_JOIN);
+		event.add(TeamProperties.MAX_MSG_HISTORY_SIZE);
 	}
 
 	private void playerLoggedIn(ServerPlayer player) {
-		if (TeamManager.INSTANCE != null) {
-			TeamManager.INSTANCE.playerLoggedIn(player, player.getUUID(), player.getScoreboardName());
+		if (TeamManagerImpl.INSTANCE != null) {
+			TeamManagerImpl.INSTANCE.playerLoggedIn(player, player.getUUID(), player.getScoreboardName());
 		}
 	}
 
 	private void playerLoggedOut(ServerPlayer player) {
-		if (TeamManager.INSTANCE != null) {
-			TeamManager.INSTANCE.playerLoggedOut(player);
+		if (TeamManagerImpl.INSTANCE != null) {
+			TeamManagerImpl.INSTANCE.playerLoggedOut(player);
 		}
 	}