From d63f340fd9f0144edffcf2a8eee21ff70dad4ae5 Mon Sep 17 00:00:00 2001 From: Sven Date: Sat, 31 Jul 2021 21:53:01 +0200 Subject: [PATCH 1/3] Link to the correct wiki page (#226) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 91ce4ce1..2faf750e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Some features and some blocks are still missing. Especially some tile-entities w You can choose a version and download BlueMap from [here](https://github.com/BlueMap-Minecraft/BlueMap/releases). ### Using BlueMap -BlueMap can be used on the command-line, or as a plugin/mod for your Sponge/Spigot/Paper/Forge/Fabric-Server. Read the [wiki](https://github.com/BlueMap-Minecraft/BlueMap/wiki) to get started! +BlueMap can be used on the command-line, or as a plugin/mod for your Sponge/Spigot/Paper/Forge/Fabric-Server. Read the [wiki](https://bluemap.bluecolored.de/wiki/) to get started! ### Clone If you have git installed, simply use the command `git clone --recursive https://github.com/BlueMap-Minecraft/BlueMap.git` to clone BlueMap. From fd109b2407cfdd6525dbb3b00a51c4061d314ccf Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Tue, 10 Aug 2021 21:26:49 +0200 Subject: [PATCH 2/3] Potential fix for chisels block-id hack --- .../bluemap/core/resourcepack/ResourcePack.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/ResourcePack.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/ResourcePack.java index 3f94e712..442b73d7 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/ResourcePack.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/ResourcePack.java @@ -151,12 +151,13 @@ public void load(File... sources) throws InterruptedException { //load blockstates String namespace = namespaceRoot.substring("assets/".length()); Logger.global.logInfo("Loading " + namespace + " assets (" + i + "/" + namespaces.size() + ")..."); - - Collection blockstateFiles = sourcesAccess.listFiles(namespaceRoot + "/blockstates", true); + + String blockstatesRootPath = namespaceRoot + "/blockstates"; + Collection blockstateFiles = sourcesAccess.listFiles(blockstatesRootPath, true); for (String blockstateFile : blockstateFiles) { if (Thread.interrupted()) throw new InterruptedException(); - String filename = FileAccess.getFileName(blockstateFile); + String filename = blockstateFile.substring(blockstatesRootPath.length() + 1); if (!filename.endsWith(".json")) continue; try { From b9d55661b8d64cc9b2067da6008cf678ef8f344a Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Tue, 10 Aug 2021 21:46:20 +0200 Subject: [PATCH 3/3] Fix sponge changes --- .../java/de/bluecolored/bluemap/sponge8/SpongeCommands.java | 2 +- .../main/java/de/bluecolored/bluemap/sponge8/SpongePlugin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge8/SpongeCommands.java b/implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge8/SpongeCommands.java index c41ff2d2..f963f236 100644 --- a/implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge8/SpongeCommands.java +++ b/implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge8/SpongeCommands.java @@ -93,7 +93,7 @@ public CommandResult process(CommandCause cause, ArgumentReader.Mutable argument String context = ex.getContext(); if (context != null) cause.audience().sendMessage(Component.text(context, NamedTextColor.GRAY)); - return CommandResult.empty(); + return CommandResult.builder().result(0).build(); } } diff --git a/implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge8/SpongePlugin.java b/implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge8/SpongePlugin.java index fa976c4f..ff30c930 100644 --- a/implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge8/SpongePlugin.java +++ b/implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge8/SpongePlugin.java @@ -186,7 +186,7 @@ public void registerListener(ServerEventListener listener) { @Override public void unregisterAllListeners() { - Sponge.eventManager().unregisterPluginListeners(this.pluginContainer); + Sponge.eventManager().unregisterListeners(this.pluginContainer); Sponge.eventManager().registerListeners(this.pluginContainer, this); }