Compare commits

..

No commits in common. "6c65256c7f7ac728311e1dfed8d5bd45bf0e7ef9" and "c7655236b1eea70ba6da83986742fde75cf28314" have entirely different histories.

36 changed files with 109 additions and 124 deletions

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>tamablefoxes-parent</artifactId>
<groupId>net.seanomik</groupId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<artifactId>tamablefoxes_v1_14_R1</artifactId>

View File

@ -246,29 +246,26 @@ public class EntityTamableFox extends EntityFox {
public void rename(org.bukkit.entity.Player player) {
new AnvilGUI.Builder()
.onClick((slot, stateSnapshot) -> {
String text = stateSnapshot.getText();
if (slot == AnvilGUI.Slot.OUTPUT && !text.isEmpty()) {
.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(text, player.getDisplayName());
String foxName = LanguageConfig.getFoxNameFormat(input, player.getDisplayName());
tamableFox.setCustomName(foxName);
tamableFox.setCustomNameVisible(true);
if (!LanguageConfig.getTamingChosenPerfect(text).equalsIgnoreCase("disabled")) {
stateSnapshot.getPlayer().sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(text));
if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) {
plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input));
}
} 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());
})
.text("Fox name")
.title("Name your new friend!")
.plugin(Utils.tamableFoxesPlugin)
.open(player);
.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
}
// deobf: mobInteract
@ -529,7 +526,7 @@ public class EntityTamableFox extends EntityFox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUniqueID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>tamablefoxes-parent</artifactId>
<groupId>net.seanomik</groupId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<artifactId>tamablefoxes_v1_15_R1</artifactId>

View File

@ -246,29 +246,26 @@ public class EntityTamableFox extends EntityFox {
public void rename(org.bukkit.entity.Player player) {
new AnvilGUI.Builder()
.onClick((slot, stateSnapshot) -> {
String text = stateSnapshot.getText();
if (slot == AnvilGUI.Slot.OUTPUT && !text.isEmpty()) {
.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(text, player.getDisplayName());
String foxName = LanguageConfig.getFoxNameFormat(input, player.getDisplayName());
tamableFox.setCustomName(foxName);
tamableFox.setCustomNameVisible(true);
if (!LanguageConfig.getTamingChosenPerfect(text).equalsIgnoreCase("disabled")) {
stateSnapshot.getPlayer().sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(text));
if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) {
plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input));
}
} 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());
})
.text("Fox name")
.title("Name your new friend!")
.plugin(Utils.tamableFoxesPlugin)
.open(player);
.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
}
// deobf: mobInteract
@ -529,7 +526,7 @@ public class EntityTamableFox extends EntityFox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUniqueID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>tamablefoxes-parent</artifactId>
<groupId>net.seanomik</groupId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<artifactId>tamablefoxes_v1_16_R1</artifactId>

View File

@ -244,29 +244,26 @@ public class EntityTamableFox extends EntityFox {
public void rename(org.bukkit.entity.Player player) {
new AnvilGUI.Builder()
.onClick((slot, stateSnapshot) -> {
String text = stateSnapshot.getText();
if (slot == AnvilGUI.Slot.OUTPUT && !text.isEmpty()) {
.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(text, player.getDisplayName());
String foxName = LanguageConfig.getFoxNameFormat(input, player.getDisplayName());
tamableFox.setCustomName(foxName);
tamableFox.setCustomNameVisible(true);
if (!LanguageConfig.getTamingChosenPerfect(text).equalsIgnoreCase("disabled")) {
stateSnapshot.getPlayer().sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(text));
if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) {
plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input));
}
} 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());
})
.text("Fox name")
.title("Name your new friend!")
.plugin(Utils.tamableFoxesPlugin)
.open(player);
.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
}
// deobf: mobInteract
@ -531,7 +528,7 @@ public class EntityTamableFox extends EntityFox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUniqueID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>tamablefoxes-parent</artifactId>
<groupId>net.seanomik</groupId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<artifactId>tamablefoxes_v1_16_R2</artifactId>

View File

@ -242,29 +242,26 @@ public class EntityTamableFox extends EntityFox {
public void rename(org.bukkit.entity.Player player) {
new AnvilGUI.Builder()
.onClick((slot, stateSnapshot) -> {
String text = stateSnapshot.getText();
if (slot == AnvilGUI.Slot.OUTPUT && !text.isEmpty()) {
.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(text, player.getDisplayName());
String foxName = LanguageConfig.getFoxNameFormat(input, player.getDisplayName());
tamableFox.setCustomName(foxName);
tamableFox.setCustomNameVisible(true);
if (!LanguageConfig.getTamingChosenPerfect(text).equalsIgnoreCase("disabled")) {
stateSnapshot.getPlayer().sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(text));
if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) {
plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input));
}
} 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());
})
.text("Fox name")
.title("Name your new friend!")
.plugin(Utils.tamableFoxesPlugin)
.open(player);
.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
}
// deobf: mobInteract
@ -523,7 +520,7 @@ public class EntityTamableFox extends EntityFox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUniqueID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<artifactId>tamablefoxes_v1_16_R3</artifactId>

View File

@ -242,29 +242,26 @@ public class EntityTamableFox extends EntityFox {
public void rename(org.bukkit.entity.Player player) {
new AnvilGUI.Builder()
.onClick((slot, stateSnapshot) -> {
String text = stateSnapshot.getText();
if (slot == AnvilGUI.Slot.OUTPUT && !text.isEmpty()) {
.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(text, player.getDisplayName());
String foxName = LanguageConfig.getFoxNameFormat(input, player.getDisplayName());
tamableFox.setCustomName(foxName);
tamableFox.setCustomNameVisible(true);
if (!LanguageConfig.getTamingChosenPerfect(text).equalsIgnoreCase("disabled")) {
stateSnapshot.getPlayer().sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(text));
if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) {
plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input));
}
} 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());
})
.text("Fox name")
.title("Name your new friend!")
.plugin(Utils.tamableFoxesPlugin)
.open(player);
.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
}
// deobf: mobInteract
@ -523,7 +520,7 @@ public class EntityTamableFox extends EntityFox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUniqueID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<build>

View File

@ -554,7 +554,7 @@ public class EntityTamableFox extends Fox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<build>

View File

@ -551,7 +551,7 @@ public class EntityTamableFox extends Fox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<build>

View File

@ -573,7 +573,7 @@ public class EntityTamableFox extends Fox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<build>

View File

@ -573,7 +573,7 @@ public class EntityTamableFox extends Fox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<build>

View File

@ -571,7 +571,7 @@ public class EntityTamableFox extends Fox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<build>

View File

@ -572,7 +572,7 @@ public class EntityTamableFox extends Fox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<build>

View File

@ -572,7 +572,7 @@ public class EntityTamableFox extends Fox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<build>

View File

@ -572,7 +572,7 @@ public class EntityTamableFox extends Fox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<build>

View File

@ -572,7 +572,7 @@ public class EntityTamableFox extends Fox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<build>

View File

@ -572,7 +572,7 @@ public class EntityTamableFox extends Fox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<build>

View File

@ -572,7 +572,7 @@ public class EntityTamableFox extends Fox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
if (Config.getMaxPlayerFoxTames() > 0) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<artifactId>tamablefoxes</artifactId>

View File

@ -7,7 +7,7 @@
<parent>
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
</parent>
<artifactId>tamablefoxes-util</artifactId>

View File

@ -6,7 +6,7 @@
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
<packaging>pom</packaging>
<repositories>

View File

@ -6,7 +6,7 @@
<groupId>net.seanomik</groupId>
<artifactId>tamablefoxes-parent</artifactId>
<version>2.2.11-SNAPSHOT</version>
<version>2.2.10-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>