Start integrating flags with event handler

cjburkey01 · Aug 29, 2024 · 12c7d43 · 12c7d43
1 parent e5e2f55
commit 12c7d43
Show file tree

Hide file tree

Showing 7 changed files with 359 additions and 137 deletions.
diff --git a/src/main/java/com/cjburkey/claimchunk/ClaimChunk.java b/src/main/java/com/cjburkey/claimchunk/ClaimChunk.java
@@ -103,8 +103,6 @@ public final class ClaimChunk extends JavaPlugin implements IClaimChunkPlugin {
     @Getter private ChunkHandler chunkHandler;
     // An instance of the player handler
     @Getter private PlayerHandler playerHandler;
-    // An instance of the permission flag handler
-    @Getter private FlagHandler flagHandler;
     // An instance of the rank handler
     @Getter private RankHandler rankHandler;
     // An instance of the world permissions manager
@@ -116,6 +114,8 @@ public final class ClaimChunk extends JavaPlugin implements IClaimChunkPlugin {
     @Getter private ChunkOutlineHandler chunkOutlineHandler;
     @Getter private CCGuiHandler guiHandler;
 
+    // An instance of the permission flag handler
+    @Getter private FlagHandler flagHandler;
     @Getter private CCInteractClasses interactClasses;
     @Getter private CCPermFlags permFlags;
 
@@ -288,7 +288,7 @@ public void onEnable() {
 
         chunkHandler = new ChunkHandler(dataHandler, this);
         playerHandler = new PlayerHandler(dataHandler, this);
-        flagHandler = new FlagHandler(dataHandler, this);
+        flagHandler = new FlagHandler(permFlags, dataHandler);
 
         // As of version 0.0.23, the `ranks.json` file will be located in
         // `/plugins/ClaimChunk` instead of `/plugins/ClaimChunk/data` to make

diff --git a/src/main/java/com/cjburkey/claimchunk/config/ClaimChunkWorldProfileHandler.java b/src/main/java/com/cjburkey/claimchunk/config/ClaimChunkWorldProfileHandler.java
@@ -247,6 +247,7 @@ public void unloadAllProfiles() {
                                         && Monster.class.isAssignableFrom(
                                                 entityType.getEntityClass()))
                 .forEach(monsters::add);
+        entityAccessMapping.put("MONSTERS", monsters);
 
         // Add the hanging entities (item frames, leads, paintings)
         HashSet<EntityType> hangingEntities = new HashSet<>();
@@ -258,6 +259,7 @@ public void unloadAllProfiles() {
                                         && Hanging.class.isAssignableFrom(
                                                 entityType.getEntityClass()))
                 .forEach(hangingEntities::add);
+        entityAccessMapping.put("HANGING_ENTITIES", hangingEntities);
 
         // Add all animals
         HashSet<EntityType> animals = new HashSet<>();
@@ -268,6 +270,7 @@ public void unloadAllProfiles() {
                                         && Animals.class.isAssignableFrom(
                                                 entityType.getEntityClass()))
                 .forEach(animals::add);
+        entityAccessMapping.put("ANIMALS", animals);
 
         // Add mine-carts and boats
         HashSet<EntityType> vehicles = new HashSet<>();
@@ -280,6 +283,7 @@ public void unloadAllProfiles() {
                                                 || Boat.class.isAssignableFrom(
                                                         entityType.getEntityClass())))
                 .forEach(vehicles::add);
+        entityAccessMapping.put("VEHICLES", vehicles);
 
         // Containers (Keep up to date? Need to work on this)
         HashSet<EntityType> containers = new HashSet<>();
@@ -288,11 +292,6 @@ public void unloadAllProfiles() {
                 EntityType.CHEST_BOAT,
                 EntityType.CHEST_MINECART,
                 EntityType.HOPPER_MINECART);
-
-        entityAccessMapping.put("MONSTERS", monsters);
-        entityAccessMapping.put("HANGING_ENTITIES", hangingEntities);
-        entityAccessMapping.put("ANIMALS", animals);
-        entityAccessMapping.put("VEHICLES", vehicles);
         entityAccessMapping.put("CONTAINER_ENTITIES", containers);
 
         return entityAccessMapping;