Fixes for potiondata 1.21

TheNewEconomy · Aug 3, 2024 · d94c120 · d94c120
1 parent 4f92c7c
commit d94c120
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 29 deletions.
diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>net.tnemc</groupId>
  <artifactId>TNIL</artifactId>
- <version>0.1.7.6-Pre-12</version>
+ <version>0.1.7.6-Pre-122</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 
@@ -107,7 +107,7 @@
  <dependency>
  <groupId>net.tnemc</groupId>
  <artifactId>TNIL-BukkitBase</artifactId>
- <version>0.1.7.6-Pre-12</version>
+ <version>0.1.7.6-Pre-122</version>
  <scope>compile</scope>
  </dependency>
  </dependencies>

diff --git a/BukkitBase/pom.xml b/BukkitBase/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>net.tnemc</groupId>
  <artifactId>TNIL</artifactId>
- <version>0.1.7.6-Pre-12</version>
+ <version>0.1.7.6-Pre-122</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 
@@ -101,7 +101,7 @@
  <dependency>
  <groupId>net.tnemc</groupId>
  <artifactId>TNIL-Core</artifactId>
- <version>0.1.7.6-Pre-12</version>
+ <version>0.1.7.6-Pre-122</version>
  <scope>compile</scope>
  <exclusions>
  <exclusion>

diff --git a/BukkitBase/src/net/tnemc/item/bukkitbase/data/BukkitPotionData.java b/BukkitBase/src/net/tnemc/item/bukkitbase/data/BukkitPotionData.java
@@ -25,6 +25,8 @@
 import net.tnemc.item.data.SerialPotionData;
 import net.tnemc.item.data.potion.PotionEffectData;
 import org.bukkit.Color;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionData;
@@ -47,9 +49,23 @@ public void of(ItemStack stack) {
  if(meta != null) {
 
  if(meta.hasColor()) colorRGB = meta.getColor().asRGB();
- type = meta.getBasePotionData().getType().name();
- extended = meta.getBasePotionData().isExtended();
- upgraded = meta.getBasePotionData().isUpgraded();
+
+ try {
+
+ if(meta.hasBasePotionType()) {
+ updated = true;
+ type = meta.getBasePotionType().getKey().getKey();
+ extended = meta.getBasePotionType().isExtendable();
+ upgraded = meta.getBasePotionType().isUpgradeable();
+ }
+
+ } catch(Exception ignore) {
+ if(meta.getBasePotionData() != null) {
+ type = meta.getBasePotionData().getType().name();
+ extended = meta.getBasePotionData().isExtended();
+ upgraded = meta.getBasePotionData().isUpgraded();
+ }
+ }
 
  for(final PotionEffect effect : meta.getCustomEffects()) {
 
@@ -82,8 +98,16 @@ public ItemStack apply(ItemStack stack) {
  effect.isAmbient(),
  effect.hasParticles(),
  effect.hasIcon()), true));
- final PotionData data = new PotionData(PotionType.valueOf(type), extended, upgraded);
- meta.setBasePotionData(data);
+
+ if(updated) {
+ try {
+ final PotionType potionType = Registry.POTION.get(NamespacedKey.fromString(type));
+ meta.setBasePotionType(potionType);
+ } catch(Exception ignore) {}
+ } else {
+ final PotionData data = new PotionData(PotionType.valueOf(type), extended, upgraded);
+ meta.setBasePotionData(data);
+ }
  stack.setItemMeta(meta);
  return stack;
  }

diff --git a/Core/pom.xml b/Core/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>net.tnemc</groupId>
  <artifactId>TNIL</artifactId>
- <version>0.1.7.6-Pre-12</version>
+ <version>0.1.7.6-Pre-122</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/Core/src/net/tnemc/item/data/SerialPotionData.java b/Core/src/net/tnemc/item/data/SerialPotionData.java
@@ -31,10 +31,11 @@
 public abstract class SerialPotionData<T> implements SerialItemData<T> {
 
  protected final List<PotionEffectData> customEffects = new ArrayList<>();
- protected String type;
+ protected String type = null;
  protected int colorRGB = -1;
  protected boolean extended;
  protected boolean upgraded;
+ protected boolean updated = false; //magic value for bukkit fuckiness
 
  /**
  * Converts the {@link SerialItemData} to a JSON object.
@@ -45,12 +46,16 @@ public abstract class SerialPotionData<T> implements SerialItemData<T> {
  public JSONObject toJSON() {
  final JSONObject json = new JSONObject();
  json.put("name", "potion");
- json.put("type", type);
  if(colorRGB != -1) json.put("colour", colorRGB);
- json.put("extended", extended);
- json.put("upgraded", upgraded);
 
- if(customEffects.size() > 0) {
+ if(type != null) {
+ json.put("type", type);
+ json.put("updated", updated);
+ json.put("extended", extended);
+ json.put("upgraded", upgraded);
+ }
+
+ if(!customEffects.isEmpty()) {
  final JSONObject effects = new JSONObject();
  for(PotionEffectData effect : customEffects) {
 
@@ -68,11 +73,17 @@ public JSONObject toJSON() {
  */
  @Override
  public void readJSON(JSONHelper json) {
- type = json.getString("type");
-
  if(json.has("colour")) colorRGB = json.getInteger("colour");
- extended = json.getBoolean("extended");
- upgraded = json.getBoolean("upgraded");
+
+ if(json.has("type")) {
+ type = json.getString("type");
+ extended = json.getBoolean("extended");
+ upgraded = json.getBoolean("upgraded");
+
+ if(json.has("updated")) {
+ updated = json.getBoolean("updated");
+ }
+ }
 
  if(json.has("effects")) {
  final JSONHelper effects = json.getHelper("effects");
@@ -94,9 +105,13 @@ public void readJSON(JSONHelper json) {
  @Override
  public boolean equals(SerialItemData<? extends T> data) {
  if(data instanceof SerialPotionData<?> compare) {
- return customEffects.equals(compare.customEffects) && type.equalsIgnoreCase(compare.type)
- && colorRGB == compare.colorRGB && extended == compare.extended
- && upgraded == compare.upgraded;
+
+ if(type != null) {
+ return customEffects.equals(compare.customEffects) && type.equalsIgnoreCase(compare.type)
+ && colorRGB == compare.colorRGB && extended == compare.extended
+ && upgraded == compare.upgraded;
+ }
+ return customEffects.equals(compare.customEffects) && colorRGB == compare.colorRGB;
  }
  return false;
  }

diff --git a/Paper/pom.xml b/Paper/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>net.tnemc</groupId>
  <artifactId>TNIL</artifactId>
- <version>0.1.7.6-Pre-12</version>
+ <version>0.1.7.6-Pre-122</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 
@@ -108,7 +108,7 @@
  <dependency>
  <groupId>net.tnemc</groupId>
  <artifactId>TNIL-BukkitBase</artifactId>
- <version>0.1.7.6-Pre-12</version>
+ <version>0.1.7.6-Pre-122</version>
  <scope>compile</scope>
  </dependency>
  </dependencies>

diff --git a/TNIL-Sponge/pom.xml b/TNIL-Sponge/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>TNIL</artifactId>
  <groupId>net.tnemc</groupId>
- <version>0.1.7.6-Pre-12</version>
+ <version>0.1.7.6-Pre-122</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>
@@ -105,7 +105,7 @@
  <dependency>
  <groupId>net.tnemc</groupId>
  <artifactId>TNIL-Core</artifactId>
- <version>0.1.7.6-Pre-12</version>
+ <version>0.1.7.6-Pre-122</version>
  <scope>compile</scope>
  </dependency>
  </dependencies>

diff --git a/TNIL-Sponge7/pom.xml b/TNIL-Sponge7/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>TNIL</artifactId>
  <groupId>net.tnemc</groupId>
- <version>0.1.7.6-Pre-12</version>
+ <version>0.1.7.6-Pre-122</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>
@@ -56,7 +56,7 @@
  <dependency>
  <groupId>net.tnemc</groupId>
  <artifactId>TNIL-Core</artifactId>
- <version>0.1.7.6-Pre-12</version>
+ <version>0.1.7.6-Pre-122</version>
  <scope>compile</scope>
  </dependency>
  </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>net.tnemc</groupId>
  <artifactId>TNIL</artifactId>
- <version>0.1.7.6-Pre-12</version>
+ <version>0.1.7.6-Pre-122</version>
  <packaging>pom</packaging>
  <name>The New Item Library</name>