From 5401917703b886a0f77e8809ab50369f120acc02 Mon Sep 17 00:00:00 2001 From: dfsek Date: Fri, 17 Dec 2021 08:36:43 -0700 Subject: [PATCH] createBlockData -> createBlockState --- .../com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java | 2 +- .../addons/terrascript/script/functions/BlockFunction.java | 4 ++-- .../addons/terrascript/script/functions/PullFunction.java | 2 +- .../src/main/java/com/dfsek/terra/api/handle/WorldHandle.java | 2 +- .../src/main/java/com/dfsek/terra/config/GenericLoaders.java | 4 ++-- .../src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java | 2 +- .../com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java | 2 +- .../java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java | 2 +- .../java/com/dfsek/terra/sponge/handle/SpongeWorldHandle.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java index 763e83d88..5051ed4ee 100644 --- a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java +++ b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java @@ -91,7 +91,7 @@ public class SpongeSchematicAddon implements AddonInitializer { for(int y = 0; y < hei; y++) { String block = data.get((int) arr[x + z * wid + y * wid * len]); if(block.startsWith("minecraft:structure_void")) continue; - states[x][z][y] = platform.getWorldHandle().createBlockData(block); + states[x][z][y] = platform.getWorldHandle().createBlockState(block); } } } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java index b9a6250b6..8160f9fdb 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java @@ -79,7 +79,7 @@ public class BlockFunction implements Function { } protected BlockState getBlockState(ImplementationArguments arguments, Map> variableMap) { - return data.computeIfAbsent(blockData.apply(arguments, variableMap), platform.getWorldHandle()::createBlockData); + return data.computeIfAbsent(blockData.apply(arguments, variableMap), platform.getWorldHandle()::createBlockState); } @@ -89,7 +89,7 @@ public class BlockFunction implements Function { public Constant(Returnable x, Returnable y, Returnable z, StringConstant blockData, Returnable overwrite, Platform platform, Position position) { super(x, y, z, blockData, overwrite, platform, position); - this.state = platform.getWorldHandle().createBlockData(blockData.getConstant()); + this.state = platform.getWorldHandle().createBlockState(blockData.getConstant()); } @Override diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java index b42feb8f2..b97524513 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java @@ -37,7 +37,7 @@ public class PullFunction implements Function { this.position = position; if(!(data instanceof ConstantExpression)) throw new ParseException("Block data must be constant", data.getPosition()); - this.data = platform.getWorldHandle().createBlockData(((ConstantExpression) data).getConstant()); + this.data = platform.getWorldHandle().createBlockState(((ConstantExpression) data).getConstant()); this.x = x; this.y = y; this.z = z; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java b/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java index cb01ea67c..4f28b254e 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java @@ -20,7 +20,7 @@ import com.dfsek.terra.api.entity.EntityType; public interface WorldHandle { @NotNull @Contract("_ -> new") - BlockState createBlockData(@NotNull String data); + BlockState createBlockState(@NotNull String data); @NotNull @Contract(pure = true) diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java index c1f289dc9..6e9f1b2d5 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java @@ -58,8 +58,8 @@ public class GenericLoaders implements LoaderRegistrar { if(platform != null) { registry.registerLoader(BaseAddon.class, platform.getAddons()) .registerLoader(BlockType.class, - (t, object, cf) -> platform.getWorldHandle().createBlockData((String) object).getBlockType()) - .registerLoader(BlockState.class, (t, object, cf) -> platform.getWorldHandle().createBlockData((String) object)); + (t, object, cf) -> platform.getWorldHandle().createBlockState((String) object).getBlockType()) + .registerLoader(BlockState.class, (t, object, cf) -> platform.getWorldHandle().createBlockState((String) object)); } } } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java index 1618349e4..83321bc08 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java @@ -85,7 +85,7 @@ public class PlatformImpl extends AbstractPlatform { @Override public void register(TypeRegistry registry) { super.register(registry); - registry.registerLoader(BlockState.class, (t, o, l) -> handle.createBlockData((String) o)) + registry.registerLoader(BlockState.class, (t, o, l) -> handle.createBlockState((String) o)) .registerLoader(PlatformBiome.class, (t, o, l) -> parseBiome((String) o)) .registerLoader(EntityType.class, (t, o, l) -> EntityType.valueOf((String) o)); diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java index 6bedd955f..a01de6691 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java @@ -39,7 +39,7 @@ public class BukkitWorldHandle implements WorldHandle { } @Override - public @NotNull BlockState createBlockData(@NotNull String data) { + public @NotNull BlockState createBlockState(@NotNull String data) { org.bukkit.block.data.BlockData bukkitData = Bukkit.createBlockData(data); return BukkitBlockState.newInstance(bukkitData); } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java index a3bdd523d..95d5164cf 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java @@ -37,7 +37,7 @@ public class FabricWorldHandle implements WorldHandle { private static final com.dfsek.terra.api.block.state.BlockState AIR = FabricAdapter.adapt(Blocks.AIR.getDefaultState()); @Override - public @NotNull FabricBlockState createBlockData(@NotNull String data) { + public @NotNull FabricBlockState createBlockState(@NotNull String data) { BlockArgumentParser parser = new BlockArgumentParser(new StringReader(data), true); try { BlockState state = parser.parse(true).getBlockState(); diff --git a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/handle/SpongeWorldHandle.java b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/handle/SpongeWorldHandle.java index 6de1027d1..84cc0a55d 100644 --- a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/handle/SpongeWorldHandle.java +++ b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/handle/SpongeWorldHandle.java @@ -35,7 +35,7 @@ public class SpongeWorldHandle implements WorldHandle { } @Override - public @NotNull BlockState createBlockData(@NotNull String data) { + public @NotNull BlockState createBlockState(@NotNull String data) { return new SpongeBlockState(org.spongepowered.api.block.BlockState.fromString(data)); }