diff --git a/.gitignore b/.gitignore index 1ea6ffe2..839d056d 100644 --- a/.gitignore +++ b/.gitignore @@ -31,8 +31,8 @@ node_modules/ package-lock.json # exclude generated resource -BlueMapCore/src/main/resources/webroot.zip -BlueMapCore/src/main/resources/resourceExtensions.zip +BlueMapCore/src/main/resources/de/bluecolored/bluemap/webroot.zip +BlueMapCore/src/main/resources/de/bluecolored/bluemap/resourceExtensions.zip #exclude-test-data data/test-render diff --git a/BlueMapBukkit/src/main/resources/core-defaults.conf b/BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/core-defaults.conf similarity index 100% rename from BlueMapBukkit/src/main/resources/core-defaults.conf rename to BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/core-defaults.conf diff --git a/BlueMapBukkit/src/main/resources/core.conf b/BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/core.conf similarity index 100% rename from BlueMapBukkit/src/main/resources/core.conf rename to BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/core.conf diff --git a/BlueMapBukkit/src/main/resources/plugin-defaults.conf b/BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/plugin-defaults.conf similarity index 100% rename from BlueMapBukkit/src/main/resources/plugin-defaults.conf rename to BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/plugin-defaults.conf diff --git a/BlueMapBukkit/src/main/resources/plugin.conf b/BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/plugin.conf similarity index 100% rename from BlueMapBukkit/src/main/resources/plugin.conf rename to BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/plugin.conf diff --git a/BlueMapBukkit/src/main/resources/render-defaults.conf b/BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/render-defaults.conf similarity index 100% rename from BlueMapBukkit/src/main/resources/render-defaults.conf rename to BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/render-defaults.conf diff --git a/BlueMapBukkit/src/main/resources/render.conf b/BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/render.conf similarity index 100% rename from BlueMapBukkit/src/main/resources/render.conf rename to BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/render.conf diff --git a/BlueMapBukkit/src/main/resources/webserver-defaults.conf b/BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/webserver-defaults.conf similarity index 100% rename from BlueMapBukkit/src/main/resources/webserver-defaults.conf rename to BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/webserver-defaults.conf diff --git a/BlueMapBukkit/src/main/resources/webserver.conf b/BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/webserver.conf similarity index 100% rename from BlueMapBukkit/src/main/resources/webserver.conf rename to BlueMapBukkit/src/main/resources/de/bluecolored/bluemap/webserver.conf diff --git a/BlueMapCLI/src/main/resources/core-defaults.conf b/BlueMapCLI/src/main/resources/de/bluecolored/bluemap/core-defaults.conf similarity index 100% rename from BlueMapCLI/src/main/resources/core-defaults.conf rename to BlueMapCLI/src/main/resources/de/bluecolored/bluemap/core-defaults.conf diff --git a/BlueMapCLI/src/main/resources/core.conf b/BlueMapCLI/src/main/resources/de/bluecolored/bluemap/core.conf similarity index 100% rename from BlueMapCLI/src/main/resources/core.conf rename to BlueMapCLI/src/main/resources/de/bluecolored/bluemap/core.conf diff --git a/BlueMapCLI/src/main/resources/render-defaults.conf b/BlueMapCLI/src/main/resources/de/bluecolored/bluemap/render-defaults.conf similarity index 100% rename from BlueMapCLI/src/main/resources/render-defaults.conf rename to BlueMapCLI/src/main/resources/de/bluecolored/bluemap/render-defaults.conf diff --git a/BlueMapCLI/src/main/resources/render.conf b/BlueMapCLI/src/main/resources/de/bluecolored/bluemap/render.conf similarity index 100% rename from BlueMapCLI/src/main/resources/render.conf rename to BlueMapCLI/src/main/resources/de/bluecolored/bluemap/render.conf diff --git a/BlueMapCLI/src/main/resources/webserver-defaults.conf b/BlueMapCLI/src/main/resources/de/bluecolored/bluemap/webserver-defaults.conf similarity index 100% rename from BlueMapCLI/src/main/resources/webserver-defaults.conf rename to BlueMapCLI/src/main/resources/de/bluecolored/bluemap/webserver-defaults.conf diff --git a/BlueMapCLI/src/main/resources/webserver.conf b/BlueMapCLI/src/main/resources/de/bluecolored/bluemap/webserver.conf similarity index 100% rename from BlueMapCLI/src/main/resources/webserver.conf rename to BlueMapCLI/src/main/resources/de/bluecolored/bluemap/webserver.conf diff --git a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/BlueMapService.java b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/BlueMapService.java index cc9fd489..cf75b474 100644 --- a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/BlueMapService.java +++ b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/BlueMapService.java @@ -239,7 +239,7 @@ public class BlueMapService { Logger.global.logInfo("Loading resources..."); resourceExtensionsFile.delete(); - FileUtils.copyURLToFile(Plugin.class.getResource("/resourceExtensions.zip"), resourceExtensionsFile, 10000, 10000); + FileUtils.copyURLToFile(Plugin.class.getResource("/de/bluecolored/bluemap/resourceExtensions.zip"), resourceExtensionsFile, 10000, 10000); //find more resource packs File resourcePackFolder = new File(configFolder, "resourcepacks"); @@ -283,8 +283,8 @@ public class BlueMapService { if (coreConfig == null) { coreConfig = new CoreConfig(configManager.loadOrCreate( getCoreConfigFile(), - Plugin.class.getResource("/core.conf"), - Plugin.class.getResource("/core-defaults.conf"), + Plugin.class.getResource("/de/bluecolored/bluemap/core.conf"), + Plugin.class.getResource("/de/bluecolored/bluemap/core-defaults.conf"), true, true )); @@ -301,8 +301,8 @@ public class BlueMapService { if (renderConfig == null) { renderConfig = new RenderConfig(configManager.loadOrCreate( getRenderConfigFile(), - Plugin.class.getResource("/render.conf"), - Plugin.class.getResource("/render-defaults.conf"), + Plugin.class.getResource("/de/bluecolored/bluemap/render.conf"), + Plugin.class.getResource("/de/bluecolored/bluemap/render-defaults.conf"), true, true )); @@ -319,8 +319,8 @@ public class BlueMapService { if (webServerConfig == null) { webServerConfig = new WebServerConfig(configManager.loadOrCreate( getWebServerConfigFile(), - Plugin.class.getResource("/webserver.conf"), - Plugin.class.getResource("/webserver-defaults.conf"), + Plugin.class.getResource("/de/bluecolored/bluemap/webserver.conf"), + Plugin.class.getResource("/de/bluecolored/bluemap/webserver-defaults.conf"), true, true )); diff --git a/BlueMapCore/build.gradle b/BlueMapCore/build.gradle index 93f2a320..4ff9bbe4 100644 --- a/BlueMapCore/build.gradle +++ b/BlueMapCore/build.gradle @@ -54,7 +54,7 @@ task webpackWebroot(type: NpmTask) { task zipWebroot(type: Zip) { from fileTree('build/generated/webroot/') archiveName 'webroot.zip' - destinationDir(file('src/main/resources/')) + destinationDir(file('src/main/resources/de/bluecolored/bluemap/')) outputs.upToDateWhen { false } } @@ -70,7 +70,7 @@ task buildWebroot { task zipResourceExtensions(type: Zip) { from fileTree('src/main/resourceExtensions') archiveName 'resourceExtensions.zip' - destinationDir(file('src/main/resources/')) + destinationDir(file('src/main/resources/de/bluecolored/bluemap/')) outputs.upToDateWhen { false } } diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/BlueMap.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/BlueMap.java index f19bd8e4..6f4870b3 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/BlueMap.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/BlueMap.java @@ -35,9 +35,9 @@ public class BlueMap { static { String version = "DEV"; try { - version = GsonConfigurationLoader.builder().setURL(BlueMap.class.getResource("/version.json")).build().load().getNode("version").getString("DEV"); + version = GsonConfigurationLoader.builder().setURL(BlueMap.class.getResource("/de/bluecolored/bluemap/version.json")).build().load().getNode("version").getString("DEV"); } catch (IOException ex) { - Logger.global.logError("Failed to load core.json from resources!", ex); + Logger.global.logError("Failed to load version.json from resources!", ex); } if (version.equals("${version}")) version = "DEV"; diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/config/ConfigManager.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/config/ConfigManager.java index d8ed6bfa..8fbc0341 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/config/ConfigManager.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/config/ConfigManager.java @@ -125,7 +125,7 @@ public class ConfigManager { public void loadResourceConfigs(File configFolder, ResourcePack resourcePack) throws IOException { //load blockColors.json from resources, config-folder and resourcepack - URL blockColorsConfigUrl = BlueMap.class.getResource("/blockColors.json"); + URL blockColorsConfigUrl = BlueMap.class.getResource("/de/bluecolored/bluemap/blockColors.json"); File blockColorsConfigFile = new File(configFolder, "blockColors.json"); ConfigurationNode blockColorsConfigNode = loadOrCreate( blockColorsConfigFile, @@ -138,7 +138,7 @@ public class ConfigManager { resourcePack.getBlockColorCalculator().loadColorConfig(blockColorsConfigNode); //load blockIds.json from resources, config-folder and resourcepack - URL blockIdsConfigUrl = BlueMap.class.getResource("/blockIds.json"); + URL blockIdsConfigUrl = BlueMap.class.getResource("/de/bluecolored/bluemap/blockIds.json"); File blockIdsConfigFile = new File(configFolder, "blockIds.json"); ConfigurationNode blockIdsConfigNode = loadOrCreate( blockIdsConfigFile, @@ -154,7 +154,7 @@ public class ConfigManager { ); //load blockProperties.json from resources, config-folder and resourcepack - URL blockPropertiesConfigUrl = BlueMap.class.getResource("/blockProperties.json"); + URL blockPropertiesConfigUrl = BlueMap.class.getResource("/de/bluecolored/bluemap/blockProperties.json"); File blockPropertiesConfigFile = new File(configFolder, "blockProperties.json"); ConfigurationNode blockPropertiesConfigNode = loadOrCreate( blockPropertiesConfigFile, @@ -171,7 +171,7 @@ public class ConfigManager { ); //load biomes.json from resources, config-folder and resourcepack - URL biomeConfigUrl = BlueMap.class.getResource("/biomes.json"); + URL biomeConfigUrl = BlueMap.class.getResource("/de/bluecolored/bluemap/biomes.json"); File biomeConfigFile = new File(configFolder, "biomes.json"); ConfigurationNode biomeConfigNode = loadOrCreate( biomeConfigFile, diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/web/WebFilesManager.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/web/WebFilesManager.java index 8ae72b0e..50b123e5 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/web/WebFilesManager.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/web/WebFilesManager.java @@ -48,7 +48,7 @@ public class WebFilesManager { } public void updateFiles() throws IOException { - URL fileResource = getClass().getResource("/webroot.zip"); + URL fileResource = getClass().getResource("/de/bluecolored/bluemap/webroot.zip"); File tempFile = File.createTempFile("bluemap_webroot_extraction", null); try { diff --git a/BlueMapCore/src/main/resources/biomes.json b/BlueMapCore/src/main/resources/de/bluecolored/bluemap/biomes.json similarity index 100% rename from BlueMapCore/src/main/resources/biomes.json rename to BlueMapCore/src/main/resources/de/bluecolored/bluemap/biomes.json diff --git a/BlueMapCore/src/main/resources/blockColors.json b/BlueMapCore/src/main/resources/de/bluecolored/bluemap/blockColors.json similarity index 100% rename from BlueMapCore/src/main/resources/blockColors.json rename to BlueMapCore/src/main/resources/de/bluecolored/bluemap/blockColors.json diff --git a/BlueMapCore/src/main/resources/blockIds.json b/BlueMapCore/src/main/resources/de/bluecolored/bluemap/blockIds.json similarity index 100% rename from BlueMapCore/src/main/resources/blockIds.json rename to BlueMapCore/src/main/resources/de/bluecolored/bluemap/blockIds.json diff --git a/BlueMapCore/src/main/resources/blockProperties.json b/BlueMapCore/src/main/resources/de/bluecolored/bluemap/blockProperties.json similarity index 100% rename from BlueMapCore/src/main/resources/blockProperties.json rename to BlueMapCore/src/main/resources/de/bluecolored/bluemap/blockProperties.json diff --git a/BlueMapCore/src/main/resources/version.json b/BlueMapCore/src/main/resources/de/bluecolored/bluemap/version.json similarity index 100% rename from BlueMapCore/src/main/resources/version.json rename to BlueMapCore/src/main/resources/de/bluecolored/bluemap/version.json diff --git a/BlueMapFabric/src/main/resources/core-defaults.conf b/BlueMapFabric/src/main/resources/de/bluecolored/bluemap/core-defaults.conf similarity index 100% rename from BlueMapFabric/src/main/resources/core-defaults.conf rename to BlueMapFabric/src/main/resources/de/bluecolored/bluemap/core-defaults.conf diff --git a/BlueMapFabric/src/main/resources/core.conf b/BlueMapFabric/src/main/resources/de/bluecolored/bluemap/core.conf similarity index 100% rename from BlueMapFabric/src/main/resources/core.conf rename to BlueMapFabric/src/main/resources/de/bluecolored/bluemap/core.conf diff --git a/BlueMapFabric/src/main/resources/plugin-defaults.conf b/BlueMapFabric/src/main/resources/de/bluecolored/bluemap/plugin-defaults.conf similarity index 100% rename from BlueMapFabric/src/main/resources/plugin-defaults.conf rename to BlueMapFabric/src/main/resources/de/bluecolored/bluemap/plugin-defaults.conf diff --git a/BlueMapFabric/src/main/resources/plugin.conf b/BlueMapFabric/src/main/resources/de/bluecolored/bluemap/plugin.conf similarity index 100% rename from BlueMapFabric/src/main/resources/plugin.conf rename to BlueMapFabric/src/main/resources/de/bluecolored/bluemap/plugin.conf diff --git a/BlueMapFabric/src/main/resources/render-defaults.conf b/BlueMapFabric/src/main/resources/de/bluecolored/bluemap/render-defaults.conf similarity index 100% rename from BlueMapFabric/src/main/resources/render-defaults.conf rename to BlueMapFabric/src/main/resources/de/bluecolored/bluemap/render-defaults.conf diff --git a/BlueMapFabric/src/main/resources/render.conf b/BlueMapFabric/src/main/resources/de/bluecolored/bluemap/render.conf similarity index 100% rename from BlueMapFabric/src/main/resources/render.conf rename to BlueMapFabric/src/main/resources/de/bluecolored/bluemap/render.conf diff --git a/BlueMapFabric/src/main/resources/webserver-defaults.conf b/BlueMapFabric/src/main/resources/de/bluecolored/bluemap/webserver-defaults.conf similarity index 100% rename from BlueMapFabric/src/main/resources/webserver-defaults.conf rename to BlueMapFabric/src/main/resources/de/bluecolored/bluemap/webserver-defaults.conf diff --git a/BlueMapFabric/src/main/resources/webserver.conf b/BlueMapFabric/src/main/resources/de/bluecolored/bluemap/webserver.conf similarity index 100% rename from BlueMapFabric/src/main/resources/webserver.conf rename to BlueMapFabric/src/main/resources/de/bluecolored/bluemap/webserver.conf diff --git a/BlueMapForge/src/main/resources/core-defaults.conf b/BlueMapForge/src/main/resources/de/bluecolored/bluemap/core-defaults.conf similarity index 100% rename from BlueMapForge/src/main/resources/core-defaults.conf rename to BlueMapForge/src/main/resources/de/bluecolored/bluemap/core-defaults.conf diff --git a/BlueMapForge/src/main/resources/core.conf b/BlueMapForge/src/main/resources/de/bluecolored/bluemap/core.conf similarity index 100% rename from BlueMapForge/src/main/resources/core.conf rename to BlueMapForge/src/main/resources/de/bluecolored/bluemap/core.conf diff --git a/BlueMapForge/src/main/resources/plugin-defaults.conf b/BlueMapForge/src/main/resources/de/bluecolored/bluemap/plugin-defaults.conf similarity index 100% rename from BlueMapForge/src/main/resources/plugin-defaults.conf rename to BlueMapForge/src/main/resources/de/bluecolored/bluemap/plugin-defaults.conf diff --git a/BlueMapForge/src/main/resources/plugin.conf b/BlueMapForge/src/main/resources/de/bluecolored/bluemap/plugin.conf similarity index 100% rename from BlueMapForge/src/main/resources/plugin.conf rename to BlueMapForge/src/main/resources/de/bluecolored/bluemap/plugin.conf diff --git a/BlueMapForge/src/main/resources/render-defaults.conf b/BlueMapForge/src/main/resources/de/bluecolored/bluemap/render-defaults.conf similarity index 100% rename from BlueMapForge/src/main/resources/render-defaults.conf rename to BlueMapForge/src/main/resources/de/bluecolored/bluemap/render-defaults.conf diff --git a/BlueMapForge/src/main/resources/render.conf b/BlueMapForge/src/main/resources/de/bluecolored/bluemap/render.conf similarity index 100% rename from BlueMapForge/src/main/resources/render.conf rename to BlueMapForge/src/main/resources/de/bluecolored/bluemap/render.conf diff --git a/BlueMapForge/src/main/resources/webserver-defaults.conf b/BlueMapForge/src/main/resources/de/bluecolored/bluemap/webserver-defaults.conf similarity index 100% rename from BlueMapForge/src/main/resources/webserver-defaults.conf rename to BlueMapForge/src/main/resources/de/bluecolored/bluemap/webserver-defaults.conf diff --git a/BlueMapForge/src/main/resources/webserver.conf b/BlueMapForge/src/main/resources/de/bluecolored/bluemap/webserver.conf similarity index 100% rename from BlueMapForge/src/main/resources/webserver.conf rename to BlueMapForge/src/main/resources/de/bluecolored/bluemap/webserver.conf diff --git a/BlueMapSponge/src/main/resources/core-defaults.conf b/BlueMapSponge/src/main/resources/de/bluecolored/bluemap/core-defaults.conf similarity index 100% rename from BlueMapSponge/src/main/resources/core-defaults.conf rename to BlueMapSponge/src/main/resources/de/bluecolored/bluemap/core-defaults.conf diff --git a/BlueMapSponge/src/main/resources/core.conf b/BlueMapSponge/src/main/resources/de/bluecolored/bluemap/core.conf similarity index 100% rename from BlueMapSponge/src/main/resources/core.conf rename to BlueMapSponge/src/main/resources/de/bluecolored/bluemap/core.conf diff --git a/BlueMapSponge/src/main/resources/plugin-defaults.conf b/BlueMapSponge/src/main/resources/de/bluecolored/bluemap/plugin-defaults.conf similarity index 100% rename from BlueMapSponge/src/main/resources/plugin-defaults.conf rename to BlueMapSponge/src/main/resources/de/bluecolored/bluemap/plugin-defaults.conf diff --git a/BlueMapSponge/src/main/resources/plugin.conf b/BlueMapSponge/src/main/resources/de/bluecolored/bluemap/plugin.conf similarity index 100% rename from BlueMapSponge/src/main/resources/plugin.conf rename to BlueMapSponge/src/main/resources/de/bluecolored/bluemap/plugin.conf diff --git a/BlueMapSponge/src/main/resources/render-defaults.conf b/BlueMapSponge/src/main/resources/de/bluecolored/bluemap/render-defaults.conf similarity index 100% rename from BlueMapSponge/src/main/resources/render-defaults.conf rename to BlueMapSponge/src/main/resources/de/bluecolored/bluemap/render-defaults.conf diff --git a/BlueMapSponge/src/main/resources/render.conf b/BlueMapSponge/src/main/resources/de/bluecolored/bluemap/render.conf similarity index 100% rename from BlueMapSponge/src/main/resources/render.conf rename to BlueMapSponge/src/main/resources/de/bluecolored/bluemap/render.conf diff --git a/BlueMapSponge/src/main/resources/webserver-defaults.conf b/BlueMapSponge/src/main/resources/de/bluecolored/bluemap/webserver-defaults.conf similarity index 100% rename from BlueMapSponge/src/main/resources/webserver-defaults.conf rename to BlueMapSponge/src/main/resources/de/bluecolored/bluemap/webserver-defaults.conf diff --git a/BlueMapSponge/src/main/resources/webserver.conf b/BlueMapSponge/src/main/resources/de/bluecolored/bluemap/webserver.conf similarity index 100% rename from BlueMapSponge/src/main/resources/webserver.conf rename to BlueMapSponge/src/main/resources/de/bluecolored/bluemap/webserver.conf