Mirror/Nebula
1
0
Fork 0
mirror of https://github.com/Melledy/Nebula.git synced 2026-09-19 17:19:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor various inventory functions

Browse Source
This commit is contained in:
Melledy
2025-11-12 03:33:00 -08:00
parent 2c74441583
commit 281d61d0ab
14 changed files with 61 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/nebula/data/resources/CharGemInstanceDef.java
+5 -7
View File
@@ -1,11 +1,9 @@
package emu.nebula.data.resources;
import java.util.ArrayList;
import java.util.List;
import emu.nebula.data.BaseDef;
import emu.nebula.data.ResourceType;
import emu.nebula.game.instance.InstanceData;
import emu.nebula.game.inventory.ItemRewardList;
import emu.nebula.game.inventory.ItemRewardParam;
import emu.nebula.util.JsonUtils;
@@ -21,8 +19,8 @@ public class CharGemInstanceDef extends BaseDef implements InstanceData {
private int EnergyConsume;
private String BaseAwardPreview;
private transient List<ItemRewardParam> firstRewards;
private transient List<ItemRewardParam> rewards;
private transient ItemRewardList firstRewards;
private transient ItemRewardList rewards;
@Override
public int getId() {
@@ -32,8 +30,8 @@ public class CharGemInstanceDef extends BaseDef implements InstanceData {
@Override
public void onLoad() {
// Init reward lists
this.firstRewards = new ArrayList<>();
this.rewards = new ArrayList<>();
this.firstRewards = new ItemRewardList();
this.rewards = new ItemRewardList();
// Parse rewards
var awards = JsonUtils.decodeList(this.BaseAwardPreview, int[].class);
src/main/java/emu/nebula/data/resources/DailyInstanceDef.java
+5 -7
View File
@@ -1,12 +1,10 @@
package emu.nebula.data.resources;
import java.util.List;
import emu.nebula.data.BaseDef;
import emu.nebula.data.GameData;
import emu.nebula.data.ResourceType;
import emu.nebula.game.instance.InstanceData;
import emu.nebula.game.inventory.ItemRewardParam;
import emu.nebula.game.inventory.ItemRewardList;
import lombok.Getter;
@Getter
@@ -36,18 +34,18 @@ public class DailyInstanceDef extends BaseDef implements InstanceData {
@Override
@Deprecated
public List<ItemRewardParam> getFirstRewards() {
public ItemRewardList getFirstRewards() {
return null;
}
@Override
@Deprecated
public List<ItemRewardParam> getRewards() {
public ItemRewardList getRewards() {
return null;
}
@Override
public List<ItemRewardParam> getFirstRewards(int rewardType) {
public ItemRewardList getFirstRewards(int rewardType) {
var data = this.getRewardGroup(rewardType);
if (data != null) {
@@ -58,7 +56,7 @@ public class DailyInstanceDef extends BaseDef implements InstanceData {
}
@Override
public List<ItemRewardParam> getRewards(int rewardType) {
public ItemRewardList getRewards(int rewardType) {
var data = this.getRewardGroup(rewardType);
if (data != null) {
src/main/java/emu/nebula/data/resources/DailyInstanceRewardGroupDef.java
+6 -7
View File
@@ -1,12 +1,11 @@
package emu.nebula.data.resources;
import java.util.ArrayList;
import java.util.List;
import emu.nebula.data.BaseDef;
import emu.nebula.data.ResourceType;
import emu.nebula.game.inventory.ItemRewardList;
import emu.nebula.game.inventory.ItemRewardParam;
import emu.nebula.util.JsonUtils;
import lombok.Getter;
@Getter
@@ -16,8 +15,8 @@ public class DailyInstanceRewardGroupDef extends BaseDef {
private int DailyRewardType;
private String BaseAwardPreview;
private transient List<ItemRewardParam> firstRewards;
private transient List<ItemRewardParam> rewards;
private transient ItemRewardList firstRewards;
private transient ItemRewardList rewards;
@Override
public int getId() {
@@ -27,8 +26,8 @@ public class DailyInstanceRewardGroupDef extends BaseDef {
@Override
public void onLoad() {
// Init reward lists
this.firstRewards = new ArrayList<>();
this.rewards = new ArrayList<>();
this.firstRewards = new ItemRewardList();
this.rewards = new ItemRewardList();
// Parse rewards
var awards = JsonUtils.decodeList(this.BaseAwardPreview, int[].class);
src/main/java/emu/nebula/data/resources/RegionBossLevelDef.java
+5 -7
View File
@@ -1,11 +1,9 @@
package emu.nebula.data.resources;
import java.util.ArrayList;
import java.util.List;
import emu.nebula.data.BaseDef;
import emu.nebula.data.ResourceType;
import emu.nebula.game.instance.InstanceData;
import emu.nebula.game.inventory.ItemRewardList;
import emu.nebula.game.inventory.ItemRewardParam;
import emu.nebula.util.JsonUtils;
@@ -21,8 +19,8 @@ public class RegionBossLevelDef extends BaseDef implements InstanceData {
private int EnergyConsume;
private String BaseAwardPreview;
private transient List<ItemRewardParam> firstRewards;
private transient List<ItemRewardParam> rewards;
private transient ItemRewardList firstRewards;
private transient ItemRewardList rewards;
@Override
public int getId() {
@@ -32,8 +30,8 @@ public class RegionBossLevelDef extends BaseDef implements InstanceData {
@Override
public void onLoad() {
// Init reward lists
this.firstRewards = new ArrayList<>();
this.rewards = new ArrayList<>();
this.firstRewards = new ItemRewardList();
this.rewards = new ItemRewardList();
// Parse rewards
var awards = JsonUtils.decodeList(this.BaseAwardPreview, int[].class);
src/main/java/emu/nebula/data/resources/SkillInstanceDef.java
+5 -7
View File
@@ -1,11 +1,9 @@
package emu.nebula.data.resources;
import java.util.ArrayList;
import java.util.List;
import emu.nebula.data.BaseDef;
import emu.nebula.data.ResourceType;
import emu.nebula.game.instance.InstanceData;
import emu.nebula.game.inventory.ItemRewardList;
import emu.nebula.game.inventory.ItemRewardParam;
import emu.nebula.util.JsonUtils;
import lombok.Getter;
@@ -20,8 +18,8 @@ public class SkillInstanceDef extends BaseDef implements InstanceData {
private int EnergyConsume;
private String BaseAwardPreview;
private transient List<ItemRewardParam> firstRewards;
private transient List<ItemRewardParam> rewards;
private transient ItemRewardList firstRewards;
private transient ItemRewardList rewards;
@Override
public int getId() {
@@ -31,8 +29,8 @@ public class SkillInstanceDef extends BaseDef implements InstanceData {
@Override
public void onLoad() {
// Init reward lists
this.firstRewards = new ArrayList<>();
this.rewards = new ArrayList<>();
this.firstRewards = new ItemRewardList();
this.rewards = new ItemRewardList();
// Parse rewards
var awards = JsonUtils.decodeList(this.BaseAwardPreview, int[].class);
src/main/java/emu/nebula/data/resources/WeekBossLevelDef.java
+5 -7
View File
@@ -1,11 +1,9 @@
package emu.nebula.data.resources;
import java.util.ArrayList;
import java.util.List;
import emu.nebula.data.BaseDef;
import emu.nebula.data.ResourceType;
import emu.nebula.game.instance.InstanceData;
import emu.nebula.game.inventory.ItemRewardList;
import emu.nebula.game.inventory.ItemRewardParam;
import emu.nebula.util.JsonUtils;
@@ -19,8 +17,8 @@ public class WeekBossLevelDef extends BaseDef implements InstanceData {
private int NeedWorldClass;
private String BaseAwardPreview;
private transient List<ItemRewardParam> firstRewards;
private transient List<ItemRewardParam> rewards;
private transient ItemRewardList firstRewards;
private transient ItemRewardList rewards;
@Override
public int getId() {
@@ -34,8 +32,8 @@ public class WeekBossLevelDef extends BaseDef implements InstanceData {
@Override
public void onLoad() {
// Init reward lists
this.firstRewards = new ArrayList<>();
this.rewards = new ArrayList<>();
this.firstRewards = new ItemRewardList();
this.rewards = new ItemRewardList();
// Parse rewards
var awards = JsonUtils.decodeList(this.BaseAwardPreview, int[].class);