Run IntelliJ IDEA code formatter

This commit is contained in:
KingRainbow44
2023-03-31 17:19:26 -04:00
parent 5bf5fb07a2
commit 15e2f3ca34
917 changed files with 30030 additions and 22446 deletions

View File

@@ -36,8 +36,7 @@ public class CombineManger extends BaseGameSystem {
reliquaryDecomposeData.put(entry.getConfigId(), entry.getItems());
});
Grasscutter.getLogger().debug("Loaded {} reliquary decompose entries.", reliquaryDecomposeData.size());
}
catch (Exception ex) {
} catch (Exception ex) {
Grasscutter.getLogger().error("Unable to load reliquary decompose data.", ex);
}
}
@@ -77,12 +76,12 @@ public class CombineManger extends BaseGameSystem {
// make the result
player.getInventory().addItem(combineData.getResultItemId(),
combineData.getResultItemCount() * count);
combineData.getResultItemCount() * count);
CombineResult result = new CombineResult();
result.setMaterial(List.of());
result.setResult(List.of(new ItemParamData(combineData.getResultItemId(),
combineData.getResultItemCount() * count)));
combineData.getResultItemCount() * count)));
// TODO lucky characters
result.setExtra(List.of());
result.setBack(List.of());

View File

@@ -1,9 +1,8 @@
package emu.grasscutter.game.combine;
import java.util.List;
import emu.grasscutter.data.common.ItemParamData;
import emu.grasscutter.data.excels.CombineData;
import java.util.List;
public class CombineResult {
private List<ItemParamData> material;

View File

@@ -9,6 +9,7 @@ public class ReliquaryDecomposeEntry {
public int getConfigId() {
return configId;
}
public void setConfigId(int configId) {
this.configId = configId;
}
@@ -16,7 +17,8 @@ public class ReliquaryDecomposeEntry {
public List<Integer> getItems() {
return items;
}
public void setItems(List<Integer> items) {
this.items = items;
}
}
}