diff --git a/ItemChecklist.csproj b/ItemChecklist.csproj index 3e0a7bf..c5bfc8e 100644 --- a/ItemChecklist.csproj +++ b/ItemChecklist.csproj @@ -1,14 +1,11 @@ - + ItemChecklist - net6.0 - AnyCPU latest - \ No newline at end of file diff --git a/ItemChecklistGlobalItem.cs b/ItemChecklistGlobalItem.cs index 677a393..1a4ff80 100644 --- a/ItemChecklistGlobalItem.cs +++ b/ItemChecklistGlobalItem.cs @@ -7,7 +7,6 @@ namespace ItemChecklist { class ItemChecklistGlobalItem : GlobalItem { - const string LOCALIZATION_KEY = "Mods.ItemChecklist.GlobalItem."; private static LocalizedText ItemChecklistAnnounceText; diff --git a/ItemChecklistPlayer.cs b/ItemChecklistPlayer.cs index 55773c6..eb6275e 100644 --- a/ItemChecklistPlayer.cs +++ b/ItemChecklistPlayer.cs @@ -15,6 +15,7 @@ namespace ItemChecklist // This is a list of items...Holds clean versions of unloaded mystery and loaded real items. internal List foundItems; + // TODO: Need to switch to saving ItemDefinition while preserving existing. Can you get ItemDefinition from UnloadedItem? // internal bool[] foundItem; internal bool[] findableItems; @@ -54,7 +55,6 @@ namespace ItemChecklist public override void OnEnterWorld() { - var itemChecklistPlayer = Main.LocalPlayer.GetModPlayer(); ItemChecklistUI.Visible = false; ItemChecklistUI.announce = announcePreference; ItemChecklistUI.collectChestItems = findChestItemsPreference; diff --git a/Localization/de-DE_Mods.ItemChecklist.hjson b/Localization/de-DE_Mods.ItemChecklist.hjson new file mode 100644 index 0000000..070715d --- /dev/null +++ b/Localization/de-DE_Mods.ItemChecklist.hjson @@ -0,0 +1,123 @@ +Configs: { + ItemChecklistClientConfig: { + ShowItemModSource: { + // Label: Show Item Mod Source + // Tooltip: Show which mod adds which item in the recipe catalog. Disable for immersion. + } + + // DisplayName: Item Checklist Client Config + // Headers.AutomaticSettings: Automatic Settings + + ItemChecklistSize: { + // Label: Item Checklist Size + // Tooltip: Size of the Item Checklist UI. This will automatically save, no need to adjust + } + + ItemChecklistPosition: { + // Label: Item Checklist Position + // Tooltip: Position of the Item Checklist UI. This will automatically save, no need to adjust + } + } +} + +// Keybinds.ToggleItemChecklist.DisplayName: Toggle Item Checklist +// GlobalItem.ItemChecklistAnnounceText: You found your first {0}. {1}/{2} {3}% + +UICollectionBar: { + // collectionTotalText: Total: {0}/{1} ({2}% Collected) + // collectionTerrariaText: Terraria: {0}/{1} ({2}% Collected) + // collectionModText: "{0}: {1}/{2} ({3}% Collected)" +} + +Ui: { + // FilterByTooltipText: Filter by tooltip + // FilterByNameText: Filter by Name + // ToggleCollectChestItemsText: Toggle Collect Chest Items + // ToggleMessagesText: Toggle Messages + // ShowSortValueTextText: Show Sort Value Text + // CycleModFilterText: Cycle Mod Filter: {0} + // CycleFoundFilterText: Cycle Found Filter: {0} + // ModnamesAllText: All + // FoundFilterAllText: All + // FoundFilterUnfoundText: Unfound + // FoundFilterFoundText: Found + // ModnamesVanillaText: Vanilla +} + +SharedUI: { + // mutuallyExclusiveFilterVanityText: Vanity + // mutuallyExclusiveFilterArmorText: Armor + // cycleAmmoTypesText: Cycle Ammo Types + // cycleUsedAmmoTypesText: Cycle Used Ammo Types + // categoryAllText: All + // categoryMeleeText: Melee + // categoryYoyoText: Yoyo + // categoryMagicText: Magic + // categoryRangedText: Ranged + // sortUseAmmoTypeText: Use Ammo Type + // categoryThrowingText: Throwing + // categorySummonText: Summon + // categorySentryText: Sentry + // sortDamageText: Damage + // categoryToolsText: Tools + // categoryPickaxesText: Pickaxes + // categoryAxesText: Axes + // categoryHammersText: Hammers + // categoryArmorText: Armor + // categoryWeaponsText: Weapons + // sortValueText: Value + // sortAlphabeticalText: Alphabetical + // sortRarityText: Rarity + // sortTerrariaSortText: Terraria Sort + // filterMaterialsText: Materials + // sortPickPower: Pick Power + // sortAxePower: Axe Power + // sortHammerPower: Hammer Power + // categoryHead: Head + // categoryBody: Body + // categoryLegs: Legs + // sortDefense: Defense + // categoryTiles: Tiles + // categoryContainersText: Containers + // categoryWiringText: Wiring + // categoryStatuesText: Statues + // categoryDoorsText: Doors + // categoryChairsText: Chairs + // categoryTablesText: Tables + // categoryLightSourcesText: Light Sources + // categoryTorchesText: Torches + // categoryWallsText: Walls + // categoryAccessoriesText: Accessories + // categoryWingsText: Wings + // categoryAmmoText: Ammo + // categoryPotionsText: Potions + // categoryHealthPotionsText: Health Potions + // categoryManaPotionsText: Mana Potions + // categoryBuffPotionsText: Buff Potions + // categoryExpertText: Expert + // categoryPetsText: Pets + // categoryLightPetsText: Light Pets + // categoryMountsText: Mounts + // categoryCartsText: Carts + // categoryHooksText: Hooks + // categoryDyesText: Dyes + // categoryHairDyesText: Hair Dyes + // categoryBossSummonsText: Boss Summons + // categoryConsumablesText: Consumables + // categoryCapturedNPCText: Captured NPC + // categoryFishingText: Fishing + // categoryPolesText: Poles + // categoryBaitText: Bait + // categoryQuestFishText: Quest Fish + // categoryExtractinatorText: Extractinator + // categoryOtherText: Other + // sortItemIdText: ItemID + // sortPlaceTileText: Place Tile + // sortAmmoTypeText: Ammo Type + // sortHealLifeText: Heal Life + // sortHealManaText: Heal Mana + // sortGrappleRangeText: Grapple Range + // sortProgressionOrderText: Progression Order + // sortPolePowerText: Pole Power + // sortBaitPowerText: Bait Power +} diff --git a/Localization/en-US.hjson b/Localization/en-US.hjson deleted file mode 100644 index febf5d2..0000000 --- a/Localization/en-US.hjson +++ /dev/null @@ -1,127 +0,0 @@ -Mods: { - ItemChecklist: { - Configs: { - ItemChecklistClientConfig: { - ShowItemModSource: { - Label: Show Item Mod Source - Tooltip: Show which mod adds which item in the recipe catalog. Disable for immersion. - } - - DisplayName: Item Checklist Client Config - Headers.AutomaticSettings: Automatic Settings - - ItemChecklistSize: { - Label: Item Checklist Size - Tooltip: Size of the Item Checklist UI. This will automatically save, no need to adjust - } - - ItemChecklistPosition: { - Label: Item Checklist Position - Tooltip: Position of the Item Checklist UI. This will automatically save, no need to adjust - } - } - } - - Keybinds.ToggleItemChecklist.DisplayName: Toggle Item Checklist - GlobalItem.ItemChecklistAnnounceText: You found your first {0}. {1}/{2} {3}% - - UICollectionBar: { - collectionTotalText: Total: {0}/{1} ({2}% Collected) - collectionTerrariaText: Terraria: {0}/{1} ({2}% Collected) - collectionModText: "{0}: {1}/{2} ({3}% Collected)" - } - - Ui: { - FilterByTooltipText: Filter by tooltip - FilterByNameText: Filter by Name - ToggleCollectChestItemsText: Toggle Collect Chest Items - ToggleMessagesText: Toggle Messages - ShowSortValueTextText: Show Sort Value Text - CycleModFilterText: Cycle Mod Filter: {0} - CycleFoundFilterText: Cycle Found Filter: {0} - ModnamesAllText: All - FoundFilterAllText: All - FoundFilterUnfoundText: Unfound - FoundFilterFoundText: Found - ModnamesVanillaText: Vanilla - } - - SharedUI: { - mutuallyExclusiveFilterVanityText: Vanity - mutuallyExclusiveFilterArmorText: Armor - cycleAmmoTypesText: Cycle Ammo Types - cycleUsedAmmoTypesText: Cycle Used Ammo Types - categoryAllText: All - categoryMeleeText: Melee - categoryYoyoText: Yoyo - categoryMagicText: Magic - categoryRangedText: Ranged - sortUseAmmoTypeText: Use Ammo Type - categoryThrowingText: Throwing - categorySummonText: Summon - categorySentryText: Sentry - sortDamageText: Damage - categoryToolsText: Tools - categoryPickaxesText: Pickaxes - categoryAxesText: Axes - categoryHammersText: Hammers - categoryArmorText: Armor - categoryWeaponsText: Weapons - sortValueText: Value - sortAlphabeticalText: Alphabetical - sortRarityText: Rarity - sortTerrariaSortText: Terraria Sort - filterMaterialsText: Materials - sortPickPower: Pick Power - sortAxePower: Axe Power - sortHammerPower: Hammer Power - categoryHead: Head - categoryBody: Body - categoryLegs: Legs - sortDefense: Defense - categoryTiles: Tiles - categoryContainersText: Containers - categoryWiringText: Wiring - categoryStatuesText: Statues - categoryDoorsText: Doors - categoryChairsText: Chairs - categoryTablesText: Tables - categoryLightSourcesText: Light Sources - categoryTorchesText: Torches - categoryWallsText: Walls - categoryAccessoriesText: Accessories - categoryWingsText: Wings - categoryAmmoText: Ammo - categoryPotionsText: Potions - categoryHealthPotionsText: Health Potions - categoryManaPotionsText: Mana Potions - categoryBuffPotionsText: Buff Potions - categoryExpertText: Expert - categoryPetsText: Pets - categoryLightPetsText: Light Pets - categoryMountsText: Mounts - categoryCartsText: Carts - categoryHooksText: Hooks - categoryDyesText: Dyes - categoryHairDyesText: Hair Dyes - categoryBossSummonsText: Boss Summons - categoryConsumablesText: Consumables - categoryCapturedNPCText: Captured NPC - categoryFishingText: Fishing - categoryPolesText: Poles - categoryBaitText: Bait - categoryQuestFishText: Quest Fish - categoryExtractinatorText: Extractinator - categoryOtherText: Other - sortItemIdText: ItemID - sortPlaceTileText: Place Tile - sortAmmoTypeText: Ammo Type - sortHealLifeText: Heal Life - sortHealManaText: Heal Mana - sortGrappleRangeText: Grapple Range - sortProgressionOrderText: Progression Order - sortPolePowerText: Pole Power - sortBaitPowerText: Bait Power - } - } -} \ No newline at end of file diff --git a/Localization/en-US_Mods.ItemChecklist.hjson b/Localization/en-US_Mods.ItemChecklist.hjson new file mode 100644 index 0000000..bc995c5 --- /dev/null +++ b/Localization/en-US_Mods.ItemChecklist.hjson @@ -0,0 +1,123 @@ +Configs: { + ItemChecklistClientConfig: { + ShowItemModSource: { + Label: Show Item Mod Source + Tooltip: Show which mod adds which item in the recipe catalog. Disable for immersion. + } + + DisplayName: Item Checklist Client Config + Headers.AutomaticSettings: Automatic Settings + + ItemChecklistSize: { + Label: Item Checklist Size + Tooltip: Size of the Item Checklist UI. This will automatically save, no need to adjust + } + + ItemChecklistPosition: { + Label: Item Checklist Position + Tooltip: Position of the Item Checklist UI. This will automatically save, no need to adjust + } + } +} + +Keybinds.ToggleItemChecklist.DisplayName: Toggle Item Checklist +GlobalItem.ItemChecklistAnnounceText: You found your first {0}. {1}/{2} {3}% + +UICollectionBar: { + collectionTotalText: Total: {0}/{1} ({2}% Collected) + collectionTerrariaText: Terraria: {0}/{1} ({2}% Collected) + collectionModText: "{0}: {1}/{2} ({3}% Collected)" +} + +Ui: { + FilterByTooltipText: Filter by tooltip + FilterByNameText: Filter by Name + ToggleCollectChestItemsText: Toggle Collect Chest Items + ToggleMessagesText: Toggle Messages + ShowSortValueTextText: Show Sort Value Text + CycleModFilterText: Cycle Mod Filter: {0} + CycleFoundFilterText: Cycle Found Filter: {0} + ModnamesAllText: All + FoundFilterAllText: All + FoundFilterUnfoundText: Unfound + FoundFilterFoundText: Found + ModnamesVanillaText: Vanilla +} + +SharedUI: { + mutuallyExclusiveFilterVanityText: Vanity + mutuallyExclusiveFilterArmorText: Armor + cycleAmmoTypesText: Cycle Ammo Types + cycleUsedAmmoTypesText: Cycle Used Ammo Types + categoryAllText: All + categoryMeleeText: Melee + categoryYoyoText: Yoyo + categoryMagicText: Magic + categoryRangedText: Ranged + sortUseAmmoTypeText: Use Ammo Type + categoryThrowingText: Throwing + categorySummonText: Summon + categorySentryText: Sentry + sortDamageText: Damage + categoryToolsText: Tools + categoryPickaxesText: Pickaxes + categoryAxesText: Axes + categoryHammersText: Hammers + categoryArmorText: Armor + categoryWeaponsText: Weapons + sortValueText: Value + sortAlphabeticalText: Alphabetical + sortRarityText: Rarity + sortTerrariaSortText: Terraria Sort + filterMaterialsText: Materials + sortPickPower: Pick Power + sortAxePower: Axe Power + sortHammerPower: Hammer Power + categoryHead: Head + categoryBody: Body + categoryLegs: Legs + sortDefense: Defense + categoryTiles: Tiles + categoryContainersText: Containers + categoryWiringText: Wiring + categoryStatuesText: Statues + categoryDoorsText: Doors + categoryChairsText: Chairs + categoryTablesText: Tables + categoryLightSourcesText: Light Sources + categoryTorchesText: Torches + categoryWallsText: Walls + categoryAccessoriesText: Accessories + categoryWingsText: Wings + categoryAmmoText: Ammo + categoryPotionsText: Potions + categoryHealthPotionsText: Health Potions + categoryManaPotionsText: Mana Potions + categoryBuffPotionsText: Buff Potions + categoryExpertText: Expert + categoryPetsText: Pets + categoryLightPetsText: Light Pets + categoryMountsText: Mounts + categoryCartsText: Carts + categoryHooksText: Hooks + categoryDyesText: Dyes + categoryHairDyesText: Hair Dyes + categoryBossSummonsText: Boss Summons + categoryConsumablesText: Consumables + categoryCapturedNPCText: Captured NPC + categoryFishingText: Fishing + categoryPolesText: Poles + categoryBaitText: Bait + categoryQuestFishText: Quest Fish + categoryExtractinatorText: Extractinator + categoryOtherText: Other + sortItemIdText: ItemID + sortPlaceTileText: Place Tile + sortAmmoTypeText: Ammo Type + sortHealLifeText: Heal Life + sortHealManaText: Heal Mana + sortGrappleRangeText: Grapple Range + sortProgressionOrderText: Progression Order + sortPolePowerText: Pole Power + sortBaitPowerText: Bait Power +} diff --git a/Localization/es-ES_Mods.ItemChecklist.hjson b/Localization/es-ES_Mods.ItemChecklist.hjson new file mode 100644 index 0000000..070715d --- /dev/null +++ b/Localization/es-ES_Mods.ItemChecklist.hjson @@ -0,0 +1,123 @@ +Configs: { + ItemChecklistClientConfig: { + ShowItemModSource: { + // Label: Show Item Mod Source + // Tooltip: Show which mod adds which item in the recipe catalog. Disable for immersion. + } + + // DisplayName: Item Checklist Client Config + // Headers.AutomaticSettings: Automatic Settings + + ItemChecklistSize: { + // Label: Item Checklist Size + // Tooltip: Size of the Item Checklist UI. This will automatically save, no need to adjust + } + + ItemChecklistPosition: { + // Label: Item Checklist Position + // Tooltip: Position of the Item Checklist UI. This will automatically save, no need to adjust + } + } +} + +// Keybinds.ToggleItemChecklist.DisplayName: Toggle Item Checklist +// GlobalItem.ItemChecklistAnnounceText: You found your first {0}. {1}/{2} {3}% + +UICollectionBar: { + // collectionTotalText: Total: {0}/{1} ({2}% Collected) + // collectionTerrariaText: Terraria: {0}/{1} ({2}% Collected) + // collectionModText: "{0}: {1}/{2} ({3}% Collected)" +} + +Ui: { + // FilterByTooltipText: Filter by tooltip + // FilterByNameText: Filter by Name + // ToggleCollectChestItemsText: Toggle Collect Chest Items + // ToggleMessagesText: Toggle Messages + // ShowSortValueTextText: Show Sort Value Text + // CycleModFilterText: Cycle Mod Filter: {0} + // CycleFoundFilterText: Cycle Found Filter: {0} + // ModnamesAllText: All + // FoundFilterAllText: All + // FoundFilterUnfoundText: Unfound + // FoundFilterFoundText: Found + // ModnamesVanillaText: Vanilla +} + +SharedUI: { + // mutuallyExclusiveFilterVanityText: Vanity + // mutuallyExclusiveFilterArmorText: Armor + // cycleAmmoTypesText: Cycle Ammo Types + // cycleUsedAmmoTypesText: Cycle Used Ammo Types + // categoryAllText: All + // categoryMeleeText: Melee + // categoryYoyoText: Yoyo + // categoryMagicText: Magic + // categoryRangedText: Ranged + // sortUseAmmoTypeText: Use Ammo Type + // categoryThrowingText: Throwing + // categorySummonText: Summon + // categorySentryText: Sentry + // sortDamageText: Damage + // categoryToolsText: Tools + // categoryPickaxesText: Pickaxes + // categoryAxesText: Axes + // categoryHammersText: Hammers + // categoryArmorText: Armor + // categoryWeaponsText: Weapons + // sortValueText: Value + // sortAlphabeticalText: Alphabetical + // sortRarityText: Rarity + // sortTerrariaSortText: Terraria Sort + // filterMaterialsText: Materials + // sortPickPower: Pick Power + // sortAxePower: Axe Power + // sortHammerPower: Hammer Power + // categoryHead: Head + // categoryBody: Body + // categoryLegs: Legs + // sortDefense: Defense + // categoryTiles: Tiles + // categoryContainersText: Containers + // categoryWiringText: Wiring + // categoryStatuesText: Statues + // categoryDoorsText: Doors + // categoryChairsText: Chairs + // categoryTablesText: Tables + // categoryLightSourcesText: Light Sources + // categoryTorchesText: Torches + // categoryWallsText: Walls + // categoryAccessoriesText: Accessories + // categoryWingsText: Wings + // categoryAmmoText: Ammo + // categoryPotionsText: Potions + // categoryHealthPotionsText: Health Potions + // categoryManaPotionsText: Mana Potions + // categoryBuffPotionsText: Buff Potions + // categoryExpertText: Expert + // categoryPetsText: Pets + // categoryLightPetsText: Light Pets + // categoryMountsText: Mounts + // categoryCartsText: Carts + // categoryHooksText: Hooks + // categoryDyesText: Dyes + // categoryHairDyesText: Hair Dyes + // categoryBossSummonsText: Boss Summons + // categoryConsumablesText: Consumables + // categoryCapturedNPCText: Captured NPC + // categoryFishingText: Fishing + // categoryPolesText: Poles + // categoryBaitText: Bait + // categoryQuestFishText: Quest Fish + // categoryExtractinatorText: Extractinator + // categoryOtherText: Other + // sortItemIdText: ItemID + // sortPlaceTileText: Place Tile + // sortAmmoTypeText: Ammo Type + // sortHealLifeText: Heal Life + // sortHealManaText: Heal Mana + // sortGrappleRangeText: Grapple Range + // sortProgressionOrderText: Progression Order + // sortPolePowerText: Pole Power + // sortBaitPowerText: Bait Power +} diff --git a/Localization/fr-FR_Mods.ItemChecklist.hjson b/Localization/fr-FR_Mods.ItemChecklist.hjson new file mode 100644 index 0000000..070715d --- /dev/null +++ b/Localization/fr-FR_Mods.ItemChecklist.hjson @@ -0,0 +1,123 @@ +Configs: { + ItemChecklistClientConfig: { + ShowItemModSource: { + // Label: Show Item Mod Source + // Tooltip: Show which mod adds which item in the recipe catalog. Disable for immersion. + } + + // DisplayName: Item Checklist Client Config + // Headers.AutomaticSettings: Automatic Settings + + ItemChecklistSize: { + // Label: Item Checklist Size + // Tooltip: Size of the Item Checklist UI. This will automatically save, no need to adjust + } + + ItemChecklistPosition: { + // Label: Item Checklist Position + // Tooltip: Position of the Item Checklist UI. This will automatically save, no need to adjust + } + } +} + +// Keybinds.ToggleItemChecklist.DisplayName: Toggle Item Checklist +// GlobalItem.ItemChecklistAnnounceText: You found your first {0}. {1}/{2} {3}% + +UICollectionBar: { + // collectionTotalText: Total: {0}/{1} ({2}% Collected) + // collectionTerrariaText: Terraria: {0}/{1} ({2}% Collected) + // collectionModText: "{0}: {1}/{2} ({3}% Collected)" +} + +Ui: { + // FilterByTooltipText: Filter by tooltip + // FilterByNameText: Filter by Name + // ToggleCollectChestItemsText: Toggle Collect Chest Items + // ToggleMessagesText: Toggle Messages + // ShowSortValueTextText: Show Sort Value Text + // CycleModFilterText: Cycle Mod Filter: {0} + // CycleFoundFilterText: Cycle Found Filter: {0} + // ModnamesAllText: All + // FoundFilterAllText: All + // FoundFilterUnfoundText: Unfound + // FoundFilterFoundText: Found + // ModnamesVanillaText: Vanilla +} + +SharedUI: { + // mutuallyExclusiveFilterVanityText: Vanity + // mutuallyExclusiveFilterArmorText: Armor + // cycleAmmoTypesText: Cycle Ammo Types + // cycleUsedAmmoTypesText: Cycle Used Ammo Types + // categoryAllText: All + // categoryMeleeText: Melee + // categoryYoyoText: Yoyo + // categoryMagicText: Magic + // categoryRangedText: Ranged + // sortUseAmmoTypeText: Use Ammo Type + // categoryThrowingText: Throwing + // categorySummonText: Summon + // categorySentryText: Sentry + // sortDamageText: Damage + // categoryToolsText: Tools + // categoryPickaxesText: Pickaxes + // categoryAxesText: Axes + // categoryHammersText: Hammers + // categoryArmorText: Armor + // categoryWeaponsText: Weapons + // sortValueText: Value + // sortAlphabeticalText: Alphabetical + // sortRarityText: Rarity + // sortTerrariaSortText: Terraria Sort + // filterMaterialsText: Materials + // sortPickPower: Pick Power + // sortAxePower: Axe Power + // sortHammerPower: Hammer Power + // categoryHead: Head + // categoryBody: Body + // categoryLegs: Legs + // sortDefense: Defense + // categoryTiles: Tiles + // categoryContainersText: Containers + // categoryWiringText: Wiring + // categoryStatuesText: Statues + // categoryDoorsText: Doors + // categoryChairsText: Chairs + // categoryTablesText: Tables + // categoryLightSourcesText: Light Sources + // categoryTorchesText: Torches + // categoryWallsText: Walls + // categoryAccessoriesText: Accessories + // categoryWingsText: Wings + // categoryAmmoText: Ammo + // categoryPotionsText: Potions + // categoryHealthPotionsText: Health Potions + // categoryManaPotionsText: Mana Potions + // categoryBuffPotionsText: Buff Potions + // categoryExpertText: Expert + // categoryPetsText: Pets + // categoryLightPetsText: Light Pets + // categoryMountsText: Mounts + // categoryCartsText: Carts + // categoryHooksText: Hooks + // categoryDyesText: Dyes + // categoryHairDyesText: Hair Dyes + // categoryBossSummonsText: Boss Summons + // categoryConsumablesText: Consumables + // categoryCapturedNPCText: Captured NPC + // categoryFishingText: Fishing + // categoryPolesText: Poles + // categoryBaitText: Bait + // categoryQuestFishText: Quest Fish + // categoryExtractinatorText: Extractinator + // categoryOtherText: Other + // sortItemIdText: ItemID + // sortPlaceTileText: Place Tile + // sortAmmoTypeText: Ammo Type + // sortHealLifeText: Heal Life + // sortHealManaText: Heal Mana + // sortGrappleRangeText: Grapple Range + // sortProgressionOrderText: Progression Order + // sortPolePowerText: Pole Power + // sortBaitPowerText: Bait Power +} diff --git a/Localization/it-IT_Mods.ItemChecklist.hjson b/Localization/it-IT_Mods.ItemChecklist.hjson new file mode 100644 index 0000000..070715d --- /dev/null +++ b/Localization/it-IT_Mods.ItemChecklist.hjson @@ -0,0 +1,123 @@ +Configs: { + ItemChecklistClientConfig: { + ShowItemModSource: { + // Label: Show Item Mod Source + // Tooltip: Show which mod adds which item in the recipe catalog. Disable for immersion. + } + + // DisplayName: Item Checklist Client Config + // Headers.AutomaticSettings: Automatic Settings + + ItemChecklistSize: { + // Label: Item Checklist Size + // Tooltip: Size of the Item Checklist UI. This will automatically save, no need to adjust + } + + ItemChecklistPosition: { + // Label: Item Checklist Position + // Tooltip: Position of the Item Checklist UI. This will automatically save, no need to adjust + } + } +} + +// Keybinds.ToggleItemChecklist.DisplayName: Toggle Item Checklist +// GlobalItem.ItemChecklistAnnounceText: You found your first {0}. {1}/{2} {3}% + +UICollectionBar: { + // collectionTotalText: Total: {0}/{1} ({2}% Collected) + // collectionTerrariaText: Terraria: {0}/{1} ({2}% Collected) + // collectionModText: "{0}: {1}/{2} ({3}% Collected)" +} + +Ui: { + // FilterByTooltipText: Filter by tooltip + // FilterByNameText: Filter by Name + // ToggleCollectChestItemsText: Toggle Collect Chest Items + // ToggleMessagesText: Toggle Messages + // ShowSortValueTextText: Show Sort Value Text + // CycleModFilterText: Cycle Mod Filter: {0} + // CycleFoundFilterText: Cycle Found Filter: {0} + // ModnamesAllText: All + // FoundFilterAllText: All + // FoundFilterUnfoundText: Unfound + // FoundFilterFoundText: Found + // ModnamesVanillaText: Vanilla +} + +SharedUI: { + // mutuallyExclusiveFilterVanityText: Vanity + // mutuallyExclusiveFilterArmorText: Armor + // cycleAmmoTypesText: Cycle Ammo Types + // cycleUsedAmmoTypesText: Cycle Used Ammo Types + // categoryAllText: All + // categoryMeleeText: Melee + // categoryYoyoText: Yoyo + // categoryMagicText: Magic + // categoryRangedText: Ranged + // sortUseAmmoTypeText: Use Ammo Type + // categoryThrowingText: Throwing + // categorySummonText: Summon + // categorySentryText: Sentry + // sortDamageText: Damage + // categoryToolsText: Tools + // categoryPickaxesText: Pickaxes + // categoryAxesText: Axes + // categoryHammersText: Hammers + // categoryArmorText: Armor + // categoryWeaponsText: Weapons + // sortValueText: Value + // sortAlphabeticalText: Alphabetical + // sortRarityText: Rarity + // sortTerrariaSortText: Terraria Sort + // filterMaterialsText: Materials + // sortPickPower: Pick Power + // sortAxePower: Axe Power + // sortHammerPower: Hammer Power + // categoryHead: Head + // categoryBody: Body + // categoryLegs: Legs + // sortDefense: Defense + // categoryTiles: Tiles + // categoryContainersText: Containers + // categoryWiringText: Wiring + // categoryStatuesText: Statues + // categoryDoorsText: Doors + // categoryChairsText: Chairs + // categoryTablesText: Tables + // categoryLightSourcesText: Light Sources + // categoryTorchesText: Torches + // categoryWallsText: Walls + // categoryAccessoriesText: Accessories + // categoryWingsText: Wings + // categoryAmmoText: Ammo + // categoryPotionsText: Potions + // categoryHealthPotionsText: Health Potions + // categoryManaPotionsText: Mana Potions + // categoryBuffPotionsText: Buff Potions + // categoryExpertText: Expert + // categoryPetsText: Pets + // categoryLightPetsText: Light Pets + // categoryMountsText: Mounts + // categoryCartsText: Carts + // categoryHooksText: Hooks + // categoryDyesText: Dyes + // categoryHairDyesText: Hair Dyes + // categoryBossSummonsText: Boss Summons + // categoryConsumablesText: Consumables + // categoryCapturedNPCText: Captured NPC + // categoryFishingText: Fishing + // categoryPolesText: Poles + // categoryBaitText: Bait + // categoryQuestFishText: Quest Fish + // categoryExtractinatorText: Extractinator + // categoryOtherText: Other + // sortItemIdText: ItemID + // sortPlaceTileText: Place Tile + // sortAmmoTypeText: Ammo Type + // sortHealLifeText: Heal Life + // sortHealManaText: Heal Mana + // sortGrappleRangeText: Grapple Range + // sortProgressionOrderText: Progression Order + // sortPolePowerText: Pole Power + // sortBaitPowerText: Bait Power +} diff --git a/Localization/pl-PL_Mods.ItemChecklist.hjson b/Localization/pl-PL_Mods.ItemChecklist.hjson new file mode 100644 index 0000000..070715d --- /dev/null +++ b/Localization/pl-PL_Mods.ItemChecklist.hjson @@ -0,0 +1,123 @@ +Configs: { + ItemChecklistClientConfig: { + ShowItemModSource: { + // Label: Show Item Mod Source + // Tooltip: Show which mod adds which item in the recipe catalog. Disable for immersion. + } + + // DisplayName: Item Checklist Client Config + // Headers.AutomaticSettings: Automatic Settings + + ItemChecklistSize: { + // Label: Item Checklist Size + // Tooltip: Size of the Item Checklist UI. This will automatically save, no need to adjust + } + + ItemChecklistPosition: { + // Label: Item Checklist Position + // Tooltip: Position of the Item Checklist UI. This will automatically save, no need to adjust + } + } +} + +// Keybinds.ToggleItemChecklist.DisplayName: Toggle Item Checklist +// GlobalItem.ItemChecklistAnnounceText: You found your first {0}. {1}/{2} {3}% + +UICollectionBar: { + // collectionTotalText: Total: {0}/{1} ({2}% Collected) + // collectionTerrariaText: Terraria: {0}/{1} ({2}% Collected) + // collectionModText: "{0}: {1}/{2} ({3}% Collected)" +} + +Ui: { + // FilterByTooltipText: Filter by tooltip + // FilterByNameText: Filter by Name + // ToggleCollectChestItemsText: Toggle Collect Chest Items + // ToggleMessagesText: Toggle Messages + // ShowSortValueTextText: Show Sort Value Text + // CycleModFilterText: Cycle Mod Filter: {0} + // CycleFoundFilterText: Cycle Found Filter: {0} + // ModnamesAllText: All + // FoundFilterAllText: All + // FoundFilterUnfoundText: Unfound + // FoundFilterFoundText: Found + // ModnamesVanillaText: Vanilla +} + +SharedUI: { + // mutuallyExclusiveFilterVanityText: Vanity + // mutuallyExclusiveFilterArmorText: Armor + // cycleAmmoTypesText: Cycle Ammo Types + // cycleUsedAmmoTypesText: Cycle Used Ammo Types + // categoryAllText: All + // categoryMeleeText: Melee + // categoryYoyoText: Yoyo + // categoryMagicText: Magic + // categoryRangedText: Ranged + // sortUseAmmoTypeText: Use Ammo Type + // categoryThrowingText: Throwing + // categorySummonText: Summon + // categorySentryText: Sentry + // sortDamageText: Damage + // categoryToolsText: Tools + // categoryPickaxesText: Pickaxes + // categoryAxesText: Axes + // categoryHammersText: Hammers + // categoryArmorText: Armor + // categoryWeaponsText: Weapons + // sortValueText: Value + // sortAlphabeticalText: Alphabetical + // sortRarityText: Rarity + // sortTerrariaSortText: Terraria Sort + // filterMaterialsText: Materials + // sortPickPower: Pick Power + // sortAxePower: Axe Power + // sortHammerPower: Hammer Power + // categoryHead: Head + // categoryBody: Body + // categoryLegs: Legs + // sortDefense: Defense + // categoryTiles: Tiles + // categoryContainersText: Containers + // categoryWiringText: Wiring + // categoryStatuesText: Statues + // categoryDoorsText: Doors + // categoryChairsText: Chairs + // categoryTablesText: Tables + // categoryLightSourcesText: Light Sources + // categoryTorchesText: Torches + // categoryWallsText: Walls + // categoryAccessoriesText: Accessories + // categoryWingsText: Wings + // categoryAmmoText: Ammo + // categoryPotionsText: Potions + // categoryHealthPotionsText: Health Potions + // categoryManaPotionsText: Mana Potions + // categoryBuffPotionsText: Buff Potions + // categoryExpertText: Expert + // categoryPetsText: Pets + // categoryLightPetsText: Light Pets + // categoryMountsText: Mounts + // categoryCartsText: Carts + // categoryHooksText: Hooks + // categoryDyesText: Dyes + // categoryHairDyesText: Hair Dyes + // categoryBossSummonsText: Boss Summons + // categoryConsumablesText: Consumables + // categoryCapturedNPCText: Captured NPC + // categoryFishingText: Fishing + // categoryPolesText: Poles + // categoryBaitText: Bait + // categoryQuestFishText: Quest Fish + // categoryExtractinatorText: Extractinator + // categoryOtherText: Other + // sortItemIdText: ItemID + // sortPlaceTileText: Place Tile + // sortAmmoTypeText: Ammo Type + // sortHealLifeText: Heal Life + // sortHealManaText: Heal Mana + // sortGrappleRangeText: Grapple Range + // sortProgressionOrderText: Progression Order + // sortPolePowerText: Pole Power + // sortBaitPowerText: Bait Power +} diff --git a/Localization/pt-BR_Mods.ItemChecklist.hjson b/Localization/pt-BR_Mods.ItemChecklist.hjson new file mode 100644 index 0000000..070715d --- /dev/null +++ b/Localization/pt-BR_Mods.ItemChecklist.hjson @@ -0,0 +1,123 @@ +Configs: { + ItemChecklistClientConfig: { + ShowItemModSource: { + // Label: Show Item Mod Source + // Tooltip: Show which mod adds which item in the recipe catalog. Disable for immersion. + } + + // DisplayName: Item Checklist Client Config + // Headers.AutomaticSettings: Automatic Settings + + ItemChecklistSize: { + // Label: Item Checklist Size + // Tooltip: Size of the Item Checklist UI. This will automatically save, no need to adjust + } + + ItemChecklistPosition: { + // Label: Item Checklist Position + // Tooltip: Position of the Item Checklist UI. This will automatically save, no need to adjust + } + } +} + +// Keybinds.ToggleItemChecklist.DisplayName: Toggle Item Checklist +// GlobalItem.ItemChecklistAnnounceText: You found your first {0}. {1}/{2} {3}% + +UICollectionBar: { + // collectionTotalText: Total: {0}/{1} ({2}% Collected) + // collectionTerrariaText: Terraria: {0}/{1} ({2}% Collected) + // collectionModText: "{0}: {1}/{2} ({3}% Collected)" +} + +Ui: { + // FilterByTooltipText: Filter by tooltip + // FilterByNameText: Filter by Name + // ToggleCollectChestItemsText: Toggle Collect Chest Items + // ToggleMessagesText: Toggle Messages + // ShowSortValueTextText: Show Sort Value Text + // CycleModFilterText: Cycle Mod Filter: {0} + // CycleFoundFilterText: Cycle Found Filter: {0} + // ModnamesAllText: All + // FoundFilterAllText: All + // FoundFilterUnfoundText: Unfound + // FoundFilterFoundText: Found + // ModnamesVanillaText: Vanilla +} + +SharedUI: { + // mutuallyExclusiveFilterVanityText: Vanity + // mutuallyExclusiveFilterArmorText: Armor + // cycleAmmoTypesText: Cycle Ammo Types + // cycleUsedAmmoTypesText: Cycle Used Ammo Types + // categoryAllText: All + // categoryMeleeText: Melee + // categoryYoyoText: Yoyo + // categoryMagicText: Magic + // categoryRangedText: Ranged + // sortUseAmmoTypeText: Use Ammo Type + // categoryThrowingText: Throwing + // categorySummonText: Summon + // categorySentryText: Sentry + // sortDamageText: Damage + // categoryToolsText: Tools + // categoryPickaxesText: Pickaxes + // categoryAxesText: Axes + // categoryHammersText: Hammers + // categoryArmorText: Armor + // categoryWeaponsText: Weapons + // sortValueText: Value + // sortAlphabeticalText: Alphabetical + // sortRarityText: Rarity + // sortTerrariaSortText: Terraria Sort + // filterMaterialsText: Materials + // sortPickPower: Pick Power + // sortAxePower: Axe Power + // sortHammerPower: Hammer Power + // categoryHead: Head + // categoryBody: Body + // categoryLegs: Legs + // sortDefense: Defense + // categoryTiles: Tiles + // categoryContainersText: Containers + // categoryWiringText: Wiring + // categoryStatuesText: Statues + // categoryDoorsText: Doors + // categoryChairsText: Chairs + // categoryTablesText: Tables + // categoryLightSourcesText: Light Sources + // categoryTorchesText: Torches + // categoryWallsText: Walls + // categoryAccessoriesText: Accessories + // categoryWingsText: Wings + // categoryAmmoText: Ammo + // categoryPotionsText: Potions + // categoryHealthPotionsText: Health Potions + // categoryManaPotionsText: Mana Potions + // categoryBuffPotionsText: Buff Potions + // categoryExpertText: Expert + // categoryPetsText: Pets + // categoryLightPetsText: Light Pets + // categoryMountsText: Mounts + // categoryCartsText: Carts + // categoryHooksText: Hooks + // categoryDyesText: Dyes + // categoryHairDyesText: Hair Dyes + // categoryBossSummonsText: Boss Summons + // categoryConsumablesText: Consumables + // categoryCapturedNPCText: Captured NPC + // categoryFishingText: Fishing + // categoryPolesText: Poles + // categoryBaitText: Bait + // categoryQuestFishText: Quest Fish + // categoryExtractinatorText: Extractinator + // categoryOtherText: Other + // sortItemIdText: ItemID + // sortPlaceTileText: Place Tile + // sortAmmoTypeText: Ammo Type + // sortHealLifeText: Heal Life + // sortHealManaText: Heal Mana + // sortGrappleRangeText: Grapple Range + // sortProgressionOrderText: Progression Order + // sortPolePowerText: Pole Power + // sortBaitPowerText: Bait Power +} diff --git a/Localization/ru-RU_Mods.ItemChecklist.hjson b/Localization/ru-RU_Mods.ItemChecklist.hjson new file mode 100644 index 0000000..070715d --- /dev/null +++ b/Localization/ru-RU_Mods.ItemChecklist.hjson @@ -0,0 +1,123 @@ +Configs: { + ItemChecklistClientConfig: { + ShowItemModSource: { + // Label: Show Item Mod Source + // Tooltip: Show which mod adds which item in the recipe catalog. Disable for immersion. + } + + // DisplayName: Item Checklist Client Config + // Headers.AutomaticSettings: Automatic Settings + + ItemChecklistSize: { + // Label: Item Checklist Size + // Tooltip: Size of the Item Checklist UI. This will automatically save, no need to adjust + } + + ItemChecklistPosition: { + // Label: Item Checklist Position + // Tooltip: Position of the Item Checklist UI. This will automatically save, no need to adjust + } + } +} + +// Keybinds.ToggleItemChecklist.DisplayName: Toggle Item Checklist +// GlobalItem.ItemChecklistAnnounceText: You found your first {0}. {1}/{2} {3}% + +UICollectionBar: { + // collectionTotalText: Total: {0}/{1} ({2}% Collected) + // collectionTerrariaText: Terraria: {0}/{1} ({2}% Collected) + // collectionModText: "{0}: {1}/{2} ({3}% Collected)" +} + +Ui: { + // FilterByTooltipText: Filter by tooltip + // FilterByNameText: Filter by Name + // ToggleCollectChestItemsText: Toggle Collect Chest Items + // ToggleMessagesText: Toggle Messages + // ShowSortValueTextText: Show Sort Value Text + // CycleModFilterText: Cycle Mod Filter: {0} + // CycleFoundFilterText: Cycle Found Filter: {0} + // ModnamesAllText: All + // FoundFilterAllText: All + // FoundFilterUnfoundText: Unfound + // FoundFilterFoundText: Found + // ModnamesVanillaText: Vanilla +} + +SharedUI: { + // mutuallyExclusiveFilterVanityText: Vanity + // mutuallyExclusiveFilterArmorText: Armor + // cycleAmmoTypesText: Cycle Ammo Types + // cycleUsedAmmoTypesText: Cycle Used Ammo Types + // categoryAllText: All + // categoryMeleeText: Melee + // categoryYoyoText: Yoyo + // categoryMagicText: Magic + // categoryRangedText: Ranged + // sortUseAmmoTypeText: Use Ammo Type + // categoryThrowingText: Throwing + // categorySummonText: Summon + // categorySentryText: Sentry + // sortDamageText: Damage + // categoryToolsText: Tools + // categoryPickaxesText: Pickaxes + // categoryAxesText: Axes + // categoryHammersText: Hammers + // categoryArmorText: Armor + // categoryWeaponsText: Weapons + // sortValueText: Value + // sortAlphabeticalText: Alphabetical + // sortRarityText: Rarity + // sortTerrariaSortText: Terraria Sort + // filterMaterialsText: Materials + // sortPickPower: Pick Power + // sortAxePower: Axe Power + // sortHammerPower: Hammer Power + // categoryHead: Head + // categoryBody: Body + // categoryLegs: Legs + // sortDefense: Defense + // categoryTiles: Tiles + // categoryContainersText: Containers + // categoryWiringText: Wiring + // categoryStatuesText: Statues + // categoryDoorsText: Doors + // categoryChairsText: Chairs + // categoryTablesText: Tables + // categoryLightSourcesText: Light Sources + // categoryTorchesText: Torches + // categoryWallsText: Walls + // categoryAccessoriesText: Accessories + // categoryWingsText: Wings + // categoryAmmoText: Ammo + // categoryPotionsText: Potions + // categoryHealthPotionsText: Health Potions + // categoryManaPotionsText: Mana Potions + // categoryBuffPotionsText: Buff Potions + // categoryExpertText: Expert + // categoryPetsText: Pets + // categoryLightPetsText: Light Pets + // categoryMountsText: Mounts + // categoryCartsText: Carts + // categoryHooksText: Hooks + // categoryDyesText: Dyes + // categoryHairDyesText: Hair Dyes + // categoryBossSummonsText: Boss Summons + // categoryConsumablesText: Consumables + // categoryCapturedNPCText: Captured NPC + // categoryFishingText: Fishing + // categoryPolesText: Poles + // categoryBaitText: Bait + // categoryQuestFishText: Quest Fish + // categoryExtractinatorText: Extractinator + // categoryOtherText: Other + // sortItemIdText: ItemID + // sortPlaceTileText: Place Tile + // sortAmmoTypeText: Ammo Type + // sortHealLifeText: Heal Life + // sortHealManaText: Heal Mana + // sortGrappleRangeText: Grapple Range + // sortProgressionOrderText: Progression Order + // sortPolePowerText: Pole Power + // sortBaitPowerText: Bait Power +} diff --git a/Localization/zh-Hans_Mods.ItemChecklist.hjson b/Localization/zh-Hans_Mods.ItemChecklist.hjson new file mode 100644 index 0000000..070715d --- /dev/null +++ b/Localization/zh-Hans_Mods.ItemChecklist.hjson @@ -0,0 +1,123 @@ +Configs: { + ItemChecklistClientConfig: { + ShowItemModSource: { + // Label: Show Item Mod Source + // Tooltip: Show which mod adds which item in the recipe catalog. Disable for immersion. + } + + // DisplayName: Item Checklist Client Config + // Headers.AutomaticSettings: Automatic Settings + + ItemChecklistSize: { + // Label: Item Checklist Size + // Tooltip: Size of the Item Checklist UI. This will automatically save, no need to adjust + } + + ItemChecklistPosition: { + // Label: Item Checklist Position + // Tooltip: Position of the Item Checklist UI. This will automatically save, no need to adjust + } + } +} + +// Keybinds.ToggleItemChecklist.DisplayName: Toggle Item Checklist +// GlobalItem.ItemChecklistAnnounceText: You found your first {0}. {1}/{2} {3}% + +UICollectionBar: { + // collectionTotalText: Total: {0}/{1} ({2}% Collected) + // collectionTerrariaText: Terraria: {0}/{1} ({2}% Collected) + // collectionModText: "{0}: {1}/{2} ({3}% Collected)" +} + +Ui: { + // FilterByTooltipText: Filter by tooltip + // FilterByNameText: Filter by Name + // ToggleCollectChestItemsText: Toggle Collect Chest Items + // ToggleMessagesText: Toggle Messages + // ShowSortValueTextText: Show Sort Value Text + // CycleModFilterText: Cycle Mod Filter: {0} + // CycleFoundFilterText: Cycle Found Filter: {0} + // ModnamesAllText: All + // FoundFilterAllText: All + // FoundFilterUnfoundText: Unfound + // FoundFilterFoundText: Found + // ModnamesVanillaText: Vanilla +} + +SharedUI: { + // mutuallyExclusiveFilterVanityText: Vanity + // mutuallyExclusiveFilterArmorText: Armor + // cycleAmmoTypesText: Cycle Ammo Types + // cycleUsedAmmoTypesText: Cycle Used Ammo Types + // categoryAllText: All + // categoryMeleeText: Melee + // categoryYoyoText: Yoyo + // categoryMagicText: Magic + // categoryRangedText: Ranged + // sortUseAmmoTypeText: Use Ammo Type + // categoryThrowingText: Throwing + // categorySummonText: Summon + // categorySentryText: Sentry + // sortDamageText: Damage + // categoryToolsText: Tools + // categoryPickaxesText: Pickaxes + // categoryAxesText: Axes + // categoryHammersText: Hammers + // categoryArmorText: Armor + // categoryWeaponsText: Weapons + // sortValueText: Value + // sortAlphabeticalText: Alphabetical + // sortRarityText: Rarity + // sortTerrariaSortText: Terraria Sort + // filterMaterialsText: Materials + // sortPickPower: Pick Power + // sortAxePower: Axe Power + // sortHammerPower: Hammer Power + // categoryHead: Head + // categoryBody: Body + // categoryLegs: Legs + // sortDefense: Defense + // categoryTiles: Tiles + // categoryContainersText: Containers + // categoryWiringText: Wiring + // categoryStatuesText: Statues + // categoryDoorsText: Doors + // categoryChairsText: Chairs + // categoryTablesText: Tables + // categoryLightSourcesText: Light Sources + // categoryTorchesText: Torches + // categoryWallsText: Walls + // categoryAccessoriesText: Accessories + // categoryWingsText: Wings + // categoryAmmoText: Ammo + // categoryPotionsText: Potions + // categoryHealthPotionsText: Health Potions + // categoryManaPotionsText: Mana Potions + // categoryBuffPotionsText: Buff Potions + // categoryExpertText: Expert + // categoryPetsText: Pets + // categoryLightPetsText: Light Pets + // categoryMountsText: Mounts + // categoryCartsText: Carts + // categoryHooksText: Hooks + // categoryDyesText: Dyes + // categoryHairDyesText: Hair Dyes + // categoryBossSummonsText: Boss Summons + // categoryConsumablesText: Consumables + // categoryCapturedNPCText: Captured NPC + // categoryFishingText: Fishing + // categoryPolesText: Poles + // categoryBaitText: Bait + // categoryQuestFishText: Quest Fish + // categoryExtractinatorText: Extractinator + // categoryOtherText: Other + // sortItemIdText: ItemID + // sortPlaceTileText: Place Tile + // sortAmmoTypeText: Ammo Type + // sortHealLifeText: Heal Life + // sortHealManaText: Heal Mana + // sortGrappleRangeText: Grapple Range + // sortProgressionOrderText: Progression Order + // sortPolePowerText: Pole Power + // sortBaitPowerText: Bait Power +} diff --git a/SharedUI.cs b/SharedUI.cs index 631391c..02b630b 100644 --- a/SharedUI.cs +++ b/SharedUI.cs @@ -442,7 +442,7 @@ namespace ItemChecklist private void SetupSortsAndCategories() { foreach (int type in itemTexturePreload) - Main.instance.LoadItem(type); + Main.instance.LoadItem(type); // needs ImmediateLoad. Texture2D terrariaSort = ResizeImage(TextureAssets.InventorySort[0], 24, 24); Texture2D rarity = ResizeImage(TextureAssets.Item[ItemID.MetalDetector], 24, 24); diff --git a/UIElements/UIItemSlot.cs b/UIElements/UIItemSlot.cs index d3c6a28..dab579b 100644 --- a/UIElements/UIItemSlot.cs +++ b/UIElements/UIItemSlot.cs @@ -51,7 +51,7 @@ namespace ItemChecklist.UIElements } if (!item.IsAir) { - Main.instance.LoadItem(this.item.type); + Utilities.LoadItem(this.item.type); Texture2D itemTexture = TextureAssets.Item[this.item.type].Value; Rectangle rectangle2 = Main.itemAnimations[item.type]?.GetFrame(itemTexture) ?? itemTexture.Frame(); Color newColor = Color.White; diff --git a/Utilities.cs b/Utilities.cs index 241e721..f8b204a 100644 --- a/Utilities.cs +++ b/Utilities.cs @@ -200,5 +200,17 @@ namespace ItemChecklist internal static Color noColor = Color.LightSalmon; // OrangeRed Red internal static Color yesColor = Color.LightGreen; // Green internal static Color maybeColor = Color.Yellow; // LightYellow LightGoldenrodYellow Yellow Goldenrod + + internal static void LoadItem(int type) { + // Use this instead of Main.instance.LoadItem because we don't need ImmediateLoad + if (TextureAssets.Item[type].State == AssetState.NotLoaded) + Main.Assets.Request(TextureAssets.Item[type].Name, AssetRequestMode.AsyncLoad); + } + + internal static void LoadNPC(int type) { + // Use this instead of Main.instance.LoadNPC because we don't need ImmediateLoad + if (TextureAssets.Npc[type].State == AssetState.NotLoaded) + Main.Assets.Request(TextureAssets.Npc[type].Name, AssetRequestMode.AsyncLoad); + } } } \ No newline at end of file diff --git a/build.txt b/build.txt index 0e79ff6..8248330 100644 --- a/build.txt +++ b/build.txt @@ -1,5 +1,5 @@ author = jopojelly -version = 0.6.1 +version = 0.7 displayName = Item Checklist homepage = https://forums.terraria.org/index.php?threads/item-checklist-in-game-100-item-collection-checklist.52786/ hideCode = false @@ -8,4 +8,4 @@ includeSource = true includePDB = true notworkingside = Client buildIgnore = .vs\*, Properties\*, *.csproj, *.user, obj\*, bin\*, *.config, lib\*, .gitignore, .git\* -weakReferences = MagicStorage@0.5.7.4 +weakReferences = MagicStorage@0.6.0.3