Update for 1.20.1

SeanOMik · Jul 20, 2023 · c765523 · c765523
1 parent 2730dbe
commit c765523
Show file tree

Hide file tree

Showing 43 changed files with 1,649 additions and 261 deletions.
diff --git a/1_14_R1/pom.xml b/1_14_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>tamablefoxes-parent</artifactId>
         <groupId>net.seanomik</groupId>
-        <version>2.2.9-SNAPSHOT</version>
+        <version>2.2.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>tamablefoxes_v1_14_R1</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.6.3-SNAPSHOT</version>
+            <version>1.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/1_15_R1/pom.xml b/1_15_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>tamablefoxes-parent</artifactId>
         <groupId>net.seanomik</groupId>
-        <version>2.2.9-SNAPSHOT</version>
+        <version>2.2.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>tamablefoxes_v1_15_R1</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.6.3-SNAPSHOT</version>
+            <version>1.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/1_16_R1/pom.xml b/1_16_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>tamablefoxes-parent</artifactId>
         <groupId>net.seanomik</groupId>
-        <version>2.2.9-SNAPSHOT</version>
+        <version>2.2.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>tamablefoxes_v1_16_R1</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.6.3-SNAPSHOT</version>
+            <version>1.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/1_16_R2/pom.xml b/1_16_R2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>tamablefoxes-parent</artifactId>
         <groupId>net.seanomik</groupId>
-        <version>2.2.9-SNAPSHOT</version>
+        <version>2.2.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>tamablefoxes_v1_16_R2</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.6.3-SNAPSHOT</version>
+            <version>1.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/1_16_R3/pom.xml b/1_16_R3/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.seanomik</groupId>
         <artifactId>tamablefoxes-parent</artifactId>
-        <version>2.2.9-SNAPSHOT</version>
+        <version>2.2.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>tamablefoxes_v1_16_R3</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.6.3-SNAPSHOT</version>
+            <version>1.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/1_17_1_R1/pom.xml b/1_17_1_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.seanomik</groupId>
         <artifactId>tamablefoxes-parent</artifactId>
-        <version>2.2.9-SNAPSHOT</version>
+        <version>2.2.10-SNAPSHOT</version>
     </parent>
 
     <build>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.6.3-SNAPSHOT</version>
+            <version>1.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/.../src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_1_R1/EntityTamableFox.java b/.../src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_1_R1/EntityTamableFox.java
@@ -283,27 +283,29 @@ private void reassessTameGoals() {
 
     public void rename(org.bukkit.entity.Player player) {
         new AnvilGUI.Builder()
-                .onComplete((plr, input) -> { // Called when the inventory output slot is clicked
-                    if (!input.equals("")) {
-                        org.bukkit.entity.Entity tamableFox = this.getBukkitEntity();
-
-                        // This will auto format the name for config settings.
-                        String foxName = LanguageConfig.getFoxNameFormat(input, player.getDisplayName());
-
-                        tamableFox.setCustomName(foxName);
-                        tamableFox.setCustomNameVisible(true);
-                        if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) {
-                            plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input));
-                        }
+            .onClick((slot, stateSnapshot) -> {
+                String text = stateSnapshot.getText();
+                if (slot == AnvilGUI.Slot.OUTPUT && !text.isEmpty()) {
+                    org.bukkit.entity.Entity tamableFox = this.getBukkitEntity();
+
+                    // This will auto format the name for config settings.
+                    String foxName = LanguageConfig.getFoxNameFormat(text, player.getDisplayName());
+
+                    tamableFox.setCustomName(foxName);
+                    tamableFox.setCustomNameVisible(true);
+                    if (!LanguageConfig.getTamingChosenPerfect(text).equalsIgnoreCase("disabled")) {
+                        stateSnapshot.getPlayer().sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(text));
                     }
+                } else if (!LanguageConfig.getTamingChosenPerfect(text).equalsIgnoreCase("disabled")) {
+                    stateSnapshot.getPlayer().sendMessage(Config.getPrefix() + ChatColor.GRAY + "The fox was not named");
+                }
 
-                    //return AnvilGUI.Response.close();
-                    return Arrays.asList(AnvilGUI.ResponseAction.close());
-                })
-                .preventClose()
-                .text("Fox name")      // Sets the text the GUI should start with
-                .plugin(Utils.tamableFoxesPlugin)          // Set the plugin instance
-                .open(player);         // Opens the GUI for the player provided
+                return Arrays.asList(AnvilGUI.ResponseAction.close());
+            })
+            .text("Fox name")
+            .title("Name your new friend!")
+            .plugin(Utils.tamableFoxesPlugin)
+            .open(player);
     }
 
     @Override

diff --git a/1_17_R1/pom.xml b/1_17_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.seanomik</groupId>
         <artifactId>tamablefoxes-parent</artifactId>
-        <version>2.2.9-SNAPSHOT</version>
+        <version>2.2.10-SNAPSHOT</version>
     </parent>
 
     <build>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.6.3-SNAPSHOT</version>
+            <version>1.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/...R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_R1/EntityTamableFox.java b/...R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_R1/EntityTamableFox.java
@@ -280,27 +280,29 @@ private void reassessTameGoals() {
 
     public void rename(org.bukkit.entity.Player player) {
         new AnvilGUI.Builder()
-                .onComplete((plr, input) -> { // Called when the inventory output slot is clicked
-                    if (!input.equals("")) {
-                        org.bukkit.entity.Entity tamableFox = this.getBukkitEntity();
-
-                        // This will auto format the name for config settings.
-                        String foxName = LanguageConfig.getFoxNameFormat(input, player.getDisplayName());
-
-                        tamableFox.setCustomName(foxName);
-                        tamableFox.setCustomNameVisible(true);
-                        if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) {
-                            plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input));
-                        }
+            .onClick((slot, stateSnapshot) -> {
+                String text = stateSnapshot.getText();
+                if (slot == AnvilGUI.Slot.OUTPUT && !text.isEmpty()) {
+                    org.bukkit.entity.Entity tamableFox = this.getBukkitEntity();
+
+                    // This will auto format the name for config settings.
+                    String foxName = LanguageConfig.getFoxNameFormat(text, player.getDisplayName());
+
+                    tamableFox.setCustomName(foxName);
+                    tamableFox.setCustomNameVisible(true);
+                    if (!LanguageConfig.getTamingChosenPerfect(text).equalsIgnoreCase("disabled")) {
+                        stateSnapshot.getPlayer().sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(text));
                     }
+                } else if (!LanguageConfig.getTamingChosenPerfect(text).equalsIgnoreCase("disabled")) {
+                    stateSnapshot.getPlayer().sendMessage(Config.getPrefix() + ChatColor.GRAY + "The fox was not named");
+                }
 
-                    //return AnvilGUI.Response.close();
-                    return Arrays.asList(AnvilGUI.ResponseAction.close());
-                })
-                .preventClose()
-                .text("Fox name")      // Sets the text the GUI should start with
-                .plugin(Utils.tamableFoxesPlugin)          // Set the plugin instance
-                .open(player);         // Opens the GUI for the player provided
+                return Arrays.asList(AnvilGUI.ResponseAction.close());
+            })
+            .text("Fox name")
+            .title("Name your new friend!")
+            .plugin(Utils.tamableFoxesPlugin)
+            .open(player);
     }
 
     @Override

diff --git a/1_18_1_R1/pom.xml b/1_18_1_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.seanomik</groupId>
         <artifactId>tamablefoxes-parent</artifactId>
-        <version>2.2.9-SNAPSHOT</version>
+        <version>2.2.10-SNAPSHOT</version>
     </parent>
 
     <build>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.6.3-SNAPSHOT</version>
+            <version>1.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/.../src/main/java/net/seanomik/tamablefoxes/versions/version_1_18_1_R1/EntityTamableFox.java b/.../src/main/java/net/seanomik/tamablefoxes/versions/version_1_18_1_R1/EntityTamableFox.java
@@ -302,27 +302,29 @@ private void reassessTameGoals() {
 
     public void rename(org.bukkit.entity.Player player) {
         new AnvilGUI.Builder()
-                .onComplete((plr, input) -> { // Called when the inventory output slot is clicked
-                    if (!input.equals("")) {
-                        org.bukkit.entity.Entity tamableFox = this.getBukkitEntity();
-
-                        // This will auto format the name for config settings.
-                        String foxName = LanguageConfig.getFoxNameFormat(input, player.getDisplayName());
-
-                        tamableFox.setCustomName(foxName);
-                        tamableFox.setCustomNameVisible(true);
-                        if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) {
-                            plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input));
-                        }
+            .onClick((slot, stateSnapshot) -> {
+                String text = stateSnapshot.getText();
+                if (slot == AnvilGUI.Slot.OUTPUT && !text.isEmpty()) {
+                    org.bukkit.entity.Entity tamableFox = this.getBukkitEntity();
+
+                    // This will auto format the name for config settings.
+                    String foxName = LanguageConfig.getFoxNameFormat(text, player.getDisplayName());
+
+                    tamableFox.setCustomName(foxName);
+                    tamableFox.setCustomNameVisible(true);
+                    if (!LanguageConfig.getTamingChosenPerfect(text).equalsIgnoreCase("disabled")) {
+                        stateSnapshot.getPlayer().sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(text));
                     }
+                } else if (!LanguageConfig.getTamingChosenPerfect(text).equalsIgnoreCase("disabled")) {
+                    stateSnapshot.getPlayer().sendMessage(Config.getPrefix() + ChatColor.GRAY + "The fox was not named");
+                }
 
-                    //return AnvilGUI.Response.close();
-                    return Arrays.asList(AnvilGUI.ResponseAction.close());
-                })
-                .preventClose()
-                .text("Fox name")      // Sets the text the GUI should start with
-                .plugin(Utils.tamableFoxesPlugin)          // Set the plugin instance
-                .open(player);         // Opens the GUI for the player provided
+                return Arrays.asList(AnvilGUI.ResponseAction.close());
+            })
+            .text("Fox name")
+            .title("Name your new friend!")
+            .plugin(Utils.tamableFoxesPlugin)
+            .open(player);
     }
 
     @Override

diff --git a/1_18_R1/pom.xml b/1_18_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.seanomik</groupId>
         <artifactId>tamablefoxes-parent</artifactId>
-        <version>2.2.9-SNAPSHOT</version>
+        <version>2.2.10-SNAPSHOT</version>
     </parent>
 
     <build>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.6.3-SNAPSHOT</version>
+            <version>1.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/...R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_18_R1/EntityTamableFox.java b/...R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_18_R1/EntityTamableFox.java
@@ -302,27 +302,29 @@ private void reassessTameGoals() {
 
     public void rename(org.bukkit.entity.Player player) {
         new AnvilGUI.Builder()
-                .onComplete((plr, input) -> { // Called when the inventory output slot is clicked
-                    if (!input.equals("")) {
-                        org.bukkit.entity.Entity tamableFox = this.getBukkitEntity();
-
-                        // This will auto format the name for config settings.
-                        String foxName = LanguageConfig.getFoxNameFormat(input, player.getDisplayName());
-
-                        tamableFox.setCustomName(foxName);
-                        tamableFox.setCustomNameVisible(true);
-                        if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) {
-                            plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input));
-                        }
+            .onClick((slot, stateSnapshot) -> {
+                String text = stateSnapshot.getText();
+                if (slot == AnvilGUI.Slot.OUTPUT && !text.isEmpty()) {
+                    org.bukkit.entity.Entity tamableFox = this.getBukkitEntity();
+
+                    // This will auto format the name for config settings.
+                    String foxName = LanguageConfig.getFoxNameFormat(text, player.getDisplayName());
+
+                    tamableFox.setCustomName(foxName);
+                    tamableFox.setCustomNameVisible(true);
+                    if (!LanguageConfig.getTamingChosenPerfect(text).equalsIgnoreCase("disabled")) {
+                        stateSnapshot.getPlayer().sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(text));
                     }
+                } else if (!LanguageConfig.getTamingChosenPerfect(text).equalsIgnoreCase("disabled")) {
+                    stateSnapshot.getPlayer().sendMessage(Config.getPrefix() + ChatColor.GRAY + "The fox was not named");
+                }
 
-                    //return AnvilGUI.Response.close();
-                    return Arrays.asList(AnvilGUI.ResponseAction.close());
-                })
-                .preventClose()
-                .text("Fox name")      // Sets the text the GUI should start with
-                .plugin(Utils.tamableFoxesPlugin)          // Set the plugin instance
-                .open(player);         // Opens the GUI for the player provided
+                return Arrays.asList(AnvilGUI.ResponseAction.close());
+            })
+            .text("Fox name")
+            .title("Name your new friend!")
+            .plugin(Utils.tamableFoxesPlugin)
+            .open(player);
     }
 
     @Override

diff --git a/1_18_R2/pom.xml b/1_18_R2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.seanomik</groupId>
         <artifactId>tamablefoxes-parent</artifactId>
-        <version>2.2.9-SNAPSHOT</version>
+        <version>2.2.10-SNAPSHOT</version>
     </parent>
 
     <build>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.6.3-SNAPSHOT</version>
+            <version>1.7.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>