Refactoring (#1660)

* Refactor a couple of iterators

* Use side-effect instead of second iterator

* Make World::onTick return shouldDelete instead of success

* Replace Shop iterator with side effects

* Scene

* Clean up Expeditions

* Refactor Expeditions

* Clean up Expeditions, Player

* Limit Expeditions by AR

* Lombokify props

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>

src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardData.java

@@ -1,18 +1,15 @@
 package emu.grasscutter.game.expedition;
 
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.utils.Utils;
+import lombok.Getter;
+
 public class ExpeditionRewardData {
-    private int itemId;
-    private int minCount;
-    private int maxCount;
+    @Getter private int itemId;
+    @Getter private int minCount;
+    @Getter private int maxCount;
 
-    public int getItemId() {
-        return itemId;
+    public GameItem getReward() {
+        return new GameItem(itemId, Utils.randomRange(minCount, maxCount));
     }
-
-    public int getMinCount() { return minCount; }
-
-    public int getMaxCount() {
-        return maxCount;
-    }
-
 }