Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-12-24 01:50:06 +01:00
Make AbstractProperty abstract
Dieser Commit ist enthalten in:
Ursprung
8dd5f0c298
Commit
0feebac44b
@ -27,7 +27,7 @@ import com.sk89q.worldedit.world.block.BlockTypes;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public class AbstractProperty<T> implements Property<T> {
|
||||
public abstract class AbstractProperty<T> implements Property<T> {
|
||||
|
||||
private final PropertyKey key;
|
||||
private String name;
|
||||
@ -73,9 +73,7 @@ public class AbstractProperty<T> implements Property<T> {
|
||||
}
|
||||
|
||||
//todo remove the following to allow for upstream compatibility.
|
||||
public <C extends AbstractProperty<T>> C withOffset(int bitOffset) {
|
||||
return (C) new AbstractProperty<>(name, values, bitOffset);
|
||||
}
|
||||
public abstract <C extends AbstractProperty<T>> C withOffset(int bitOffset);
|
||||
|
||||
@Deprecated
|
||||
public int modify(int state, T value) {
|
||||
|
@ -46,8 +46,7 @@ import java.util.Objects;
|
||||
*/
|
||||
public class BaseBlock implements BlockStateHolder<BaseBlock> {
|
||||
|
||||
private final BlockState blockState;
|
||||
|
||||
private BlockState blockState;
|
||||
@Nullable protected CompoundTag nbtData;
|
||||
|
||||
@Deprecated
|
||||
@ -55,16 +54,6 @@ public class BaseBlock implements BlockStateHolder<BaseBlock> {
|
||||
this(BlockTypes.AIR.getDefaultState());
|
||||
}
|
||||
|
||||
// /**
|
||||
// * Construct a block with a state.
|
||||
// * @deprecated Just use the BlockStateHolder instead
|
||||
// * @param blockState The blockstate
|
||||
// */
|
||||
// @Deprecated
|
||||
// public BaseBlock(BlockStateHolder blockState) {
|
||||
// this(blockState, blockState.getNbtData());
|
||||
// }
|
||||
|
||||
/**
|
||||
* Construct a block with the given type and default data.
|
||||
* @deprecated Just use the BlockType.getDefaultState()
|
||||
|
@ -19,15 +19,16 @@
|
||||
|
||||
package com.sk89q.worldedit.world.block;
|
||||
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.blocks.TileEntityBlock;
|
||||
import com.sk89q.worldedit.function.pattern.FawePattern;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.registry.state.Property;
|
||||
import com.sk89q.worldedit.registry.state.PropertyKey;
|
||||
import com.sk89q.worldedit.world.registry.BlockMaterial;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@ -198,9 +199,11 @@ public interface BlockStateHolder<B extends BlockStateHolder<B>> extends FawePat
|
||||
if (getStates().isEmpty()) {
|
||||
return this.getBlockType().getId();
|
||||
} else {
|
||||
String properties =
|
||||
getStates().entrySet().stream().map(entry -> entry.getKey().getName() + "=" + entry.getValue().toString().toLowerCase()).collect(Collectors.joining(
|
||||
","));
|
||||
String properties = getStates().entrySet().stream()
|
||||
.map(entry -> entry.getKey().getName()
|
||||
+ "="
|
||||
+ entry.getValue().toString().toLowerCase(Locale.ROOT))
|
||||
.collect(Collectors.joining(","));
|
||||
return this.getBlockType().getId() + "[" + properties + "]";
|
||||
}
|
||||
}
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren