Merge pull request #47 from FTBTeam/dev

Dev

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
       !contains(github.event.head_commit.message, '[ciskip]')
     uses: FTBTeam/mods-meta/.github/workflows/standard-release.yml@main
     with:
-      curse-publish-task: curseforge
+      curse-publish-task: publishMods
       java-version: 21
     secrets:
       ftb-maven-token: ${{ secrets.FTB_MAVEN_TOKEN }}

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+[2100.1.0]
+
+### Changed
+* Ported to Minecraft 1.21. Support for Fabric and NeoForge.
+  * Forge support may be re-added if/when Architectury adds support for Forge
+
 [2006.1.0]
 
 ### Changed

build.gradle

@@ -1,6 +1,7 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
 	id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+	id "me.modmuss50.mod-publish-plugin" version "0.5.1"
 }
 
 architectury {
@@ -72,6 +73,79 @@ allprojects {
 	java {
 		withSourcesJar()
 	}
+
+	publishing {
+		repositories {
+			if (ftbPublishing.ftbToken) {
+				maven {
+					url ftbPublishing.ftbURL
+					credentials {
+						username = ftbPublishing.ftbUser
+						password = ftbPublishing.ftbToken
+					}
+				}
+			}
+
+			if (ftbPublishing.sapsToken) {
+				maven {
+					url ftbPublishing.sapsURL
+					credentials {
+						username = ftbPublishing.sapsUser
+						password = ftbPublishing.sapsToken
+					}
+				}
+			}
+		}
+	}
+}
+
+publishMods {
+	dryRun = providers.environmentVariable("CURSEFORGE_KEY").getOrNull() == null
+	changelog = providers.environmentVariable("CHANGELOG").getOrElse("No changelog provided")
+	version = mod_version
+
+	// TODO: Migrate to something else
+	def tag = providers.environmentVariable("TAG").getOrElse("release")
+	type = tag == "beta" ? BETA : (tag == "alpha" ? ALPHA : STABLE)
+
+	def createOptions = (String projectName) -> {
+		publishOptions {
+			file = project.provider { project(":$projectName").tasks.remapJar }.flatMap { it.archiveFile }
+			displayName = "[${projectName.toUpperCase()}][${minecraft_version}] ${readable_name} ${mod_version}"
+			modLoaders.add(projectName.toLowerCase())
+		}
+	}
+
+	def fabricOptions = createOptions("fabric")
+//	def forgeOptions = createOptions("forge")
+	def neoForgeOptions = createOptions("neoforge")
+
+	def curseForgeOptions = curseforgeOptions {
+		accessToken = providers.environmentVariable("CURSEFORGE_KEY")
+		minecraftVersions.add("${minecraft_version}")
+		javaVersions.add(JavaVersion.VERSION_21)
+	}
+
+	curseforge("curseforgeFabric") {
+		from(curseForgeOptions, fabricOptions)
+		projectId = curseforge_id_fabric
+		requires('architectury-api')
+		requires('fabric-api')
+		requires('ftb-library-fabric')
+	}
+
+	curseforge("curseforgeNeoForge") {
+		from(curseForgeOptions, neoForgeOptions)
+		projectId = curseforge_id_forge
+		requires('architectury-api')
+		requires('ftb-library-forge')
+	}
+
+//	curseforge("curseforgeForge") {
+//		from(curseForgeOptions, forgeOptions)
+//		projectId = curseforge_id_forge
+//		requires('architectury-api')
+//		requires('ftb-library-forge')
+//	}
 }
 
-task curseforgePublish

common/build.gradle

@@ -6,8 +6,6 @@ dependencies {
 	modApi "dev.ftb.mods:ftb-library:${rootProject.ftb_library_version}"
 }
 
-def ENV = System.getenv()
-
 architectury {
 	common(/* "forge", */ "fabric", "neoforge")
 }
@@ -20,26 +18,4 @@ publishing {
 			from components.java
 		}
 	}
-
-	repositories {
-		if (ftbPublishing.ftbToken) {
-			maven {
-				url ftbPublishing.ftbURL
-				credentials {
-					username = ftbPublishing.ftbUser
-					password = ftbPublishing.ftbToken
-				}
-			}
-		}
-
-		if (ftbPublishing.sapsToken) {
-			maven {
-				url ftbPublishing.sapsURL
-				credentials {
-					username = ftbPublishing.sapsUser
-					password = ftbPublishing.sapsToken
-				}
-			}
-		}
-	}
 }

common/src/main/java/dev/ftb/mods/ftbranks/FTBRanks.java

@@ -8,9 +8,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-/**
- * @author LatvianModder
- */
 public class FTBRanks {
 	public static final String MOD_ID = "ftbranks";
 	public static final Logger LOGGER = LogManager.getLogger("FTB Ranks");

common/src/main/java/dev/ftb/mods/ftbranks/FTBRanksCommands.java

@@ -36,9 +36,6 @@
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 
-/**
- * @author LatvianModder
- */
 public class FTBRanksCommands {
 	public static final DynamicCommandExceptionType ERROR_UNKNOWN_RANK = new DynamicCommandExceptionType(
 			(object) -> Component.literal("Unknown rank: " + object.toString())

common/src/main/java/dev/ftb/mods/ftbranks/impl/FTBRanksAPIImpl.java

@@ -13,9 +13,6 @@
 import net.minecraft.server.level.ServerLevel;
 import org.apache.commons.lang3.math.NumberUtils;
 
-/**
- * @author LatvianModder
- */
 public class FTBRanksAPIImpl extends FTBRanksAPI {
 	public static RankManagerImpl manager;
 

common/src/main/java/dev/ftb/mods/ftbranks/impl/PlayerRankData.java

@@ -10,9 +10,6 @@
 import java.time.format.DateTimeParseException;
 import java.util.*;
 
-/**
- * @author LatvianModder
- */
 public class PlayerRankData {
 	private final RankManagerImpl manager;
 	private final UUID playerId;

common/src/main/java/dev/ftb/mods/ftbranks/impl/RankCommandPredicate.java

@@ -8,9 +8,6 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
-/**
- * @author LatvianModder
- */
 public class RankCommandPredicate implements Predicate<CommandSourceStack> {
 	private final Predicate<CommandSourceStack> original;
 	private final String nodeName;

common/src/main/java/dev/ftb/mods/ftbranks/impl/RankImpl.java

@@ -11,9 +11,6 @@
 
 import java.util.*;
 
-/**
- * @author LatvianModder
- */
 public class RankImpl implements Rank, Comparable<RankImpl> {
 	private static final Set<String> SPECIAL_FIELDS = Set.of("name", "power", "condition");
 

common/src/main/java/dev/ftb/mods/ftbranks/impl/RankManagerImpl.java

@@ -35,9 +35,6 @@
 
 import static dev.ftb.mods.ftbranks.FTBRanks.MOD_ID;
 
-/**
- * @author LatvianModder
- */
 public class RankManagerImpl implements RankManager {
 	public static final LevelResource FOLDER_NAME = new LevelResource("serverconfig/ftbranks");
 	private static final Path DEFAULT_RANK_FILE = ConfigUtil.DEFAULT_CONFIG_DIR.resolve(MOD_ID).resolve("ranks.snbt");

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/AlwaysActiveCondition.java

@@ -3,9 +3,6 @@
 import dev.ftb.mods.ftbranks.api.RankCondition;
 import net.minecraft.server.level.ServerPlayer;
 
-/**
- * @author LatvianModder
- */
 public class AlwaysActiveCondition implements RankCondition.Simple {
 	public static final AlwaysActiveCondition INSTANCE = new AlwaysActiveCondition();
 

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/AndCondition.java

@@ -11,9 +11,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author LatvianModder
- */
 public class AndCondition implements RankCondition {
 	private final List<RankCondition> conditions;
 

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/CreativeModeCondition.java

@@ -3,9 +3,6 @@
 import dev.ftb.mods.ftbranks.api.RankCondition;
 import net.minecraft.server.level.ServerPlayer;
 
-/**
- * @author LatvianModder
- */
 public class CreativeModeCondition implements RankCondition.Simple {
 	@Override
 	public String getType() {

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/DefaultCondition.java

@@ -4,9 +4,6 @@
 import dev.ftb.mods.ftbranks.api.RankCondition;
 import net.minecraft.server.level.ServerPlayer;
 
-/**
- * @author LatvianModder
- */
 public class DefaultCondition implements RankCondition.Simple {
 	public final Rank original;
 

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/DimensionCondition.java

@@ -15,7 +15,7 @@ public class DimensionCondition implements RankCondition {
 	private final ResourceKey<Level> dimension;
 
 	public DimensionCondition(SNBTCompoundTag tag) {
-		dimension = ResourceKey.create(Registries.DIMENSION, new ResourceLocation(tag.getString("dimension")));
+		dimension = ResourceKey.create(Registries.DIMENSION, ResourceLocation.parse(tag.getString("dimension")));
 	}
 
 	@Override

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/FakePlayerCondition.java

@@ -4,9 +4,6 @@
 import dev.ftb.mods.ftbranks.api.RankCondition;
 import net.minecraft.server.level.ServerPlayer;
 
-/**
- * @author LatvianModder
- */
 public class FakePlayerCondition implements RankCondition.Simple {
 	@Override
 	public String getType() {

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/NotCondition.java

@@ -6,9 +6,6 @@
 import dev.ftb.mods.ftbranks.api.RankException;
 import net.minecraft.server.level.ServerPlayer;
 
-/**
- * @author LatvianModder
- */
 public class NotCondition implements RankCondition {
 	private final RankCondition condition;
 

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/OPCondition.java

@@ -3,9 +3,6 @@
 import dev.ftb.mods.ftbranks.api.RankCondition;
 import net.minecraft.server.level.ServerPlayer;
 
-/**
- * @author LatvianModder
- */
 public class OPCondition implements RankCondition.Simple {
 	@Override
 	public String getType() {

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/OrCondition.java

@@ -11,9 +11,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author LatvianModder
- */
 public class OrCondition implements RankCondition {
 	private final List<RankCondition> conditions;
 

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/PlaytimeCondition.java

@@ -8,9 +8,6 @@
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.Stats;
 
-/**
- * @author LatvianModder
- */
 public class PlaytimeCondition implements RankCondition {
 	public static final int TICKS = 1;
 	public static final int SECONDS = TICKS * 20;

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/RankAddedCondition.java

@@ -5,9 +5,6 @@
 import dev.ftb.mods.ftbranks.api.RankCondition;
 import net.minecraft.server.level.ServerPlayer;
 
-/**
- * @author LatvianModder
- */
 public final class RankAddedCondition implements RankCondition {
 	private final Rank original;
 	private final String id;

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/SpawnCondition.java

@@ -7,9 +7,6 @@
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.Level;
 
-/**
- * @author LatvianModder
- */
 public class SpawnCondition implements RankCondition.Simple {
 	@Override
 	public String getType() {

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/StatCondition.java

@@ -2,14 +2,14 @@
 
 import dev.ftb.mods.ftblibrary.snbt.SNBTCompoundTag;
 import dev.ftb.mods.ftbranks.api.RankCondition;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.Stats;
 
-/**
- * @author LatvianModder
- */
+import java.util.NoSuchElementException;
+
 public class StatCondition implements RankCondition {
 	public static final int EQUALS = 1;
 	public static final int NOT_EQUALS = 2;
@@ -24,8 +24,12 @@ public class StatCondition implements RankCondition {
 	private final Stat<?> stat;
 
 	public StatCondition(SNBTCompoundTag tag) {
-		statId = new ResourceLocation(tag.getString("stat"));
-		stat = Stats.CUSTOM.get(statId);
+		statId = ResourceLocation.parse(tag.getString("stat"));
+		stat = BuiltInRegistries.CUSTOM_STAT.getOptional(statId)
+				.map(Stats.CUSTOM::get)
+				.orElseThrow(() ->
+						new NoSuchElementException(String.format("%s does not match any known stat", statId))
+				);
 		value = tag.getInt("value");
 
 		switch (tag.getString("value_check")) {

common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/XorCondition.java

@@ -11,9 +11,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author LatvianModder
- */
 public class XorCondition implements RankCondition {
 	private final List<RankCondition> conditions;
 

common/src/main/java/dev/ftb/mods/ftbranks/impl/decorate/TextComponentParser.java

@@ -10,9 +10,6 @@
 
 import java.util.function.Function;
 
-/**
- * @author LatvianModder
- */
 public class TextComponentParser {
 	public static final Char2ObjectOpenHashMap<ChatFormatting> CODE_TO_FORMATTING = new Char2ObjectOpenHashMap<>();
 

common/src/main/java/dev/ftb/mods/ftbranks/impl/permission/StringPermissionValue.java

@@ -4,9 +4,6 @@
 
 import java.util.Optional;
 
-/**
- * @author LatvianModder
- */
 public class StringPermissionValue implements PermissionValue {
 	public static final StringPermissionValue EMPTY = new StringPermissionValue("");