Some perm changes (ldtteam#9989)

Add levitation effect after too many times breaking colony perms
Add entity right click whitelist
Add new toggleable permission that defaults to true

src/main/java/com/minecolonies/api/colony/permissions/Action.java

@@ -39,7 +39,8 @@ public enum Action
     HURT_CITIZEN(26),
     HURT_VISITOR(27),
     MAP_BORDER(28),
-    MAP_DEATHS(29);
+    MAP_DEATHS(29),
+    ACCESS_TOGGLEABLES(30);
 
     // remember to update permissionsVersion and add some upgrade logic in upgradePermissions if you
     // add new actions that shouldn't just be off by default for everyone

src/main/java/com/minecolonies/api/items/ModTags.java

@@ -69,6 +69,9 @@ public class ModTags
 
     public static final TagKey<EntityType<?>> raiders = TagKey.create(Registries.ENTITY_TYPE, TagConstants.RAIDERS);
 
+    public static final TagKey<EntityType<?>> freeToInteractWith = TagKey.create(Registries.ENTITY_TYPE, TagConstants.ALLOW_INTERACT);
+
+
     public static final TagKey<Item> ignoreNBT = ItemTags.create(TagConstants.IGNORE_NBT);
 
     public static final Map<String, TagKey<Item>> crafterProduct              = new HashMap<>();

src/main/java/com/minecolonies/api/util/constant/TagConstants.java

@@ -45,6 +45,7 @@ public final class TagConstants
     public static final ResourceLocation MOB_ATTACK_BLACKLIST      = new ResourceLocation(MOD_ID, "mob_attack_blacklist");
     public static final ResourceLocation RAIDERS                   = new ResourceLocation(MOD_ID, "raiders");
     public static final ResourceLocation IGNORE_NBT                = new ResourceLocation(MOD_ID, "ignore_nbt");
+    public static final ResourceLocation ALLOW_INTERACT            = new ResourceLocation(MOD_ID, "allowinteract");
 
     public static final String CRAFTING_BAKER                = ModJobs.BAKER_ID.getPath();
     public static final String CRAFTING_BLACKSMITH           = ModJobs.BLACKSMITH_ID.getPath();

src/main/java/com/minecolonies/core/colony/permissions/ColonyPermissionEventHandler.java

@@ -13,16 +13,21 @@
 import com.minecolonies.api.util.EntityUtils;
 import com.minecolonies.api.util.ItemStackUtils;
 import com.minecolonies.api.util.MessageUtils;
-import com.minecolonies.api.util.constant.Constants;
 import com.minecolonies.core.MineColonies;
 import com.minecolonies.core.blocks.BlockDecorationController;
 import com.minecolonies.core.blocks.huts.BlockHutTownHall;
 import com.minecolonies.core.colony.Colony;
 import com.minecolonies.core.colony.jobs.AbstractJobGuard;
 import com.minecolonies.core.entity.citizen.EntityCitizen;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.animal.horse.Llama;
 import net.minecraft.world.entity.monster.Enemy;
 import net.minecraft.world.entity.monster.Monster;
@@ -55,6 +60,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import static com.minecolonies.api.util.constant.Constants.TICKS_SECOND;
 import static com.minecolonies.api.util.constant.TranslationConstants.PERMISSION_DENIED;
 
 /**
@@ -70,7 +76,12 @@ public class ColonyPermissionEventHandler
     /**
      * The last time the player was notified about not having permission.
      */
-    private Map<UUID, Long> lastPlayerNotificationTick = new HashMap<>();
+    private final Map<UUID, Long> lastPlayerNotificationTick = new HashMap<>();
+
+    /**
+     * Number of attempts within a notif tick.
+     */
+    private final Object2IntMap<UUID> playerAttempts = new Object2IntOpenHashMap<>();
 
     /**
      * Create this EventHandler.
@@ -173,11 +184,23 @@ private void cancelEvent(final Event event, @Nullable final Entity entity, final
 
             final long worldTime = entity.level.getGameTime();
             if (!lastPlayerNotificationTick.containsKey(entity.getUUID())
-                  || lastPlayerNotificationTick.get(entity.getUUID()) + (Constants.TICKS_SECOND * 10)
+                  || lastPlayerNotificationTick.get(entity.getUUID()) + (TICKS_SECOND * 10)
                        < worldTime)
             {
                 MessageUtils.format(PERMISSION_DENIED).sendTo((Player) entity);
                 lastPlayerNotificationTick.put(entity.getUUID(), worldTime);
+                playerAttempts.put(entity.getUUID(), 0);
+            }
+            else
+            {
+                if (playerAttempts.compute(entity.getUUID(), (uuid, count) -> count == null ? 1 : count + 1) > 10)
+                {
+                    if (entity instanceof LivingEntity living)
+                    {
+                        playerAttempts.put(entity.getUUID(), 0);
+                        living.addEffect(new MobEffectInstance(MobEffects.LEVITATION, TICKS_SECOND * 10));
+                    }
+                }
             }
         }
     }
@@ -318,7 +341,8 @@ public void on(final PlayerInteractEvent event)
         if (colony.isCoordInColony(event.getLevel(), event.getPos())
               && !(event instanceof PlayerInteractEvent.EntityInteract || event instanceof PlayerInteractEvent.EntityInteractSpecific))
         {
-            final Block block = event.getLevel().getBlockState(event.getPos()).getBlock();
+            final BlockState state = event.getLevel().getBlockState(event.getPos());
+            final Block block = state.getBlock();
 
             // Huts
             if (event instanceof PlayerInteractEvent.RightClickBlock && block instanceof AbstractBlockHut
@@ -336,6 +360,11 @@ public void on(final PlayerInteractEvent event)
                 return;
             }
 
+            if ((state.is(BlockTags.DOORS) || state.is(BlockTags.FENCE_GATES)) && perms.hasPermission(event.getEntity(), Action.ACCESS_TOGGLEABLES))
+            {
+                return;
+            }
+
             if (MineColonies.getConfig().getServer().enableColonyProtection.get())
             {
                 if (!perms.hasPermission(event.getEntity(), Action.RIGHTCLICK_BLOCK) && !(block instanceof AirBlock))
@@ -407,6 +436,11 @@ public void on(final PlayerInteractEvent.EntityInteract event)
             return;
         }
 
+        if (event.getEntity().getType().is(ModTags.freeToInteractWith))
+        {
+            return;
+        }
+
         checkEventCancelation(Action.RIGHTCLICK_ENTITY, event.getEntity(), event.getLevel(), event, event.getPos());
     }
 

src/main/java/com/minecolonies/core/colony/permissions/Permissions.java

@@ -113,7 +113,7 @@ public class Permissions implements IPermissions
     /**
      * The current version of the permissions, increase upon changes to the preset permissions
      */
-    private static final int permissionsVersion = 4;
+    private static final int permissionsVersion = 5;
 
     /**
      * Saves the permissionMap with allowed actions.
@@ -172,9 +172,11 @@ private void loadRanks()
                     rank.addPermission(Action.ATTACK_CITIZEN);
                     rank.addPermission(Action.ATTACK_ENTITY);
                     rank.addPermission(Action.TELEPORT_TO_COLONY);
+                    rank.addPermission(Action.ACCESS_TOGGLEABLES);
                     rank.addPermission(Action.MAP_BORDER);
                 case NEUTRAL:
                     rank.addPermission(Action.ACCESS_FREE_BLOCKS);
+                    rank.addPermission(Action.ACCESS_TOGGLEABLES);
                     rank.addPermission(Action.MAP_BORDER);
                     break;
                 case HOSTILE:
@@ -216,7 +218,13 @@ private void upgradePermissions(final int version, final Rank rank)
             this.setPermission(rank, Action.MAP_BORDER, true);
         }
 
-        // if (version < 5) ...
+        if (version < 5)
+        {
+            if (!rank.isHostile())
+            {
+                this.setPermission(rank, Action.ACCESS_TOGGLEABLES, true);
+            }
+        }
 
         // Fix bad saved values
         if (rank == getRankOwner())

src/main/resources/assets/minecolonies/lang/manual_en_us.json

@@ -718,6 +718,7 @@
   "com.minecolonies.coremod.permission.attack_citizen": "Attack Citizens",
   "com.minecolonies.coremod.permission.attack_entity": "Attack Entities",
   "com.minecolonies.coremod.permission.access_free_blocks": "Access Free-Blocks",
+  "com.minecolonies.coremod.permission.access_toggleables": "Access Doors/Gates",
   "com.minecolonies.coremod.permission.explode": "Explode",
   "com.minecolonies.coremod.permission.hurt_citizen": "Hurt Citizen",
   "com.minecolonies.coremod.permission.hurt_visitor": "Hurt Visitor",

src/main/resources/data/minecolonies/tags/entity_types/allowinteract.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "corpse:corpse",
+      "required": false
+    }
+  ]
+}