Skip to content

Commit ada1d34

Browse files
MrButtersDEVMrButtersDEV
committed
custom spawner names
1 parent 3a0cd61 commit ada1d34

File tree

14 files changed

+70
-23
lines changed

14 files changed

+70
-23
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@ hs_err_pid*
5454
*.iws
5555
.idea/
5656
SilkySpawnersLITE.iml
57+
*.iml

‎SilkySpawnersLITE.iml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,20 @@
2828
<orderEntry type="library" name="spigot-1.14" level="project" />
2929
<orderEntry type="library" name="spigot-1.13" level="project" />
3030
<orderEntry type="library" name="spigot-1.13.1" level="project" />
31-
<orderEntry type="library" name="spigot-1.12" level="project" />
3231
<orderEntry type="library" name="spigot-1.16.1" level="project" />
3332
<orderEntry type="library" name="spigot-1.16.2" level="project" />
34-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT" level="project" />
33+
<orderEntry type="library" name="spigot-1.16.5" level="project" />
34+
<orderEntry type="library" name="spigot-1.17.1" level="project" />
35+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT" level="project" />
3536
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
3637
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
3738
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
38-
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.3" level="project" />
39-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
39+
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" />
40+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.28" level="project" />
4041
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" />
4142
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13.1-R0.1-SNAPSHOT" level="project" />
4243
<orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
4344
<orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
4445
<orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
45-
<orderEntry type="library" name="spigot-1.16.5" level="project" />
46-
<orderEntry type="library" name="spigot-1.17" level="project" />
4746
</component>
4847
</module>

‎pom.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>us.thezircon.play</groupId>
88
<artifactId>SilkySpawnersLITE</artifactId>
9-
<version>1.0.15-SNAPSHOT</version>
9+
<version>1.0.16-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>SilkySpawnersLITE</name>
@@ -55,6 +55,10 @@
5555
</build>
5656

5757
<repositories>
58+
<repository>
59+
<id>spigotmc-repo</id>
60+
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
61+
</repository>
5862
<repository>
5963
<id>sonatype</id>
6064
<url>https://oss.sonatype.org/content/groups/public/</url>
@@ -69,7 +73,7 @@
6973
<dependency>
7074
<groupId>org.spigotmc</groupId>
7175
<artifactId>spigot-api</artifactId>
72-
<version>1.16.4-R0.1-SNAPSHOT</version>
76+
<version>1.17-R0.1-SNAPSHOT</version>
7377
<scope>provided</scope>
7478
</dependency>
7579
<dependency>

‎src/main/java/us/thezircon/play/silkyspawnerslite/commands/SilkySpawner/subcommands/give.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public void perform(CommandSender sender, String[] args) {
4848
String msgGiveSelf = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("msgGiveSelf"));
4949
String msgGiveOther = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("msgGiveOther"));
5050
String msgReceiveSpawner = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("msgReceiveSpawner"));
51+
String defaultSpawnerName = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("spawnerName"));
5152

5253
if (sender instanceof Player) { // Player
5354
Player player = (Player) sender;
@@ -64,7 +65,9 @@ public void perform(CommandSender sender, String[] args) {
6465
csm.setSpawnedType(EntityType.valueOf(mobtype));
6566

6667
meta.setBlockState(csm);
67-
meta.setDisplayName(ChatColor.AQUA + mobtype.replace("_", " ") + " Spawner");
68+
//meta.setDisplayName(ChatColor.AQUA + mobtype.replace("_", " ") + " Spawner");
69+
meta.setDisplayName(defaultSpawnerName.replace("{TYPE}", csm.getSpawnedType().toString().replace("_", " ")));
70+
6871
meta.addItemFlags();
6972
spawner_to_give.setItemMeta(meta);
7073

@@ -97,7 +100,9 @@ public void perform(CommandSender sender, String[] args) {
97100
csm.setSpawnedType(EntityType.valueOf(mobtype));
98101

99102
meta.setBlockState(csm);
100-
meta.setDisplayName(ChatColor.AQUA + mobtype.replace("_", " ") + " Spawner");
103+
//meta.setDisplayName(ChatColor.AQUA + mobtype.replace("_", " ") + " Spawner");
104+
meta.setDisplayName(defaultSpawnerName.replace("{TYPE}", csm.getSpawnedType().toString().replace("_", " ")));
105+
101106
meta.addItemFlags();
102107
spawner_to_give.setItemMeta(meta);
103108

‎src/main/java/us/thezircon/play/silkyspawnerslite/commands/SilkySpawner/subcommands/type.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public void perform(CommandSender sender, String[] args) {
4949
String msgNotSpawner = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("msgNotSpawner"));
5050
String msgSpawnerTypeError = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("msgSpawnerTypeError"));
5151
String msgSpawnerChanged = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("msgSpawnerChanged"));
52+
String defaultSpawnerName = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("spawnerName"));
5253

5354
if (!(args.length > 1)) {
5455
player.sendMessage(msgPrefix + ChatColor.RED + " " + getSyntax());
@@ -68,7 +69,8 @@ public void perform(CommandSender sender, String[] args) {
6869
CreatureSpawner csm = (CreatureSpawner) hand_meta.getBlockState();
6970

7071
csm.setSpawnedType(EntityType.valueOf(mobtype));
71-
hand_meta.setDisplayName(ChatColor.AQUA + mobtype + " Spawner");
72+
//hand_meta.setDisplayName(ChatColor.AQUA + mobtype + " Spawner");
73+
hand_meta.setDisplayName(defaultSpawnerName.replace("{TYPE}", csm.getSpawnedType().toString().replace("_", " ")));
7274
hand_meta.setBlockState(csm);
7375

7476
hand.setItemMeta(hand_meta);

‎src/main/java/us/thezircon/play/silkyspawnerslite/events/breakSpawner.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public void onBreak(BlockBreakEvent e){
3838
String msgPrefix = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("msgPrefix"));
3939
String msgChargedOnMine = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("msgChargedOnMine"));
4040
String msgFundsNeeded = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("msgFundsNeeded"));
41+
String defaultSpawnerName = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("spawnerName"));
4142

4243
Player player = e.getPlayer();
4344
Block block = e.getBlock();
@@ -96,7 +97,8 @@ public void onBreak(BlockBreakEvent e){
9697

9798
//Spawners Meta
9899
meta.setBlockState(csm);
99-
meta.setDisplayName(ChatColor.AQUA + (cs.getSpawnedType().toString().replace("_", " ")) + " Spawner");
100+
//meta.setDisplayName(ChatColor.AQUA + (cs.getSpawnedType().toString().replace("_", " ")) + " Spawner");
101+
meta.setDisplayName(defaultSpawnerName.replace("{TYPE}", cs.getSpawnedType().toString().replace("_", " ")));
100102
meta.addItemFlags();
101103

102104
spawner_to_give.setItemMeta(meta); // Set Meta

‎src/main/java/us/thezircon/play/silkyspawnerslite/nms/NMS_1_17.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package us.thezircon.play.silkyspawnerslite.nms;
22

3-
4-
5-
63
import net.minecraft.nbt.NBTTagCompound;
74
import net.minecraft.nbt.NBTTagString;
85
import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack;

‎src/main/java/us/thezircon/play/silkyspawnerslite/utils/HexFormat.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package us.thezircon.play.silkyspawnerslite.utils;
2+
3+
import net.md_5.bungee.api.ChatColor;
4+
import org.bukkit.Bukkit;
5+
6+
import java.util.regex.Matcher;
7+
import java.util.regex.Pattern;
8+
9+
//public class HexFormat {
10+
//
11+
// private static final Pattern pattern = Pattern.compile("&#[a-fA-F0-9]{6}");
12+
//
13+
// public static String format(String msg) {
14+
// if (Bukkit.getVersion().contains("1.17") || Bukkit.getVersion().contains("1.16") || Bukkit.getVersion().contains("1.18")) {
15+
// Matcher match = pattern.matcher(msg);
16+
// while (match.find()) {
17+
// String color = msg.substring(match.start(), match.end());
18+
// msg = msg.replace(color, ChatColor.of(color.replace("&#","#")) + "");
19+
// match = pattern.matcher(msg);
20+
// }
21+
// }
22+
// return ChatColor.translateAlternateColorCodes('&', msg);
23+
// }
24+
//
25+
//}

‎src/main/java/us/thezircon/play/silkyspawnerslite/utils/SpawnerGiver.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public class SpawnerGiver {
2525
private String msgGiveSelf = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("msgGiveSelf"));
2626
private String msgGiveOther = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("msgGiveOther"));
2727
private String msgReceiveSpawner = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("msgReceiveSpawner"));
28+
String defaultSpawnerName = ChatColor.translateAlternateColorCodes('&', plugin.getLangConfig().getString("spawnerName"));
2829

2930
/**
3031
* Constructor for deciding what spawner should be used.
@@ -39,7 +40,8 @@ public SpawnerGiver(EntityType spawnerType) {
3940
csm.setSpawnedType(spawnerType);
4041

4142
meta.setBlockState(csm);
42-
meta.setDisplayName(ChatColor.AQUA + spawnerType.toString().replace("_", " ") + " Spawner");
43+
//meta.setDisplayName(ChatColor.AQUA + spawnerType.toString().replace("_", " ") + " Spawner");
44+
meta.setDisplayName(defaultSpawnerName.replace("{TYPE}", csm.getSpawnedType().toString().replace("_", " ")));
4345
meta.addItemFlags();
4446
spawner_to_give.setItemMeta(meta);
4547

‎src/main/resources/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ chargeOnBreak:
3333
price: 50.00
3434
sendMSG: true
3535

36-
# Blacklist worlds that you don't want player to be able to mine spawners.
37-
# This would cause the spawner to break and drop xp for all worlds on the blacklist!
36+
#Blacklist worlds that you don't want player to be able to mine spawners.
37+
#This would cause the spawner to break and drop xp for all worlds on the blacklist!
3838
blacklist:
3939
- exampleworld

0 commit comments

Comments
 (0)