Skip to content

Commit

Permalink
update 1.6.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@DarwinBaker
DarwinBaker committed Jun 7, 2023
1 parent f3ff5fc commit 8cd56e5
Show file tree
Hide file tree
Showing 51 changed files with 443 additions and 249 deletions.
52 changes: 37 additions & 15 deletions AATool/AATool.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
<Compile Include="Net\Lobby.cs" />
<Compile Include="Net\OpenTracker.cs" />
<Compile Include="Net\PeerStatic.cs" />
<Compile Include="Net\Requests\AASsgRequest.cs" />
<Compile Include="Net\Requests\AnyRsgRequest.cs" />
<Compile Include="Net\Requests\UuidRequest.cs" />
<Compile Include="Net\Requests\SpreadsheetRequest.cs" />
Expand Down Expand Up @@ -515,28 +516,28 @@
<Content Include="assets\objectives\1.19\potions.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\objectives\1.20 Snapshot\advancements\adventure.xml">
<Content Include="assets\objectives\1.20\advancements\adventure.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\objectives\1.20 Snapshot\advancements\end.xml">
<Content Include="assets\objectives\1.20\advancements\end.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\objectives\1.20 Snapshot\advancements\husbandry.xml">
<Content Include="assets\objectives\1.20\advancements\husbandry.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\objectives\1.20 Snapshot\advancements\minecraft.xml">
<Content Include="assets\objectives\1.20\advancements\minecraft.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\objectives\1.20 Snapshot\advancements\nether.xml">
<Content Include="assets\objectives\1.20\advancements\nether.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\objectives\1.20 Snapshot\trims.xml">
<Content Include="assets\objectives\1.20\trims.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\objectives\1.20 Snapshot\blocks.xml">
<Content Include="assets\objectives\1.20\blocks.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\objectives\1.20 Snapshot\potions.xml">
<Content Include="assets\objectives\1.20\potions.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\ab_guide\all_heads_1.20%244x4x30.png">
Expand Down Expand Up @@ -836,6 +837,12 @@
<Content Include="assets\sprites\blocks\bamboo\bamboo_trapdoor^48.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\blocks\misc\trident_and_heads_1.20^32.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\blocks\misc\trident_and_heads_1.20^48.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\blocks\special\chiseled_bookshelf^32.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down Expand Up @@ -3374,6 +3381,9 @@
<Content Include="assets\sprites\global\gui\button_icons\button_icon_biomes.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\global\gui\frames\flags\frame_flag_aroace.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\global\gui\frames\flags\frame_flag_demigirl.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down Expand Up @@ -3443,6 +3453,9 @@
<Content Include="assets\sprites\global\gui\icons\day_night_arrow.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\global\gui\icons\patreon.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\global\gui\icons\smithing_unapplied.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down Expand Up @@ -3584,6 +3597,9 @@
<Content Include="assets\sprites\global\items\bee_nest_pickup^32.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\global\items\old_local_brewery.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\global\items\pottery_shard.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down Expand Up @@ -6956,6 +6972,9 @@
<Content Include="assets\sprites\winforms\frames_main\Pride Flags\Intersex Pride.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\winforms\frames_main\Pride Flags\Aroace Pride.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\winforms\frames_main\Pride Flags\Lesbian Pride.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down Expand Up @@ -6986,6 +7005,9 @@
<Content Include="assets\sprites\winforms\frames_overlay\Other\2_Minecraft.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\winforms\frames_overlay\Pride Flags\Aroace Pride.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\sprites\winforms\frames_overlay\Solid Colors\90%27s Hacker.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down Expand Up @@ -7112,7 +7134,7 @@
<Content Include="assets\views\adventuring_time\1.16\main.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\views\adventuring_time\1.20 Snapshot\main.xml">
<Content Include="assets\views\adventuring_time\1.20\main.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\views\adventuring_time\1.19\main.xml">
Expand Down Expand Up @@ -7151,16 +7173,16 @@
<Content Include="assets\views\all_advancements\1.19\main_optimized.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\views\all_advancements\1.20 Snapshot\main_compact.xml">
<Content Include="assets\views\all_advancements\1.20\main_compact.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\views\all_advancements\1.20 Snapshot\main_optimized.xml">
<Content Include="assets\views\all_advancements\1.20\main_optimized.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\views\all_advancements\1.20 Snapshot\main_relaxed.xml">
<Content Include="assets\views\all_advancements\1.20\main_relaxed.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\views\all_advancements\1.20 Snapshot\main_vertical.xml">
<Content Include="assets\views\all_advancements\1.20\main_vertical.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\views\all_advancements\1.19\main_compact.xml">
Expand All @@ -7184,10 +7206,10 @@
<Content Include="assets\views\all_blocks\1.16\main.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\views\all_blocks\1.20 Snapshot\help.xml">
<Content Include="assets\views\all_blocks\1.20\help.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\views\all_blocks\1.20 Snapshot\main.xml">
<Content Include="assets\views\all_blocks\1.20\main.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="assets\views\all_blocks\overlay.xml">
Expand Down
5 changes: 4 additions & 1 deletion AATool/Configuration/PinnedObjectiveSet.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static List<string> GetAllAvailable()

[JsonProperty]
public Dictionary<string, List<string>> Pinned = new () {
{ "All Advancements 1.20 Snapshot", new () {
{ "All Advancements 1.20", new () {
"AncientDebris", "WitherSkulls", "NautilusShells", "Trident", "EGap", "ArmorTrims",
}},
{ "All Advancements 1.19", new () {
Expand Down Expand Up @@ -100,6 +100,9 @@ public static List<string> GetAllAvailable()
{ "All Achievements 1.11", new () {
"GoldBlocks", "WitherSkulls", "Biomes", "EGap",
}},
{ "All Blocks 1.20", new () {
"AncientDebris", "DeepslateEmerald", "WitherSkulls", "ShulkerShells", "NautilusShells", "Trident",
}},
{ "All Blocks 1.19", new () {
"AncientDebris", "DeepslateEmerald", "WitherSkulls", "ShulkerShells", "NautilusShells", "Trident",
}},
Expand Down
2 changes: 1 addition & 1 deletion AATool/Data/Categories/AdventuringTime.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class AdventuringTime : SingleAdvancement
private const string Id = "minecraft:adventure/adventuring_time";

public static readonly List<string> SupportedVersions = new () {
"1.20 Snapshot",
"1.20",
"1.19",
"1.18",
"1.16",
Expand Down
2 changes: 1 addition & 1 deletion AATool/Data/Categories/AllAdvancements.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace AATool.Data.Categories
public class AllAdvancements : Category
{
public static readonly List<string> SupportedVersions = new () {
"1.20 Snapshot",
"1.20",
"1.19",
"1.18",
"1.17",
Expand Down
62 changes: 41 additions & 21 deletions AATool/Data/Categories/AllBlocks.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Threading;
using AATool.Data.Objectives;
using AATool.Graphics;
using AATool.Net;
Expand All @@ -14,11 +16,14 @@ public class AllBlocks : Category
public const string HelpTextureSet = "ab_guide";

public static readonly List<string> SupportedVersions = new () {
"1.20",
"1.19",
"1.18",
"1.16",
};

private static bool WritingChecklistFile = false;

public override IEnumerable<string> GetSupportedVersions() => SupportedVersions;
public override IEnumerable<Objective> GetOverlayObjectives() => Tracker.Blocks.All.Values;

Expand Down Expand Up @@ -134,31 +139,46 @@ public void SaveChecklist()

this.BlocksHighlightedCount = 0;
this.BlocksConfirmedCount = 0;
string path = Paths.System.BlockChecklistFile(ActiveInstance.Number, Tracker.WorldName);
try
var list = new StringBuilder();
foreach (Block block in Tracker.Blocks.All.Values)
{
Directory.CreateDirectory(Paths.System.BlockChecklistsFolder);
using (StreamWriter file = File.CreateText(path))
if (block.Highlighted)
{
foreach (Block block in Tracker.Blocks.All.Values)
{
if (block.Highlighted)
{
file.WriteLine(block.Id);

//update counts
if (block.IsComplete())
this.BlocksConfirmedCount++;
else
this.BlocksHighlightedCount++;
}
}
list.AppendLine(block.Id);

//update counts
if (block.IsComplete())
this.BlocksConfirmedCount++;
else
this.BlocksHighlightedCount++;
}
}
catch
{

}
TryWriteChecklist(list.ToString());
}

private void TryWriteChecklist(string list)
{
if (WritingChecklistFile)
return;

WritingChecklistFile = true;
new Thread(() => {
try
{
string path = Paths.System.BlockChecklistFile(ActiveInstance.Number, Tracker.WorldName);
Directory.CreateDirectory(Paths.System.BlockChecklistsFolder);
using (StreamWriter file = File.CreateText(path))
file.Write(list);
}
catch
{
}
finally
{
WritingChecklistFile = false;
}
}).Start();
}

private void TryLoadChecklist()
Expand Down
1 change: 1 addition & 0 deletions AATool/Data/Credits.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public static class Credits
new (NetheriteTier, "Deadpool", new Uuid("899c63ac-6590-46c0-b77c-4dae1543f707")),
new (NetheriteTier, "merpmerp", new Uuid("fc357f37-ebbb-4687-971f-df8016b41a6f")),
new (NetheriteTier, "Oliver", new Uuid("6174765b-7158-4d18-af89-4692b2704ae8")),
new (NetheriteTier, "DCMii", new Uuid("3d71114e-4d3d-469b-8a2c-2aeea4df1e86")),

new (DiamondTier, "NiceTwice", new Uuid("e43dad54-4b24-4da9-b690-a12fdc8626dc")),
new (DiamondTier, "Cube1337x", new Uuid("1ae14cb9-6a2f-4357-a71e-fac6f7012b59")),
Expand Down
16 changes: 15 additions & 1 deletion AATool/Data/Objectives/Complex/Trident.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public class Trident : ComplexObjective
private const string VVF = "minecraft:adventure/very_very_frightening";
private const string Surge = "minecraft:adventure/lightning_rod_with_villager_no_fire";

private static readonly Version PiglinHeadAdded = new ("1.20");
private static readonly Version AncientCitySkeletonSkulls = new ("1.19");
private static readonly Version SurgeProtectorAdded = new ("1.17");

Expand All @@ -20,6 +21,7 @@ public class Trident : ComplexObjective
private bool surgeDone;
private bool ignoreSurge;

private bool piglinHead;
private bool zombieHead;
private bool creeperHead;
private bool skeletonSkull;
Expand All @@ -43,6 +45,9 @@ protected override void UpdateAdvancedState(ProgressState progress)
bool ancientCitiesExist = Version.TryParse(Tracker.Category.CurrentVersion, out Version current)
&& current >= AncientCitySkeletonSkulls;

bool piglinHeadRequired = current is not null
&& current >= PiglinHeadAdded;

this.zombieHead = progress.WasUsed("minecraft:zombie_head")
|| progress.WasPickedUp("minecraft:zombie_head");

Expand All @@ -52,7 +57,13 @@ protected override void UpdateAdvancedState(ProgressState progress)
this.skeletonSkull = progress.WasUsed("minecraft:skeleton_skull")
|| progress.WasPickedUp("minecraft:skeleton_skull") || ancientCitiesExist;

this.piglinHead = progress.WasUsed("minecraft:piglin_head")
| progress.WasPickedUp("minecraft:piglin_head");

this.doneWithHeads = this.zombieHead && this.creeperHead && this.skeletonSkull;
if (piglinHeadRequired)
this.doneWithHeads &= this.piglinHead;

this.CompletionOverride |= this.doneWithHeads;
}
else
Expand Down Expand Up @@ -135,8 +146,11 @@ protected override string GetCurrentIcon()
{
if (Tracker.Category is AllBlocks)
{
bool piglinHead = Version.TryParse(Tracker.Category.CurrentVersion, out Version current)
&& current >= PiglinHeadAdded;

return this.doneWithHeads
? "trident_and_heads"
? (piglinHead ? "trident_and_heads_1.20" : "trident_and_heads")
: "trident";
}

Expand Down
Loading

0 comments on commit 8cd56e5

Please sign in to comment.