From eaf2e2e41d60b02efc6e6caa5fdfae8eb9ef9d32 Mon Sep 17 00:00:00 2001 From: Llm Dl Date: Sat, 25 Sep 2021 13:53:41 -0500 Subject: [PATCH] Changes to use the built-in MetaDataUtil found in Towny as of 0.97.2.0. --- pom.xml | 2 +- .../siegewar/metadata/MetaDataUtil.java | 99 ------------------- .../metadata/NationMetaDataController.java | 3 +- .../metadata/SiegeMetaDataController.java | 37 +++---- .../metadata/TownMetaDataController.java | 13 +-- 5 files changed, 29 insertions(+), 125 deletions(-) delete mode 100644 src/main/java/com/gmail/goosius/siegewar/metadata/MetaDataUtil.java diff --git a/pom.xml b/pom.xml index 43d64e5a6..a451dfa82 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ com.github.TownyAdvanced Towny - 0.97.0.23 + 0.97.2.0 provided diff --git a/src/main/java/com/gmail/goosius/siegewar/metadata/MetaDataUtil.java b/src/main/java/com/gmail/goosius/siegewar/metadata/MetaDataUtil.java deleted file mode 100644 index 67fceb6df..000000000 --- a/src/main/java/com/gmail/goosius/siegewar/metadata/MetaDataUtil.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.gmail.goosius.siegewar.metadata; - -import com.palmergames.bukkit.towny.object.Town; -import com.palmergames.bukkit.towny.object.TownyObject; -import com.palmergames.bukkit.towny.object.metadata.BooleanDataField; -import com.palmergames.bukkit.towny.object.metadata.CustomDataField; -import com.palmergames.bukkit.towny.object.metadata.DecimalDataField; -import com.palmergames.bukkit.towny.object.metadata.IntegerDataField; -import com.palmergames.bukkit.towny.object.metadata.LongDataField; -import com.palmergames.bukkit.towny.object.metadata.StringDataField; - -/** - * - * @author LlmDl - * - */ -class MetaDataUtil { - - static String getString(Town town, StringDataField sdf) { - CustomDataField cdf = town.getMetadata(sdf.getKey()); - if (cdf instanceof StringDataField) { - return ((StringDataField) cdf).getValue(); - } - return ""; - } - - static boolean getBoolean(Town town, BooleanDataField bdf) { - CustomDataField cdf = town.getMetadata(bdf.getKey()); - if (cdf instanceof BooleanDataField) - return ((BooleanDataField) cdf).getValue(); - return false; - } - - static long getLong(TownyObject townyObject, LongDataField ldf) { - CustomDataField cdf = townyObject.getMetadata(ldf.getKey()); - if (cdf instanceof LongDataField) - return ((LongDataField) cdf).getValue(); - return 0l; - } - - static int getInt(TownyObject townyObject, IntegerDataField idf) { - CustomDataField cdf = townyObject.getMetadata(idf.getKey()); - if (cdf instanceof IntegerDataField) - return ((IntegerDataField) cdf).getValue(); - return 0; - } - - static double getDouble(Town town, DecimalDataField ddf) { - CustomDataField cdf = town.getMetadata(ddf.getKey()); - if (cdf instanceof DecimalDataField) - return ((DecimalDataField) cdf).getValue(); - return 0.0; - } - - static void setString(Town town, StringDataField sdf, String string) { - CustomDataField cdf = town.getMetadata(sdf.getKey()); - if (cdf instanceof StringDataField) { - StringDataField value = (StringDataField) cdf; - value.setValue(string); - town.save(); - } - } - - static void setBoolean(Town town, BooleanDataField bdf, boolean bool) { - CustomDataField cdf = town.getMetadata(bdf.getKey()); - if (cdf instanceof BooleanDataField) { - BooleanDataField value = (BooleanDataField) cdf; - value.setValue(bool); - town.save(); - } - } - - static void setLong(TownyObject townyObject, LongDataField ldf, long num) { - CustomDataField cdf = townyObject.getMetadata(ldf.getKey()); - if (cdf instanceof LongDataField) { - LongDataField value = (LongDataField) cdf; - value.setValue(num); - townyObject.save(); - } - } - - static void setInt(TownyObject townyObject, IntegerDataField idf, int num) { - CustomDataField cdf = townyObject.getMetadata(idf.getKey()); - if (cdf instanceof IntegerDataField) { - IntegerDataField value = (IntegerDataField) cdf; - value.setValue(num); - townyObject.save(); - } - } - - static void setDouble(Town town, DecimalDataField ddf, double num) { - CustomDataField cdf = town.getMetadata(ddf.getKey()); - if (cdf instanceof DecimalDataField) { - DecimalDataField value = (DecimalDataField) cdf; - value.setValue(num); - town.save(); - } - } -} diff --git a/src/main/java/com/gmail/goosius/siegewar/metadata/NationMetaDataController.java b/src/main/java/com/gmail/goosius/siegewar/metadata/NationMetaDataController.java index fda38b579..2c9a7d863 100644 --- a/src/main/java/com/gmail/goosius/siegewar/metadata/NationMetaDataController.java +++ b/src/main/java/com/gmail/goosius/siegewar/metadata/NationMetaDataController.java @@ -5,6 +5,7 @@ import com.palmergames.bukkit.towny.object.metadata.CustomDataField; import com.palmergames.bukkit.towny.object.metadata.IntegerDataField; import com.palmergames.bukkit.towny.object.metadata.LongDataField; +import com.palmergames.bukkit.towny.utils.MetaDataUtil; public class NationMetaDataController { @SuppressWarnings("unused") @@ -89,7 +90,7 @@ public static long getPendingSiegeImmunityMillis(Nation nation) { public static void setPendingSiegeImmunityMillis(Nation nation, long num) { LongDataField ldf = (LongDataField) pendingSiegeImmunityMillis.clone(); if (nation.hasMeta(ldf.getKey())) - MetaDataUtil.setLong(nation, ldf, num); + MetaDataUtil.setLong(nation, ldf, num, true); else nation.addMetaData(new LongDataField(pendingSiegeImmunityMillis.getKey(), num)); } diff --git a/src/main/java/com/gmail/goosius/siegewar/metadata/SiegeMetaDataController.java b/src/main/java/com/gmail/goosius/siegewar/metadata/SiegeMetaDataController.java index d2bcef8a7..e6e846195 100644 --- a/src/main/java/com/gmail/goosius/siegewar/metadata/SiegeMetaDataController.java +++ b/src/main/java/com/gmail/goosius/siegewar/metadata/SiegeMetaDataController.java @@ -9,6 +9,7 @@ import com.palmergames.bukkit.towny.object.metadata.IntegerDataField; import com.palmergames.bukkit.towny.object.metadata.LongDataField; import com.palmergames.bukkit.towny.object.metadata.StringDataField; +import com.palmergames.bukkit.towny.utils.MetaDataUtil; import java.util.HashMap; import java.util.Map; @@ -70,7 +71,7 @@ public static boolean hasSiege(Town town) { public static void setSiege(Town town, boolean bool) { BooleanDataField bdf = (BooleanDataField) hasSiege.clone(); if (town.hasMeta(bdf.getKey())) - MetaDataUtil.setBoolean(town, bdf, bool); + MetaDataUtil.setBoolean(town, bdf, bool, true); else town.addMetaData(new BooleanDataField("siegewar_hasSiege", bool)); } @@ -94,7 +95,7 @@ public static String getAttackerUUID(Town town) { public static void setAttackerUUID(Town town, String uuid) { StringDataField sdf = (StringDataField) siegeAttackerUUID.clone(); if (town.hasMeta(sdf.getKey())) - MetaDataUtil.setString(town, sdf, uuid); + MetaDataUtil.setString(town, sdf, uuid, true); else town.addMetaData(new StringDataField("siegewar_attackerUUID", uuid)); } @@ -110,7 +111,7 @@ public static String getAttackerName(Town town) { public static void setAttackerName(Town town, String name) { StringDataField sdf = (StringDataField) siegeAttackerName.clone(); if (town.hasMeta(sdf.getKey())) - MetaDataUtil.setString(town, sdf, name); + MetaDataUtil.setString(town, sdf, name, true); else town.addMetaData(new StringDataField("siegewar_attackerName", name)); } @@ -126,7 +127,7 @@ public static String getDefenderUUID(Town town) { public static void setDefenderUUID(Town town, String uuid) { StringDataField sdf = (StringDataField) siegeDefenderUUID.clone(); if (town.hasMeta(sdf.getKey())) - MetaDataUtil.setString(town, sdf, uuid); + MetaDataUtil.setString(town, sdf, uuid, true); else town.addMetaData(new StringDataField("siegewar_defenderUUID", uuid)); } @@ -142,7 +143,7 @@ public static String getDefenderName(Town town) { public static void setDefenderName(Town town, String name) { StringDataField sdf = (StringDataField) siegeDefenderName.clone(); if (town.hasMeta(sdf.getKey())) - MetaDataUtil.setString(town, sdf, name); + MetaDataUtil.setString(town, sdf, name, true); else town.addMetaData(new StringDataField("siegewar_defenderName", name)); } @@ -158,7 +159,7 @@ public static String getTownUUID(Town town) { public static void setTownUUID(Town town, String uuid) { StringDataField sdf = (StringDataField) siegeTownUUID.clone(); if (town.hasMeta(sdf.getKey())) - MetaDataUtil.setString(town, sdf, uuid); + MetaDataUtil.setString(town, sdf, uuid, true); else town.addMetaData(new StringDataField("siegewar_townUUID", uuid)); } @@ -174,7 +175,7 @@ public static String getFlagLocation(Town town) { public static void setFlagLocation(Town town, String loc) { StringDataField sdf = (StringDataField) siegeFlagLocation.clone(); if (town.hasMeta(sdf.getKey())) - MetaDataUtil.setString(town, sdf, loc); + MetaDataUtil.setString(town, sdf, loc, true); else town.addMetaData(new StringDataField("siegewar_flagLocation", loc)); } @@ -190,7 +191,7 @@ public static String getSiegeStatus(Town town) { public static void setSiegeStatus(Town town, String status) { StringDataField sdf = (StringDataField) siegeStatus.clone(); if (town.hasMeta(sdf.getKey())) - MetaDataUtil.setString(town, sdf, status); + MetaDataUtil.setString(town, sdf, status, true); else town.addMetaData(new StringDataField("siegewar_status", status)); } @@ -206,7 +207,7 @@ public static String getSiegeType(Town town) { public static void setSiegeType(Town town, String status) { StringDataField sdf = (StringDataField) siegeType.clone(); if (town.hasMeta(sdf.getKey())) - MetaDataUtil.setString(town, sdf, status); + MetaDataUtil.setString(town, sdf, status, true); else town.addMetaData(new StringDataField("siegewar_type", status)); } @@ -221,7 +222,7 @@ public static int getSiegeBalance(Town town) { public static void setSiegeBalance(Town town, int num) { IntegerDataField idf = (IntegerDataField) siegeBalance.clone(); if (town.hasMeta(idf.getKey())) - MetaDataUtil.setInt(town, idf, num); + MetaDataUtil.setInt(town, idf, num, true); else town.addMetaData(new IntegerDataField("siegewar_points", num)); } @@ -236,7 +237,7 @@ public static double getWarChestAmount(Town town) { public static void setWarChestAmount(Town town, double num) { DecimalDataField ddf = (DecimalDataField) siegeWarChestAmount.clone(); if (town.hasMeta(ddf.getKey())) - MetaDataUtil.setDouble(town, ddf, num); + MetaDataUtil.setDouble(town, ddf, num, true); else town.addMetaData(new DecimalDataField("siegewar_warChestAmount", num)); } @@ -251,7 +252,7 @@ public static boolean townPlundered(Town town) { public static void setTownPlundered(Town town, boolean bool) { BooleanDataField bdf = (BooleanDataField) townPlundered.clone(); if (town.hasMeta(bdf.getKey())) - MetaDataUtil.setBoolean(town, bdf, bool); + MetaDataUtil.setBoolean(town, bdf, bool, true); else town.addMetaData(new BooleanDataField("siegewar_townPlundered", bool)); } @@ -266,7 +267,7 @@ public static boolean townInvaded(Town town) { public static void setTownInvaded(Town town, boolean bool) { BooleanDataField bdf = (BooleanDataField) townInvaded.clone(); if (town.hasMeta(bdf.getKey())) - MetaDataUtil.setBoolean(town, bdf, bool); + MetaDataUtil.setBoolean(town, bdf, bool, true); else town.addMetaData(new BooleanDataField("siegewar_townInvaded", bool)); } @@ -281,7 +282,7 @@ public static long getStartTime(Town town) { public static void setStartTime(Town town, long num) { LongDataField ldf = (LongDataField) startTime.clone(); if (town.hasMeta(ldf.getKey())) - MetaDataUtil.setLong(town, ldf, num); + MetaDataUtil.setLong(town, ldf, num, true); else town.addMetaData(new LongDataField("siegewar_startTime", num)); } @@ -296,7 +297,7 @@ public static long getEndTime(Town town) { public static void setEndTime(Town town, long num) { LongDataField ldf = (LongDataField) endTime.clone(); if (town.hasMeta(ldf.getKey())) - MetaDataUtil.setLong(town, ldf, num); + MetaDataUtil.setLong(town, ldf, num, true); else town.addMetaData(new LongDataField("siegewar_endTime", num)); } @@ -311,7 +312,7 @@ public static long getActualEndTime(Town town) { public static void setActualEndTime(Town town, long num) { LongDataField ldf = (LongDataField) actualEndTime.clone(); if (town.hasMeta(ldf.getKey())) - MetaDataUtil.setLong(town, ldf, num); + MetaDataUtil.setLong(town, ldf, num, true); else town.addMetaData(new LongDataField("siegewar_actualEndTime", num)); } @@ -441,7 +442,7 @@ public static void setResidentTimedPointContributors(Town town, Map govern StringDataField sdf = (StringDataField) primaryTownGovernments.clone(); if (town.hasMeta(sdf.getKey())) - MetaDataUtil.setString(town, sdf, mapAsStringBuilder.toString()); + MetaDataUtil.setString(town, sdf, mapAsStringBuilder.toString(), true); else town.addMetaData(new StringDataField(primaryTownGovernments.getKey(), mapAsStringBuilder.toString())); } diff --git a/src/main/java/com/gmail/goosius/siegewar/metadata/TownMetaDataController.java b/src/main/java/com/gmail/goosius/siegewar/metadata/TownMetaDataController.java index c7b1aef0e..f355bf549 100644 --- a/src/main/java/com/gmail/goosius/siegewar/metadata/TownMetaDataController.java +++ b/src/main/java/com/gmail/goosius/siegewar/metadata/TownMetaDataController.java @@ -7,6 +7,7 @@ import com.palmergames.bukkit.towny.object.metadata.IntegerDataField; import com.palmergames.bukkit.towny.object.metadata.LongDataField; import com.palmergames.bukkit.towny.object.metadata.StringDataField; +import com.palmergames.bukkit.towny.utils.MetaDataUtil; import org.jetbrains.annotations.Nullable; /** @@ -45,7 +46,7 @@ public static void setPeacefulnessChangeDays(Town town, int days) { town.removeMetaData(idf); return; } - MetaDataUtil.setInt(town, idf, days); + MetaDataUtil.setInt(town, idf, days, true); } else if (days != 0) { town.addMetaData(new IntegerDataField("siegewar_peacefuldays", days, Translation.of("status_town_days_to_peacefulness_status_change"))); } @@ -62,7 +63,7 @@ public static boolean getDesiredPeacefulnessSetting(Town town) { public static void setDesiredPeacefulnessSetting(Town town, boolean bool) { BooleanDataField bdf = (BooleanDataField) desiredPeacefulness.clone(); if (town.hasMeta(bdf.getKey())) { - MetaDataUtil.setBoolean(town, bdf, bool); + MetaDataUtil.setBoolean(town, bdf, bool, true); } else { town.addMetaData(new BooleanDataField("siegewar_desiredPeaceSetting", bool)); } @@ -83,7 +84,7 @@ public static void setRevoltImmunityEndTime(Town town, long time) { return; } if (town.hasMeta(ldf.getKey())) { - MetaDataUtil.setLong(town, ldf, time); + MetaDataUtil.setLong(town, ldf, time, true); } else { town.addMetaData(new LongDataField("siegewar_revoltImmunityEndTime", time)); } @@ -104,7 +105,7 @@ public static void setSiegeImmunityEndTime(Town town, long time) { return; } if (town.hasMeta(ldf.getKey())) { - MetaDataUtil.setLong(town, ldf, time); + MetaDataUtil.setLong(town, ldf, time, true); } else { town.addMetaData(new LongDataField("siegewar_siegeImmunityEndTime", time)); } @@ -121,7 +122,7 @@ public static String getOccupyingNationUUID(Town town) { public static void setOccupyingNationUUID(Town town, String uuid) { StringDataField sdf = (StringDataField) occupyingNationUUID.clone(); if (town.hasMeta(sdf.getKey())) - MetaDataUtil.setString(town, sdf, uuid); + MetaDataUtil.setString(town, sdf, uuid, true); else town.addMetaData(new StringDataField("siegewar_occupyingNationUUID", uuid)); } @@ -143,7 +144,7 @@ public static String getPrePeacefulOccupierUUID(Town town) { public static void setPrePeacefulOccupierUUID(Town town, String uuid) { StringDataField sdf = (StringDataField) prePeacefulOccupierUUID.clone(); if (town.hasMeta(sdf.getKey())) - MetaDataUtil.setString(town, sdf, uuid); + MetaDataUtil.setString(town, sdf, uuid, true); else town.addMetaData(new StringDataField("siegewar_prePeacefulOccupierUUID", uuid)); }