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

Give fox command - bring up name screen for receiving player (#72)

This commit is contained in:
SeanOMik 2022-01-31 23:58:42 -05:00
parent ddfc667d65
commit 2b37feec07
14 changed files with 67 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
1_14_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_14_R1/NMSInterface_1_14_R1.java
View File

@ -46,4 +46,10 @@ public class NMSInterface_1_14_R1 implements NMSInterface {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
return tamableFox.getOwnerUUID();
}
@Override
public void renameFox(org.bukkit.entity.Fox fox, Player player) {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
tamableFox.rename(player);
}
}

6
1_15_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_15_R1/NMSInterface_1_15_R1.java
View File

@ -46,4 +46,10 @@ public class NMSInterface_1_15_R1 implements NMSInterface {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
return tamableFox.getOwnerUUID();
}
@Override
public void renameFox(org.bukkit.entity.Fox fox, Player player) {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
tamableFox.rename(player);
}
}

6
1_16_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R1/NMSInterface_1_16_R1.java
View File

@ -46,4 +46,10 @@ public class NMSInterface_1_16_R1 implements NMSInterface {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
return tamableFox.getOwnerUUID();
}
@Override
public void renameFox(org.bukkit.entity.Fox fox, Player player) {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
tamableFox.rename(player);
}
}

6
1_16_R2/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R2/NMSInterface_1_16_R2.java
View File

@ -46,4 +46,10 @@ public class NMSInterface_1_16_R2 implements NMSInterface {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
return tamableFox.getOwnerUUID();
}
@Override
public void renameFox(org.bukkit.entity.Fox fox, Player player) {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
tamableFox.rename(player);
}
}

6
1_16_R3/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R3/NMSInterface_1_16_R3.java
View File

@ -46,4 +46,10 @@ public class NMSInterface_1_16_R3 implements NMSInterface {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
return tamableFox.getOwnerUUID();
}
@Override
public void renameFox(org.bukkit.entity.Fox fox, Player player) {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
tamableFox.rename(player);
}
}

6
1_17_1_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_1_R1/NMSInterface_1_17_1_R1.java
View File

@ -45,4 +45,10 @@ public class NMSInterface_1_17_1_R1 implements NMSInterface {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
return tamableFox.getOwnerUUID();
}
@Override
public void renameFox(org.bukkit.entity.Fox fox, Player player) {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
tamableFox.rename(player);
}
}

6
1_17_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_R1/NMSInterface_1_17_R1.java
View File

@ -45,4 +45,10 @@ public class NMSInterface_1_17_R1 implements NMSInterface {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
return tamableFox.getOwnerUUID();
}
@Override
public void renameFox(org.bukkit.entity.Fox fox, Player player) {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
tamableFox.rename(player);
}
}

6
1_18_1_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_18_1_R1/NMSInterface_1_18_1_R1.java
View File

@ -45,4 +45,10 @@ public class NMSInterface_1_18_1_R1 implements NMSInterface {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
return tamableFox.getOwnerUUID();
}
@Override
public void renameFox(org.bukkit.entity.Fox fox, Player player) {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
tamableFox.rename(player);
}
}

6
1_18_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_18_R1/NMSInterface_1_18_R1.java
View File

@ -45,4 +45,10 @@ public class NMSInterface_1_18_R1 implements NMSInterface {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
return tamableFox.getOwnerUUID();
}
@Override
public void renameFox(org.bukkit.entity.Fox fox, Player player) {
EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) fox).getHandle();
tamableFox.rename(player);
}
}

3
Plugin/pom.xml
View File

@ -58,7 +58,8 @@
<goal>shade</goal>
</goals>
<configuration>
<outputFile>C:\Development\Java\Spigot Servers\${server.version}\plugins\TamableFoxes_v${project.parent.version}.jar</outputFile>
<outputFile>/home/seanomik/Development/java/spigot-dev/test-servers/${server.version}/plugins/TamableFoxes_v${project.parent.version}.jar</outputFile>
<!--<outputFile>C:\Development\Java\Spigot Servers\${server.version}\plugins\TamableFoxes_v${project.parent.version}.jar</outputFile>-->
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</execution>

8
Plugin/src/main/java/net/seanomik/tamablefoxes/CommandGiveFox.java
View File

@ -71,6 +71,14 @@ public class CommandGiveFox implements TabExecutor {
if (plugin.nmsInterface.getFoxOwner(fox).equals(player.getUniqueId()) ||
player.hasPermission("tamablefoxes.givefox.give.others")) {
plugin.nmsInterface.changeFoxOwner(fox, givingToPlayer);
Bukkit.getScheduler().runTask(plugin, r2 -> {
// If the player that is receiving the fox is online, prompt them to rename their new fox!
if (givingToPlayer.isOnline()) {
plugin.nmsInterface.renameFox(fox, givingToPlayer);
}
});
sender.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getGaveFox(givingToPlayer));
} else {
sender.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getNotYourFox());

6
Utility/src/main/java/net/seanomik/tamablefoxes/util/FieldHelper.java
View File

@ -1,11 +1,5 @@
package net.seanomik.tamablefoxes.util;
import net.seanomik.tamablefoxes.util.io.Config;
import net.seanomik.tamablefoxes.util.io.LanguageConfig;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import sun.misc.Unsafe;
import sun.misc.Unsafe;
import java.lang.reflect.Field;

1
Utility/src/main/java/net/seanomik/tamablefoxes/util/NMSInterface.java
View File

@ -16,4 +16,5 @@ public interface NMSInterface {
void spawnTamableFox(Location loc, FoxType type);
void changeFoxOwner(Fox fox, Player newOwner);
UUID getFoxOwner(Fox fox);
void renameFox(org.bukkit.entity.Fox fox, Player player);
}

4
Utility/src/main/java/net/seanomik/tamablefoxes/util/io/LanguageConfig.java
View File

@ -158,7 +158,7 @@ public class LanguageConfig extends YamlConfiguration {
if (str == null || str.isEmpty()) {
str = "Right click the fox that you want to give to " + transferringTo.getDisplayName() + ".";
} else {
str.replace("%TRANSFER_TO_PLAYER%", transferringTo.getDisplayName());
str = str.replace("%TRANSFER_TO_PLAYER%", transferringTo.getDisplayName());
}
return str;
@ -169,7 +169,7 @@ public class LanguageConfig extends YamlConfiguration {
if (str == null || str.isEmpty()) {
str = "Fox has been given to " + givingTo.getDisplayName() + "!";
} else {
str.replace("%GAVE_TO_PLAYER%", givingTo.getDisplayName());
str = str.replace("%GAVE_TO_PLAYER%", givingTo.getDisplayName());
}
return str;