Removes useless method in DisplayPetData and DisplayPetRecord

anjoismysign · Jan 7, 2024 · 2daeaa4 · 2daeaa4
1 parent 783b53b
commit 2daeaa4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/ci-pom.xml b/ci-pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>us.mytheria</groupId>
         <artifactId>BlobLib</artifactId>
-        <version>1.697.57</version>
+        <version>1.697.58</version>
         <relativePath>pom.xml</relativePath>
     </parent>
     <artifactId>bloblib</artifactId>

diff --git a/local-pom.xml b/local-pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>us.mytheria</groupId>
         <artifactId>BlobLib</artifactId>
-        <version>1.697.57</version>
+        <version>1.697.58</version>
         <relativePath>pom.xml</relativePath>
     </parent>
     <artifactId>bloblib</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>us.mytheria</groupId>
     <artifactId>BlobLib</artifactId>
-    <version>1.697.57</version>
+    <version>1.697.58</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/src/main/java/us/mytheria/bloblib/displayentity/DisplayPetData.java b/src/main/java/us/mytheria/bloblib/displayentity/DisplayPetData.java
@@ -150,24 +150,21 @@ public String getCustomName() {
 
     /**
      * Will serialize the FloatingPetData in a configuration section
-     * under the patch name.
      * Example:
      * ConfigurationSection section = YamlConfiguration.loadConfiguration(file);
      * FloatingPetData data = new FloatingPetData(new ItemStack(Material.DIAMOND),
      * Particle.FLAME, "%owner%'s Pet");
-     * data.serialize(section, "FloatingPetRecord");
+     * data.serialize(section);
      * // YAML file would look like:
-     * // FloatingPetRecord:
-     * //   ItemStack:
-     * //     #blablabla
-     * //   Particle: FLAME
-     * //   CustomName: "%owner%'s Pet"
+     * // ItemStack:
+     * //   #blablabla
+     * // Particle: FLAME
+     * // CustomName: "%owner%'s Pet"
      *
      * @param configurationSection the configuration section to serialize in
-     * @param path                 the path to serialize in
      */
-    public void serialize(ConfigurationSection configurationSection, String path) {
+    public void serialize(ConfigurationSection configurationSection) {
         DisplayPetRecord record = new DisplayPetRecord(itemStack, blockData, particle, customName);
-        record.serialize(configurationSection, path);
+        record.serialize(configurationSection);
     }
 }
diff --git a/src/main/java/us/mytheria/bloblib/displayentity/DisplayPetRecord.java b/src/main/java/us/mytheria/bloblib/displayentity/DisplayPetRecord.java
@@ -5,6 +5,7 @@
 import org.bukkit.block.data.BlockData;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
 import us.mytheria.bloblib.BlobLib;
 import us.mytheria.bloblib.itemstack.ItemStackBuilder;
 import us.mytheria.bloblib.itemstack.ItemStackReader;
@@ -22,7 +23,10 @@
  * @param particle   the particle to display
  * @param customName the custom name to display
  */
-public record DisplayPetRecord(ItemStack itemStack, BlockData blockData, Particle particle, String customName) {
+public record DisplayPetRecord(@Nullable ItemStack itemStack,
+                               @Nullable BlockData blockData,
+                               @Nullable Particle particle,
+                               @Nullable String customName) {
 
     public static DisplayPetRecord read(ConfigurationSection section) {
         ItemStack itemStack = null;
@@ -48,16 +52,16 @@ public static DisplayPetRecord read(ConfigurationSection section) {
         return new DisplayPetRecord(itemStack, blockData, particle, customName);
     }
 
-    public void serialize(ConfigurationSection configurationSection, String path) {
+    public void serialize(ConfigurationSection configurationSection) {
         if (itemStack == null && blockData == null)
             throw new IllegalArgumentException("ItemStack and BlockData cannot both be null");
         if (itemStack != null)
-            configurationSection.set(path + ".ItemStack", itemStack);
+            configurationSection.set("ItemStack", itemStack);
         if (blockData != null)
-            configurationSection.set(path + ".BlockData", blockData.getAsString(true));
+            configurationSection.set("BlockData", blockData.getAsString(true));
         if (particle != null)
-            configurationSection.set(path + ".Particle", particle);
+            configurationSection.set("Particle", particle);
         if (customName != null)
-            configurationSection.set(path + ".CustomName", customName);
+            configurationSection.set("CustomName", customName);
     }
 }