From 268d8cff49df810c5d8093aa7172606079f3114c Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Tue, 21 Sep 2021 18:53:37 +0100 Subject: [PATCH] Apply list of properties everywhere --- .../worldedit/bukkit/BukkitBlockRegistry.java | 3 +- .../src/main/resources/worldedit-adapters.jar | Bin 830848 -> 830830 bytes .../world/block/BlockTypesCache.java | 30 ++++++++++++------ .../world/registry/BlockRegistry.java | 3 +- .../world/registry/BundledBlockRegistry.java | 3 +- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java index 21d4cc9d4..8a84a5b11 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java @@ -33,6 +33,7 @@ import org.bukkit.block.data.BlockData; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; +import java.util.List; import java.util.Map; import java.util.OptionalInt; @@ -161,7 +162,7 @@ public class BukkitBlockRegistry extends BundledBlockRegistry { } @Override - public Map> getAllProperties() { + public Map>> getAllProperties() { BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter(); if (adapter != null) { return adapter.getAllProperties(); diff --git a/worldedit-bukkit/src/main/resources/worldedit-adapters.jar b/worldedit-bukkit/src/main/resources/worldedit-adapters.jar index 8f804d7d2e95571eb1e8a94135d13194e928229c..6bdcc25b57186cd3fde306837d4559762a789123 100644 GIT binary patch delta 12359 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 delta 12313 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 allProperties; + private static final Map>> allProperties = new HashMap<>(); protected static final Set $NAMESPACES = new LinkedHashSet<>(); @@ -267,14 +267,6 @@ public class BlockTypesCache { states = stateList.toArray(new BlockState[stateList.size()]); ticking = Booleans.toArray(tickList); - allProperties = WorldEdit - .getInstance() - .getPlatformManager() - .queryCapability(Capability.GAME_HOOKS) - .getRegistries() - .getBlockRegistry() - .getAllProperties(); - } catch (Throwable e) { e.printStackTrace(); throw new RuntimeException(e); @@ -296,4 +288,24 @@ public class BlockTypesCache { return existing; } + /** + * Get a list of all block properties available. + * + * @return map of string key against property of all block properties available + */ + public static Map>> getAllProperties() { + synchronized (allProperties) { + if (allProperties.size() == 0) { + allProperties.putAll(WorldEdit + .getInstance() + .getPlatformManager() + .queryCapability(Capability.GAME_HOOKS) + .getRegistries() + .getBlockRegistry() + .getAllProperties()); + } + return allProperties; + } + } + } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java index bc4dbdb11..3b782445d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java @@ -27,6 +27,7 @@ import com.sk89q.worldedit.world.block.BlockType; import javax.annotation.Nullable; import java.util.Collection; import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.OptionalInt; @@ -102,6 +103,6 @@ public interface BlockRegistry { * * @return a map of states where the key is the property's ID */ - Map> getAllProperties(); + Map>> getAllProperties(); //FAWE end } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java index f1d4ba21b..3f7181397 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java @@ -29,6 +29,7 @@ import com.sk89q.worldedit.world.block.BlockType; import javax.annotation.Nullable; import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.OptionalInt; @@ -82,7 +83,7 @@ public class BundledBlockRegistry implements BlockRegistry { //FAWE start @Override - public Map> getAllProperties() { + public Map>> getAllProperties() { return Collections.emptyMap(); // Oof } //FAWE end