Skip to content

Commit

Permalink
Dev. progress for v3.8
Browse files Browse the repository at this point in the history 
Minor corrections
  • Loading branch information
@TheCSDev
TheCSDev committed Jan 30, 2024
1 parent aa74356 commit 7edcecb
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions ...ts-3-fabric-1.20.1/src/main/java/io/github/thecsdev/betterstats/util/stats/SASConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class SASConfig implements ACJsonHandler<JsonObject>
// ==================================================
public String[] firstMinedBlocks = new String[] { "diamond_ore", "deepslate_diamond_ore", "ancient_debris", "deepslate_coal_ore", "dragon_egg", "sculk_sensor", "reinforced_deepslate" };
public String[] firstCraftedItems = new String[] { "wooden_pickaxe", "diamond_pickaxe", "beacon", "netherite_block", "ender_eye" };
public boolean announceFirstDeath = true;
public boolean announceFirstDeaths = true;
public String[] firstKilledEntities = new String[] { "zombie", "blaze", "enderman", "ender_dragon", "warden", "wither", "player" };
public String[] firstKilledByEntities = new String[] { "ender_dragon", "warden", "wither", "player" };
// ==================================================
Expand All @@ -19,7 +19,7 @@ public class SASConfig implements ACJsonHandler<JsonObject>
final var json = new JsonObject();
json.add("firstMinedBlocks", stringArrayToJsonArray(this.firstMinedBlocks));
json.add("firstCraftedItems", stringArrayToJsonArray(this.firstCraftedItems));
json.addProperty("announceFirstDeath", this.announceFirstDeath);
json.addProperty("announceFirstDeaths", this.announceFirstDeaths);
json.add("firstKilledEntities", stringArrayToJsonArray(this.firstKilledEntities));
json.add("firstKilledByEntities", stringArrayToJsonArray(this.firstKilledByEntities));
return json;
Expand All @@ -32,7 +32,7 @@ public class SASConfig implements ACJsonHandler<JsonObject>
{
if(json.has("firstMinedBlocks")) this.firstMinedBlocks = jsonArrayToStringArray(json.getAsJsonArray("firstMinedBlocks"));
if(json.has("firstCraftedItems")) this.firstCraftedItems = jsonArrayToStringArray(json.getAsJsonArray("firstCraftedItems"));
if(json.has("announceFirstDeath")) this.announceFirstDeath = json.getAsJsonPrimitive("announceFirstDeath").getAsBoolean();
if(json.has("announceFirstDeaths")) this.announceFirstDeaths = json.getAsJsonPrimitive("announceFirstDeaths").getAsBoolean();
if(json.has("firstKilledEntities")) this.firstKilledEntities = jsonArrayToStringArray(json.getAsJsonArray("firstKilledEntities"));
if(json.has("firstKilledByEntities")) this.firstKilledByEntities = jsonArrayToStringArray(json.getAsJsonArray("firstKilledByEntities"));
return true;
Expand Down
2 changes: 1 addition & 1 deletion ....20.1/src/main/java/io/github/thecsdev/betterstats/util/stats/StatAnnouncementSystem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ else if(stat.getType() == Stats.CRAFTED && FIRST_CRAFTED_ITEMS.contains(stat.get
broadcastFirstCraft(player, (Item)stat.getValue());

//handle "first death"
else if(stat.getType() == Stats.CUSTOM && Objects.equals(stat.getValue(), Stats.DEATHS) && SASC.announceFirstDeath)
else if(stat.getType() == Stats.CUSTOM && Objects.equals(stat.getValue(), Stats.DEATHS) && SASC.announceFirstDeaths)
broadcastFirstDeath(player);

//handle first "killed"
Expand Down
4 changes: 2 additions & 2 deletions betterstats-3-fabric-1.20.1/src/main/resources/assets/betterstats/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@

"betterstats.util.stats.statannouncementsystem.first_mine": "%s just mined their first %s.",
"betterstats.util.stats.statannouncementsystem.first_craft": "%s just crafted their first %s.",
"betterstats.util.stats.statannouncementsystem.first_death": "%s died for their first time.",
"betterstats.util.stats.statannouncementsystem.first_death.hc1": "%s died for their first time. On the bright side, it likely won't happen again.",
"betterstats.util.stats.statannouncementsystem.first_death": "%s just died for their first time.",
"betterstats.util.stats.statannouncementsystem.first_death.hc1": "%s just died for their first time. On the bright side, it likely won't happen again.",
"betterstats.util.stats.statannouncementsystem.first_kill": "%s just killed a %s for their first time.",
"betterstats.util.stats.statannouncementsystem.first_death_to": "%s just died to a %s for their first time."
}
6 changes: 3 additions & 3 deletions ...ts-3-fabric-1.20.2/src/main/java/io/github/thecsdev/betterstats/util/stats/SASConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class SASConfig implements ACJsonHandler<JsonObject>
// ==================================================
public String[] firstMinedBlocks = new String[] { "diamond_ore", "deepslate_diamond_ore", "ancient_debris", "deepslate_coal_ore", "dragon_egg", "sculk_sensor", "reinforced_deepslate" };
public String[] firstCraftedItems = new String[] { "wooden_pickaxe", "diamond_pickaxe", "beacon", "netherite_block", "ender_eye" };
public boolean announceFirstDeath = true;
public boolean announceFirstDeaths = true;
public String[] firstKilledEntities = new String[] { "zombie", "blaze", "enderman", "ender_dragon", "warden", "wither", "player" };
public String[] firstKilledByEntities = new String[] { "ender_dragon", "warden", "wither", "player" };
// ==================================================
Expand All @@ -19,7 +19,7 @@ public class SASConfig implements ACJsonHandler<JsonObject>
final var json = new JsonObject();
json.add("firstMinedBlocks", stringArrayToJsonArray(this.firstMinedBlocks));
json.add("firstCraftedItems", stringArrayToJsonArray(this.firstCraftedItems));
json.addProperty("announceFirstDeath", this.announceFirstDeath);
json.addProperty("announceFirstDeaths", this.announceFirstDeaths);
json.add("firstKilledEntities", stringArrayToJsonArray(this.firstKilledEntities));
json.add("firstKilledByEntities", stringArrayToJsonArray(this.firstKilledByEntities));
return json;
Expand All @@ -32,7 +32,7 @@ public class SASConfig implements ACJsonHandler<JsonObject>
{
if(json.has("firstMinedBlocks")) this.firstMinedBlocks = jsonArrayToStringArray(json.getAsJsonArray("firstMinedBlocks"));
if(json.has("firstCraftedItems")) this.firstCraftedItems = jsonArrayToStringArray(json.getAsJsonArray("firstCraftedItems"));
if(json.has("announceFirstDeath")) this.announceFirstDeath = json.getAsJsonPrimitive("announceFirstDeath").getAsBoolean();
if(json.has("announceFirstDeaths")) this.announceFirstDeaths = json.getAsJsonPrimitive("announceFirstDeaths").getAsBoolean();
if(json.has("firstKilledEntities")) this.firstKilledEntities = jsonArrayToStringArray(json.getAsJsonArray("firstKilledEntities"));
if(json.has("firstKilledByEntities")) this.firstKilledByEntities = jsonArrayToStringArray(json.getAsJsonArray("firstKilledByEntities"));
return true;
Expand Down
2 changes: 1 addition & 1 deletion ....20.2/src/main/java/io/github/thecsdev/betterstats/util/stats/StatAnnouncementSystem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ else if(stat.getType() == Stats.CRAFTED && FIRST_CRAFTED_ITEMS.contains(stat.get
broadcastFirstCraft(player, (Item)stat.getValue());

//handle "first death"
else if(stat.getType() == Stats.CUSTOM && Objects.equals(stat.getValue(), Stats.DEATHS) && SASC.announceFirstDeath)
else if(stat.getType() == Stats.CUSTOM && Objects.equals(stat.getValue(), Stats.DEATHS) && SASC.announceFirstDeaths)
broadcastFirstDeath(player);

//handle first "killed"
Expand Down
4 changes: 2 additions & 2 deletions betterstats-3-fabric-1.20.2/src/main/resources/assets/betterstats/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@

"betterstats.util.stats.statannouncementsystem.first_mine": "%s just mined their first %s.",
"betterstats.util.stats.statannouncementsystem.first_craft": "%s just crafted their first %s.",
"betterstats.util.stats.statannouncementsystem.first_death": "%s died for their first time.",
"betterstats.util.stats.statannouncementsystem.first_death.hc1": "%s died for their first time. On the bright side, it likely won't happen again.",
"betterstats.util.stats.statannouncementsystem.first_death": "%s just died for their first time.",
"betterstats.util.stats.statannouncementsystem.first_death.hc1": "%s just died for their first time. On the bright side, it likely won't happen again.",
"betterstats.util.stats.statannouncementsystem.first_kill": "%s just killed a %s for their first time.",
"betterstats.util.stats.statannouncementsystem.first_death_to": "%s just died to a %s for their first time."
}
6 changes: 3 additions & 3 deletions ...ts-3-fabric-1.20.4/src/main/java/io/github/thecsdev/betterstats/util/stats/SASConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class SASConfig implements ACJsonHandler<JsonObject>
// ==================================================
public String[] firstMinedBlocks = new String[] { "diamond_ore", "deepslate_diamond_ore", "ancient_debris", "deepslate_coal_ore", "dragon_egg", "sculk_sensor", "reinforced_deepslate" };
public String[] firstCraftedItems = new String[] { "wooden_pickaxe", "diamond_pickaxe", "beacon", "netherite_block", "ender_eye" };
public boolean announceFirstDeath = true;
public boolean announceFirstDeaths = true;
public String[] firstKilledEntities = new String[] { "zombie", "blaze", "enderman", "ender_dragon", "warden", "wither", "player" };
public String[] firstKilledByEntities = new String[] { "ender_dragon", "warden", "wither", "player" };
// ==================================================
Expand All @@ -19,7 +19,7 @@ public class SASConfig implements ACJsonHandler<JsonObject>
final var json = new JsonObject();
json.add("firstMinedBlocks", stringArrayToJsonArray(this.firstMinedBlocks));
json.add("firstCraftedItems", stringArrayToJsonArray(this.firstCraftedItems));
json.addProperty("announceFirstDeath", this.announceFirstDeath);
json.addProperty("announceFirstDeaths", this.announceFirstDeaths);
json.add("firstKilledEntities", stringArrayToJsonArray(this.firstKilledEntities));
json.add("firstKilledByEntities", stringArrayToJsonArray(this.firstKilledByEntities));
return json;
Expand All @@ -32,7 +32,7 @@ public class SASConfig implements ACJsonHandler<JsonObject>
{
if(json.has("firstMinedBlocks")) this.firstMinedBlocks = jsonArrayToStringArray(json.getAsJsonArray("firstMinedBlocks"));
if(json.has("firstCraftedItems")) this.firstCraftedItems = jsonArrayToStringArray(json.getAsJsonArray("firstCraftedItems"));
if(json.has("announceFirstDeath")) this.announceFirstDeath = json.getAsJsonPrimitive("announceFirstDeath").getAsBoolean();
if(json.has("announceFirstDeaths")) this.announceFirstDeaths = json.getAsJsonPrimitive("announceFirstDeaths").getAsBoolean();
if(json.has("firstKilledEntities")) this.firstKilledEntities = jsonArrayToStringArray(json.getAsJsonArray("firstKilledEntities"));
if(json.has("firstKilledByEntities")) this.firstKilledByEntities = jsonArrayToStringArray(json.getAsJsonArray("firstKilledByEntities"));
return true;
Expand Down
2 changes: 1 addition & 1 deletion ....20.4/src/main/java/io/github/thecsdev/betterstats/util/stats/StatAnnouncementSystem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ else if(stat.getType() == Stats.CRAFTED && FIRST_CRAFTED_ITEMS.contains(stat.get
broadcastFirstCraft(player, (Item)stat.getValue());

//handle "first death"
else if(stat.getType() == Stats.CUSTOM && Objects.equals(stat.getValue(), Stats.DEATHS) && SASC.announceFirstDeath)
else if(stat.getType() == Stats.CUSTOM && Objects.equals(stat.getValue(), Stats.DEATHS) && SASC.announceFirstDeaths)
broadcastFirstDeath(player);

//handle first "killed"
Expand Down
4 changes: 2 additions & 2 deletions betterstats-3-fabric-1.20.4/src/main/resources/assets/betterstats/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@

"betterstats.util.stats.statannouncementsystem.first_mine": "%s just mined their first %s.",
"betterstats.util.stats.statannouncementsystem.first_craft": "%s just crafted their first %s.",
"betterstats.util.stats.statannouncementsystem.first_death": "%s died for their first time.",
"betterstats.util.stats.statannouncementsystem.first_death.hc1": "%s died for their first time. On the bright side, it likely won't happen again.",
"betterstats.util.stats.statannouncementsystem.first_death": "%s just died for their first time.",
"betterstats.util.stats.statannouncementsystem.first_death.hc1": "%s just died for their first time. On the bright side, it likely won't happen again.",
"betterstats.util.stats.statannouncementsystem.first_kill": "%s just killed a %s for their first time.",
"betterstats.util.stats.statannouncementsystem.first_death_to": "%s just died to a %s for their first time."
}

0 comments on commit 7edcecb

Please sign in to comment.