SeanOMik
/
TamableFoxes
mirror of https://github.com/SeanOMik/TamableFoxes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(#101), fix: some version implementations were still using old anvilgui version

This commit is contained in:
SeanOMik 2023-07-26 00:59:41 -04:00
parent c7655236b1
commit c1860d3fc8
Signed by: SeanOMik
GPG Key ID: 568F326C7EB33ACB
16 changed files with 104 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
1_14_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_14_R1/EntityTamableFox.java
View File

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

37
1_15_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_15_R1/EntityTamableFox.java
View File

@ -246,26 +246,29 @@ public class EntityTamableFox extends EntityFox {
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();
.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(input, player.getDisplayName());
// 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(input).equalsIgnoreCase("disabled")) {
plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input));
}
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());
})
.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);
}
// deobf: mobInteract
@ -526,7 +529,7 @@ public class EntityTamableFox extends EntityFox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUniqueID(), 1);
}

37
1_16_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R1/EntityTamableFox.java
View File

@ -244,26 +244,29 @@ public class EntityTamableFox extends EntityFox {
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();
.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(input, player.getDisplayName());
// 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(input).equalsIgnoreCase("disabled")) {
plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input));
}
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());
})
.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);
}
// deobf: mobInteract
@ -528,7 +531,7 @@ public class EntityTamableFox extends EntityFox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUniqueID(), 1);
}

37
1_16_R2/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R2/EntityTamableFox.java
View File

@ -242,26 +242,29 @@ public class EntityTamableFox extends EntityFox {
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();
.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(input, player.getDisplayName());
// 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(input).equalsIgnoreCase("disabled")) {
plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input));
}
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());
})
.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);
}
// deobf: mobInteract
@ -520,7 +523,7 @@ public class EntityTamableFox extends EntityFox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUniqueID(), 1);
}

37
1_16_R3/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R3/EntityTamableFox.java
View File

@ -242,26 +242,29 @@ public class EntityTamableFox extends EntityFox {
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();
.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(input, player.getDisplayName());
// 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(input).equalsIgnoreCase("disabled")) {
plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input));
}
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());
})
.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);
}
// deobf: mobInteract
@ -520,7 +523,7 @@ public class EntityTamableFox extends EntityFox {
}
// Remove the amount of foxes the player has tamed if the limit is enabled.
if (Config.getMaxPlayerFoxTames() > 0) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUniqueID(), 1);
}

2
1_17_1_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_1_R1/EntityTamableFox.java
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) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

2
1_17_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_R1/EntityTamableFox.java
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) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

2
1_18_1_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_18_1_R1/EntityTamableFox.java
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) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

2
1_18_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_18_R1/EntityTamableFox.java
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) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

2
1_18_R2/src/main/java/net/seanomik/tamablefoxes/versions/version_1_18_R2/EntityTamableFox.java
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) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

2
1_19_1_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_19_1_R1/EntityTamableFox.java
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) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

2
1_19_2_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_19_2_R1/EntityTamableFox.java
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) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

2
1_19_3_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_19_3_R1/EntityTamableFox.java
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) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

2
1_19_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_19_R1/EntityTamableFox.java
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) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

2
1_19_R3/src/main/java/net/seanomik/tamablefoxes/versions/version_1_19_R3/EntityTamableFox.java
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) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}

2
1_20_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_20_R1/EntityTamableFox.java
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) {
if (Config.getMaxPlayerFoxTames() > 0 && this.getOwner() != null) {
SQLiteHelper sqliteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin);
sqliteHelper.removePlayerFoxAmount(this.getOwner().getUUID(), 1);
}