v1.0.6

getplusm · getplusm · commit 1ba567b05666 · 2023-12-20T19:03:06.000+05:00
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'plazmer'
-version = '1.0.5'
+version = '1.0.6'
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/t/me/p1azmer/plugin/protectionblocks/Placeholders.java b/src/main/java/t/me/p1azmer/plugin/protectionblocks/Placeholders.java
@@ -47,6 +47,7 @@ public class Placeholders extends t.me.p1azmer.engine.utils.Placeholders {
     public static final String REGION_BLOCK_HOLOGRAM_TEMPLATE = "%region_block_hologram_template%";
     public static final String REGION_BLOCK_HOLOGRAM_ENABLED = "%region_block_hologram_enabled%";
     public static final String REGION_BLOCK_HOLOGRAM_IN_REGION = "%region_block_hologram_in_region%";
+    public static final String REGION_BLOCK_WORLDS = "%region_block_worlds%";
 
     // region block breaker
     public static final String REGION_BLOCK_BREAKER_DMG_TYPE = "%region_block_breaker_damage_type%";
diff --git a/src/main/java/t/me/p1azmer/plugin/protectionblocks/config/Lang.java b/src/main/java/t/me/p1azmer/plugin/protectionblocks/config/Lang.java
@@ -41,6 +41,7 @@ public class Lang extends EngineLang {
     public static final LangKey MENU_MEMBERS_KICK_SUCCESS = LangKey.of("Messages.Menu.Members.Kick.Success", GREEN + "Member " + LIGHT_YELLOW + Placeholders.MEMBER_NAME + GREEN + " success removed from region!");
 
     public static final LangKey Editor_Region_Block_Enter_Create = new LangKey("Editor.Region.Block.Enter.Create", GRAY + "Enter " + GREEN + "unique " + GRAY + "block " + GREEN + "identifier" + GRAY + "...");
+    public static final LangKey Editor_Region_Block_Enter_World = new LangKey("Editor.Region.Block.Enter.World", GRAY + "Enter " + GREEN + "world name" + GRAY + "...");
     public static final LangKey Editor_Region_Block_Enter_Name = new LangKey("Editor.Region.Block.Enter.Name", GRAY + "Enter " + GREEN + "name" + GRAY + "...");
     public static final LangKey Editor_Region_Enter_Player_name = new LangKey("Editor.Region.Enter.Player_Name", GRAY + "Enter " + GREEN + "player name" + GRAY + "...");
     public static final LangKey Editor_Region_Block_Enter_Currency = new LangKey("Editor.Region.Block.Enter.Currency", GRAY + "Enter " + GREEN + "currency" + GRAY + "...");
diff --git a/src/main/java/t/me/p1azmer/plugin/protectionblocks/editor/EditorLocales.java b/src/main/java/t/me/p1azmer/plugin/protectionblocks/editor/EditorLocales.java
@@ -64,9 +64,9 @@ public class EditorLocales extends t.me.p1azmer.engine.api.editor.EditorLocales
                     GRAY + "Example:",
                     GRAY + "You can disable hologram and create 'invisible' region",
                     "",
-                    GRAY+"If set to "+LIGHT_YELLOW+"In Region"+GRAY+",",
-                    GRAY+"the region hologram will only be displayed",
-                    GRAY+"when the player is in the region")
+                    GRAY + "If set to " + LIGHT_YELLOW + "In Region" + GRAY + ",",
+                    GRAY + "the region hologram will only be displayed",
+                    GRAY + "when the player is in the region")
             .emptyLine()
             .currentHeader()
             .current("In Region Only", Placeholders.REGION_BLOCK_HOLOGRAM_IN_REGION + GRAY + " (" + WHITE + DROP_KEY + GRAY + ")")
@@ -86,7 +86,7 @@ public class EditorLocales extends t.me.p1azmer.engine.api.editor.EditorLocales
                     RED + "You can only change it in the " + BOLD + "config.yml" + RED + " file"
             )
             .currentHeader()
-            .current("Enabled", Placeholders.REGION_BLOCK_LIFE_TIME_ENABLED+ GRAY + " (" + WHITE + LMB + GRAY + ")")
+            .current("Enabled", Placeholders.REGION_BLOCK_LIFE_TIME_ENABLED + GRAY + " (" + WHITE + LMB + GRAY + ")")
             .build();
     public static final EditorLocale REGION_BLOCK_PLACE_LIMIT = builder(PREFIX + "Region.Block.Change.Place_Limit")
             .name("Region Place Limit")
@@ -98,7 +98,7 @@ public class EditorLocales extends t.me.p1azmer.engine.api.editor.EditorLocales
                     RED + "You can only change it in the " + BOLD + "config.yml" + RED + " file"
             )
             .currentHeader()
-            .current("Enabled", Placeholders.REGION_BLOCK_PLACE_LIMIT_ENABLED+ GRAY + " (" + WHITE + LMB + GRAY + ")")
+            .current("Enabled", Placeholders.REGION_BLOCK_PLACE_LIMIT_ENABLED + GRAY + " (" + WHITE + LMB + GRAY + ")")
             .build();
     public static final EditorLocale REGION_BLOCK_GROUP_SIZE = builder(PREFIX + "Region.Block.Change.Group_Size")
             .name("Region Groups Size")
@@ -109,7 +109,19 @@ public class EditorLocales extends t.me.p1azmer.engine.api.editor.EditorLocales
                     RED + "You can only change it in the " + BOLD + "config.yml" + RED + " file"
             )
             .currentHeader()
-            .current("Enabled", Placeholders.REGION_BLOCK_GROUP_SIZE_ENABLED+ GRAY + " (" + WHITE + LMB + GRAY + ")")
+            .current("Enabled", Placeholders.REGION_BLOCK_GROUP_SIZE_ENABLED + GRAY + " (" + WHITE + LMB + GRAY + ")")
+            .build();
+
+    public static final EditorLocale REGION_BLOCK_WORLDS = builder(PREFIX + "Region.Block.Change.Worlds")
+            .name("Region Worlds")
+            .text("List of worlds where this",
+                    "region block will be available")
+            .emptyLine()
+            .currentHeader()
+            .current("List", Placeholders.REGION_BLOCK_WORLDS)
+            .emptyLine()
+            .click(LMB, "Add world")
+            .click(SHIFT_RMB, "Clear")
             .build();
     public static final EditorLocale REGION_BLOCK_BREAKERS_ICON = builder(PREFIX + "Region.Block.Breakers.Navigate")
             .name("Region Breakers")
@@ -120,7 +132,7 @@ public class EditorLocales extends t.me.p1azmer.engine.api.editor.EditorLocales
     public static final EditorLocale REGION_BLOCK_BREAKERS_CREATE = builder(PREFIX + "Region.Block.Breakers.Create")
             .name("New Breaker")
             .emptyLine()
-            .text(GREEN + "Note" + GRAY + ":", "If you added TNT,","it means that the block can be","broken with a TNT blast")
+            .text(GREEN + "Note" + GRAY + ":", "If you added TNT,", "it means that the block can be", "broken with a TNT blast")
             .emptyLine()
             .click(DRAG_DROP, "Add")
             .build();
diff --git a/src/main/java/t/me/p1azmer/plugin/protectionblocks/region/RegionManager.java b/src/main/java/t/me/p1azmer/plugin/protectionblocks/region/RegionManager.java
@@ -172,6 +172,7 @@ public boolean create(@NotNull String id) {
     public void tryCreateRegion(@NotNull Player player, @NotNull Block block, @NotNull ItemStack item, @NotNull RegionBlock regionBlock) {
         Region region = this.getRegionByBlock(block);
         if (region != null && !region.isAllowed(player)) return;
+        if (!regionBlock.getWorlds().contains(block.getWorld().getName())) return;
 
         if (regionBlock.isPlaceLimitEnabled() && regionBlock.getPlaceLimit() != null) {
             RegionUser regionUser = plugin.getUserManager().getUserData(player);
diff --git a/src/main/java/t/me/p1azmer/plugin/protectionblocks/region/editor/RGBlockMainEditor.java b/src/main/java/t/me/p1azmer/plugin/protectionblocks/region/editor/RGBlockMainEditor.java
@@ -1,5 +1,6 @@
 package t.me.p1azmer.plugin.protectionblocks.region.editor;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -18,6 +19,7 @@
 import t.me.p1azmer.plugin.protectionblocks.region.editor.breakers.RGBlockBreakersListEditor;
 import t.me.p1azmer.plugin.protectionblocks.region.impl.RegionBlock;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class RGBlockMainEditor extends EditorMenu<ProtectionPlugin, RegionBlock> {
@@ -58,28 +60,28 @@ public RGBlockMainEditor(@NotNull RegionBlock regionBlock) {
                     .writeMeta();
         }));
 
-        this.addItem(Material.NAME_TAG, EditorLocales.REGION_BLOCK_NAME, 11).setClick((viewer, event) ->
+        this.addItem(Material.NAME_TAG, EditorLocales.REGION_BLOCK_NAME, 10).setClick((viewer, event) ->
                 this.handleInput(viewer, Lang.Editor_Region_Block_Enter_Name, wrapper -> {
                     regionBlock.setName(wrapper.getText());
                     regionBlock.save();
                     return true;
                 }));
-        this.addItem(Material.MOSS_BLOCK, EditorLocales.REGION_BLOCK_SIZE, 13).setClick((viewer, event) ->
+        this.addItem(Material.MOSS_BLOCK, EditorLocales.REGION_BLOCK_SIZE, 12).setClick((viewer, event) ->
                 this.handleInput(viewer, Lang.Editor_Region_Block_Enter_Value, wrapper -> {
                     regionBlock.setRegionSize(wrapper.asInt(1));
                     regionBlock.save();
                     return true;
                 }));
         this.addItem(ItemUtil.createCustomHead("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNmQzNmMzMjkxZmUwMmQxNDJjNGFmMjhkZjJmNTViYjAzOTdlMTk4NTU0ZTgzNDU5OTBkYmJjZDRjMTQwMzE2YiJ9fX0="),
-                EditorLocales.REGION_BLOCK_STRENGTH, 15).setClick((viewer, event) ->
+                EditorLocales.REGION_BLOCK_STRENGTH, 14).setClick((viewer, event) ->
                 this.handleInput(viewer, Lang.Editor_Region_Block_Enter_Value, wrapper -> {
                     regionBlock.setStrength(wrapper.asInt(1));
                     regionBlock.save();
                     return true;
                 }));
-        this.addItem(Material.IRON_PICKAXE, EditorLocales.REGION_BLOCK_BREAKERS_ICON, 21).setClick((viewer, event) -> this.plugin.runTask(task -> this.getEditorBreakers().open(viewer.getPlayer(), 1)));
+        this.addItem(Material.IRON_PICKAXE, EditorLocales.REGION_BLOCK_BREAKERS_ICON, 16).setClick((viewer, event) -> this.plugin.runTask(task -> this.getEditorBreakers().open(viewer.getPlayer(), 1)));
 
-        this.addItem(Material.ARMOR_STAND, EditorLocales.REGION_HOLOGRAM, 23).setClick((viewer, event) -> {
+        this.addItem(Material.ARMOR_STAND, EditorLocales.REGION_HOLOGRAM, 20).setClick((viewer, event) -> {
             if (event.getClick().equals(ClickType.DROP)) {
                 regionBlock.setHologramInRegion(!regionBlock.isHologramInRegion());
                 regionBlock.getManager().getRegionsWithBlocks(regionBlock).forEach(regionBlock::updateHologram);
@@ -100,7 +102,7 @@ public RGBlockMainEditor(@NotNull RegionBlock regionBlock) {
             }
         });
         this.addItem(ItemUtil.createCustomHead("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjg4OWNmY2JhY2JlNTk4ZThhMWNkODYxMGI0OWZjYjYyNjQ0ZThjYmE5ZDQ5MTFkMTIxMTM0NTA2ZDhlYTFiNyJ9fX0="),
-                        EditorLocales.REGION_BLOCK_DEPOSIT, 31)
+                        EditorLocales.REGION_BLOCK_DEPOSIT, 22)
                 .setClick((viewer, event) -> {
                     if (event.isLeftClick()) {
                         this.handleInput(viewer, Lang.Editor_Region_Block_Enter_Value, wrapper -> {
@@ -122,6 +124,26 @@ public RGBlockMainEditor(@NotNull RegionBlock regionBlock) {
                         EditorManager.suggestValues(viewer.getPlayer(), plugin().getCurrencyManager().getCurrencyIds(), true);
                     }
                 });
+        this.addItem(ItemUtil.createCustomHead("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjgwZDMyOTVkM2Q5YWJkNjI3NzZhYmNiOGRhNzU2ZjI5OGE1NDVmZWU5NDk4YzRmNjlhMWMyYzc4NTI0YzgyNCJ9fX0="),
+                EditorLocales.REGION_BLOCK_WORLDS, 24).setClick((viewer, event) -> {
+            if (event.isShiftClick()) {
+                if (event.isRightClick()) {
+                    regionBlock.setWorlds(new ArrayList<>());
+                    this.save(viewer);
+                }
+            } else {
+                if (event.isLeftClick()) {
+                    EditorManager.suggestValues(viewer.getPlayer(), CollectionsUtil.worldNames(), true);
+                    this.handleInput(viewer, Lang.Editor_Region_Block_Enter_World, wrapper -> {
+                        List<String> list = regionBlock.getWorlds();
+                        list.add(wrapper.getText());
+                        regionBlock.setWorlds(list);
+                        regionBlock.save();
+                        return true;
+                    });
+                }
+            }
+        });
         this.addItem(ItemUtil.createCustomHead("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTRiZDlhNDViOTY4MWNlYTViMjhjNzBmNzVhNjk1NmIxZjU5NGZlYzg0MGI5NjA3Nzk4ZmIxZTcwNzc2NDQzMCJ9fX0="),
                         EditorLocales.REGION_BLOCK_LIFE_TIME, 39)
                 .setClick((viewer, event) -> {
diff --git a/src/main/java/t/me/p1azmer/plugin/protectionblocks/region/impl/RegionBlock.java b/src/main/java/t/me/p1azmer/plugin/protectionblocks/region/impl/RegionBlock.java
@@ -9,6 +9,7 @@
 import t.me.p1azmer.engine.api.placeholder.PlaceholderMap;
 import t.me.p1azmer.engine.lang.LangManager;
 import t.me.p1azmer.engine.utils.Colorizer;
+import t.me.p1azmer.engine.utils.Colors;
 import t.me.p1azmer.engine.utils.PlayerRankMap;
 import t.me.p1azmer.plugin.protectionblocks.Placeholders;
 import t.me.p1azmer.plugin.protectionblocks.ProtectionPlugin;
@@ -35,6 +36,7 @@ public class RegionBlock extends AbstractConfigHolder<ProtectionPlugin> implemen
     private PlayerRankMap<Integer> placeLimit;
     private int regionSize;
     private List<RegionBreaker> breakers;
+    private List<String> worlds;
     private boolean hologramEnabled;
     private boolean hologramInRegion;
     private String hologramTemplate;
@@ -52,6 +54,7 @@ public RegionBlock(@NotNull RegionManager manager, @NotNull JYML cfg) {
         this.manager = manager;
 
         this.breakers = new ArrayList<>();
+        this.worlds = List.of("world");
 
         this.placeholderMap = new PlaceholderMap()
                 .add(Placeholders.REGION_BLOCK_ID, this::getId)
@@ -66,6 +69,7 @@ public RegionBlock(@NotNull RegionManager manager, @NotNull JYML cfg) {
                 .add(Placeholders.REGION_BLOCK_HOLOGRAM_ENABLED, () -> LangManager.getBoolean(this.isHologramEnabled()))
                 .add(Placeholders.REGION_BLOCK_HOLOGRAM_IN_REGION, () -> LangManager.getBoolean(this.isHologramInRegion()))
                 .add(Placeholders.REGION_BLOCK_HOLOGRAM_TEMPLATE, this::getHologramTemplate)
+                .add(Placeholders.REGION_BLOCK_WORLDS, ()-> Colorizer.apply(Colors.LIGHT_PURPLE + String.join(", ", this.getWorlds())))
         ;
     }
 
@@ -102,6 +106,10 @@ public boolean load() {
             this.getBreakers().add(RegionBreaker.read(cfg, "Region.Breakers.List." + sId));
         }
         this.setCurrencyId(cfg.getString("Region.Deposit.Currency_Id", "Vault"));
+
+        if (!cfg.contains("Worlds") && cfg.getStringList("Worlds").isEmpty())
+            cfg.set("Worlds", List.of("world"));
+        this.setWorlds(cfg.getStringList("Worlds"));
         return true;
     }
 
@@ -133,6 +141,8 @@ protected void onSave() {
         for (RegionBreaker breaker : this.getBreakers()){
             breaker.write(cfg, "Region.Breakers.List."+ (i++));
         }
+
+        cfg.set("Worlds", this.getWorlds());
     }
 
     public void clear() {
@@ -228,6 +238,15 @@ public List<RegionBreaker> getBreakers() {
         return breakers;
     }
 
+    @NotNull
+    public List<String> getWorlds() {
+        return worlds;
+    }
+
+    public void setWorlds(@NotNull List<String> worlds) {
+        this.worlds = worlds;
+    }
+
     @NotNull
     public String getCurrencyId() {
         return currencyId;

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`group = 'plazmer'`
`6`		`-version = '1.0.5'`
	`6`	`+version = '1.0.6'`
`7`	`7`
`8`	`8`	`repositories {`
`9`	`9`	`mavenCentral()`