Merge pull request #268 from FTBTeam/dev

Dev

Author: desht

Diff for: CHANGELOG.md

@@ -4,15 +4,30 @@ 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.2.3]
+
+### Added
+* Added a team property to control whether PvP is permitted in a team's claims
+  * If PvP is prevented, then if either the attacking player or the attacked player is in such a claim, PvP damage will be cancelled
+  * Can be controlled by server admin with the server config "Allow PvP Combat"
+    *  "always" (default) allows PvP everywhere
+    * "never" prevents PvP in all claimed chunks
+    * "per_team" allows teams to configure PvP for their claims via new team property "Allow PvP Combat"
+  * Not 100% guaranteed to prevent all forms of PvP damage, but direct or projectile damage is prevented where the damage source can be traced back to a player
+
+### Fixed
+* Fixed a held item desync when an item or block right-click is prevented in a claimed area
+* Cleaned up stale kubjes support files (kubejs.classfilter.txt / kubejs.plugins.txt) - they're in FTB XMod Compat now
+
 ## [2001.2.2]
 
-### Fixes
+### Fixed
 * Fixed crash on player disconnect if they don't have a team assigned
-  * Should never occur under normal circumstance but could happen if external factors force a premature disconnect
+  * Should never occur under normal circumstances but could happen if external factors force a premature disconnect
 
 ## [2001.2.1]
 
-### Fixes
+### Fixed
 * Fixed "Show waypoints in world" client config setting being ignored for waypoint icons
   * It was only working to suppress beacons when set to false, now it suppresses icons too
 * Fixed NPE when checking for fake players which had a null name or UUID in their GameProfile

Diff for: common/src/main/java/dev/ftb/mods/ftbchunks/FTBCUtils.java

@@ -4,6 +4,7 @@
 import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.level.block.Block;
 
 public class FTBCUtils {
@@ -13,16 +14,19 @@ public static boolean isRail(Block block) {
 	}
 
 
-
 	/**
 	 * Used after various events have been cancelled server-side; client may already have updated the held item for the
 	 * player, but it needs to be brought back in sync with the server.
-	 * @param sp the player
+	 *
+	 * @param sp   the player
 	 * @param hand the hand being used
 	 */
 	public static void forceHeldItemSync(ServerPlayer sp, InteractionHand hand) {
 		if (sp.connection != null) {
-			sp.connection.send(new ClientboundContainerSetSlotPacket(-2, 0, sp.getInventory().selected, sp.getItemInHand(hand)));
+			switch (hand) {
+				case MAIN_HAND -> sp.connection.send(new ClientboundContainerSetSlotPacket(-2, 0, sp.getInventory().selected, sp.getItemInHand(hand)));
+				case OFF_HAND -> sp.connection.send(new ClientboundContainerSetSlotPacket(-2, 0, Inventory.SLOT_OFFHAND, sp.getItemInHand(hand)));
+			}
 		}
 	}
-}
+}

Diff for: common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunks.java

@@ -11,14 +11,12 @@
 import dev.architectury.utils.Env;
 import dev.architectury.utils.EnvExecutor;
 import dev.architectury.utils.value.IntValue;
+import dev.ftb.mods.ftbchunks.api.ClaimedChunk;
 import dev.ftb.mods.ftbchunks.api.FTBChunksAPI;
 import dev.ftb.mods.ftbchunks.api.FTBChunksProperties;
 import dev.ftb.mods.ftbchunks.api.Protection;
 import dev.ftb.mods.ftbchunks.client.FTBChunksClient;
-import dev.ftb.mods.ftbchunks.data.ChunkTeamDataImpl;
-import dev.ftb.mods.ftbchunks.data.ClaimExpirationManager;
-import dev.ftb.mods.ftbchunks.data.ClaimedChunkImpl;
-import dev.ftb.mods.ftbchunks.data.ClaimedChunkManagerImpl;
+import dev.ftb.mods.ftbchunks.data.*;
 import dev.ftb.mods.ftbchunks.net.*;
 import dev.ftb.mods.ftblibrary.integration.stages.StageHelper;
 import dev.ftb.mods.ftblibrary.math.ChunkDimPos;
@@ -28,17 +26,20 @@
 import dev.ftb.mods.ftblibrary.snbt.config.ConfigUtil;
 import dev.ftb.mods.ftbteams.api.FTBTeamsAPI;
 import dev.ftb.mods.ftbteams.api.event.*;
+import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.InteractionHand;
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.MobSpawnType;
@@ -122,6 +123,7 @@ public FTBChunks() {
 
 		EntityEvent.ENTER_SECTION.register(this::enterSection);
 		EntityEvent.LIVING_CHECK_SPAWN.register(this::checkSpawn);
+		EntityEvent.LIVING_HURT.register(this::onLivingHurt);
 
 		ExplosionEvent.DETONATE.register(this::explosionDetonate);
 
@@ -136,13 +138,34 @@ public FTBChunks() {
 	private EventResult playerAttackEntity(Player player, Level level, Entity entity, InteractionHand interactionHand, @Nullable EntityHitResult entityHitResult) {
 		// note: intentionally does not prevent attacking living entities;
 		// this is for preventing griefing of entities like paintings & item frames
-		if (player instanceof ServerPlayer && !(entity instanceof LivingEntity) && ClaimedChunkManagerImpl.getInstance().shouldPreventInteraction(player, interactionHand, entity.blockPosition(), Protection.ATTACK_NONLIVING_ENTITY, entity)) {
-			return EventResult.interruptFalse();
+		if (player instanceof ServerPlayer) {
+			if (!(entity instanceof LivingEntity) && ClaimedChunkManagerImpl.getInstance().shouldPreventInteraction(player, interactionHand, entity.blockPosition(), Protection.ATTACK_NONLIVING_ENTITY, entity)) {
+				return EventResult.interruptFalse();
+			}
 		}
 
 		return EventResult.pass();
 	}
 
+	private EventResult onLivingHurt(LivingEntity living, DamageSource damageSource, float dmg) {
+		if (!living.level().isClientSide() && living instanceof Player target && damageSource.getEntity() instanceof Player attacker) {
+			PvPMode mode = FTBChunksWorldConfig.PVP_MODE.get();
+			if (mode == PvPMode.ALWAYS) {
+				return EventResult.pass();
+			}
+			if (isPvPProtectedChunk(mode, attacker) || isPvPProtectedChunk(mode, target)) {
+				PlayerNotifier.notifyWithCooldown(attacker, Component.translatable("ftbchunks.message.no_pvp").withStyle(ChatFormatting.GOLD), 3000L);
+				return EventResult.interruptFalse();
+			}
+		}
+		return EventResult.pass();
+	}
+
+	private boolean isPvPProtectedChunk(PvPMode mode, Player player) {
+		ClaimedChunk cc = ClaimedChunkManagerImpl.getInstance().getChunk(new ChunkDimPos(player.level(), player.blockPosition()));
+		return cc != null && (mode == PvPMode.NEVER || !cc.getTeamData().allowPVP());
+	}
+
 	private void playerTickPost(Player player) {
 		if (player.level().isClientSide && player.level().getGameTime() % 20 == 0) {
 			FTBChunksClient.INSTANCE.maybeClearDeathpoint(player);
@@ -408,6 +431,7 @@ private void teamConfig(TeamCollectPropertiesEvent event) {
 		event.add(FTBChunksProperties.ALLOW_ALL_FAKE_PLAYERS);
 		event.add(FTBChunksProperties.ALLOW_NAMED_FAKE_PLAYERS);
 		event.add(FTBChunksProperties.ALLOW_FAKE_PLAYERS_BY_ID);
+		event.add(FTBChunksProperties.ALLOW_PVP);
 
 		// block edit/interact properties vary on forge & fabric
 		FTBChunksExpected.getPlatformSpecificProperties(event);

Diff for: common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunksWorldConfig.java

@@ -5,6 +5,7 @@
 import dev.ftb.mods.ftbchunks.data.AllyMode;
 import dev.ftb.mods.ftbchunks.data.ForceLoadMode;
 import dev.ftb.mods.ftbchunks.data.PartyLimitMode;
+import dev.ftb.mods.ftbchunks.data.PvPMode;
 import dev.ftb.mods.ftbchunks.integration.PermissionsHelper;
 import dev.ftb.mods.ftbchunks.util.DimensionFilter;
 import dev.ftb.mods.ftblibrary.config.NameMap;
@@ -24,6 +25,7 @@ public interface FTBChunksWorldConfig {
 	EnumValue<ForceLoadMode> FORCE_LOAD_MODE = CONFIG.addEnum("force_load_mode", ForceLoadMode.NAME_MAP).comment("Control how force-loaded chunks work.","NEVER: only allow chunk force-loading if the owning team has at least one online player.","ALWAYS: always allow force-loading, even if no players are online.","DEFAULT: allow force-loading IF the team has at least one player with the 'ftbchunks.chunk_load_offline' FTB Ranks permission.");
 	BooleanValue DISABLE_PROTECTION = CONFIG.addBoolean("disable_protection", false).comment("Disables all land protection. Useful for private servers where everyone is trusted and claims are only used for force-loading");
 	EnumValue<AllyMode> ALLY_MODE = CONFIG.addEnum("ally_mode", AllyMode.NAME_MAP).comment("Forced modes won't let players change their ally settings");
+	EnumValue<PvPMode> PVP_MODE = CONFIG.addEnum("pvp_mode", PvPMode.NAME_MAP).comment("Should PvP combat be allowed in claimed chunks? Default is ALWAYS; NEVER prevents it in all claimed chunks; PER_TEAM allows teams to decide if PvP is allowed in their claims");
 	StringListValue CLAIM_DIMENSION_BLACKLIST = CONFIG.addStringList("claim_dimension_blacklist", Collections.emptyList()).comment("Dimension ID's where chunks may not be claimed. Add \"minecraft:the_end\" to this list if you want to disable chunk claiming in The End, or \"othermod:*\" to disable chunk claiming in *all* dimensions added by \"othermod\"");
 	StringListValue CLAIM_DIMENSION_WHITELIST = CONFIG.addStringList("claim_dimension_whitelist", Collections.emptyList()).comment("Dimension ID's where chunks may be claimed. If non-empty, chunks may be claimed *only* in these dimensions (and the dimension is not in \"claim_dimension_blacklist\"). Same syntax as for \"claim_dimension_blacklist\".");
 	BooleanValue NO_WILDERNESS = CONFIG.addBoolean("no_wilderness", false).comment("Requires you to claim chunks in order to edit and interact with blocks");

Diff for: common/src/main/java/dev/ftb/mods/ftbchunks/PlayerNotifier.java

@@ -0,0 +1,20 @@
+package dev.ftb.mods.ftbchunks;
+
+import it.unimi.dsi.fastutil.objects.Object2LongMap;
+import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Player;
+
+import java.util.UUID;
+
+public class PlayerNotifier {
+    private static final Object2LongMap<UUID> lastNotified = new Object2LongOpenHashMap<>();
+
+    public static void notifyWithCooldown(Player player, Component msg, long cooldownMS) {
+        long now = System.currentTimeMillis();
+        if (now - lastNotified.getOrDefault(player.getUUID(), 0L) > cooldownMS) {
+            player.displayClientMessage(msg, true);
+            lastNotified.put(player.getUUID(), now);
+        }
+    }
+}

Diff for: common/src/main/java/dev/ftb/mods/ftbchunks/api/ChunkTeamData.java

@@ -198,6 +198,20 @@ public interface ChunkTeamData {
      */
     boolean allowMobGriefing();
 
+    /**
+     * Is player-vs-player damage allowed in chunks claimed by this team? This is a convenience method to check
+     * the value of the {@link FTBChunksProperties#ALLOW_PVP} team property.
+     * <p>
+     * If PvP is not allowed, then if either the attacker or the victim are in a claimed chunk, PvP damage will
+     * be cancelled. Note this is not 100% foolproof, e.g. it won't prevent a player pouring a bucket of lava
+     * over another player, for example.
+     * <p>
+     * This is also dependent on the server's "Allow PvP Combat" setting being set to "per_team".
+     *
+     * @return true if PvP os permitted, false if not
+     */
+    boolean allowPVP();
+
     /**
      * Get the time (milliseconds since the epoch) that any member of this team logged in to the server. This time is
      * used when chunk claiming and force-load expiry is in effect on this server.

Diff for: common/src/main/java/dev/ftb/mods/ftbchunks/api/FTBChunksProperties.java

@@ -31,6 +31,8 @@ public class FTBChunksProperties {
             = new PrivacyProperty(new ResourceLocation(FTBChunks.MOD_ID, "claim_visibility"), PrivacyMode.PUBLIC);
     public static final PrivacyProperty LOCATION_MODE
             = new PrivacyProperty(new ResourceLocation(FTBChunks.MOD_ID, "location_mode"), PrivacyMode.ALLIES);
+    public static final BooleanProperty ALLOW_PVP
+            = new BooleanProperty(new ResourceLocation(FTBChunks.MOD_ID, "allow_pvp"), true);
 
     // FTB Chunks on Forge adds two separate block edit & interact properties
     public static final PrivacyProperty BLOCK_EDIT_MODE

Diff for: common/src/main/java/dev/ftb/mods/ftbchunks/data/ChunkTeamDataImpl.java

@@ -511,6 +511,11 @@ public boolean allowMobGriefing() {
 		return team.getProperty(FTBChunksProperties.ALLOW_MOB_GRIEFING);
 	}
 
+	@Override
+	public boolean allowPVP() {
+		return team.getProperty(FTBChunksProperties.ALLOW_PVP);
+	}
+
 	public void setLastLoginTime(long when) {
 		this.lastLoginTime = when;
 		markDirty();

Diff for: common/src/main/java/dev/ftb/mods/ftbchunks/data/PvPMode.java

@@ -0,0 +1,12 @@
+package dev.ftb.mods.ftbchunks.data;
+
+import dev.ftb.mods.ftblibrary.config.NameMap;
+
+public enum PvPMode {
+    ALWAYS,
+    NEVER,
+    PER_TEAM,
+    ;
+
+    public static final NameMap<PvPMode> NAME_MAP = NameMap.of(ALWAYS, values()).create();
+}

Diff for: common/src/main/resources/assets/ftbchunks/lang/en_us.json

@@ -119,6 +119,8 @@
 	"ftbteamsconfig.ftbchunks.allow_fake_players_by_id.tooltip": "Allows fake players which have the ID of a real player access to your claims, IF that real player would be permitted, either as ally or team member. Set this to true if you're unsure.",
 	"ftbteamsconfig.ftbchunks.allow_explosions": "Allow Explosion Damage",
 	"ftbteamsconfig.ftbchunks.allow_explosions.tooltip": "Should explosions be able to damage blocks in claimed areas?",
+	"ftbteamsconfig.ftbchunks.allow_pvp": "Allow PvP Combat",
+	"ftbteamsconfig.ftbchunks.allow_pvp.tooltip": "Should player-vs-player combat be allowed in claimed areas?\nServer config setting 'Allow PvP Combat' must be 'per_team' for this to function\nNot guaranteed to protect against 100%% of indirect attacks; requires that damage sources can be attributed to a player",
 	"ftbteamsconfig.ftbchunks.allow_mob_griefing": "Allow Mob Griefing Actions",
 	"ftbteamsconfig.ftbchunks.allow_mob_griefing.tooltip": "Should mobs be allowed to damage blocks in claimed areas?\nNote: currently Endermen only; may include other mobs in future\nCreeper explosions are protected against via \"Allow Explosions\"",
 	"ftbteamsconfig.ftbchunks.block_edit_and_interact_mode": "Block Edit/Interact Mode",
@@ -146,6 +148,8 @@
 	"ftbchunks.force_load_mode.tooltip": "NEVER: only allow chunk force-loading if the owning team has at least one online player\nALWAYS: always allow force-loading, even if no players are online\nDEFAULT: allow force-loading IF the team has at least one player with the FTB Ranks 'ftbchunks.chunk_load_offline' permission",
 	"ftbchunks.disable_protection": "Disable Claim Protection",
 	"ftbchunks.disable_protection.tooltip": "Useful for private servers where everyone is trusted, and claims are only used for force-loading",
+	"ftbchunks.pvp_mode": "Allow PvP Combat in Claimed Chunks",
+	"ftbchunks.pvp_mode.tooltip": "ALWAYS: allow PvP combat in all claimed chunks\nNEVER: prevent PvP in all claimed chunks\nPER_TEAM: teams can decide if PvP is allowed in their claims via team property",
 	"ftbchunks.ally_mode": "Allow Player to Change Ally Settings",
 	"ftbchunks.ally_mode.tooltip": "DEFAULT: FTB Teams ally status is checked to decide if players are allied\nFORCED_ALL: all players are always considered to be allied\nFORCED_NONE: no players are ever considered to be allied",
 	"ftbchunks.claim_dimension_blacklist": "Dimension Blacklist",
@@ -188,5 +192,6 @@
 	"ftbchunks.claim_result.not_loaded": "Chunk not loaded",
 	"ftbchunks.need_to_claim_chunk": "You need to claim this chunk to interact with blocks here!",
 	"ftbchunks.label.show": "Show",
-	"ftbchunks.label.hide": "Hide"
+	"ftbchunks.label.hide": "Hide",
+	"ftbchunks.message.no_pvp": "PvP combat is disabled here"
 }

Diff for: common/src/main/resources/kubejs.classfilter.txt

@@ -5,7 +5,7 @@ org.gradle.daemon=false
 mod_id=ftbchunks
 archives_base_name=ftb-chunks
 maven_group=dev.ftb.mods
-mod_version=2001.2.2
+mod_version=2001.2.3
 mod_author=FTB Team
 
 minecraft_version=1.20.1