From c61c984d6f207812ecfc1a8b28ca584df6c14fca Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Mon, 11 May 2020 20:07:39 +0200 Subject: [PATCH 1/9] Start implementing a fabric target --- BlueMapFabric/build.gradle | 54 +++++++++++ .../bluemap/fabric/FabricCommandSource.java | 84 ++++++++++++++++++ .../bluecolored/bluemap/fabric/FabricMod.java | 63 +++++++++++++ .../bluemap/fabric/Log4jLogger.java | 69 ++++++++++++++ .../main/resources/assets/bluemap/icon.png | Bin 0 -> 10593 bytes .../src/main/resources/bluemap.mixins.json | 13 +++ .../src/main/resources/fabric.mod.json | 35 ++++++++ build.gradle | 8 ++ settings.gradle | 13 +++ 9 files changed, 339 insertions(+) create mode 100644 BlueMapFabric/build.gradle create mode 100644 BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricCommandSource.java create mode 100644 BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java create mode 100644 BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/Log4jLogger.java create mode 100644 BlueMapFabric/src/main/resources/assets/bluemap/icon.png create mode 100644 BlueMapFabric/src/main/resources/bluemap.mixins.json create mode 100644 BlueMapFabric/src/main/resources/fabric.mod.json diff --git a/BlueMapFabric/build.gradle b/BlueMapFabric/build.gradle new file mode 100644 index 00000000..1b3103df --- /dev/null +++ b/BlueMapFabric/build.gradle @@ -0,0 +1,54 @@ +plugins { + id 'fabric-loom' version '0.2.7-SNAPSHOT' +} + +configurations { + compile.extendsFrom include +} + +dependencies { + minecraft "com.mojang:minecraft:1.15.2" + mappings "net.fabricmc:yarn:1.15.2+build.15:v2" + modImplementation "net.fabricmc:fabric-loader:0.8.2+build.194" + modImplementation "net.fabricmc.fabric-api:fabric-api:0.5.1+build.294-1.15" + + include (project(':BlueMapCommon')) { + //exclude dependencies provided by fabric + exclude group: 'com.google.guava', module: 'guava' + exclude group: 'com.google.code.gson', module: 'gson' + exclude group: 'org.apache.commons', module: 'commons-lang3' + exclude group: 'commons-io', module: 'commons-io' + exclude group: 'com.mojang', module: 'brigadier' + } +} + +build.dependsOn shadowJar { + destinationDir = file '../build/unsupported' + archiveFileName = "BlueMap-${version}-fabric.jar" + + configurations = [project.configurations.include] + + //relocate 'com.flowpowered.math', 'de.bluecolored.shadow.flowpowered.math' //DON'T relocate this, because the API depends on it + relocate 'com.typesafe.config', 'de.bluecolored.shadow.typesafe.config' + relocate 'net.querz.nbt', 'de.bluecolored.shadow.querz.nbt' + relocate 'ninja.leaping.configurate', 'de.bluecolored.shadow.ninja.leaping.configurate' + relocate 'org.yaml.snakeyaml', 'de.bluecolored.shadow.yaml.snakeyaml' +} + +processResources { + inputs.property "version", project.version + + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } + + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } +} + +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = "sources" + from sourceSets.main.allSource +} diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricCommandSource.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricCommandSource.java new file mode 100644 index 00000000..ed9b1542 --- /dev/null +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricCommandSource.java @@ -0,0 +1,84 @@ +/* + * This file is part of BlueMap, licensed under the MIT License (MIT). + * + * Copyright (c) Blue (Lukas Rieger) + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package de.bluecolored.bluemap.fabric; + +import java.io.IOException; +import java.util.Optional; + +import com.flowpowered.math.vector.Vector3d; + +import de.bluecolored.bluemap.common.plugin.Plugin; +import de.bluecolored.bluemap.common.plugin.serverinterface.CommandSource; +import de.bluecolored.bluemap.common.plugin.text.Text; +import de.bluecolored.bluemap.core.world.World; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.Vec3d; + +public class FabricCommandSource implements CommandSource { + + private FabricMod mod; + private Plugin plugin; + private ServerCommandSource delegate; + + public FabricCommandSource(FabricMod mod, Plugin plugin, ServerCommandSource delegate) { + this.mod = mod; + this.plugin = plugin; + this.delegate = delegate; + } + + @Override + public void sendMessage(Text text) { + delegate.sendFeedback(net.minecraft.text.Text.Serializer.fromJson(text.toJSONString()), false); + } + + @Override + public boolean hasPermission(String permission) { + return delegate.hasPermissionLevel(1); + } + + @Override + public Optional getPosition() { + Vec3d pos = delegate.getPosition(); + if (pos != null) { + return Optional.of(new Vector3d(pos.x, pos.y, pos.z)); + } + + return Optional.empty(); + } + + @Override + public Optional getWorld() { + try { + ServerWorld world = delegate.getWorld(); + if (world != null) { + return Optional.ofNullable(plugin.getWorld(mod.getUUIDForWorld(world))); + } + } catch (IOException ignore) {} + + return Optional.empty(); + } + +} diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java new file mode 100644 index 00000000..2fb082c1 --- /dev/null +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java @@ -0,0 +1,63 @@ +package de.bluecolored.bluemap.fabric; + +import java.io.File; +import java.io.IOException; +import java.util.UUID; + +import org.apache.logging.log4j.LogManager; + +import de.bluecolored.bluemap.common.plugin.Plugin; +import de.bluecolored.bluemap.common.plugin.commands.Commands; +import de.bluecolored.bluemap.common.plugin.serverinterface.ServerEventListener; +import de.bluecolored.bluemap.common.plugin.serverinterface.ServerInterface; +import de.bluecolored.bluemap.core.logger.Logger; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.registry.CommandRegistry; +import net.minecraft.server.world.ServerWorld; + +public class FabricMod implements ModInitializer, ServerInterface { + + private Plugin plugin; + + @Override + public void onInitialize() { + Logger.global = new Log4jLogger(LogManager.getLogger(Plugin.PLUGIN_NAME)); + + this.plugin = new Plugin("forge", this); + + //register commands + CommandRegistry.INSTANCE.register(true, dispatcher -> { + new Commands<>(plugin, dispatcher, fabricSource -> new FabricCommandSource(this, plugin, fabricSource)); + }); + } + + public UUID getUUIDForWorld(ServerWorld world) throws IOException { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Not implemented!"); + } + + @Override + public void registerListener(ServerEventListener listener) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Not implemented!"); + } + + @Override + public void unregisterAllListeners() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Not implemented!"); + } + + @Override + public UUID getUUIDForWorld(File worldFolder) throws IOException { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Not implemented!"); + } + + @Override + public File getConfigFolder() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Not implemented!"); + } + +} diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/Log4jLogger.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/Log4jLogger.java new file mode 100644 index 00000000..41206a3b --- /dev/null +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/Log4jLogger.java @@ -0,0 +1,69 @@ +/* + * This file is part of BlueMapSponge, licensed under the MIT License (MIT). + * + * Copyright (c) Blue (Lukas Rieger) + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package de.bluecolored.bluemap.fabric; + +import org.apache.logging.log4j.Logger; + +import de.bluecolored.bluemap.core.logger.AbstractLogger; + +public class Log4jLogger extends AbstractLogger { + + private Logger out; + + public Log4jLogger(Logger out) { + this.out = out; + } + + @Override + public void logError(String message, Throwable throwable) { + out.error(message, throwable); + } + + @Override + public void logWarning(String message) { + out.warn(message); + } + + @Override + public void logInfo(String message) { + out.info(message); + } + + @Override + public void logDebug(String message) { + if (out.isDebugEnabled()) out.debug(message); + } + + @Override + public void noFloodDebug(String message) { + if (out.isDebugEnabled()) super.noFloodDebug(message); + } + + @Override + public void noFloodDebug(String key, String message) { + if (out.isDebugEnabled()) super.noFloodDebug(key, message); + } + +} diff --git a/BlueMapFabric/src/main/resources/assets/bluemap/icon.png b/BlueMapFabric/src/main/resources/assets/bluemap/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..65d56d7a88fd8adb9003df6e0c10424b0ec8e375 GIT binary patch literal 10593 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 vi6!A+?}%zq>>?r?=0.7.4", + "fabric": "*", + "minecraft": "1.15.x" + }, + "suggests": {} +} diff --git a/build.gradle b/build.gradle index 0b5089b0..fef52440 100644 --- a/build.gradle +++ b/build.gradle @@ -24,10 +24,18 @@ allprojects { maven { url "https://libraries.minecraft.net" } + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } } compileJava.options.compilerArgs.add '-parameters' compileTestJava.options.compilerArgs.add '-parameters' + + tasks.withType(JavaCompile) { + options.encoding = "UTF-8" + } apply plugin: 'java' diff --git a/settings.gradle b/settings.gradle index fd1b97fc..dd4abee2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,14 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} + rootProject.name = 'BlueMap' include ':BlueMapCore' include ':BlueMapCLI' @@ -6,6 +17,7 @@ include ':BlueMapSponge' include ':BlueMapBukkit' include ':BlueMapForge' include ':BlueMapAPI' +include ':BlueMapFabric' project(':BlueMapCore').projectDir = "$rootDir/BlueMapCore" as File project(':BlueMapCLI').projectDir = "$rootDir/BlueMapCLI" as File @@ -14,3 +26,4 @@ project(':BlueMapSponge').projectDir = "$rootDir/BlueMapSponge" as File project(':BlueMapBukkit').projectDir = "$rootDir/BlueMapBukkit" as File project(':BlueMapForge').projectDir = "$rootDir/BlueMapForge" as File project(':BlueMapAPI').projectDir = "$rootDir/BlueMapAPI" as File +project(':BlueMapFabric').projectDir = "$rootDir/BlueMapFabric" as File From e1370c81574c0b7730c93ecf7591b957342f8885 Mon Sep 17 00:00:00 2001 From: Brandon Davis Date: Tue, 12 May 2020 12:49:44 -0500 Subject: [PATCH 2/9] include dependencies with new task --- BlueMapFabric/build.gradle | 45 +++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/BlueMapFabric/build.gradle b/BlueMapFabric/build.gradle index 1b3103df..d75cc224 100644 --- a/BlueMapFabric/build.gradle +++ b/BlueMapFabric/build.gradle @@ -1,3 +1,5 @@ +import net.fabricmc.loom.task.RemapJarTask + plugins { id 'fabric-loom' version '0.2.7-SNAPSHOT' } @@ -11,8 +13,8 @@ dependencies { mappings "net.fabricmc:yarn:1.15.2+build.15:v2" modImplementation "net.fabricmc:fabric-loader:0.8.2+build.194" modImplementation "net.fabricmc.fabric-api:fabric-api:0.5.1+build.294-1.15" - - include (project(':BlueMapCommon')) { + + compile (project(':BlueMapCommon')) { //exclude dependencies provided by fabric exclude group: 'com.google.guava', module: 'guava' exclude group: 'com.google.code.gson', module: 'gson' @@ -22,19 +24,6 @@ dependencies { } } -build.dependsOn shadowJar { - destinationDir = file '../build/unsupported' - archiveFileName = "BlueMap-${version}-fabric.jar" - - configurations = [project.configurations.include] - - //relocate 'com.flowpowered.math', 'de.bluecolored.shadow.flowpowered.math' //DON'T relocate this, because the API depends on it - relocate 'com.typesafe.config', 'de.bluecolored.shadow.typesafe.config' - relocate 'net.querz.nbt', 'de.bluecolored.shadow.querz.nbt' - relocate 'ninja.leaping.configurate', 'de.bluecolored.shadow.ninja.leaping.configurate' - relocate 'org.yaml.snakeyaml', 'de.bluecolored.shadow.yaml.snakeyaml' -} - processResources { inputs.property "version", project.version @@ -48,6 +37,32 @@ processResources { } } +shadowJar { + configurations = [project.configurations.compile] + + dependencies { + include(dependency(':BlueMapCommon')) + include(dependency(':BlueMapCore')) + include(dependency(':BlueMapAPI')) + } + + //relocate 'com.flowpowered.math', 'de.bluecolored.shadow.flowpowered.math' //DON'T relocate this, because the API depends on it + relocate 'com.typesafe.config', 'de.bluecolored.shadow.typesafe.config' + relocate 'net.querz.nbt', 'de.bluecolored.shadow.querz.nbt' + relocate 'ninja.leaping.configurate', 'de.bluecolored.shadow.ninja.leaping.configurate' + relocate 'org.yaml.snakeyaml', 'de.bluecolored.shadow.yaml.snakeyaml' + + exclude '/mappings/*' +} + +task ramappedShadowJar(type: RemapJarTask) { + destinationDir = file '../build/unsupported' + dependsOn tasks.shadowJar + input = tasks.shadowJar.archivePath + addNestedDependencies = true + archiveName = "BlueMap-${version}-fabric.jar" +} + task sourcesJar(type: Jar, dependsOn: classes) { classifier = "sources" from sourceSets.main.allSource From 2a0aecf3591a3e67ae9da8398e8bb5c5fd56c1ef Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Fri, 31 Jul 2020 09:50:25 +0200 Subject: [PATCH 3/9] Add tint-color for the stonecutter. Fixes #63 --- BlueMapCore/src/main/resources/blockColors.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BlueMapCore/src/main/resources/blockColors.json b/BlueMapCore/src/main/resources/blockColors.json index 24cf4889..b5c34f4e 100644 --- a/BlueMapCore/src/main/resources/blockColors.json +++ b/BlueMapCore/src/main/resources/blockColors.json @@ -9,5 +9,6 @@ "minecraft:large_fern": "@grass", "minecraft:redstone_wire": "#ff0000", "minecraft:birch_leaves": "#86a863", - "minecraft:spruce_leaves": "#51946b" + "minecraft:spruce_leaves": "#51946b", + "minecraft:stonecutter": "#ffffff" } \ No newline at end of file From e40c3bd0d515dc2ea6843fd8fd49bcbb05c5fb58 Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Mon, 3 Aug 2020 00:10:00 +0200 Subject: [PATCH 4/9] Change hash code generation to improve performance --- .../main/java/de/bluecolored/bluemap/core/mca/MCAWorld.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/MCAWorld.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/MCAWorld.java index e2251f21..bbf95e66 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/MCAWorld.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/MCAWorld.java @@ -38,7 +38,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.function.Predicate; @@ -506,7 +505,7 @@ public WorldChunkHash(MCAWorld world, Vector2i chunk) { @Override public int hashCode() { - return Objects.hash(world, chunk); + return (world.hashCode() * 31 + chunk.getX()) * 31 + chunk.getY(); } @Override From 9283f2caec15c86dc293442feefcc754e5213135 Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Mon, 3 Aug 2020 00:10:37 +0200 Subject: [PATCH 5/9] Tidy up some chunkloading math --- .../bluemap/core/mca/ChunkAnvil113.java | 31 +------- .../bluemap/core/mca/ChunkAnvil115.java | 31 +------- .../bluemap/core/mca/ChunkAnvil116.java | 26 +------ .../bluecolored/bluemap/core/mca/MCAMath.java | 74 +++++++++++++++++++ 4 files changed, 83 insertions(+), 79 deletions(-) create mode 100644 BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/MCAMath.java diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil113.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil113.java index 60cd87b2..4871b80b 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil113.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil113.java @@ -198,20 +198,8 @@ public BlockState getBlockState(Vector3i pos) { int y = pos.getY() & 0xF; int z = pos.getZ() & 0xF; int blockIndex = y * 256 + z * 16 + x; - int index = blockIndex * bitsPerBlock; - int firstLong = index >> 6; // index / 64 - int bitoffset = index & 0x3F; // Math.floorMod(index, 64) - - long value = blocks[firstLong] >>> bitoffset; - - if (bitoffset > 0 && firstLong + 1 < blocks.length) { - long value2 = blocks[firstLong + 1]; - value2 = value2 << -bitoffset; - value = value | value2; - } - - value = value & (0xFFFFFFFFFFFFFFFFL >>> -bitsPerBlock); + long value = MCAMath.getValueFromLongStream(blocks, blockIndex, bitsPerBlock); if (value >= palette.length) { Logger.global.noFloodWarning("palettewarning", "Got palette value " + value + " but palette has size of " + palette.length + " (Future occasions of this error will not be logged)"); return BlockState.MISSING; @@ -230,24 +218,11 @@ public LightData getLightData(Vector3i pos) { int blockHalfByteIndex = blockByteIndex >> 1; // blockByteIndex / 2 boolean largeHalf = (blockByteIndex & 0x1) != 0; // (blockByteIndex % 2) == 0 - int blockLight = this.blockLight.length > 0 ? getByteHalf(this.blockLight[blockHalfByteIndex], largeHalf) : 0; - int skyLight = this.skyLight.length > 0 ? getByteHalf(this.skyLight[blockHalfByteIndex], largeHalf) : 0; + int blockLight = this.blockLight.length > 0 ? MCAMath.getByteHalf(this.blockLight[blockHalfByteIndex], largeHalf) : 0; + int skyLight = this.skyLight.length > 0 ? MCAMath.getByteHalf(this.skyLight[blockHalfByteIndex], largeHalf) : 0; return new LightData(skyLight, blockLight); } - - /** - * Extracts the 4 bits of the left (largeHalf = true) or the right (largeHalf = false) side of the byte stored in value.
- * The value is treated as an unsigned byte. - */ - private int getByteHalf(int value, boolean largeHalf) { - value = value & 0xFF; - if (largeHalf) { - value = value >> 4; - } - value = value & 0xF; - return value; - } } } diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil115.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil115.java index 4b36ad1e..c96b8932 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil115.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil115.java @@ -199,20 +199,8 @@ public BlockState getBlockState(Vector3i pos) { int y = pos.getY() & 0xF; int z = pos.getZ() & 0xF; int blockIndex = y * 256 + z * 16 + x; - int index = blockIndex * bitsPerBlock; - int firstLong = index >> 6; // index / 64 - int bitoffset = index & 0x3F; // Math.floorMod(index, 64) - - long value = blocks[firstLong] >>> bitoffset; - - if (bitoffset > 0 && firstLong + 1 < blocks.length) { - long value2 = blocks[firstLong + 1]; - value2 = value2 << -bitoffset; - value = value | value2; - } - - value = value & (0xFFFFFFFFFFFFFFFFL >>> -bitsPerBlock); + long value = MCAMath.getValueFromLongStream(blocks, blockIndex, bitsPerBlock); if (value >= palette.length) { Logger.global.noFloodWarning("palettewarning", "Got palette value " + value + " but palette has size of " + palette.length + " (Future occasions of this error will not be logged)"); return BlockState.MISSING; @@ -231,24 +219,11 @@ public LightData getLightData(Vector3i pos) { int blockHalfByteIndex = blockByteIndex >> 1; // blockByteIndex / 2 boolean largeHalf = (blockByteIndex & 0x1) != 0; // (blockByteIndex % 2) == 0 - int blockLight = this.blockLight.length > 0 ? getByteHalf(this.blockLight[blockHalfByteIndex], largeHalf) : 0; - int skyLight = this.skyLight.length > 0 ? getByteHalf(this.skyLight[blockHalfByteIndex], largeHalf) : 0; + int blockLight = this.blockLight.length > 0 ? MCAMath.getByteHalf(this.blockLight[blockHalfByteIndex], largeHalf) : 0; + int skyLight = this.skyLight.length > 0 ? MCAMath.getByteHalf(this.skyLight[blockHalfByteIndex], largeHalf) : 0; return new LightData(skyLight, blockLight); } - - /** - * Extracts the 4 bits of the left (largeHalf = true) or the right (largeHalf = false) side of the byte stored in value.
- * The value is treated as an unsigned byte. - */ - private int getByteHalf(int value, boolean largeHalf) { - value = value & 0xFF; - if (largeHalf) { - value = value >> 4; - } - value = value & 0xF; - return value; - } } } diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil116.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil116.java index bb185642..637a467f 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil116.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil116.java @@ -145,7 +145,6 @@ private class Section { private BlockState[] palette; private int bitsPerBlock; - private int blocksPerLong; @SuppressWarnings("unchecked") public Section(CompoundTag sectionData) { @@ -189,7 +188,6 @@ public Section(CompoundTag sectionData) { this.bitsPerBlock = 32 - Integer.numberOfLeadingZeros(palette.length - 1); if (this.bitsPerBlock < 4) this.bitsPerBlock = 4; - this.blocksPerLong = 64 / bitsPerBlock; } public int getSectionY() { @@ -203,13 +201,8 @@ public BlockState getBlockState(Vector3i pos) { int y = pos.getY() & 0xF; int z = pos.getZ() & 0xF; int blockIndex = y * 256 + z * 16 + x; - int longIndex = blockIndex / blocksPerLong; - int bitIndex = (blockIndex % blocksPerLong) * bitsPerBlock; - - long value = blocks[longIndex] >>> bitIndex; - value = value & (0xFFFFFFFFFFFFFFFFL >>> -bitsPerBlock); - + long value = MCAMath.getValueFromLongArray(blocks, blockIndex, bitsPerBlock); if (value >= palette.length) { Logger.global.noFloodWarning("palettewarning", "Got palette value " + value + " but palette has size of " + palette.length + "! (Future occasions of this error will not be logged)"); return BlockState.MISSING; @@ -228,24 +221,11 @@ public LightData getLightData(Vector3i pos) { int blockHalfByteIndex = blockByteIndex >> 1; // blockByteIndex / 2 boolean largeHalf = (blockByteIndex & 0x1) != 0; // (blockByteIndex % 2) == 0 - int blockLight = this.blockLight.length > 0 ? getByteHalf(this.blockLight[blockHalfByteIndex], largeHalf) : 0; - int skyLight = this.skyLight.length > 0 ? getByteHalf(this.skyLight[blockHalfByteIndex], largeHalf) : 0; + int blockLight = this.blockLight.length > 0 ? MCAMath.getByteHalf(this.blockLight[blockHalfByteIndex], largeHalf) : 0; + int skyLight = this.skyLight.length > 0 ? MCAMath.getByteHalf(this.skyLight[blockHalfByteIndex], largeHalf) : 0; return new LightData(skyLight, blockLight); } - - /** - * Extracts the 4 bits of the left (largeHalf = true) or the right (largeHalf = false) side of the byte stored in value.
- * The value is treated as an unsigned byte. - */ - private int getByteHalf(int value, boolean largeHalf) { - value = value & 0xFF; - if (largeHalf) { - value = value >> 4; - } - value = value & 0xF; - return value; - } } } diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/MCAMath.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/MCAMath.java new file mode 100644 index 00000000..e8ccf810 --- /dev/null +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/MCAMath.java @@ -0,0 +1,74 @@ +/* + * This file is part of BlueMap, licensed under the MIT License (MIT). + * + * Copyright (c) Blue (Lukas Rieger) + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package de.bluecolored.bluemap.core.mca; + +public class MCAMath { + + /** + * Having a long array where each long contains as many values as fit in it without overflowing, returning the "valueIndex"-th value when each value has "bitsPerValue" bits. + */ + public static long getValueFromLongArray(long[] data, int valueIndex, int bitsPerValue) { + int valuesPerLong = 64 / bitsPerValue; + int longIndex = valueIndex / valuesPerLong; + int bitIndex = (valueIndex % valuesPerLong) * bitsPerValue; + + long value = data[longIndex] >>> bitIndex; + + return value & (0xFFFFFFFFFFFFFFFFL >>> -bitsPerValue); + } + + /** + * Treating the long array "data" as a continuous stream of bits, returning the "valueIndex"-th value when each value has "bitsPerValue" bits. + */ + public static long getValueFromLongStream(long[] data, int valueIndex, int bitsPerValue) { + int bitIndex = valueIndex * bitsPerValue; + int firstLong = bitIndex >> 6; // index / 64 + int bitoffset = bitIndex & 0x3F; // Math.floorMod(index, 64) + + long value = data[firstLong] >>> bitoffset; + + if (bitoffset > 0 && firstLong + 1 < data.length) { + long value2 = data[firstLong + 1]; + value2 = value2 << -bitoffset; + value = value | value2; + } + + return value & (0xFFFFFFFFFFFFFFFFL >>> -bitsPerValue); + } + + /** + * Extracts the 4 bits of the left (largeHalf = true) or the right (largeHalf = false) side of the byte stored in value.
+ * The value is treated as an unsigned byte. + */ + public static int getByteHalf(int value, boolean largeHalf) { + value = value & 0xFF; + if (largeHalf) { + value = value >> 4; + } + value = value & 0xF; + return value; + } + +} From 7861405f605e57f57e1611085cc6212156d619ca Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Mon, 3 Aug 2020 14:15:05 +0200 Subject: [PATCH 6/9] Fix Fabric build script and implement the fabric-plugin --- .../common/plugin/MapUpdateHandler.java | 13 +- .../bluemap/common/plugin/Plugin.java | 10 +- BlueMapFabric/build.gradle | 15 +- .../bluemap/fabric/FabricEventForwarder.java | 95 ++++++++++ .../bluecolored/bluemap/fabric/FabricMod.java | 99 +++++++++-- .../fabric/events/ChunkFinalizeCallback.java | 19 ++ .../fabric/events/WorldSaveCallback.java | 17 ++ .../fabric/mixin/MixinChunkGenerator.java | 32 ++++ .../fabric/mixin/MixinServerWorld.java | 21 +++ .../resources/bluemap-fabric-defaults.conf | 11 ++ .../src/main/resources/bluemap-fabric.conf | 166 ++++++++++++++++++ .../src/main/resources/bluemap.mixins.json | 26 +-- .../bluecolored/bluemap/forge/ForgeMod.java | 25 +++ 13 files changed, 495 insertions(+), 54 deletions(-) create mode 100644 BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricEventForwarder.java create mode 100644 BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/ChunkFinalizeCallback.java create mode 100644 BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/WorldSaveCallback.java create mode 100644 BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinChunkGenerator.java create mode 100644 BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinServerWorld.java create mode 100644 BlueMapFabric/src/main/resources/bluemap-fabric-defaults.conf create mode 100644 BlueMapFabric/src/main/resources/bluemap-fabric.conf diff --git a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/MapUpdateHandler.java b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/MapUpdateHandler.java index 8f8b9925..ac69cd1a 100644 --- a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/MapUpdateHandler.java +++ b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/MapUpdateHandler.java @@ -38,15 +38,18 @@ public class MapUpdateHandler implements ServerEventListener { - public Multimap updateBuffer; + private Plugin plugin; - public MapUpdateHandler() { + private Multimap updateBuffer; + + public MapUpdateHandler(Plugin plugin) { + this.plugin = plugin; updateBuffer = MultimapBuilder.hashKeys().hashSetValues().build(); } @Override public void onWorldSaveToDisk(final UUID world) { - RenderManager renderManager = Plugin.getInstance().getRenderManager(); + RenderManager renderManager = plugin.getRenderManager(); new Thread(() -> { try { @@ -106,7 +109,7 @@ private void updateChunk(UUID world, Vector2i chunkPos) { private void updateBlock(UUID world, Vector3i pos){ synchronized (updateBuffer) { - for (MapType mapType : Plugin.getInstance().getMapTypes()) { + for (MapType mapType : plugin.getMapTypes()) { if (mapType.getWorld().getUUID().equals(world)) { mapType.getWorld().invalidateChunkCache(mapType.getWorld().blockPosToChunkPos(pos)); @@ -122,7 +125,7 @@ public int getUpdateBufferCount() { } public void flushTileBuffer() { - RenderManager renderManager = Plugin.getInstance().getRenderManager(); + RenderManager renderManager = plugin.getRenderManager(); synchronized (updateBuffer) { for (MapType map : updateBuffer.keySet()) { diff --git a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java index 7c0ef346..17daded0 100644 --- a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java +++ b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java @@ -72,8 +72,6 @@ public class Plugin { public static final String PLUGIN_ID = "bluemap"; public static final String PLUGIN_NAME = "BlueMap"; - - private static Plugin instance; private BlueMapAPIImpl api; @@ -104,8 +102,6 @@ public Plugin(String implementationType, ServerInterface serverInterface) { this.maps = new HashMap<>(); this.worlds = new HashMap<>(); - - instance = this; } public synchronized void load() throws IOException, ParseResourceException { @@ -270,7 +266,7 @@ public synchronized void load() throws IOException, ParseResourceException { periodicalSaveThread.start(); //start map updater - this.updateHandler = new MapUpdateHandler(); + this.updateHandler = new MapUpdateHandler(this); serverInterface.registerListener(updateHandler); //create/update webfiles @@ -427,8 +423,4 @@ public boolean isLoaded() { return loaded; } - public static Plugin getInstance() { - return instance; - } - } diff --git a/BlueMapFabric/build.gradle b/BlueMapFabric/build.gradle index d75cc224..c94a5520 100644 --- a/BlueMapFabric/build.gradle +++ b/BlueMapFabric/build.gradle @@ -5,7 +5,7 @@ plugins { } configurations { - compile.extendsFrom include + compile.extendsFrom shadowInclude } dependencies { @@ -14,7 +14,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:0.8.2+build.194" modImplementation "net.fabricmc.fabric-api:fabric-api:0.5.1+build.294-1.15" - compile (project(':BlueMapCommon')) { + shadowInclude (project(':BlueMapCommon')) { //exclude dependencies provided by fabric exclude group: 'com.google.guava', module: 'guava' exclude group: 'com.google.code.gson', module: 'gson' @@ -38,13 +38,7 @@ processResources { } shadowJar { - configurations = [project.configurations.compile] - - dependencies { - include(dependency(':BlueMapCommon')) - include(dependency(':BlueMapCore')) - include(dependency(':BlueMapAPI')) - } + configurations = [project.configurations.shadowInclude] //relocate 'com.flowpowered.math', 'de.bluecolored.shadow.flowpowered.math' //DON'T relocate this, because the API depends on it relocate 'com.typesafe.config', 'de.bluecolored.shadow.typesafe.config' @@ -52,7 +46,7 @@ shadowJar { relocate 'ninja.leaping.configurate', 'de.bluecolored.shadow.ninja.leaping.configurate' relocate 'org.yaml.snakeyaml', 'de.bluecolored.shadow.yaml.snakeyaml' - exclude '/mappings/*' + //exclude '/mappings/*' } task ramappedShadowJar(type: RemapJarTask) { @@ -62,6 +56,7 @@ task ramappedShadowJar(type: RemapJarTask) { addNestedDependencies = true archiveName = "BlueMap-${version}-fabric.jar" } +build.dependsOn ramappedShadowJar task sourcesJar(type: Jar, dependsOn: classes) { classifier = "sources" diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricEventForwarder.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricEventForwarder.java new file mode 100644 index 00000000..d46fd3e5 --- /dev/null +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricEventForwarder.java @@ -0,0 +1,95 @@ +package de.bluecolored.bluemap.fabric; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.UUID; + +import com.flowpowered.math.vector.Vector2i; +import com.flowpowered.math.vector.Vector3i; + +import de.bluecolored.bluemap.common.plugin.serverinterface.ServerEventListener; +import de.bluecolored.bluemap.core.logger.Logger; +import de.bluecolored.bluemap.fabric.events.ChunkFinalizeCallback; +import de.bluecolored.bluemap.fabric.events.WorldSaveCallback; +import net.fabricmc.fabric.api.event.player.AttackBlockCallback; +import net.fabricmc.fabric.api.event.player.UseBlockCallback; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; + +public class FabricEventForwarder { + + private FabricMod mod; + private Collection eventListeners; + + public FabricEventForwarder(FabricMod mod) { + this.mod = mod; + this.eventListeners = new ArrayList<>(1); + + WorldSaveCallback.EVENT.register(this::onWorldSave); + ChunkFinalizeCallback.EVENT.register(this::onChunkFinalize); + AttackBlockCallback.EVENT.register(this::onBlockAttack); + UseBlockCallback.EVENT.register(this::onBlockUse); + } + + public void addEventListener(ServerEventListener listener) { + this.eventListeners.add(listener); + } + + public void removeAllListeners() { + this.eventListeners.clear(); + } + + + public ActionResult onBlockUse(PlayerEntity player, World world, Hand hand, BlockHitResult hitResult) { + if (world instanceof ServerWorld) { + onBlockChange((ServerWorld) world, hitResult.getBlockPos()); + } + + return ActionResult.PASS; + } + + public ActionResult onBlockAttack(PlayerEntity player, World world, Hand hand, BlockPos pos, Direction direction) { + if (world instanceof ServerWorld) { + onBlockChange((ServerWorld) world, pos); + } + + return ActionResult.PASS; + } + + public void onBlockChange(ServerWorld world, BlockPos blockPos) { + Vector3i position = new Vector3i(blockPos.getX(), blockPos.getY(), blockPos.getZ()); + + try { + UUID uuid = mod.getUUIDForWorld(world); + eventListeners.forEach(e -> e.onBlockChange(uuid, position)); + } catch (IOException e) { + Logger.global.logError("Failed to get UUID for world: " + world, e); + } + } + + public void onWorldSave(ServerWorld world) { + try { + UUID uuid = mod.getUUIDForWorld(world); + eventListeners.forEach(e -> e.onWorldSaveToDisk(uuid)); + } catch (IOException e) { + Logger.global.logError("Failed to get UUID for world: " + world, e); + } + } + + public void onChunkFinalize(ServerWorld world, Vector2i chunkPos) { + try { + UUID uuid = mod.getUUIDForWorld(world); + eventListeners.forEach(e -> e.onChunkFinishedGeneration(uuid, chunkPos)); + } catch (IOException e) { + Logger.global.logError("Failed to get UUID for world: " + world, e); + } + } + +} diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java index 2fb082c1..bf095dba 100644 --- a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java @@ -2,62 +2,125 @@ import java.io.File; import java.io.IOException; +import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutionException; import org.apache.logging.log4j.LogManager; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; + import de.bluecolored.bluemap.common.plugin.Plugin; import de.bluecolored.bluemap.common.plugin.commands.Commands; import de.bluecolored.bluemap.common.plugin.serverinterface.ServerEventListener; import de.bluecolored.bluemap.common.plugin.serverinterface.ServerInterface; import de.bluecolored.bluemap.core.logger.Logger; +import de.bluecolored.bluemap.core.resourcepack.ParseResourceException; import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.event.server.ServerStartCallback; +import net.fabricmc.fabric.api.event.server.ServerStopCallback; import net.fabricmc.fabric.api.registry.CommandRegistry; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.world.ServerWorld; public class FabricMod implements ModInitializer, ServerInterface { + + private Plugin pluginInstance = null; - private Plugin plugin; + private Map worldUuids; + private FabricEventForwarder eventForwarder; + + private LoadingCache worldUuidCache; + + public FabricMod() { + Logger.global = new Log4jLogger(LogManager.getLogger(Plugin.PLUGIN_NAME)); + + pluginInstance = new Plugin("fabric", this); + + this.worldUuids = new ConcurrentHashMap<>(); + this.eventForwarder = new FabricEventForwarder(this); + this.worldUuidCache = CacheBuilder.newBuilder() + .weakKeys() + .maximumSize(1000) + .build(new CacheLoader() { + @Override + public UUID load(ServerWorld key) throws Exception { + return loadUUIDForWorld(key); + } + }); + } @Override public void onInitialize() { - Logger.global = new Log4jLogger(LogManager.getLogger(Plugin.PLUGIN_NAME)); - - this.plugin = new Plugin("forge", this); //register commands CommandRegistry.INSTANCE.register(true, dispatcher -> { - new Commands<>(plugin, dispatcher, fabricSource -> new FabricCommandSource(this, plugin, fabricSource)); + new Commands<>(pluginInstance, dispatcher, fabricSource -> new FabricCommandSource(this, pluginInstance, fabricSource)); + }); + + ServerStartCallback.EVENT.register((MinecraftServer server) -> { + new Thread(()->{ + Logger.global.logInfo("Loading BlueMap..."); + + try { + pluginInstance.load(); + Logger.global.logInfo("BlueMap loaded!"); + } catch (IOException | ParseResourceException e) { + Logger.global.logError("Failed to load bluemap!", e); + } + }).start(); + }); + + ServerStopCallback.EVENT.register((MinecraftServer server) -> { + pluginInstance.unload(); + Logger.global.logInfo("BlueMap unloaded!"); }); } - public UUID getUUIDForWorld(ServerWorld world) throws IOException { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Not implemented!"); - } - @Override public void registerListener(ServerEventListener listener) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Not implemented!"); + eventForwarder.addEventListener(listener); } @Override public void unregisterAllListeners() { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Not implemented!"); + eventForwarder.removeAllListeners(); } @Override public UUID getUUIDForWorld(File worldFolder) throws IOException { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Not implemented!"); + worldFolder = worldFolder.getCanonicalFile(); + + UUID uuid = worldUuids.get(worldFolder); + if (uuid == null) { + uuid = UUID.randomUUID(); + worldUuids.put(worldFolder, uuid); + } + + return uuid; + } + + public UUID getUUIDForWorld(ServerWorld world) throws IOException { + try { + return worldUuidCache.get(world); + } catch (ExecutionException e) { + Throwable cause = e.getCause(); + if (cause instanceof IOException) throw (IOException) cause; + else throw new IOException(cause); + } + } + + private UUID loadUUIDForWorld(ServerWorld world) throws IOException { + File dimensionDir = world.getDimension().getType().getSaveDirectory(world.getSaveHandler().getWorldDir()); + return getUUIDForWorld(dimensionDir); } @Override public File getConfigFolder() { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Not implemented!"); + return new File("config/bluemap"); } } diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/ChunkFinalizeCallback.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/ChunkFinalizeCallback.java new file mode 100644 index 00000000..bf20dd88 --- /dev/null +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/ChunkFinalizeCallback.java @@ -0,0 +1,19 @@ +package de.bluecolored.bluemap.fabric.events; + +import com.flowpowered.math.vector.Vector2i; + +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.server.world.ServerWorld; + +public interface ChunkFinalizeCallback { + Event EVENT = EventFactory.createArrayBacked(ChunkFinalizeCallback.class, + (listeners) -> (world, chunkPos) -> { + for (ChunkFinalizeCallback event : listeners) { + event.onChunkFinalized(world, chunkPos); + } + } + ); + + void onChunkFinalized(ServerWorld world, Vector2i chunkPos); +} diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/WorldSaveCallback.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/WorldSaveCallback.java new file mode 100644 index 00000000..56b6eeab --- /dev/null +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/WorldSaveCallback.java @@ -0,0 +1,17 @@ +package de.bluecolored.bluemap.fabric.events; + +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.server.world.ServerWorld; + +public interface WorldSaveCallback { + Event EVENT = EventFactory.createArrayBacked(WorldSaveCallback.class, + (listeners) -> (world) -> { + for (WorldSaveCallback event : listeners) { + event.onWorldSaved(world); + } + } + ); + + void onWorldSaved(ServerWorld world); +} diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinChunkGenerator.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinChunkGenerator.java new file mode 100644 index 00000000..cf15eb34 --- /dev/null +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinChunkGenerator.java @@ -0,0 +1,32 @@ +package de.bluecolored.bluemap.fabric.mixin; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.flowpowered.math.vector.Vector2i; + +import de.bluecolored.bluemap.fabric.events.ChunkFinalizeCallback; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.ChunkRegion; +import net.minecraft.world.IWorld; +import net.minecraft.world.gen.chunk.ChunkGenerator; + +@Mixin(ChunkGenerator.class) +public class MixinChunkGenerator { + + @Shadow + @Final + protected IWorld world; + + @Inject(at = @At("RETURN"), method = "generateFeatures") + public void generateFeatures(ChunkRegion region, CallbackInfo ci) { + if (world instanceof ServerWorld) { + ChunkFinalizeCallback.EVENT.invoker().onChunkFinalized((ServerWorld) world, new Vector2i(region.getCenterChunkX(), region.getCenterChunkZ())); + } + } + +} diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinServerWorld.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinServerWorld.java new file mode 100644 index 00000000..fb9e9bc0 --- /dev/null +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinServerWorld.java @@ -0,0 +1,21 @@ +package de.bluecolored.bluemap.fabric.mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import de.bluecolored.bluemap.fabric.events.WorldSaveCallback; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.ProgressListener; +import net.minecraft.world.SessionLockException; + +@Mixin(ServerWorld.class) +public abstract class MixinServerWorld { + + @Inject(at = @At("RETURN"), method = "save") + public void save(ProgressListener progressListener, boolean flush, boolean bl, CallbackInfo ci) throws SessionLockException { + WorldSaveCallback.EVENT.invoker().onWorldSaved((ServerWorld) (Object) this); + } + +} diff --git a/BlueMapFabric/src/main/resources/bluemap-fabric-defaults.conf b/BlueMapFabric/src/main/resources/bluemap-fabric-defaults.conf new file mode 100644 index 00000000..c6f20621 --- /dev/null +++ b/BlueMapFabric/src/main/resources/bluemap-fabric-defaults.conf @@ -0,0 +1,11 @@ +accept-download: false +metrics: true +renderThreadCount: -2 +data: "bluemap" +webroot: "bluemap/web" +useCookies: true +webserver { + enabled: true + port: 8100 + maxConnectionCount: 100 +} diff --git a/BlueMapFabric/src/main/resources/bluemap-fabric.conf b/BlueMapFabric/src/main/resources/bluemap-fabric.conf new file mode 100644 index 00000000..8b740ce2 --- /dev/null +++ b/BlueMapFabric/src/main/resources/bluemap-fabric.conf @@ -0,0 +1,166 @@ +## ## +## BlueMap ## +## ## +## by Blue (Lukas Rieger) ## +## http://bluecolored.de/ ## +## ## + +# By changing the setting (accept-download) below to TRUE you are indicating that you have accepted mojang's EULA (https://account.mojang.com/documents/minecraft_eula), +# you confirm that you own a license to Minecraft (Java Edition) +# and you agree that BlueMap will download and use this file for you: %minecraft-client-url% +# (Alternatively you can download the file yourself and store it here: /minecraft-client-%minecraft-client-version%.jar) +# This file contains resources that belong to mojang and you must not redistribute it or do anything else that is not compliant with mojang's EULA. +# BlueMap uses resources in this file to generate the 3D-Models used for the map and texture them. (BlueMap will not work without those resources.) +# %datetime-iso% +accept-download: false + +# This changes the amount of threads that BlueMap will use to render the maps. +# A higher value can improve render-speed but could impact performance on the host machine. +# This should be always below or equal to the number of available processor-cores. +# Zero or a negative value means the amount of of available processor-cores subtracted by the value. +# (So a value of -2 with 6 cores results in 4 render-processes) +# Default is -2 +renderThreadCount: -2 + +# If this is true, BlueMap might send really basic metrics reports containg only the implementation-type and the version that is being used to https://metrics.bluecolored.de/bluemap/ +# This allows me to track the basic usage of BlueMap and helps me stay motivated to further develop this tool! Please leave it on :) +# An example report looks like this: {"implementation":"forge","version":"%version%"} +metrics: true + +# The folder where bluemap saves data-files it needs during runtime or to save e.g. the render-progress to resume it later. +data: "bluemap" + +# The webroot of the website that displays the map. +webroot: "bluemap/web" + +# Unncomment this to override the path where bluemap stores the data-files. +# Default is "/data" +#webdata: "path/to/data/folder" + +# If the web-application should use cookies to save the configurations of a user. +useCookies: true + +webserver { + # With this setting you can disable the integrated web-server. + # This is usefull if you want to only render the map-data for later use, or if you setup your own webserver. + # Default is enabled + enabled: true + + # The IP-Adress that the webserver binds to. + # If this setting is commented out, bluemap tries to find the default ip-adress of your system. + # If you only want to access it locally use "localhost". + #ip: "localhost" + #ip: "127.0.0.1" + + # The port that the webserver listenes to. + # Default is 8100 + port: 8100 + + # Max number of simultaneous connections that the webserver allows + # Default is 100 + maxConnectionCount: 100 +} + +# This is an array with multiple configured maps. +# You can define multiple maps, for different worlds with different render-settings here +maps: [ + + { + # The id of this map + # Should only contain word-charactes: [a-zA-Z0-9_] + # Changing this value breaks your existing renders. + id: "world" + + # The name of this map + # This defines the display name of this map, you can change this at any time. + # Default is the id of this map + name: "World" + + # The path to the save-folder of the world to render. + world: "world" + + # The position on the world where the map will be centered if you open it. + # You can change this at any time. + # This defaults to the world-spawn if you don't set it. + #startPos: [500, -820] + + # The color of thy sky as a hex-color + # You can change this at any time. + # Default is "#7dabff" + skyColor: "#7dabff" + + # Defines the ambient light-strength that every block is recieving, regardless of the sunlight/blocklight. + # 0 is no ambient light, 1 is fully lighted. + # You can change this at any time. + # Default is 0 + ambientLight: 0 + + # If this is false, BlueMap tries to omit all blocks that are not visible from above-ground. + # More specific: Block-Faces that have a sunlight/skylight value of 0 are removed. + # This improves the performance of the map on slower devices by a lot, but might cause some blocks to disappear that should normally be visible. + # Changing this value requires a re-render of the map. + # Default is false + renderCaves: false + + # With the below values you can limit the map-render. + # This can be used to ignore the nethers ceiling or render only a certain part of a world. + # Changing this values might require a re-render of the map, already rendered tiles outside the limits will not be deleted. + # Default is no min or max value (= infinite bounds) + #minX: -4000 + #maxX: 4000 + #minZ: -4000 + #maxZ: 4000 + #minY: 50 + #maxY: 126 + + # Using this, BlueMap pretends that every Block out of the defined render-bounds is AIR, + # this means you can see the blocks where the world is cut (instead of having a see-through/xray view). + # This has only an effect if you set some render-bounds above. + # Changing this value requires a re-render of the map. + # Default is true + renderEdges: true + + # With this set to true, the generated files for this world are compressed using gzip to save A LOT of space. + # Files will be only 5% as big with compression! + # Note: If you are using NGINX or Apache to host your map, you can configure them to serve the compressed files directly. + # This is much better than disabling the compression. + # Changing this value requires a re-render of the map. + # Default is true + useCompression: true + } + + # Here another example for the End-Map + # Things we don't want to change from default we can just omit + { + id: "end" + name: "End" + world: "world/DIM1" + + # We dont want a blue sky in the end + skyColor: "#080010" + + # In the end is no sky-light, so we need to enable this or we won't see anything. + renderCaves: true + + # Same here, we don't want a dark map. But not completely lighted, so we see the effect of e.g torches. + ambientLight: 0.6 + } + + # Here another example for the Nether-Map + { + id: "nether" + name: "Nether" + world: "world/DIM-1" + + skyColor: "#290000" + + renderCaves: true + ambientLight: 0.6 + + # We slice the whole world at y:90 so every block above 90 will be air. + # This way we don't render the nethers ceiling. + maxY: 90 + renderEdges: true + } + +] diff --git a/BlueMapFabric/src/main/resources/bluemap.mixins.json b/BlueMapFabric/src/main/resources/bluemap.mixins.json index abb10ecd..e8c98a84 100644 --- a/BlueMapFabric/src/main/resources/bluemap.mixins.json +++ b/BlueMapFabric/src/main/resources/bluemap.mixins.json @@ -1,13 +1,15 @@ { - "required": true, - "minVersion": "0.8", - "package": "de.bluecolored.bluemap.fabric.mixin", - "compatibilityLevel": "JAVA_8", - "mixins": [ - ], - "client": [ - ], - "injectors": { - "defaultRequire": 1 - } -} + "required": true, + "minVersion": "0.8", + "package": "de.bluecolored.bluemap.fabric.mixin", + "compatibilityLevel": "JAVA_8", + "mixins": [], + "client": [], + "server": [ + "MixinServerWorld", + "MixinChunkGenerator" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/BlueMapForge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/BlueMapForge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java index 66cb7a9c..be051dd2 100644 --- a/BlueMapForge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java +++ b/BlueMapForge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java @@ -31,10 +31,14 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; +import java.util.concurrent.ExecutionException; import org.apache.logging.log4j.LogManager; import com.flowpowered.math.vector.Vector3i; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; import de.bluecolored.bluemap.common.plugin.Plugin; import de.bluecolored.bluemap.common.plugin.commands.Commands; @@ -59,12 +63,23 @@ public class ForgeMod implements ServerInterface { private Map worldUUIDs; private Collection eventListeners; + private LoadingCache worldUuidCache; + public ForgeMod() { Logger.global = new Log4jLogger(LogManager.getLogger(Plugin.PLUGIN_NAME)); this.bluemap = new Plugin("forge", this); this.worldUUIDs = new HashMap<>(); this.eventListeners = new ArrayList<>(1); + this.worldUuidCache = CacheBuilder.newBuilder() + .weakKeys() + .maximumSize(1000) + .build(new CacheLoader() { + @Override + public UUID load(ServerWorld key) throws Exception { + return loadUUIDForWorld(key); + } + }); MinecraftForge.EVENT_BUS.register(this); } @@ -175,6 +190,16 @@ public UUID getUUIDForWorld(File worldFolder) throws IOException { } public UUID getUUIDForWorld(ServerWorld world) throws IOException { + try { + return worldUuidCache.get(world); + } catch (ExecutionException e) { + Throwable cause = e.getCause(); + if (cause instanceof IOException) throw (IOException) cause; + else throw new IOException(cause); + } + } + + private UUID loadUUIDForWorld(ServerWorld world) throws IOException { synchronized (worldUUIDs) { String key = getFolderForWorld(world).getPath(); From fb5d2bbb2c678a5d9d2ef47adff21c9044a0e6ec Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Mon, 3 Aug 2020 16:19:51 +0200 Subject: [PATCH 7/9] Update loom version --- BlueMapFabric/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BlueMapFabric/build.gradle b/BlueMapFabric/build.gradle index c94a5520..860b9efc 100644 --- a/BlueMapFabric/build.gradle +++ b/BlueMapFabric/build.gradle @@ -1,7 +1,7 @@ import net.fabricmc.loom.task.RemapJarTask plugins { - id 'fabric-loom' version '0.2.7-SNAPSHOT' + id 'fabric-loom' version '0.4-SNAPSHOT' } configurations { From 60a7491e9f9191ee720a3fa40c2e145c2462a465 Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Mon, 3 Aug 2020 16:43:35 +0200 Subject: [PATCH 8/9] Update github upload-artifact action --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 5360794c..bd008bf7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -17,7 +17,7 @@ jobs: run: ./gradlew test - name: Build with Gradle run: ./gradlew build - - uses: actions/upload-artifact@v2-preview + - uses: actions/upload-artifact@v2 with: name: artifact path: build/release/* From 2a14718f62b5e218aeccf6b3aa991a851102d6df Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Mon, 3 Aug 2020 17:51:07 +0200 Subject: [PATCH 9/9] Add license-header check and fix all missing or invalid license headers --- .../bluemap/bukkit/JavaLogger.java | 2 +- .../bluecolored/bluemap/common/MapType.java | 2 +- BlueMapCore/build.gradle | 4 ++++ .../bluemap/fabric/FabricEventForwarder.java | 24 +++++++++++++++++++ .../bluecolored/bluemap/fabric/FabricMod.java | 24 +++++++++++++++++++ .../bluemap/fabric/Log4jLogger.java | 2 +- .../fabric/events/ChunkFinalizeCallback.java | 24 +++++++++++++++++++ .../fabric/events/WorldSaveCallback.java | 24 +++++++++++++++++++ .../fabric/mixin/MixinChunkGenerator.java | 24 +++++++++++++++++++ .../fabric/mixin/MixinServerWorld.java | 24 +++++++++++++++++++ .../bluemap/forge/Log4jLogger.java | 2 +- .../bluemap/sponge/Slf4jLogger.java | 2 +- HEADER | 24 +++++++++++++++++++ build.gradle | 12 ++++++++++ 14 files changed, 189 insertions(+), 5 deletions(-) create mode 100644 HEADER diff --git a/BlueMapBukkit/src/main/java/de/bluecolored/bluemap/bukkit/JavaLogger.java b/BlueMapBukkit/src/main/java/de/bluecolored/bluemap/bukkit/JavaLogger.java index 433bf667..6f51e64f 100644 --- a/BlueMapBukkit/src/main/java/de/bluecolored/bluemap/bukkit/JavaLogger.java +++ b/BlueMapBukkit/src/main/java/de/bluecolored/bluemap/bukkit/JavaLogger.java @@ -1,5 +1,5 @@ /* - * This file is part of BlueMapSponge, licensed under the MIT License (MIT). + * This file is part of BlueMap, licensed under the MIT License (MIT). * * Copyright (c) Blue (Lukas Rieger) * Copyright (c) contributors diff --git a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/MapType.java b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/MapType.java index 687fa720..188d0b82 100644 --- a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/MapType.java +++ b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/MapType.java @@ -1,5 +1,5 @@ /* - * This file is part of BlueMapSponge, licensed under the MIT License (MIT). + * This file is part of BlueMap, licensed under the MIT License (MIT). * * Copyright (c) Blue (Lukas Rieger) * Copyright (c) contributors diff --git a/BlueMapCore/build.gradle b/BlueMapCore/build.gradle index 5d189319..bfd61afe 100644 --- a/BlueMapCore/build.gradle +++ b/BlueMapCore/build.gradle @@ -31,6 +31,10 @@ node { download = true } +license { + exclude('**/AABB.java') +} + task fixPackageLock() { if (!file("./package-lock.json").exists()) { file("./package-lock.json").text = "" diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricEventForwarder.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricEventForwarder.java index d46fd3e5..cc3f74c0 100644 --- a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricEventForwarder.java +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricEventForwarder.java @@ -1,3 +1,27 @@ +/* + * This file is part of BlueMap, licensed under the MIT License (MIT). + * + * Copyright (c) Blue (Lukas Rieger) + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package de.bluecolored.bluemap.fabric; import java.io.IOException; diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java index bf095dba..7f75f262 100644 --- a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java @@ -1,3 +1,27 @@ +/* + * This file is part of BlueMap, licensed under the MIT License (MIT). + * + * Copyright (c) Blue (Lukas Rieger) + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package de.bluecolored.bluemap.fabric; import java.io.File; diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/Log4jLogger.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/Log4jLogger.java index 41206a3b..2d298f63 100644 --- a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/Log4jLogger.java +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/Log4jLogger.java @@ -1,5 +1,5 @@ /* - * This file is part of BlueMapSponge, licensed under the MIT License (MIT). + * This file is part of BlueMap, licensed under the MIT License (MIT). * * Copyright (c) Blue (Lukas Rieger) * Copyright (c) contributors diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/ChunkFinalizeCallback.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/ChunkFinalizeCallback.java index bf20dd88..49de240d 100644 --- a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/ChunkFinalizeCallback.java +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/ChunkFinalizeCallback.java @@ -1,3 +1,27 @@ +/* + * This file is part of BlueMap, licensed under the MIT License (MIT). + * + * Copyright (c) Blue (Lukas Rieger) + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package de.bluecolored.bluemap.fabric.events; import com.flowpowered.math.vector.Vector2i; diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/WorldSaveCallback.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/WorldSaveCallback.java index 56b6eeab..25b2ea9f 100644 --- a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/WorldSaveCallback.java +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/events/WorldSaveCallback.java @@ -1,3 +1,27 @@ +/* + * This file is part of BlueMap, licensed under the MIT License (MIT). + * + * Copyright (c) Blue (Lukas Rieger) + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package de.bluecolored.bluemap.fabric.events; import net.fabricmc.fabric.api.event.Event; diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinChunkGenerator.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinChunkGenerator.java index cf15eb34..cb61be07 100644 --- a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinChunkGenerator.java +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinChunkGenerator.java @@ -1,3 +1,27 @@ +/* + * This file is part of BlueMap, licensed under the MIT License (MIT). + * + * Copyright (c) Blue (Lukas Rieger) + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package de.bluecolored.bluemap.fabric.mixin; import org.spongepowered.asm.mixin.Final; diff --git a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinServerWorld.java b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinServerWorld.java index fb9e9bc0..a521f0d6 100644 --- a/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinServerWorld.java +++ b/BlueMapFabric/src/main/java/de/bluecolored/bluemap/fabric/mixin/MixinServerWorld.java @@ -1,3 +1,27 @@ +/* + * This file is part of BlueMap, licensed under the MIT License (MIT). + * + * Copyright (c) Blue (Lukas Rieger) + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package de.bluecolored.bluemap.fabric.mixin; import org.spongepowered.asm.mixin.Mixin; diff --git a/BlueMapForge/src/main/java/de/bluecolored/bluemap/forge/Log4jLogger.java b/BlueMapForge/src/main/java/de/bluecolored/bluemap/forge/Log4jLogger.java index 50ae484c..39502606 100644 --- a/BlueMapForge/src/main/java/de/bluecolored/bluemap/forge/Log4jLogger.java +++ b/BlueMapForge/src/main/java/de/bluecolored/bluemap/forge/Log4jLogger.java @@ -1,5 +1,5 @@ /* - * This file is part of BlueMapSponge, licensed under the MIT License (MIT). + * This file is part of BlueMap, licensed under the MIT License (MIT). * * Copyright (c) Blue (Lukas Rieger) * Copyright (c) contributors diff --git a/BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/Slf4jLogger.java b/BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/Slf4jLogger.java index 9c3787e4..7c873747 100644 --- a/BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/Slf4jLogger.java +++ b/BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/Slf4jLogger.java @@ -1,5 +1,5 @@ /* - * This file is part of BlueMapSponge, licensed under the MIT License (MIT). + * This file is part of BlueMap, licensed under the MIT License (MIT). * * Copyright (c) Blue (Lukas Rieger) * Copyright (c) contributors diff --git a/HEADER b/HEADER new file mode 100644 index 00000000..0473d5e9 --- /dev/null +++ b/HEADER @@ -0,0 +1,24 @@ +/* + * This file is part of BlueMap, licensed under the MIT License (MIT). + * + * Copyright (c) Blue (Lukas Rieger) + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ \ No newline at end of file diff --git a/build.gradle b/build.gradle index fef52440..26457e38 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'java' id 'com.github.johnrengelman.shadow' version '5.1.0' + id 'com.github.hierynomus.license' version '0.15.0' } allprojects { @@ -41,6 +42,17 @@ allprojects { group = 'de.bluecolored.bluemap' version = coreVersion + '-' + targetVersion + + apply plugin: 'license' + license { + header rootProject.file('HEADER') + excludes([ + '*.conf', + '*.yml', + '*.zip', + '*.json' + ]) + } } subprojects {