Skip to content

Commit d743745

Browse files
Add customitem flag and bump version
1 parent 58ca1bd commit d743745

File tree

5 files changed

+36
-3
lines changed

5 files changed

+36
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>parallelmc</groupId>
88
<artifactId>parallelutils</artifactId>
9-
<version>0.1.2</version>
9+
<version>0.1.3</version>
1010
<packaging>jar</packaging>
1111

1212
<name>Parallelutils</name>

src/main/java/parallelmc/parallelutils/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public class Constants {
44

5-
public static final Version VERSION = new Version(0, 1, 2);
5+
public static final Version VERSION = new Version(0, 1, 3);
66
public static final String PLUGIN_NAME = "ParallelUtils";
77
public static final String DEFAULT_WORLD = "world";
88
}

src/main/java/parallelmc/parallelutils/Parallelutils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public void onDisable() {
194194
removeStatement.execute("TRUNCATE TABLE Spawners");
195195
dbConn.commit();
196196
} catch (SQLException e) {
197-
e.printStackTrace();
197+
log(Level.WARNING, "Could not connect to DB");
198198
log(Level.WARNING, "Trying again...");
199199

200200
// Try reconnecting

src/main/java/parallelmc/parallelutils/custommobs/bukkitmobs/CraftFireWisp.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
package parallelmc.parallelutils.custommobs.bukkitmobs;
22

3+
import org.bukkit.Bukkit;
34
import org.bukkit.ChatColor;
45
import org.bukkit.Material;
6+
import org.bukkit.NamespacedKey;
57
import org.bukkit.craftbukkit.v1_16_R3.entity.CraftZombie;
68
import org.bukkit.enchantments.Enchantment;
79
import org.bukkit.event.entity.EntityDeathEvent;
810
import org.bukkit.inventory.ItemFlag;
911
import org.bukkit.inventory.ItemStack;
1012
import org.bukkit.inventory.meta.ItemMeta;
13+
import org.bukkit.persistence.PersistentDataType;
1114
import org.bukkit.plugin.Plugin;
15+
import org.bukkit.plugin.PluginManager;
16+
import org.bukkit.plugin.java.JavaPlugin;
17+
import parallelmc.parallelutils.Constants;
18+
import parallelmc.parallelutils.Parallelutils;
1219

1320
import java.util.List;
1421
import java.util.Random;
22+
import java.util.logging.Level;
1523

1624
import static org.bukkit.attribute.Attribute.*;
1725

@@ -60,6 +68,15 @@ public static void deathLoot(EntityDeathEvent event) {
6068
shardMeta.setCustomModelData(1000002);
6169
shardMeta.addEnchant(Enchantment.DURABILITY, 1, true);
6270
shardMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
71+
72+
PluginManager manager = Bukkit.getPluginManager();
73+
JavaPlugin plugin = (JavaPlugin) manager.getPlugin(Constants.PLUGIN_NAME);
74+
if (plugin == null) {
75+
Parallelutils.log(Level.SEVERE, "PLUGIN NOT FOUND. THIS IS A PROBLEM");
76+
}
77+
NamespacedKey key = new NamespacedKey(plugin, "CustomItem");
78+
shardMeta.getPersistentDataContainer().set(key, PersistentDataType.INTEGER, 1);
79+
6380
shard.setItemMeta(shardMeta);
6481
} catch (NullPointerException e) {
6582
e.printStackTrace();

src/main/java/parallelmc/parallelutils/custommobs/bukkitmobs/CraftWisp.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11
package parallelmc.parallelutils.custommobs.bukkitmobs;
22

3+
import org.bukkit.Bukkit;
34
import org.bukkit.ChatColor;
45
import org.bukkit.Material;
6+
import org.bukkit.NamespacedKey;
57
import org.bukkit.craftbukkit.v1_16_R3.entity.CraftZombie;
68
import org.bukkit.enchantments.Enchantment;
79
import org.bukkit.event.entity.EntityDeathEvent;
810
import org.bukkit.inventory.ItemFlag;
911
import org.bukkit.inventory.ItemStack;
1012
import org.bukkit.inventory.meta.ItemMeta;
13+
import org.bukkit.persistence.PersistentDataType;
1114
import org.bukkit.plugin.Plugin;
15+
import org.bukkit.plugin.PluginManager;
16+
import org.bukkit.plugin.java.JavaPlugin;
17+
import parallelmc.parallelutils.Constants;
18+
import parallelmc.parallelutils.Parallelutils;
1219

1320
import java.util.List;
21+
import java.util.logging.Level;
1422

1523
import static org.bukkit.attribute.Attribute.*;
1624

@@ -59,6 +67,14 @@ public static void deathLoot(EntityDeathEvent event) {
5967
shardMeta.setCustomModelData(1000001);
6068
shardMeta.addEnchant(Enchantment.DURABILITY, 1, true);
6169
shardMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
70+
71+
PluginManager manager = Bukkit.getPluginManager();
72+
JavaPlugin plugin = (JavaPlugin) manager.getPlugin(Constants.PLUGIN_NAME);
73+
if (plugin == null) {
74+
Parallelutils.log(Level.SEVERE, "PLUGIN NOT FOUND. THIS IS A PROBLEM");
75+
}
76+
NamespacedKey key = new NamespacedKey(plugin, "CustomItem");
77+
shardMeta.getPersistentDataContainer().set(key, PersistentDataType.INTEGER, 1);
6278
shard.setItemMeta(shardMeta);
6379
} catch (NullPointerException e) {
6480
e.printStackTrace();

0 commit comments

Comments
 (0)