Merge branch 'release/1.0.2.6'

Author: Maxlego08

changelog.md

@@ -34,6 +34,14 @@
 
 # Unreleased
 
+# 1.0.2.6
+
+- Add BlockPlaceEvent for Anti Dupe
+- Add placeholder %zmenu_test% for testing
+- Fix sound action, pitch and volume was reversed
+- Add ``job`` requirement. Check if the player has a job with JobsReborn plugins
+- Added a cache on placeholders. By default, the cache is 500ms. That corresponds to opening a menu. So if you have several times the same placeholder used, it will only be called once.
+
 # 1.0.2.5
 
 - Add new lore as string support

dependency-reduced-pom.xml

@@ -3,9 +3,19 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>fr.maxlego08</groupId>
   <artifactId>zmenu</artifactId>
-  <version>1.0.2.5</version>
+  <version>1.0.2.6</version>
   <build>
     <sourceDirectory>src</sourceDirectory>
+    <resources>
+      <resource>
+        <targetPath>.</targetPath>
+        <filtering>true</filtering>
+        <directory>src/main/resources/</directory>
+        <includes>
+          <include>*.yml</include>
+        </includes>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -210,6 +220,13 @@
       <version>2.19.0</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.github.Zrips</groupId>
+      <artifactId>Jobs</artifactId>
+      <version>5.2.2.3</version>
+      <scope>system</scope>
+      <systemPath>${basedir}/libs/Jobs5.2.2.3.jar</systemPath>
+    </dependency>
   </dependencies>
   <properties>
     <xseries.version>9.4.0</xseries.version>

libs/Jobs5.2.2.3.jar

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fr.maxlego08</groupId>
     <artifactId>zmenu</artifactId>
-    <version>1.0.2.5</version>
+    <version>1.0.2.6</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>
@@ -14,6 +14,16 @@
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
+        <resources>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>src/main/resources/</directory>
+                <includes>
+                    <include>*.yml</include>
+                </includes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -238,5 +248,12 @@
             <version>2.19.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.Zrips</groupId>
+            <artifactId>Jobs</artifactId>
+            <version>5.2.2.3</version> <!-- Change the LATEST to the current version of jobs -->
+            <scope>system</scope>
+            <systemPath>${basedir}/libs/Jobs5.2.2.3.jar</systemPath>
+        </dependency>
     </dependencies>
 </project>

pom.xml

@@ -1,7 +1,9 @@
 package fr.maxlego08.menu;
 
 import fr.maxlego08.menu.api.InventoryManager;
+import fr.maxlego08.menu.api.attribute.IAttribute;
 import fr.maxlego08.menu.api.loader.MaterialLoader;
+import fr.maxlego08.menu.api.utils.Placeholders;
 import fr.maxlego08.menu.save.Config;
 import fr.maxlego08.menu.zcore.logger.Logger;
 import fr.maxlego08.menu.zcore.utils.Banner;
@@ -10,7 +12,6 @@
 import fr.maxlego08.menu.zcore.utils.Potion;
 import fr.maxlego08.menu.zcore.utils.ZUtils;
 import fr.maxlego08.menu.zcore.utils.attribute.AttributeApplier;
-import fr.maxlego08.menu.api.attribute.IAttribute;
 import fr.maxlego08.menu.zcore.utils.meta.Meta;
 import fr.maxlego08.menu.zcore.utils.nms.NMSUtils;
 import fr.maxlego08.menu.zcore.utils.nms.NmsVersion;
@@ -24,7 +25,12 @@
 import org.bukkit.inventory.meta.SkullMeta;
 
 import javax.annotation.Nullable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 
 public class MenuItemStack extends ZUtils {
 
@@ -117,6 +123,10 @@ public ItemStack build(Player player) {
     }
 
     public ItemStack build(Player player, boolean useCache) {
+        return build(player, useCache, new Placeholders());
+    }
+
+    public ItemStack build(Player player, boolean useCache, Placeholders placeholders) {
 
         // If we don’t need PlaceHolderApi, then we use the cache
         if (!this.needPlaceholderAPI && this.cacheItemStack != null && Config.enableCacheItemStack && useCache) {
@@ -211,15 +221,15 @@ public ItemStack build(Player player, boolean useCache) {
 
         if (this.displayName != null) {
             try {
-                Meta.meta.updateDisplayName(itemMeta, this.displayName, player);
+                Meta.meta.updateDisplayName(itemMeta, placeholders.parse(this.displayName), player);
             } catch (Exception exception) {
                 Logger.info("Error with update display name for item " + path + " in file " + filePath + " (" + player + ", " + this.displayName + ")", Logger.LogType.ERROR);
                 exception.printStackTrace();
             }
         }
 
         if (!this.lore.isEmpty()) {
-            Meta.meta.updateLore(itemMeta, this.lore, player);
+            Meta.meta.updateLore(itemMeta, placeholders.parse(this.lore), player);
         }
 
         if (this.isGlowing && NMSUtils.getNMSVersion() != 1.7) {
@@ -242,7 +252,7 @@ public ItemStack build(Player player, boolean useCache) {
             }
         });
 
-		this.flags.forEach(itemMeta::addItemFlags);
+        this.flags.forEach(itemMeta::addItemFlags);
 
         itemStack.setItemMeta(itemMeta);
 

src/fr/maxlego08/menu/MenuItemStack.java

@@ -18,7 +18,13 @@
 import fr.maxlego08.menu.inventory.inventories.InventoryDefault;
 import fr.maxlego08.menu.listener.AdapterListener;
 import fr.maxlego08.menu.listener.SwapKeyListener;
-import fr.maxlego08.menu.loader.materials.*;
+import fr.maxlego08.menu.loader.materials.Base64Loader;
+import fr.maxlego08.menu.loader.materials.EcoLoader;
+import fr.maxlego08.menu.loader.materials.HeadDatabaseLoader;
+import fr.maxlego08.menu.loader.materials.ItemsAdderLoader;
+import fr.maxlego08.menu.loader.materials.NovaLoader;
+import fr.maxlego08.menu.loader.materials.OraxenLoader;
+import fr.maxlego08.menu.loader.materials.SlimeFunLoader;
 import fr.maxlego08.menu.pattern.ZPatternManager;
 import fr.maxlego08.menu.placeholder.LocalPlaceholder;
 import fr.maxlego08.menu.players.ZDataManager;
@@ -65,7 +71,7 @@ public class MenuPlugin extends ZPlugin {
     private final CommandManager commandManager = new ZCommandManager(this);
     private final MessageLoader messageLoader = new MessageLoader(this);
     private final DataManager dataManager = new ZDataManager(this);
-    private final WebsiteManager websiteManager = new ZWebsiteManager(this);
+    private final ZWebsiteManager websiteManager = new ZWebsiteManager(this);
     private final InventoriesPlayer inventoriesPlayer = new ZInventoriesPlayer(this);
     private final PatternManager patternManager = new ZPatternManager(this);
     private CommandMenu commandMenu;
@@ -106,6 +112,8 @@ public void onEnable() {
         files.add("inventories/pro_inventory.yml");
         files.add("inventories/example_punish.yml");
 
+        // files.add("website/marketplace.yml");
+
         files.add("commands/commands.yml");
         files.add("commands/punish/punish.yml");
 
@@ -114,21 +122,19 @@ public void onEnable() {
 
         File folder = new File(this.getDataFolder(), "inventories");
 
-        if (!folder.exists()) {
-            folder.mkdirs();
+        if (!folder.exists()) folder.mkdirs();
 
-            if (Config.generateDefaultFile) {
-                files.forEach(filePath -> {
-                    if (!new File(this.getDataFolder(), filePath).exists()) {
+        if (Config.generateDefaultFile) {
+            files.forEach(filePath -> {
+                if (!new File(this.getDataFolder(), filePath).exists()) {
 
-                        if (NMSUtils.isNewVersion()) {
-                            saveResource(filePath.replace("inventories/", "inventories/1_13/"), filePath, false);
-                        } else {
-                            saveResource(filePath, false);
-                        }
+                    if (NMSUtils.isNewVersion()) {
+                        saveResource(filePath.replace("inventories/", "inventories/1_13/").replace("website/", "website/1_13/"), filePath, false);
+                    } else {
+                        saveResource(filePath, false);
                     }
-                });
-            }
+                }
+            });
         }
 
         this.zCommandManager = new VCommandManager(this);
@@ -192,6 +198,9 @@ public void onEnable() {
             return optional.orElse(null);
         });
 
+        this.websiteManager.registerPlaceholders();
+        localPlaceholder.register("test", (a, b) -> "&ctest");
+
         ((ZDataManager) this.dataManager).registerPlaceholder(localPlaceholder);
 
         new Metrics(this, 14951);
@@ -211,7 +220,7 @@ public void onEnable() {
             this.addListener(new DupeListener(this.scheduler, this.dupeManager));
         }
 
-        if (Config.enableDebug){
+        if (Config.enableDebug) {
             Logger.info("Scheduler: " + this.scheduler);
             Logger.info("DupeManager: " + this.dupeManager);
         }
@@ -221,6 +230,7 @@ public void onEnable() {
         Logger.info("zMenu’s site includes an inventory editor (under development), a marketplace (already available) is a forum (under development)");
         Logger.info("");
 
+
         this.postEnable();
     }
 
@@ -282,7 +292,7 @@ public CommandManager getCommandManager() {
      *
      * @return the websitemanager
      */
-    public WebsiteManager getWebsiteManager() {
+    public ZWebsiteManager getWebsiteManager() {
         return websiteManager;
     }
 

src/fr/maxlego08/menu/MenuPlugin.java

@@ -7,6 +7,7 @@
 import fr.maxlego08.menu.api.requirement.Requirement;
 import fr.maxlego08.menu.api.utils.OpenWithItem;
 import fr.maxlego08.menu.inventory.inventories.InventoryDefault;
+import fr.maxlego08.menu.zcore.utils.ZUtils;
 import fr.maxlego08.menu.zcore.utils.inventory.InventoryResult;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryHolder;
@@ -20,7 +21,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-public class ZInventory implements Inventory {
+public class ZInventory extends ZUtils implements Inventory {
 
     private final Plugin plugin;
     private final String name;

src/fr/maxlego08/menu/ZInventory.java

@@ -9,6 +9,7 @@
 import fr.maxlego08.menu.api.event.events.PlayerOpenInventoryEvent;
 import fr.maxlego08.menu.api.itemstack.ItemStackSimilar;
 import fr.maxlego08.menu.api.loader.MaterialLoader;
+import fr.maxlego08.menu.api.scheduler.ZScheduler;
 import fr.maxlego08.menu.api.utils.MetaUpdater;
 import fr.maxlego08.menu.api.utils.OpenWithItem;
 import fr.maxlego08.menu.button.buttons.ZNoneButton;
@@ -42,6 +43,7 @@
 import fr.maxlego08.menu.loader.actions.SoundLoader;
 import fr.maxlego08.menu.loader.actions.TitleLoader;
 import fr.maxlego08.menu.loader.permissible.ItemPermissibleLoader;
+import fr.maxlego08.menu.loader.permissible.JobPermissibleLoader;
 import fr.maxlego08.menu.loader.permissible.PermissionPermissibleLoader;
 import fr.maxlego08.menu.loader.permissible.PlaceholderPermissibleLoader;
 import fr.maxlego08.menu.loader.permissible.RegexPermissibleLoader;
@@ -54,6 +56,7 @@
 import fr.maxlego08.menu.zcore.utils.loader.Loader;
 import fr.maxlego08.menu.zcore.utils.meta.Meta;
 import fr.maxlego08.menu.zcore.utils.nms.ItemStackUtils;
+import fr.maxlego08.menu.zcore.utils.plugins.Plugins;
 import fr.maxlego08.menu.zcore.utils.storage.Persist;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -255,6 +258,9 @@ public void loadButtons() {
         buttonManager.registerPermissible(new PermissionPermissibleLoader(buttonManager));
         buttonManager.registerPermissible(new ItemPermissibleLoader(buttonManager));
         buttonManager.registerPermissible(new RegexPermissibleLoader(buttonManager));
+        if (this.plugin.isEnable(Plugins.JOBS)) {
+            buttonManager.registerPermissible(new JobPermissibleLoader(buttonManager));
+        }
 
         // Load actions
         buttonManager.registerAction(new BroadcastLoader());
@@ -296,6 +302,8 @@ public void loadButtons() {
 
         ButtonLoaderRegisterEvent event = new ButtonLoaderRegisterEvent(buttonManager);
         event.call();
+
+        plugin.getWebsiteManager().loadButtons(buttonManager);
     }
 
     @Override
@@ -334,6 +342,8 @@ public void loadInventories() {
                 }
             }
         }
+
+        this.plugin.getWebsiteManager().loadInventories(this);
     }
 
     @Override
@@ -527,6 +537,17 @@ public void updateInventory(Player player) {
         }
     }
 
+    @Override
+    public void updateInventory(Player player, Plugin plugin) {
+        InventoryHolder holder = player.getOpenInventory().getTopInventory().getHolder();
+        if (holder instanceof InventoryDefault) {
+            InventoryDefault inventoryDefault = (InventoryDefault) holder;
+            if (inventoryDefault.getMenuInventory().getPlugin() == plugin) {
+                this.openInventory(player, inventoryDefault.getMenuInventory(), inventoryDefault.getPage(), inventoryDefault.getOldInventories());
+            }
+        }
+    }
+
     @Override
     public void saveItem(CommandSender sender, ItemStack itemStack, String name, String type) {
 
@@ -620,4 +641,9 @@ public Optional<ItemStackSimilar> getItemStackVerification(String name) {
     public Collection<ItemStackSimilar> getItemStackVerifications() {
         return this.itemStackSimilarMap.values();
     }
+
+    @Override
+    public ZScheduler getScheduler() {
+        return this.plugin.getScheduler();
+    }
 }

src/fr/maxlego08/menu/ZInventoryManager.java

@@ -4,6 +4,7 @@
 import fr.maxlego08.menu.api.event.events.ButtonLoaderRegisterEvent;
 import fr.maxlego08.menu.api.itemstack.ItemStackSimilar;
 import fr.maxlego08.menu.api.loader.MaterialLoader;
+import fr.maxlego08.menu.api.scheduler.ZScheduler;
 import fr.maxlego08.menu.api.utils.MetaUpdater;
 import fr.maxlego08.menu.exceptions.InventoryException;
 import fr.maxlego08.menu.zcore.utils.storage.Savable;
@@ -339,6 +340,14 @@ public interface InventoryManager extends Savable, Listener {
      */
     void updateInventory(Player player);
 
+    /**
+     * Opens the player’s current inventory again if the plugin is the same.
+     *
+     * @param player The player.
+     * @param plugin The plugin.
+     */
+    void updateInventory(Player player, Plugin plugin);
+
     /**
      * Save item in config file
      *
@@ -384,4 +393,6 @@ public interface InventoryManager extends Savable, Listener {
      * @return A Collection of ItemStackSimilar instances representing all registered verification strategies.
      */
     Collection<ItemStackSimilar> getItemStackVerifications();
+
+    ZScheduler getScheduler();
 }

src/fr/maxlego08/menu/api/InventoryManager.java

@@ -0,0 +1,9 @@
+package fr.maxlego08.menu.api.requirement.permissible;
+
+import fr.maxlego08.menu.api.requirement.Permissible;
+
+public interface JobPermissible extends Permissible {
+
+    String getJobName();
+
+}