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

Fix property loading

Browse Source
This commit is contained in:
dordsor21 2024-06-27 14:59:32 +01:00
parent fee9029bf0
commit 99a58f66cd
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
5 changed files with 181 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_19_R3/PaperweightAdapter.java
View File

@ -507,24 +507,42 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
} }
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<net.minecraft.world.level.block.state.properties.Property, Property<?>>() { private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder
@Override .newBuilder()
public Property<?> load(net.minecraft.world.level.block.state.properties.Property state) throws Exception { .build(new CacheLoader<>() {
if (state instanceof net.minecraft.world.level.block.state.properties.BooleanProperty) { @Override
return new BooleanProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); public Property<?> load(net.minecraft.world.level.block.state.properties.Property state) {
} else if (state instanceof DirectionProperty) { if (state instanceof net.minecraft.world.level.block.state.properties.BooleanProperty) {
return new DirectionalProperty(state.getName(), return new BooleanProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues()));
(List<Direction>) state.getPossibleValues().stream().map(e -> Direction.valueOf(((StringRepresentable) e).getSerializedName().toUpperCase(Locale.ROOT))).collect(Collectors.toList())); } else if (state instanceof DirectionProperty) {
} else if (state instanceof net.minecraft.world.level.block.state.properties.EnumProperty) { return new DirectionalProperty(
return new EnumProperty(state.getName(), state.getName(),
(List<String>) state.getPossibleValues().stream().map(e -> ((StringRepresentable) e).getSerializedName()).collect(Collectors.toList())); new ArrayList<>((List<Direction>) state
} else if (state instanceof net.minecraft.world.level.block.state.properties.IntegerProperty) { .getPossibleValues()
return new IntegerProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); .stream()
} else { .map(e -> Direction.valueOf(((StringRepresentable) e)
throw new IllegalArgumentException("WorldEdit needs an update to support " + state.getClass().getSimpleName()); .getSerializedName()
} .toUpperCase(Locale.ROOT)))
} .toList())
}); );
} else if (state instanceof net.minecraft.world.level.block.state.properties.EnumProperty) {
return new EnumProperty(
state.getName(),
new ArrayList<>((List<String>) state
.getPossibleValues()
.stream()
.map(e -> ((StringRepresentable) e).getSerializedName())
.toList())
);
} else if (state instanceof net.minecraft.world.level.block.state.properties.IntegerProperty) {
return new IntegerProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues()));
} else {
throw new IllegalArgumentException("WorldEdit needs an update to support " + state
.getClass()
.getSimpleName());
}
}
});
@SuppressWarnings({ "rawtypes" }) @SuppressWarnings({ "rawtypes" })
@Override @Override

54
worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R1/PaperweightAdapter.java
View File

@ -561,24 +561,42 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
} }
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<net.minecraft.world.level.block.state.properties.Property, Property<?>>() { private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder
@Override .newBuilder()
public Property<?> load(net.minecraft.world.level.block.state.properties.Property state) throws Exception { .build(new CacheLoader<>() {
if (state instanceof net.minecraft.world.level.block.state.properties.BooleanProperty) { @Override
return new BooleanProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); public Property<?> load(net.minecraft.world.level.block.state.properties.Property state) {
} else if (state instanceof DirectionProperty) { if (state instanceof net.minecraft.world.level.block.state.properties.BooleanProperty) {
return new DirectionalProperty(state.getName(), return new BooleanProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues()));
(List<Direction>) state.getPossibleValues().stream().map(e -> Direction.valueOf(((StringRepresentable) e).getSerializedName().toUpperCase(Locale.ROOT))).collect(Collectors.toList())); } else if (state instanceof DirectionProperty) {
} else if (state instanceof net.minecraft.world.level.block.state.properties.EnumProperty) { return new DirectionalProperty(
return new EnumProperty(state.getName(), state.getName(),
(List<String>) state.getPossibleValues().stream().map(e -> ((StringRepresentable) e).getSerializedName()).collect(Collectors.toList())); new ArrayList<>((List<Direction>) state
} else if (state instanceof net.minecraft.world.level.block.state.properties.IntegerProperty) { .getPossibleValues()
return new IntegerProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); .stream()
} else { .map(e -> Direction.valueOf(((StringRepresentable) e)
throw new IllegalArgumentException("WorldEdit needs an update to support " + state.getClass().getSimpleName()); .getSerializedName()
} .toUpperCase(Locale.ROOT)))
} .toList())
}); );
} else if (state instanceof net.minecraft.world.level.block.state.properties.EnumProperty) {
return new EnumProperty(
state.getName(),
new ArrayList<>((List<String>) state
.getPossibleValues()
.stream()
.map(e -> ((StringRepresentable) e).getSerializedName())
.toList())
);
} else if (state instanceof net.minecraft.world.level.block.state.properties.IntegerProperty) {
return new IntegerProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues()));
} else {
throw new IllegalArgumentException("WorldEdit needs an update to support " + state
.getClass()
.getSimpleName());
}
}
});
@SuppressWarnings({ "rawtypes" }) @SuppressWarnings({ "rawtypes" })
@Override @Override

54
worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightAdapter.java
View File

@ -551,24 +551,42 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
} }
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<net.minecraft.world.level.block.state.properties.Property, Property<?>>() { private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder
@Override .newBuilder()
public Property<?> load(net.minecraft.world.level.block.state.properties.Property state) throws Exception { .build(new CacheLoader<>() {
if (state instanceof net.minecraft.world.level.block.state.properties.BooleanProperty) { @Override
return new BooleanProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); public Property<?> load(net.minecraft.world.level.block.state.properties.Property state) {
} else if (state instanceof DirectionProperty) { if (state instanceof net.minecraft.world.level.block.state.properties.BooleanProperty) {
return new DirectionalProperty(state.getName(), return new BooleanProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues()));
(List<Direction>) state.getPossibleValues().stream().map(e -> Direction.valueOf(((StringRepresentable) e).getSerializedName().toUpperCase(Locale.ROOT))).toList()); } else if (state instanceof DirectionProperty) {
} else if (state instanceof net.minecraft.world.level.block.state.properties.EnumProperty) { return new DirectionalProperty(
return new EnumProperty(state.getName(), state.getName(),
(List<String>) state.getPossibleValues().stream().map(e -> ((StringRepresentable) e).getSerializedName()).toList()); new ArrayList<>((List<Direction>) state
} else if (state instanceof net.minecraft.world.level.block.state.properties.IntegerProperty) { .getPossibleValues()
return new IntegerProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); .stream()
} else { .map(e -> Direction.valueOf(((StringRepresentable) e)
throw new IllegalArgumentException("WorldEdit needs an update to support " + state.getClass().getSimpleName()); .getSerializedName()
} .toUpperCase(Locale.ROOT)))
} .toList())
}); );
} else if (state instanceof net.minecraft.world.level.block.state.properties.EnumProperty) {
return new EnumProperty(
state.getName(),
new ArrayList<>((List<String>) state
.getPossibleValues()
.stream()
.map(e -> ((StringRepresentable) e).getSerializedName())
.toList())
);
} else if (state instanceof net.minecraft.world.level.block.state.properties.IntegerProperty) {
return new IntegerProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues()));
} else {
throw new IllegalArgumentException("WorldEdit needs an update to support " + state
.getClass()
.getSimpleName());
}
}
});
@SuppressWarnings({ "rawtypes" }) @SuppressWarnings({ "rawtypes" })
@Override @Override

54
worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R3/PaperweightAdapter.java
View File

@ -550,24 +550,42 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
} }
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<net.minecraft.world.level.block.state.properties.Property, Property<?>>() { private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder
@Override .newBuilder()
public Property<?> load(net.minecraft.world.level.block.state.properties.Property state) throws Exception { .build(new CacheLoader<>() {
if (state instanceof net.minecraft.world.level.block.state.properties.BooleanProperty) { @Override
return new BooleanProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); public Property<?> load(net.minecraft.world.level.block.state.properties.Property state) {
} else if (state instanceof DirectionProperty) { if (state instanceof net.minecraft.world.level.block.state.properties.BooleanProperty) {
return new DirectionalProperty(state.getName(), return new BooleanProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues()));
(List<Direction>) state.getPossibleValues().stream().map(e -> Direction.valueOf(((StringRepresentable) e).getSerializedName().toUpperCase(Locale.ROOT))).toList()); } else if (state instanceof DirectionProperty) {
} else if (state instanceof net.minecraft.world.level.block.state.properties.EnumProperty) { return new DirectionalProperty(
return new EnumProperty(state.getName(), state.getName(),
(List<String>) state.getPossibleValues().stream().map(e -> ((StringRepresentable) e).getSerializedName()).toList()); new ArrayList<>((List<Direction>) state
} else if (state instanceof net.minecraft.world.level.block.state.properties.IntegerProperty) { .getPossibleValues()
return new IntegerProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); .stream()
} else { .map(e -> Direction.valueOf(((StringRepresentable) e)
throw new IllegalArgumentException("WorldEdit needs an update to support " + state.getClass().getSimpleName()); .getSerializedName()
} .toUpperCase(Locale.ROOT)))
} .toList())
}); );
} else if (state instanceof net.minecraft.world.level.block.state.properties.EnumProperty) {
return new EnumProperty(
state.getName(),
new ArrayList<>((List<String>) state
.getPossibleValues()
.stream()
.map(e -> ((StringRepresentable) e).getSerializedName())
.toList())
);
} else if (state instanceof net.minecraft.world.level.block.state.properties.IntegerProperty) {
return new IntegerProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues()));
} else {
throw new IllegalArgumentException("WorldEdit needs an update to support " + state
.getClass()
.getSimpleName());
}
}
});
@SuppressWarnings({ "rawtypes" }) @SuppressWarnings({ "rawtypes" })
@Override @Override

56
worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R4/PaperweightAdapter.java
View File

@ -557,25 +557,43 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
return TranslatableComponent.of(CraftItemStack.asNMSCopy(BukkitAdapter.adapt(itemStack)).getDescriptionId()); return TranslatableComponent.of(CraftItemStack.asNMSCopy(BukkitAdapter.adapt(itemStack)).getDescriptionId());
} }
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({"unchecked", "rawtypes"})
private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<net.minecraft.world.level.block.state.properties.Property, Property<?>>() { private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder
@Override .newBuilder()
public Property<?> load(net.minecraft.world.level.block.state.properties.Property state) throws Exception { .build(new CacheLoader<>() {
if (state instanceof net.minecraft.world.level.block.state.properties.BooleanProperty) { @Override
return new BooleanProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); public Property<?> load(net.minecraft.world.level.block.state.properties.Property state) {
} else if (state instanceof DirectionProperty) { if (state instanceof net.minecraft.world.level.block.state.properties.BooleanProperty) {
return new DirectionalProperty(state.getName(), return new BooleanProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues()));
(List<Direction>) state.getPossibleValues().stream().map(e -> Direction.valueOf(((StringRepresentable) e).getSerializedName().toUpperCase(Locale.ROOT))).toList()); } else if (state instanceof DirectionProperty) {
} else if (state instanceof net.minecraft.world.level.block.state.properties.EnumProperty) { return new DirectionalProperty(
return new EnumProperty(state.getName(), state.getName(),
(List<String>) state.getPossibleValues().stream().map(e -> ((StringRepresentable) e).getSerializedName()).toList()); new ArrayList<>((List<Direction>) state
} else if (state instanceof net.minecraft.world.level.block.state.properties.IntegerProperty) { .getPossibleValues()
return new IntegerProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues())); .stream()
} else { .map(e -> Direction.valueOf(((StringRepresentable) e)
throw new IllegalArgumentException("WorldEdit needs an update to support " + state.getClass().getSimpleName()); .getSerializedName()
} .toUpperCase(Locale.ROOT)))
} .toList())
}); );
} else if (state instanceof net.minecraft.world.level.block.state.properties.EnumProperty) {
return new EnumProperty(
state.getName(),
new ArrayList<>((List<String>) state
.getPossibleValues()
.stream()
.map(e -> ((StringRepresentable) e).getSerializedName())
.toList())
);
} else if (state instanceof net.minecraft.world.level.block.state.properties.IntegerProperty) {
return new IntegerProperty(state.getName(), ImmutableList.copyOf(state.getPossibleValues()));
} else {
throw new IllegalArgumentException("WorldEdit needs an update to support " + state
.getClass()
.getSimpleName());
}
}
});
@SuppressWarnings({ "rawtypes" }) @SuppressWarnings({ "rawtypes" })
@Override @Override