Merge pull request #54 from FTBTeam/1.20.1/dev

1.20.1/dev

Author: desht

CHANGELOG.md

@@ -4,6 +4,14 @@ 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).
 
+[2001.1.7]
+
+### Added
+* New condition: `rank_applies`
+  * This is very similar to the existing `rank_added`, but does not require the rank to be explicitly added to the player
+  * It just requires that rank currently applies to the player, either implicitly or explicitly
+  * These two conditions can be useful to create more complex conditions by combining them with the boolean conditions (and/or/not)
+
 [2001.1.6]
 
 ### Fixed

common/build.gradle

@@ -31,15 +31,5 @@ publishing {
 				}
 			}
 		}
-
-		if (ftbPublishing.sapsToken) {
-			maven {
-				url ftbPublishing.sapsURL
-				credentials {
-					username = ftbPublishing.sapsUser
-					password = ftbPublishing.sapsToken
-				}
-			}
-		}
 	}
 }

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

@@ -67,6 +67,7 @@ public static void worldSaved(ServerLevel event) {
 	public static void registerConditions(RegisterConditionsEvent event) {
 		event.register("always_active", (rank, json) -> AlwaysActiveCondition.INSTANCE);
 		event.register("rank_added", RankAddedCondition::new);
+		event.register("rank_applies", RankAppliesCondition::new);
 
 		event.register("not", NotCondition::new);
 		event.register("or", OrCondition::new);

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

@@ -8,9 +8,6 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.Level;
 
-/**
- * @author LatvianModder
- */
 public class DimensionCondition implements RankCondition {
 	private final ResourceKey<Level> dimension;
 

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

@@ -5,12 +5,9 @@
 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;
+public class RankAddedCondition implements RankCondition {
+	protected final Rank original;
+	protected final String id;
 
 	public RankAddedCondition(Rank r, SNBTCompoundTag tag) {
 		original = r;

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

@@ -0,0 +1,23 @@
+package dev.ftb.mods.ftbranks.impl.condition;
+
+import dev.ftb.mods.ftblibrary.snbt.SNBTCompoundTag;
+import dev.ftb.mods.ftbranks.api.Rank;
+import net.minecraft.server.level.ServerPlayer;
+
+public class RankAppliesCondition extends RankAddedCondition {
+    public RankAppliesCondition(Rank r, SNBTCompoundTag tag) {
+        super(r, tag);
+    }
+
+    @Override
+    public String getType() {
+        return "rank_applies";
+    }
+
+    @Override
+    public boolean isRankActive(ServerPlayer player) {
+        return original.getManager().getRank(id)
+                .map(rank -> rank != original && rank.isActive(player))
+                .orElse(false);
+    }
+}

fabric/build.gradle

@@ -109,16 +109,6 @@ publishing {
 				}
 			}
 		}
-
-		if (ftbPublishing.sapsToken) {
-			maven {
-				url ftbPublishing.sapsURL
-				credentials {
-					username = ftbPublishing.sapsUser
-					password = ftbPublishing.sapsToken
-				}
-			}
-		}
 	}
 }
 

forge/build.gradle

@@ -125,16 +125,6 @@ publishing {
 				}
 			}
 		}
-
-		if (ftbPublishing.sapsToken) {
-			maven {
-				url ftbPublishing.sapsURL
-				credentials {
-					username = ftbPublishing.sapsUser
-					password = ftbPublishing.sapsToken
-				}
-			}
-		}
 	}
 }
 

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.daemon=false
 mod_id=ftbranks
 archives_base_name=ftb-ranks
 maven_group=dev.ftb.mods
-mod_version=2001.1.6
+mod_version=2001.1.7
 mod_author=FTB Team
 
 minecraft_version=1.20.1