Skip to content

Commit eb19eaa

Browse files
author
hamstar0
committed
v3.1.0 - Improved debug filter data output
1 parent e9f0904 commit eb19eaa

3 files changed

Lines changed: 25 additions & 8 deletions

File tree

Data/FiltersAccess.cs

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,26 @@ public IEnumerable<string> GetFormattedFilterData( string subspace=" " ) {
8888

8989
public void OutputFormattedFilterData() {
9090
Main.NewText( "Is nihilated: " + this.FilterConfig.IsActive );
91-
Main.NewText( "Items BL: " + this.FilterConfig.ItemBlacklist.Count + ", WL count: " + this.FilterConfig.ItemWhitelist.Count );
92-
Main.NewText( "Recipes BL: " + this.FilterConfig.RecipeBlacklist.Count + ", WL count: " + this.FilterConfig.RecipeWhitelist.Count );
93-
Main.NewText( "NPCs BL: " + this.FilterConfig.NpcBlacklist.Count + ", WL count: " + this.FilterConfig.NpcWhitelist.Count );
94-
Main.NewText( "Loot BL: " + this.FilterConfig.NpcLootBlacklist.Count + ", WL count: " + this.FilterConfig.NpcLootWhitelist.Count );
91+
Main.NewText( "Items BL: "
92+
+ this.FilterConfig.ItemBlacklist.Count + "+"
93+
+ this.FilterConfig.ItemGroupBlacklist.Count + ", WL count: "
94+
+ this.FilterConfig.ItemWhitelist.Count + "+"
95+
+ this.FilterConfig.ItemGroupWhitelist.Count );
96+
Main.NewText( "Recipes BL: "
97+
+ this.FilterConfig.RecipeBlacklist.Count + "+"
98+
+ this.FilterConfig.RecipeGroupBlacklist.Count + ", WL count: "
99+
+ this.FilterConfig.RecipeWhitelist.Count + "+"
100+
+ this.FilterConfig.RecipeGroupWhitelist.Count );
101+
Main.NewText( "NPCs BL: "
102+
+ this.FilterConfig.NpcBlacklist.Count + "+"
103+
+ this.FilterConfig.NpcGroupBlacklist.Count + ", WL count: "
104+
+ this.FilterConfig.NpcWhitelist.Count + "+"
105+
+ this.FilterConfig.NpcGroupWhitelist.Count );
106+
Main.NewText( "Loot BL: "
107+
+ this.FilterConfig.NpcLootGroupBlacklist.Count + "+"
108+
+ this.FilterConfig.NpcLootBlacklist.Count + ", WL count: "
109+
+ this.FilterConfig.NpcLootGroupWhitelist.Count + "+"
110+
+ this.FilterConfig.NpcLootWhitelist.Count );
95111

96112
LogHelpers.Log( string.Join("\n", this.GetFormattedFilterData()) );
97113
}

MyItem_Draw.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ public override void ModifyTooltips( Item item, List<TooltipLine> tooltips ) {
3434
////////////////
3535

3636
public override void PostDrawInInventory( Item item, SpriteBatch sb, Vector2 position, Rectangle frame, Color drawColor, Color itemColor, Vector2 origin, float scale ) {
37+
if( item == null || item.IsAir ) { return; }
38+
3739
var mymod = (NihilismMod)this.mod;
3840
var myworld = ModContent.GetInstance<NihilismWorld>();
3941
if( myworld.Logic == null ) {
4042
LogHelpers.WarnOnce( "Logic not loaded." );
4143
return;
4244
}
43-
45+
4446
if( !myworld.Logic.AreItemFiltersEnabled() ) {
4547
return;
4648
}
4749

48-
if( item == null || item.IsAir ) { return; }
49-
5050
bool _;
5151
if( !myworld.Logic.DataAccess.IsItemEnabled( item, out _, out _ ) ) {
5252
float posX = position.X + (((float)frame.Width / 2f) * scale) - (((float)mymod.DisabledItemTex.Width / 2f) * scale);

MyProjectile.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using HamstarHelpers.Helpers.Players;
1+
using HamstarHelpers.Helpers.Debug;
2+
using HamstarHelpers.Helpers.Players;
23
using Terraria;
34
using Terraria.ModLoader;
45

0 commit comments

Comments
 (0)