Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply list of properties everywhere

Browse Source
This commit is contained in:
dordsor21 2021-09-21 18:53:37 +01:00
parent cf585c48ae
commit 268d8cff49
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
5 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
View File

@ -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<String, ? extends Property<?>> getAllProperties() {
public Map<String, ? extends List<Property<?>>> getAllProperties() {
BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
if (adapter != null) {
return adapter.getAllProperties();

BIN
worldedit-bukkit/src/main/resources/worldedit-adapters.jar
View File

Binary file not shown.

30
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypesCache.java
View File

@ -200,7 +200,7 @@ public class BlockTypesCache {
public static final BlockType[] values;
public static final BlockState[] states;
public static final boolean[] ticking;
public static final Map<String, ? extends Property<?>> allProperties;
private static final Map<String, List<Property<?>>> allProperties = new HashMap<>();
protected static final Set<String> $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<String, List<Property<?>>> getAllProperties() {
synchronized (allProperties) {
if (allProperties.size() == 0) {
allProperties.putAll(WorldEdit
.getInstance()
.getPlatformManager()
.queryCapability(Capability.GAME_HOOKS)
.getRegistries()
.getBlockRegistry()
.getAllProperties());
}
return allProperties;
}
}
}

3
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java
View File

@ -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<String, ? extends Property<?>> getAllProperties();
Map<String, ? extends List<Property<?>>> getAllProperties();
//FAWE end
}

3
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java
View File

@ -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<String, ? extends Property<?>> getAllProperties() {
public Map<String, ? extends List<Property<?>>> getAllProperties() {
return Collections.emptyMap(); // Oof
}
//FAWE end