From 22e212d6ab26e98c84adae98d8b9a84b63af3472 Mon Sep 17 00:00:00 2001 From: Blackdigits Date: Sun, 22 Mar 2020 18:46:55 +0700 Subject: [PATCH 1/2] Add world list for custom block world regeneration So now world regen only works on world listen on the config. Please add this to your config on custom-blocks section, or delete your config to let it generate a new one custom-blocks: #List of worlds that has custom block world regen enabled gen-whitelist: - world - world_the_end - world_resource --- .../java/net/Indyuce/mmoitems/manager/ConfigManager.java | 2 ++ .../java/net/Indyuce/mmoitems/manager/WorldGenManager.java | 1 + src/main/resources/config.yml | 5 +++++ 3 files changed, 8 insertions(+) diff --git a/src/main/java/net/Indyuce/mmoitems/manager/ConfigManager.java b/src/main/java/net/Indyuce/mmoitems/manager/ConfigManager.java index af12e49c..a0ddb7de 100644 --- a/src/main/java/net/Indyuce/mmoitems/manager/ConfigManager.java +++ b/src/main/java/net/Indyuce/mmoitems/manager/ConfigManager.java @@ -39,6 +39,7 @@ public class ConfigManager { // cached config options public boolean abilityPlayerDamage, dodgeKnockbackEnabled, replaceMushroomDrops, worldGenEnabled; + public List worldGenWhitelist; public String healIndicatorFormat, damageIndicatorFormat, abilitySplitter; public DecimalFormat healIndicatorDecimalFormat, damageIndicatorDecimalFormat; @@ -183,6 +184,7 @@ public class ConfigManager { */ replaceMushroomDrops = MMOItems.plugin.getConfig().getBoolean("custom-blocks.replace-mushroom-drops"); worldGenEnabled = MMOItems.plugin.getConfig().getBoolean("custom-blocks.enable-world-gen"); + worldGenWhitelist = MMOItems.plugin.getConfig().getStringList("custom-blocks.gen-whitelist"); abilityPlayerDamage = MMOItems.plugin.getConfig().getBoolean("ability-player-damage"); healIndicatorFormat = ChatColor.translateAlternateColorCodes('&', MMOItems.plugin.getConfig().getString("game-indicators.heal.format")); damageIndicatorFormat = ChatColor.translateAlternateColorCodes('&', MMOItems.plugin.getConfig().getString("game-indicators.damage.format")); diff --git a/src/main/java/net/Indyuce/mmoitems/manager/WorldGenManager.java b/src/main/java/net/Indyuce/mmoitems/manager/WorldGenManager.java index b0b05426..0aeab115 100644 --- a/src/main/java/net/Indyuce/mmoitems/manager/WorldGenManager.java +++ b/src/main/java/net/Indyuce/mmoitems/manager/WorldGenManager.java @@ -37,6 +37,7 @@ public class WorldGenManager implements Listener { @EventHandler public void a(ChunkLoadEvent event) { + if(!MMOItems.plugin.getLanguage().worldGenWhitelist.contains(event.getWorld().getName())) return; if(!event.isNewChunk()) return; for(int blocks : assigned.keySet()) { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 63da1ddc..497e5132 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -105,6 +105,11 @@ custom-blocks: # generate in the world according to # their generation template. enable-world-gen: false + #List of worlds that has custom block world regen enabled + gen-whitelist: + - world + - world_the_end + - world_resource # Whether or not to remove mushroom block drops # from the droplist when mining a mushroom block # with silk-touch. From 3a59dfed6be0a96182618a30aed8c2c6ade5d77f Mon Sep 17 00:00:00 2001 From: Blackdigits Date: Sun, 22 Mar 2020 21:43:53 +0700 Subject: [PATCH 2/2] Revert "Add world list for custom block world regeneration" This reverts commit 22e212d6ab26e98c84adae98d8b9a84b63af3472. --- .../java/net/Indyuce/mmoitems/manager/ConfigManager.java | 2 -- .../java/net/Indyuce/mmoitems/manager/WorldGenManager.java | 1 - src/main/resources/config.yml | 5 ----- 3 files changed, 8 deletions(-) diff --git a/src/main/java/net/Indyuce/mmoitems/manager/ConfigManager.java b/src/main/java/net/Indyuce/mmoitems/manager/ConfigManager.java index a0ddb7de..af12e49c 100644 --- a/src/main/java/net/Indyuce/mmoitems/manager/ConfigManager.java +++ b/src/main/java/net/Indyuce/mmoitems/manager/ConfigManager.java @@ -39,7 +39,6 @@ public class ConfigManager { // cached config options public boolean abilityPlayerDamage, dodgeKnockbackEnabled, replaceMushroomDrops, worldGenEnabled; - public List worldGenWhitelist; public String healIndicatorFormat, damageIndicatorFormat, abilitySplitter; public DecimalFormat healIndicatorDecimalFormat, damageIndicatorDecimalFormat; @@ -184,7 +183,6 @@ public class ConfigManager { */ replaceMushroomDrops = MMOItems.plugin.getConfig().getBoolean("custom-blocks.replace-mushroom-drops"); worldGenEnabled = MMOItems.plugin.getConfig().getBoolean("custom-blocks.enable-world-gen"); - worldGenWhitelist = MMOItems.plugin.getConfig().getStringList("custom-blocks.gen-whitelist"); abilityPlayerDamage = MMOItems.plugin.getConfig().getBoolean("ability-player-damage"); healIndicatorFormat = ChatColor.translateAlternateColorCodes('&', MMOItems.plugin.getConfig().getString("game-indicators.heal.format")); damageIndicatorFormat = ChatColor.translateAlternateColorCodes('&', MMOItems.plugin.getConfig().getString("game-indicators.damage.format")); diff --git a/src/main/java/net/Indyuce/mmoitems/manager/WorldGenManager.java b/src/main/java/net/Indyuce/mmoitems/manager/WorldGenManager.java index 0aeab115..b0b05426 100644 --- a/src/main/java/net/Indyuce/mmoitems/manager/WorldGenManager.java +++ b/src/main/java/net/Indyuce/mmoitems/manager/WorldGenManager.java @@ -37,7 +37,6 @@ public class WorldGenManager implements Listener { @EventHandler public void a(ChunkLoadEvent event) { - if(!MMOItems.plugin.getLanguage().worldGenWhitelist.contains(event.getWorld().getName())) return; if(!event.isNewChunk()) return; for(int blocks : assigned.keySet()) { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 497e5132..63da1ddc 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -105,11 +105,6 @@ custom-blocks: # generate in the world according to # their generation template. enable-world-gen: false - #List of worlds that has custom block world regen enabled - gen-whitelist: - - world - - world_the_end - - world_resource # Whether or not to remove mushroom block drops # from the droplist when mining a mushroom block # with silk-touch.