chore: ported to 1.21

FTBTeam · Jun 14, 2024 · 2b6a67b · 2b6a67b
1 parent d44bd37
commit 2b6a67b
Show file tree

Hide file tree

Showing 27 changed files with 26 additions and 79 deletions.
diff --git a/CHANGELOG.md b/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

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/FTBRanks.java b/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");

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/FTBRanksCommands.java b/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())

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/FTBRanksAPIImpl.java b/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;
 

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/PlayerRankData.java b/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;

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/RankCommandPredicate.java b/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;

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/RankImpl.java b/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");
 

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/RankManagerImpl.java b/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");

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/AlwaysActiveCondition.java b/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();
 

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/AndCondition.java b/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;
 

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/CreativeModeCondition.java b/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() {

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/DefaultCondition.java b/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;
 

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/DimensionCondition.java b/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

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/FakePlayerCondition.java b/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() {

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/NotCondition.java b/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;
 

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/OPCondition.java b/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() {

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/OrCondition.java b/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;
 

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/PlaytimeCondition.java b/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;

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/RankAddedCondition.java b/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;

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/SpawnCondition.java b/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() {

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/StatCondition.java b/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")) {

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/condition/XorCondition.java b/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;
 

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/decorate/TextComponentParser.java b/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<>();
 

diff --git a/common/src/main/java/dev/ftb/mods/ftbranks/impl/permission/StringPermissionValue.java b/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("");
 

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -5,7 +5,7 @@
 	"name": "FTB Ranks",
 	"description": "A simple mod that lets you create ranks for players, similar to Discord roles, and manage permissions for them",
 	"authors": [
-		"LatvianModder"
+		"FTB Team"
 	],
 	"contact": {
 		"sources": "https://github.com/FTBTeam/FTB-Ranks",

diff --git a/gradle.properties b/gradle.properties
@@ -3,20 +3,20 @@ org.gradle.daemon=false
 mod_id=ftbranks
 archives_base_name=ftb-ranks
 maven_group=dev.ftb.mods
-mod_version=2006.1.0
+mod_version=2100.1.0
 mod_author=FTB Team
 
-minecraft_version=1.20.6
+minecraft_version=1.21
 
 # Deps
 forge_version=50.0.9
-neoforge_version=20.6.100-beta
-neoforge_loader_version=1
-fabric_loader_version=0.15.10
-fabric_api_version=0.97.8+1.20.6
-architectury_version=12.1.3
+neoforge_version=21.0.4-beta
+neoforge_loader_version=4
+fabric_loader_version=0.15.11
+fabric_api_version=0.100.1+1.21
+architectury_version=13.0.1
 
-ftb_library_version=2006.1.1
+ftb_library_version=2100.1.0-SNAPSHOT
 
 curseforge_id_forge=314905
 curseforge_id_fabric=472659

diff --git a/settings.gradle b/settings.gradle
@@ -11,4 +11,4 @@ include("fabric")
 //include("forge")
 include("neoforge")
 
-rootProject.name = 'FTB-Ranks-1.20.6'
+rootProject.name = 'FTB-Ranks-1.21'