From 77264c311fbf9e6ff35753a8def6a9ebf9ced133 Mon Sep 17 00:00:00 2001 From: Pierre Maurice Schwang Date: Sat, 28 Dec 2024 17:30:51 +0100 Subject: [PATCH] fix: anglecolor (#3043) * fix: delegate getBiome in FilterBlock to getBiomeType * chore: make texture errors actually meaningful --- .../core/extent/filter/block/CharFilterBlock.java | 5 +++++ .../java/com/fastasyncworldedit/core/util/TextureUtil.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/CharFilterBlock.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/CharFilterBlock.java index e7d5273636..c917cb064a 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/CharFilterBlock.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/CharFilterBlock.java @@ -409,6 +409,11 @@ public BiomeType getBiomeType(int x, int y, int z) { return getExtent().getBiomeType(x, y, z); } + @Override + public BiomeType getBiome(final BlockVector3 position) { + return this.getBiomeType(position.x(), position.y(), position.z()); + } + @Override public > boolean setBlock(int x, int y, int z, T block) throws WorldEditException { diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/TextureUtil.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/TextureUtil.java index 7c4e7137b7..2c140d86a2 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/TextureUtil.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/TextureUtil.java @@ -954,7 +954,8 @@ public void loadModTextures() throws IOException { } } if (entry == null) { - LOGGER.error("Cannot find {} in {}", modelsDir, file); + final String[] dirs = Arrays.stream(modelsDir).map(s -> String.format(s, nameSpace, name)).toArray(String[]::new); + LOGGER.error("Cannot find {} in {}", dirs, file); continue; }