Skip to content

Commit

Permalink
Fix whitespace [skip actions]
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Sep 3, 2022
1 parent 005a0bc commit 6e5d986
Show file tree
Hide file tree
Showing 24 changed files with 573 additions and 573 deletions.
2 changes: 1 addition & 1 deletion src/main/java/emu/grasscutter/command/CommandMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public void invoke(Player player, Player targetPlayer, String rawMessage) {
Grasscutter.getLogger().info("Command used by server console: " + rawMessage);
}
}

rawMessage = rawMessage.trim();
if (rawMessage.length() == 0) {
CommandHandler.sendTranslatedMessage(player, "commands.generic.not_specified");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/emu/grasscutter/config/ConfigContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static class Server {
public Set<Integer> debugBlacklist = Set.of();
public ServerRunMode runMode = ServerRunMode.HYBRID;
public boolean logCommands = false;

public HTTP http = new HTTP();
public Game game = new Game();

Expand Down
96 changes: 48 additions & 48 deletions src/main/java/emu/grasscutter/data/common/PointData.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,71 +10,71 @@
import it.unimi.dsi.fastutil.ints.IntList;

public class PointData {
private int id;
private String $type;
private Position tranPos;
private int id;
private String $type;
private Position tranPos;

@SerializedName(value="dungeonIds", alternate={"JHHFPGJNMIN"})
private int[] dungeonIds;
@SerializedName(value="dungeonIds", alternate={"JHHFPGJNMIN"})
private int[] dungeonIds;

@SerializedName(value="dungeonRandomList", alternate={"OIBKFJNBLHO"})
private int[] dungeonRandomList;
@SerializedName(value="dungeonRandomList", alternate={"OIBKFJNBLHO"})
private int[] dungeonRandomList;

@SerializedName(value="tranSceneId", alternate={"JHBICGBAPIH"})
private int tranSceneId;
@SerializedName(value="tranSceneId", alternate={"JHBICGBAPIH"})
private int tranSceneId;

public int getId() {
return id;
}
public int getId() {
return id;
}

public void setId(int id) {
this.id = id;
}
public void setId(int id) {
this.id = id;
}

public String getType() {
return $type;
}
public String getType() {
return $type;
}

public Position getTranPos() {
return tranPos;
}
public Position getTranPos() {
return tranPos;
}

public int[] getDungeonIds() {
return dungeonIds;
}
public int[] getDungeonIds() {
return dungeonIds;
}

public int[] getDungeonRandomList() {
return dungeonRandomList;
}
public int[] getDungeonRandomList() {
return dungeonRandomList;
}

public int getTranSceneId() {
return tranSceneId;
}
public int getTranSceneId() {
return tranSceneId;
}

public void setTranSceneId(int tranSceneId) {
this.tranSceneId = tranSceneId;
}
public void setTranSceneId(int tranSceneId) {
this.tranSceneId = tranSceneId;
}

public void updateDailyDungeon() {
public void updateDailyDungeon() {
if (getDungeonRandomList() == null || getDungeonRandomList().length == 0) {
return;
}
}

IntList newDungeons = new IntArrayList();
int day = Grasscutter.getCurrentDayOfWeek();
IntList newDungeons = new IntArrayList();
int day = Grasscutter.getCurrentDayOfWeek();

for (int randomId : getDungeonRandomList()) {
DailyDungeonData data = GameData.getDailyDungeonDataMap().get(randomId);
for (int randomId : getDungeonRandomList()) {
DailyDungeonData data = GameData.getDailyDungeonDataMap().get(randomId);

if (data != null) {
int[] addDungeons = data.getDungeonsByDay(day);
if (data != null) {
int[] addDungeons = data.getDungeonsByDay(day);

for (int d : addDungeons) {
newDungeons.add(d);
}
}
}
for (int d : addDungeons) {
newDungeons.add(d);
}
}
}

this.dungeonIds = newDungeons.toIntArray();
}
this.dungeonIds = newDungeons.toIntArray();
}
}
38 changes: 19 additions & 19 deletions src/main/java/emu/grasscutter/data/excels/AvatarCostumeData.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,30 @@

@ResourceType(name = "AvatarCostumeExcelConfigData.json")
public class AvatarCostumeData extends GameResource {
private int costumeId;
private int itemId;
private int costumeId;
private int itemId;
private int characterId;
private int quality;

@Override
public int getId() {
return this.costumeId;
}

public int getItemId() {
return this.itemId;
}

public int getCharacterId() {
return characterId;
}

public int getQuality() {
@Override
public int getId() {
return this.costumeId;
}

public int getItemId() {
return this.itemId;
}

public int getCharacterId() {
return characterId;
}

public int getQuality() {
return quality;
}

@Override
public void onLoad() {
GameData.getAvatarCostumeDataItemIdMap().put(this.getItemId(), this);
}
public void onLoad() {
GameData.getAvatarCostumeDataItemIdMap().put(this.getItemId(), this);
}
}
84 changes: 42 additions & 42 deletions src/main/java/emu/grasscutter/data/excels/EquipAffixData.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,52 +8,52 @@
@ResourceType(name = "EquipAffixExcelConfigData.json")
public class EquipAffixData extends GameResource {

private int affixId;
private int affixId;
private int id;
private int level;
private long nameTextMapHash;
private String openConfig;
private FightPropData[] addProps;
private float[] paramList;
@Override
public int getId() {
return affixId;
}
public int getMainId() {
return id;
}

public int getLevel() {
return level;
}

public long getNameTextMapHash() {
return nameTextMapHash;
}

public String getOpenConfig() {
return openConfig;
}

public FightPropData[] getAddProps() {
return addProps;
}

public float[] getParamList() {
return paramList;
}

@Override
public void onLoad() {
ArrayList<FightPropData> parsed = new ArrayList<FightPropData>(getAddProps().length);
for (FightPropData prop : getAddProps()) {
if (prop.getPropType() != null && prop.getValue() != 0f) {
prop.onLoad();
parsed.add(prop);
}
}
this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
}

@Override
public int getId() {
return affixId;
}

public int getMainId() {
return id;
}

public int getLevel() {
return level;
}

public long getNameTextMapHash() {
return nameTextMapHash;
}

public String getOpenConfig() {
return openConfig;
}

public FightPropData[] getAddProps() {
return addProps;
}

public float[] getParamList() {
return paramList;
}

@Override
public void onLoad() {
ArrayList<FightPropData> parsed = new ArrayList<FightPropData>(getAddProps().length);
for (FightPropData prop : getAddProps()) {
if (prop.getPropType() != null && prop.getValue() != 0f) {
prop.onLoad();
parsed.add(prop);
}
}
this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
}
}
2 changes: 1 addition & 1 deletion src/main/java/emu/grasscutter/data/excels/ItemData.java
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public void onLoad() {
if (this.getFurnitureGadgetID() != null) {
this.furnitureGadgetID = this.furnitureGadgetID.stream().filter(x -> x > 0).toList();
}

// Prevent material type from being null
this.materialType = this.materialType == null ? MaterialType.MATERIAL_NONE : this.materialType;
}
Expand Down
40 changes: 20 additions & 20 deletions src/main/java/emu/grasscutter/data/excels/ReliquarySetData.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,27 @@

@ResourceType(name = "ReliquarySetExcelConfigData.json")
public class ReliquarySetData extends GameResource {
private int setId;
private int setId;
private int[] setNeedNum;

@SerializedName(value="equipAffixId", alternate={"EquipAffixId"})
private int equipAffixId;
@Override
public int getId() {
return setId;
}
public int[] getSetNeedNum() {
return setNeedNum;
}

public int getEquipAffixId() {
return equipAffixId;
}

@Override
public void onLoad() {

}

@Override
public int getId() {
return setId;
}

public int[] getSetNeedNum() {
return setNeedNum;
}

public int getEquipAffixId() {
return equipAffixId;
}

@Override
public void onLoad() {

}
}
Loading

0 comments on commit 6e5d986

Please sign in to comment.