Skip to content

Commit

Permalink
Merge pull request #376 from TownyAdvanced/feature/use_townys_metadat…
Browse files Browse the repository at this point in the history 
…autil

Changes to use the built-in MetaDataUtil found in Towny as of 0.97.2.0.
  • Loading branch information
@Goosius1
Goosius1 authored Sep 25, 2021
2 parents c90daf0 + eaf2e2e commit 69b02d0
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 124 deletions.
99 changes: 0 additions & 99 deletions src/main/java/com/gmail/goosius/siegewar/metadata/MetaDataUtil.java
View file

This file was deleted.

3 changes: 2 additions & 1 deletion src/main/java/com/gmail/goosius/siegewar/metadata/NationMetaDataController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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));
}
Expand Down
37 changes: 19 additions & 18 deletions src/main/java/com/gmail/goosius/siegewar/metadata/SiegeMetaDataController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand Down Expand Up @@ -441,7 +442,7 @@ public static void setResidentTimedPointContributors(Town town, Map<String,Integ

StringDataField sdf = (StringDataField) attackerSiegeContributors.clone();
if (town.hasMeta(sdf.getKey()))
MetaDataUtil.setString(town, sdf, mapAsStringBuilder.toString());
MetaDataUtil.setString(town, sdf, mapAsStringBuilder.toString(), true);
else
town.addMetaData(new StringDataField("siegewar_attackerSiegeContributors", mapAsStringBuilder.toString()));
}
Expand All @@ -460,7 +461,7 @@ public static void setPrimaryTownGovernments(Town town, Map<UUID,Integer> 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()));
}
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/com/gmail/goosius/siegewar/metadata/TownMetaDataController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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")));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand Down

0 comments on commit 69b02d0

Please sign in to comment.