Merge pull request #84 from BentoBoxWorld/develop

tastybento · web-flow · commit f710abda101b · 2026-04-13T17:07:16.000-07:00
Fix upgrade definitions not persisting to database on restart (v1.0.2)
diff --git a/pom.xml b/pom.xml
@@ -62,7 +62,7 @@
         <revision>${build.version}-SNAPSHOT</revision>
 
         <!-- This allows to change between versions. -->
-        <build.version>1.0.1</build.version>
+        <build.version>1.0.2</build.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- Do not change unless you want different name for local builds. -->
diff --git a/src/main/java/world/bentobox/upgrades/api/UpgradeAPI.java b/src/main/java/world/bentobox/upgrades/api/UpgradeAPI.java
@@ -120,6 +120,7 @@ public boolean doUpgrade(User user, Island island) {
 
         UpgradesData data = this.upgradesAddon.getUpgradesLevels(island.getUniqueId());
         data.setUpgradeLevel(this.name, data.getUpgradeLevel(this.name) + 1);
+        this.upgradesAddon.getDatabase().saveObjectAsync(data);
 
         return true;
     }
diff --git a/src/main/java/world/bentobox/upgrades/dataobjects/prices/IslandLevelPrice.java b/src/main/java/world/bentobox/upgrades/dataobjects/prices/IslandLevelPrice.java
@@ -149,6 +149,7 @@ private PanelItem.ClickHandler onSetRule() {
         private Consumer<String> doSetRule() {
             return (rule) -> {
                 this.saved.setLevelNeededEquation(rule);
+                this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                 this.createInterface();
                 this.getBuild()
                         .build();
diff --git a/src/main/java/world/bentobox/upgrades/dataobjects/prices/ItemPrice.java b/src/main/java/world/bentobox/upgrades/dataobjects/prices/ItemPrice.java
@@ -152,6 +152,7 @@ private PanelItem.ClickHandler onSetItem() {
                     client.sendMessage(client.getTranslation("upgrades.error.noiteminhand"));
                 } else {
                     this.saved.setMaterial(inHand.getType().name());
+                    this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                     this.createInterface();
                     this.getBuild().build();
                 }
@@ -167,6 +168,7 @@ private PanelItem.ClickHandler onSetAmount() {
                                 int amt = Integer.parseInt(input);
                                 if (amt > 0) {
                                     this.saved.setAmount(amt);
+                                    this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                                     this.createInterface();
                                     this.getBuild().build();
                                 }
diff --git a/src/main/java/world/bentobox/upgrades/dataobjects/prices/MoneyPrice.java b/src/main/java/world/bentobox/upgrades/dataobjects/prices/MoneyPrice.java
@@ -147,6 +147,7 @@ private PanelItem.ClickHandler onSetRule() {
         private Consumer<String> doSetRule() {
             return (rule) -> {
                 this.saved.setAmountEquation(rule);
+                this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                 this.createInterface();
                 this.getBuild().build();
             };
diff --git a/src/main/java/world/bentobox/upgrades/dataobjects/prices/PermissionPrice.java b/src/main/java/world/bentobox/upgrades/dataobjects/prices/PermissionPrice.java
@@ -128,6 +128,7 @@ private PanelItem.ClickHandler onSetRule() {
         private Consumer<String> doSetRule() {
             return (rule) -> {
                 this.saved.setPermission(rule);
+                this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                 this.createInterface();
                 this.getBuild().build();
             };
diff --git a/src/main/java/world/bentobox/upgrades/dataobjects/rewards/CommandReward.java b/src/main/java/world/bentobox/upgrades/dataobjects/rewards/CommandReward.java
@@ -140,6 +140,7 @@ private void createInterface() {
         private PanelItem.ClickHandler onToggle() {
             return (panel, client, click, slot) -> {
                 this.saved.setConsole(!this.saved.isConsole());
+                this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                 this.createInterface();
                 this.getBuild().build();
                 return true;
@@ -153,6 +154,7 @@ private PanelItem.ClickHandler onAddCommand() {
                             List<String> cmds = new ArrayList<>(this.saved.getCommands());
                             cmds.add(cmd);
                             this.saved.setCommands(cmds);
+                            this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                             this.createInterface();
                             this.getBuild().build();
                         },
@@ -166,6 +168,7 @@ private PanelItem.ClickHandler onAddCommand() {
         private PanelItem.ClickHandler onClearCommands() {
             return (panel, client, click, slot) -> {
                 this.saved.setCommands(new ArrayList<>());
+                this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                 this.createInterface();
                 this.getBuild().build();
                 return true;
diff --git a/src/main/java/world/bentobox/upgrades/dataobjects/rewards/CropGrowthReward.java b/src/main/java/world/bentobox/upgrades/dataobjects/rewards/CropGrowthReward.java
@@ -151,6 +151,7 @@ private PanelItem.ClickHandler onSetRule() {
         private Consumer<String> doSetRule() {
             return (rule) -> {
                 this.saved.setGrowthBonusEquation(rule);
+                this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                 this.createInterface();
                 this.getBuild().build();
             };
diff --git a/src/main/java/world/bentobox/upgrades/dataobjects/rewards/LimitsReward.java b/src/main/java/world/bentobox/upgrades/dataobjects/rewards/LimitsReward.java
@@ -185,6 +185,7 @@ private PanelItem.ClickHandler onCycleType() {
                     case "ENTITY" -> this.saved.setLimitType("ENTITY_GROUP");
                     default -> this.saved.setLimitType("BLOCK");
                 }
+                this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                 this.createInterface();
                 this.getBuild().build();
                 return true;
@@ -196,6 +197,7 @@ private PanelItem.ClickHandler onSetTarget() {
                 this.getAddon().getChatInput().askOneInput(
                         rule -> {
                             this.saved.setTarget(rule);
+                            this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                             this.createInterface();
                             this.getBuild().build();
                         },
@@ -211,6 +213,7 @@ private PanelItem.ClickHandler onSetAmount() {
                 this.getAddon().getChatInput().askOneInput(
                         rule -> {
                             this.saved.setAmountEquation(rule);
+                            this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                             this.createInterface();
                             this.getBuild().build();
                         },
diff --git a/src/main/java/world/bentobox/upgrades/dataobjects/rewards/RangeReward.java b/src/main/java/world/bentobox/upgrades/dataobjects/rewards/RangeReward.java
@@ -177,6 +177,7 @@ private PanelItem.ClickHandler onSetRule() {
         private Consumer<String> doSetRule() {
             return (rule) -> {
                 this.saved.setRangeUpgradeEquation(rule);
+                this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                 this.createInterface();
                 this.getBuild()
                         .build();
diff --git a/src/main/java/world/bentobox/upgrades/dataobjects/rewards/SpawnerReward.java b/src/main/java/world/bentobox/upgrades/dataobjects/rewards/SpawnerReward.java
@@ -151,6 +151,7 @@ private PanelItem.ClickHandler onSetRule() {
         private Consumer<String> doSetRule() {
             return (rule) -> {
                 this.saved.setSpawnBonusEquation(rule);
+                this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                 this.createInterface();
                 this.getBuild().build();
             };
diff --git a/src/main/java/world/bentobox/upgrades/ui/admin/EditTierPanel.java b/src/main/java/world/bentobox/upgrades/ui/admin/EditTierPanel.java
@@ -138,8 +138,13 @@ private void setButton() {
         return true;
     };
 
-    private final Consumer<String> doSetName = (name) -> {
+    protected void applySetName(String name) {
         this.tier.setName(name);
+        this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
+    }
+
+    private final Consumer<String> doSetName = (name) -> {
+        applySetName(name);
         this.setButton();
         this.getBuild()
                 .build();
@@ -159,13 +164,19 @@ private void setButton() {
         return true;
     };
 
-    private final Consumer<List<String>> doSetDescription = (description) -> {
-        if (description == null)
-            return;
+    protected void applySetDescription(List<String> description) {
+        if (description == null) return;
         this.tier.setDescription(description);
-        this.setButton();
-        this.getBuild()
-                .build();
+        this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
+    }
+
+    private final Consumer<List<String>> doSetDescription = (description) -> {
+        applySetDescription(description);
+        if (description != null) {
+            this.setButton();
+            this.getBuild()
+                    .build();
+        }
     };
 
     private final ClickHandler onSetIcon = (panel, client, click, slot) -> {
@@ -178,12 +189,17 @@ private void setButton() {
             return true;
         }
         this.tier.setIcon(new ItemStack(inHand.getType()));
+        this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
         this.setButton();
         this.getBuild()
                 .build();
         return true;
     };
 
+    private void saveAllTiers() {
+        this.tiers.forEach(t -> this.getAddon().getUpgradeDataManager().saveUpgradeTier(t));
+    }
+
     private final ClickHandler onSetNbLevel = (panel, client, click, slot) -> {
         int index = this.tiers.indexOf(this.tier);
         int actual = this.tiersLengths.get(index);
@@ -196,6 +212,7 @@ private void setButton() {
             return true;
 
         this.updateTierLevel(this.tiers, this.tiersLengths);
+        this.saveAllTiers();
         this.setButton();
         this.getBuild()
                 .build();
@@ -219,6 +236,7 @@ else if (click.isRightClick() && index < this.tiers.size() - 1)
         this.tiersLengths.set(newIndex, length);
         this.tiers.set(newIndex, this.tier);
         this.updateTierLevel(this.tiers, this.tiersLengths);
+        this.saveAllTiers();
         this.setButton();
         this.getBuild()
                 .build();
@@ -305,6 +323,7 @@ else if (click.isRightClick() && index < this.tiers.size() - 1)
                             .collect(
                                     Collectors.toList());
                     this.tier.setPrices(prices);
+                    this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                 }
                 this.getBuild()
                         .build();
@@ -320,6 +339,7 @@ else if (click.isRightClick() && index < this.tiers.size() - 1)
                             .collect(
                                     Collectors.toList());
                     this.tier.setRewards(rewards);
+                    this.getAddon().getUpgradeDataManager().saveUpgradeTier(this.tier);
                 }
                 this.getBuild()
                         .build();
diff --git a/src/main/java/world/bentobox/upgrades/ui/admin/EditUpgradePanel.java b/src/main/java/world/bentobox/upgrades/ui/admin/EditUpgradePanel.java
@@ -129,12 +129,17 @@ private void setButton() {
 		return true;
 	};
 	
-	private Consumer<String> doSetName = (name) -> {
+	protected void applySetName(String name) {
 		this.upgrade.setName(name);
+		this.getAddon().getUpgradeDataManager().saveUpgradeData(this.upgrade);
+	}
+
+	private Consumer<String> doSetName = (name) -> {
+		applySetName(name);
 		this.setButton();
 		this.getBuild().build();
 	};
-	
+
 	private ClickHandler onSetDescription = (panel, client, click, slot) -> {
 		this.getAddon().getChatInput().askMultiLine(this.doSetDescription,
 			input -> true,
@@ -144,24 +149,31 @@ private void setButton() {
 			this.getUser());
 		return true;
 	};
-	
-	private Consumer<List<String>> doSetDescription = (descrip) -> {
-		if (descrip == null)
-			return;
+
+	protected void applySetDescription(List<String> descrip) {
+		if (descrip == null) return;
 		this.upgrade.setDescription(descrip);
-		this.setButton();
-		this.getBuild().build();
+		this.getAddon().getUpgradeDataManager().saveUpgradeData(this.upgrade);
+	}
+
+	private Consumer<List<String>> doSetDescription = (descrip) -> {
+		applySetDescription(descrip);
+		if (descrip != null) {
+			this.setButton();
+			this.getBuild().build();
+		}
 	};
 	
 	private ClickHandler onSetIcon = (panel, client, click, slot) -> {
 		ItemStack inHand = client.getInventory().getItemInMainHand();
-		
+
 		if (inHand == null || BADICON.contains(inHand.getType())) {
 			client.sendMessage("upgrades.error.noiteminhand");
 			client.closeInventory();
 			return true;
 		}
 		upgrade.setIcon(new ItemStack(inHand.getType()));
+		this.getAddon().getUpgradeDataManager().saveUpgradeData(this.upgrade);
 		this.setButton();
 		this.getBuild().build();
 		return true;
@@ -251,8 +263,13 @@ private void setButton() {
 		return true;
 	};
 	
+	protected void applySetOrder(int order) {
+		this.upgrade.setOrder(order);
+		this.getAddon().getUpgradeDataManager().saveUpgradeData(this.upgrade);
+	}
+
 	private Consumer<Number> doSetOrder = (order) -> {
-		this.upgrade.setOrder(order.intValue());
+		applySetOrder(order.intValue());
 		this.setButton();
 		this.getBuild().build();
 	};
diff --git a/src/main/java/world/bentobox/upgrades/upgrades/DatabaseUpgrade.java b/src/main/java/world/bentobox/upgrades/upgrades/DatabaseUpgrade.java
@@ -109,6 +109,7 @@ public boolean doUpgrade(User user, Island island) {
         }
 
         data.setUpgradeLevel(this.getName(), currentLevel + 1);
+        this.getUpgradesAddon().getDatabase().saveObjectAsync(data);
         return true;
     }
 
diff --git a/src/test/java/world/bentobox/upgrades/DefaultUpgradeSeederTest.java b/src/test/java/world/bentobox/upgrades/DefaultUpgradeSeederTest.java
diff --git a/src/test/java/world/bentobox/upgrades/api/UpgradeTest.java b/src/test/java/world/bentobox/upgrades/api/UpgradeTest.java
diff --git a/src/test/java/world/bentobox/upgrades/ui/admin/EditTierPanelSaveTest.java b/src/test/java/world/bentobox/upgrades/ui/admin/EditTierPanelSaveTest.java
diff --git a/src/test/java/world/bentobox/upgrades/ui/admin/EditUpgradePanelSaveTest.java b/src/test/java/world/bentobox/upgrades/ui/admin/EditUpgradePanelSaveTest.java
diff --git a/src/test/java/world/bentobox/upgrades/upgrades/DatabaseUpgradeTest.java b/src/test/java/world/bentobox/upgrades/upgrades/DatabaseUpgradeTest.java

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@ public boolean doUpgrade(User user, Island island) {`
`120`	`120`
`121`	`121`	`UpgradesData data = this.upgradesAddon.getUpgradesLevels(island.getUniqueId());`
`122`	`122`	`data.setUpgradeLevel(this.name, data.getUpgradeLevel(this.name) + 1);`
	`123`	`+ this.upgradesAddon.getDatabase().saveObjectAsync(data);`
`123`	`124`
`124`	`125`	`return true;`
`125`	`126`	`}`