feat: added unclaim control

FTBTeam · Jun 28, 2023 · 3aa43b9 · 3aa43b9
1 parent dee8d56
commit 3aa43b9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunks.java b/common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunks.java
@@ -436,6 +436,7 @@ private void playerChangedDimension(ServerPlayer serverPlayer, ResourceKey<Level
 	}
 
 	private void teamConfig(TeamCollectPropertiesEvent event) {
+		event.add(FTBChunksTeamData.OWNER_UNCLAIM);
 		event.add(FTBChunksTeamData.ALLOW_EXPLOSIONS);
 		event.add(FTBChunksTeamData.ALLOW_MOB_GRIEFING);
 		event.add(FTBChunksTeamData.ALLOW_ALL_FAKE_PLAYERS);

diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/data/ClaimedChunk.java b/common/src/main/java/dev/ftb/mods/ftbchunks/data/ClaimedChunk.java
@@ -113,6 +113,10 @@ public boolean allowMobGriefing() {
 		return teamData.allowMobGriefing();
 	}
 
+	public boolean ownerUnclaim() {
+		return teamData.ownerUnclaim();
+	}
+
 	public void sendUpdateToAll() {
 		SendChunkPacket packet = new SendChunkPacket(pos.dimension, teamData.getTeamId(), new SendChunkPacket.SingleChunk(System.currentTimeMillis(), pos.x, pos.z, this));
 		ChunkSendingUtils.sendChunkToAll(teamData.manager.getMinecraftServer(), teamData, packet);

diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/data/FTBChunksTeamData.java b/common/src/main/java/dev/ftb/mods/ftbchunks/data/FTBChunksTeamData.java
@@ -56,6 +56,7 @@ public class FTBChunksTeamData {
 	public static final PrivacyProperty NONLIVING_ENTITY_ATTACK_MODE = new PrivacyProperty(new ResourceLocation(FTBChunks.MOD_ID, "nonliving_entity_attack_mode"), PrivacyMode.ALLIES);
 	public static final BooleanProperty ALLOW_EXPLOSIONS = new BooleanProperty(new ResourceLocation(FTBChunks.MOD_ID, "allow_explosions"), false);
 	public static final BooleanProperty ALLOW_MOB_GRIEFING = new BooleanProperty(new ResourceLocation(FTBChunks.MOD_ID, "allow_mob_griefing"), false);
+	public static final BooleanProperty OWNER_UNCLAIM = new BooleanProperty(new ResourceLocation(FTBChunks.MOD_ID, "owner_unclaim"), false);
 	public static final PrivacyProperty CLAIM_VISIBILITY = new PrivacyProperty(new ResourceLocation(FTBChunks.MOD_ID, "claim_visibility"), PrivacyMode.PUBLIC);
 
 	//	public static final PrivacyProperty MINIMAP_MODE = new PrivacyProperty(new ResourceLocation(FTBChunks.MOD_ID, "minimap_mode"), PrivacyMode.ALLIES);
@@ -178,10 +179,14 @@ public ClaimResult claim(CommandSourceStack source, ChunkDimPos pos, boolean che
 
 	public ClaimResult unclaim(CommandSourceStack source, ChunkDimPos pos, boolean checkOnly) {
 		ClaimedChunk chunk = manager.getChunk(pos);
+		boolean notAllowedToUnclaim = source.getEntity() instanceof ServerPlayer && chunk.ownerUnclaim() && !isTeamOwner(source.getEntity().getUUID());
 
 		if (chunk == null) {
 			return ClaimResults.NOT_CLAIMED;
-		} else if (chunk.teamData != this && !source.hasPermission(2) && !source.getServer().isSingleplayer()) {
+		} else if ((chunk.teamData != this || notAllowedToUnclaim)
+				&& !source.hasPermission(2)
+				&& !source.getServer().isSingleplayer()
+		) {
 			return ClaimResults.NOT_OWNER;
 		}
 
@@ -281,6 +286,10 @@ public boolean isAlly(UUID p) {
 		return team.isAlly(p);
 	}
 
+	public boolean isTeamOwner(UUID p) {
+		return team.getOwner().equals(p);
+	}
+
 	public boolean canUse(ServerPlayer p, PrivacyProperty property) {
 		PrivacyMode mode = team.getProperty(property);
 
@@ -478,6 +487,10 @@ public boolean allowMobGriefing() {
 		return team.getProperty(ALLOW_MOB_GRIEFING);
 	}
 
+	public boolean ownerUnclaim() {
+		return team.getProperty(OWNER_UNCLAIM);
+	}
+
 	public void setLastLoginTime(long when) {
 		this.lastLoginTime = when;
 		save();

diff --git a/common/src/main/resources/assets/ftbchunks/lang/en_us.json b/common/src/main/resources/assets/ftbchunks/lang/en_us.json
@@ -122,6 +122,8 @@
 	"ftbteamsconfig.ftbchunks.location_mode.tooltip": "Controls who can see you on the map or minimap (outside the normal vanilla tracking range)",
 	"ftbteamsconfig.ftbchunks.claim_visibility": "Claim Visibility",
 	"ftbteamsconfig.ftbchunks.claim_visibility.tooltip": "Controls who can see your claims on the map or minimap",
+	"ftbteamsconfig.ftbchunks.owner_unclaim": "Owner Unclaim",
+	"ftbteamsconfig.ftbchunks.owner_unclaim.tooltip": "When true, only team owners can unclaim chunks",
 	"ftbchunks.fake_players": "Allow Fake Players",
 	"ftbchunks.fake_players.tooltip": "CHECK: check fake player access like any real player\nDENY: never allow fake players\nALLOW: always allow fake players",
 	"ftbchunks.max_claimed_chunks": "Max Claimed Chunks per Player",