4.62.2

Author: Ajneb97

src/main/java/ce/ajneb97/api/ConditionalEventsAction.java

@@ -1,6 +1,7 @@
 package ce.ajneb97.api;
 
 import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public abstract class ConditionalEventsAction {
@@ -11,7 +12,7 @@ public abstract class ConditionalEventsAction {
     public ConditionalEventsAction(String name){
         this.name = name;
     }
-    public abstract void execute(Player player, String actionLine);
+    public abstract void execute(Player player, String actionLine, Event minecraftEvent);
 
     public String getName() {
         return name;

src/main/java/ce/ajneb97/configs/ConfigsManager.java

@@ -115,9 +115,9 @@ public void configureEvents(){
                                     targeter.setType(targeterType);
 
                                     action = action.replace(targeterType.name().toLowerCase()+": ","");
-                                    String parameter = action.substring(0, action.indexOf(":"));
-                                    String replace = action.substring(0, action.indexOf(":")+2);
-                                    action = action.replace(replace, "");
+                                    String[] sep = action.split(" ");
+                                    String parameter = sep[0].substring(0,sep[0].length()-1);
+                                    action = action.replace(sep[0]+" ", "");
 
                                     targeter.setParameter(parameter);
                                 }

src/main/java/ce/ajneb97/listeners/ItemEventsListener.java

@@ -99,6 +99,9 @@ public void onItemRepair(InventoryClickEvent event) {
         if(OtherUtils.isLegacy()){
             return;
         }
+        if(!(event.getInventory() instanceof AnvilInventory)){
+            return;
+        }
         AnvilInventory inv = (AnvilInventory) event.getInventory();
 
         Player player = (Player) event.getWhoClicked();

src/main/java/ce/ajneb97/managers/APIManager.java

@@ -4,6 +4,7 @@
 import ce.ajneb97.api.ConditionalEventsAction;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.ArrayList;
@@ -45,10 +46,10 @@ public ConditionalEventsAction getApiAction(String actionName){
         return null;
     }
 
-    public void executeAction(String actionName, Player player, String actionLine){
+    public void executeAction(String actionName, Player player, String actionLine, Event minecraftEvent){
         ConditionalEventsAction action = getApiAction(actionName);
         if(action != null){
-            action.execute(player,actionLine);
+            action.execute(player,actionLine,minecraftEvent);
         }
     }
 }

src/main/java/ce/ajneb97/model/internal/ExecutedEvent.java

@@ -110,7 +110,12 @@ public void executeCancelActions(){
                 ActionUtils.cancelEvent(ceAction.getActionLine(),minecraftEvent);
                 return;
             }else if(ceAction.getType().equals(ActionType.PREVENT_JOIN)){
-                ActionUtils.preventJoin(ceAction.getActionLine(),minecraftEvent);
+                String actionLine = ceAction.getActionLine();
+                VariablesProperties variablesProperties = new VariablesProperties(
+                        eventVariables,player,target,isPlaceholderAPI,event,minecraftEvent
+                );
+                actionLine = VariablesUtils.replaceAllVariablesInLine(actionLine,variablesProperties,false);
+                ActionUtils.preventJoin(actionLine,minecraftEvent);
                 return;
             }
         }
@@ -303,7 +308,7 @@ private void executeAction(Player player,ActionType type,String apiType,String a
                 ActionUtils.executeActionGroup(actionLine,this,plugin);
                 return;
             case API:
-                plugin.getApiManager().executeAction(apiType,player,actionLine);
+                plugin.getApiManager().executeAction(apiType,player,actionLine,minecraftEvent);
                 return;
         }
 

src/main/java/ce/ajneb97/utils/ItemUtils.java

@@ -11,6 +11,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
 import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemFlag;
@@ -148,6 +149,8 @@ public static ItemStack getItemFromProperties(String[] properties,Player player)
         List<String> customModelComponentDataFloats = new ArrayList<>();
         List<String> customModelComponentDataColors = new ArrayList<>();
 
+        String itemModel = null;
+
         ItemStack savedItem = null;
 
         for(String property : properties) {
@@ -169,6 +172,8 @@ public static ItemStack getItemFromProperties(String[] properties,Player player)
             }else if(property.startsWith("custom_model_component_data_colors:")){
                 String[] splitC = property.replace("custom_model_component_data_colors:", "").split("\\|");
                 customModelComponentDataColors.addAll(Arrays.asList(splitC));
+            }else if(property.startsWith("item_model:")){
+                itemModel = property.replace("item_model:","");
             }else if(property.startsWith("durability:")) {
                 durability = Short.parseShort(property.replace("durability:", ""));
             }else if(property.startsWith("name:")) {
@@ -245,6 +250,13 @@ public static ItemStack getItemFromProperties(String[] properties,Player player)
             meta.setCustomModelDataComponent(customModelDataComponent);
         }
 
+        if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_21_R3)){
+            if(itemModel != null){
+                String[] sep = itemModel.split("\\|");
+                meta.setItemModel(new NamespacedKey(sep[0],sep[1]));
+            }
+        }
+
         if(!enchants.isEmpty()) {
             for(int i=0;i<enchants.size();i++) {
                 String[] sep2 = enchants.get(i).split(";");

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 main: ce.ajneb97.ConditionalEvents
-version: 4.62.1
+version: 4.62.2
 name: ConditionalEvents
 api-version: 1.13
 softdepend: [PlaceholderAPI,Citizens,WorldGuardEvents,WorldGuard,ProtocolLib,DiscordSRV]