Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-21 03:15:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename excel classes

Browse Source
This commit is contained in:
Melledy
2022-05-28 04:21:47 -07:00
parent f139818224
commit a23b29b65a
123 changed files with 1289 additions and 1507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/emu/grasscutter/game/combine/CombineManger.java
View File

@@ -1,7 +1,8 @@
package emu.grasscutter.game.combine;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.def.CombineData;
import emu.grasscutter.data.common.ItemParamData;
import emu.grasscutter.data.excels.CombineData;
import emu.grasscutter.game.inventory.ItemType;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.net.proto.RetcodeOuterClass;
@@ -71,7 +72,7 @@ public class CombineManger {
CombineResult result = new CombineResult();
result.setMaterial(List.of());
result.setResult(List.of(new CombineData.CombineItemPair(combineData.getResultItemId(),
result.setResult(List.of(new ItemParamData(combineData.getResultItemId(),
combineData.getResultItemCount() * count)));
// TODO lucky characters
result.setExtra(List.of());

31
src/main/java/emu/grasscutter/game/combine/CombineResult.java
View File

@@ -1,44 +1,45 @@
package emu.grasscutter.game.combine;
import emu.grasscutter.data.def.CombineData;
import java.util.List;
public class CombineResult {
private List<CombineData.CombineItemPair> material;
private List<CombineData.CombineItemPair> result;
private List<CombineData.CombineItemPair> extra;
private List<CombineData.CombineItemPair> back;
import emu.grasscutter.data.common.ItemParamData;
import emu.grasscutter.data.excels.CombineData;
public List<CombineData.CombineItemPair> getMaterial() {
public class CombineResult {
private List<ItemParamData> material;
private List<ItemParamData> result;
private List<ItemParamData> extra;
private List<ItemParamData> back;
public List<ItemParamData> getMaterial() {
return material;
}
public void setMaterial(List<CombineData.CombineItemPair> material) {
public void setMaterial(List<ItemParamData> material) {
this.material = material;
}
public List<CombineData.CombineItemPair> getResult() {
public List<ItemParamData> getResult() {
return result;
}
public void setResult(List<CombineData.CombineItemPair> result) {
public void setResult(List<ItemParamData> result) {
this.result = result;
}
public List<CombineData.CombineItemPair> getExtra() {
public List<ItemParamData> getExtra() {
return extra;
}
public void setExtra(List<CombineData.CombineItemPair> extra) {
public void setExtra(List<ItemParamData> extra) {
this.extra = extra;
}
public List<CombineData.CombineItemPair> getBack() {
public List<ItemParamData> getBack() {
return back;
}
public void setBack(List<CombineData.CombineItemPair> back) {
public void setBack(List<ItemParamData> back) {
this.back = back;
}