v2.0.0.4 - Contextualized IBaseEmitterItem with it's definition type

hamstar0 · hamstar0 · commit 3b85ab1171ff · 2020-06-20T05:24:23.000-07:00
* Contextualized IBaseEmitterItem with it's definition type
* Added BaseEmitterDefinition.CreateOrGetDefForItem&lt;BaseEmitterDefinition&gt;(Item)
* Tweaked some information tip texts
* Fixed hologram UI fields not being set with new item selects
diff --git a/Emitters/Definitions/BaseEmitterDefinition.cs b/Emitters/Definitions/BaseEmitterDefinition.cs
@@ -1,7 +1,9 @@
-﻿using System.IO;
+﻿using System;
+using System.IO;
 using System.Dynamic;
 using Terraria;
 using HamstarHelpers.Classes.Errors;
+using Emitters.Items;
 
 
 namespace Emitters.Definitions {
@@ -13,8 +15,27 @@ public enum EmitterType {
 
 
 
-
+	
 	public abstract class BaseEmitterDefinition {
+		public static T CreateOrGetDefForItem<T>( Item item )
+					where T : BaseEmitterDefinition {
+			var modItem = item.modItem;
+			if( modItem == null ) {
+				throw new ModHelpersException( "Not an emitter or mod item." );
+			}
+
+			var myitem = modItem as IBaseEmitterItem<T>;
+			if( myitem == null ) {
+				myitem.SetDefinition( (T)Activator.CreateInstance(typeof(T)) );
+			}
+
+			return myitem.Def;
+		}
+
+
+
+		////////////////
+
 		public bool IsActivated { get; set; } = true;
 
 
diff --git a/Emitters/Definitions/HologramDefinition.cs b/Emitters/Definitions/HologramDefinition.cs
@@ -2,10 +2,9 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Terraria;
-using Terraria.ModLoader.Config;
+using Terraria.ModLoader;
 using HamstarHelpers.Classes.Errors;
 using HamstarHelpers.Helpers.Debug;
-using Terraria.ModLoader;
 
 
 namespace Emitters.Definitions {
diff --git a/Emitters/Items/BaseEmitterItem.cs b/Emitters/Items/BaseEmitterItem.cs
@@ -1,9 +1,22 @@
 using System;
 using Terraria;
+using Emitters.Definitions;
 
 
 namespace Emitters.Items {
 	public interface IBaseEmitterItem {
 		void OpenUI( Item emitterItem );
 	}
+
+
+
+
+	public interface IBaseEmitterItem<T> : IBaseEmitterItem where T : BaseEmitterDefinition {
+		T Def { get; }
+
+
+		////////////////
+
+		void SetDefinition( T def );
+	}
 }
diff --git a/Emitters/Items/EmitterItem_Def.cs b/Emitters/Items/EmitterItem_Def.cs
@@ -6,7 +6,7 @@
 
 
 namespace Emitters.Items {
-	public partial class EmitterItem : ModItem, IBaseEmitterItem {
+	public partial class EmitterItem : ModItem, IBaseEmitterItem<EmitterDefinition> {
 		public EmitterDefinition Def { get; private set; } = null;
 
 
@@ -59,8 +59,7 @@ public override void SetDefaults() {
 
 		////////////////
 
-		public void SetEmitterDefinition( EmitterDefinition def ) {
-//Main.NewText( def.ToString() );
+		public void SetDefinition( EmitterDefinition def ) {
 			this.Def = def;
 		}
 
diff --git a/Emitters/Items/EmitterItem_Draw.cs b/Emitters/Items/EmitterItem_Draw.cs
@@ -3,10 +3,11 @@
 using Microsoft.Xna.Framework.Graphics;
 using Terraria;
 using Terraria.ModLoader;
+using Emitters.Definitions;
 
 
 namespace Emitters.Items {
-	public partial class EmitterItem : ModItem, IBaseEmitterItem {
+	public partial class EmitterItem : ModItem, IBaseEmitterItem<EmitterDefinition> {
 		public override bool PreDrawInInventory(
 					SpriteBatch sb,
 					Vector2 pos,
diff --git a/Emitters/Items/EmitterItem_Interactivity.cs b/Emitters/Items/EmitterItem_Interactivity.cs
@@ -11,7 +11,7 @@
 
 
 namespace Emitters.Items {
-	public partial class EmitterItem : ModItem, IBaseEmitterItem {
+	public partial class EmitterItem : ModItem, IBaseEmitterItem<EmitterDefinition> {
 		public static bool CanViewEmitters( Player plr, bool withWire ) {
 			return (withWire && WiresUI.Settings.DrawWires) || (
 					plr.HeldItem != null
@@ -125,7 +125,7 @@ public override bool UseItem( Player player ) {
 			Timers.SetTimer( timerName, 15, false, () => false );
 
 			if( this.Def == null ) {
-				Main.NewText( "Emitter settings must be first specified (right-click item)." );
+				Main.NewText( "Emitter settings must be first specified (click item's button)." );
 				return base.UseItem( player );
 			}
 
diff --git a/Emitters/Items/EmitterItem_Recipe.cs b/Emitters/Items/EmitterItem_Recipe.cs
@@ -1,9 +1,10 @@
 using Terraria.ID;
 using Terraria.ModLoader;
+using Emitters.Definitions;
 
 
 namespace Emitters.Items {
-	public partial class EmitterItem : ModItem, IBaseEmitterItem {
+	public partial class EmitterItem : ModItem, IBaseEmitterItem<EmitterDefinition> {
 		public override void AddRecipes() {
 			if( !EmittersConfig.Instance.EmitterRecipeEnabled ) {
 				return;
diff --git a/Emitters/Items/EmitterItem_SaveLoad.cs b/Emitters/Items/EmitterItem_SaveLoad.cs
@@ -6,14 +6,14 @@
 
 
 namespace Emitters.Items {
-	public partial class EmitterItem : ModItem, IBaseEmitterItem {
+	public partial class EmitterItem : ModItem, IBaseEmitterItem<EmitterDefinition> {
 		public override void Load( TagCompound tag ) {
 			if( !tag.ContainsKey("EmitterMode") ) {
 				return;
 			}
 
 			try {
-				this.Def = new EmitterDefinition(
+				this.SetDefinition( new EmitterDefinition(
 					isGoreMode: tag.GetBool( "EmitterMode" ),
 					type: tag.GetInt( "EmitterType" ),
 					scale: tag.GetFloat( "EmitterScale" ),
@@ -30,7 +30,7 @@ public override void Load( TagCompound tag ) {
 					hasGravity: tag.GetBool( "EmitterHasGrav" ),
 					hasLight: tag.GetBool( "EmitterHasLight" ),
 					isActivated: tag.GetBool( "EmitterIsActivated" )
-				);
+				) );
 			} catch { }
 		}
 
diff --git a/Emitters/Items/EmitterItem_Tooltips.cs b/Emitters/Items/EmitterItem_Tooltips.cs
@@ -2,10 +2,11 @@
 using Microsoft.Xna.Framework;
 using Terraria;
 using Terraria.ModLoader;
+using Emitters.Definitions;
 
 
 namespace Emitters.Items {
-	public partial class EmitterItem : ModItem, IBaseEmitterItem {
+	public partial class EmitterItem : ModItem, IBaseEmitterItem<EmitterDefinition> {
 		public override void ModifyTooltips( List<TooltipLine> tooltips ) {
 			int i = 1;
 			//tooltips.Insert( i++, new TooltipLine(this.mod, "EmitterUI", "[c/00FF00:Right-click in inventory to adjust settings]") );
diff --git a/Emitters/Items/HologramItem_Def.cs b/Emitters/Items/HologramItem_Def.cs
@@ -5,7 +5,7 @@
 
 
 namespace Emitters.Items {
-	public partial class HologramItem : ModItem, IBaseEmitterItem {
+	public partial class HologramItem : ModItem, IBaseEmitterItem<HologramDefinition> {
 		public HologramDefinition Def { get; private set; } = null;
 
 
@@ -58,8 +58,7 @@ public override void SetDefaults() {
 
 		////////////////
 
-		public void SetHologramDefinition( HologramDefinition def ) {
-			//Main.NewText( def.ToString() );
+		public void SetDefinition( HologramDefinition def ) {
 			this.Def = def;
 		}
 
diff --git a/Emitters/Items/HologramItem_Draw.cs b/Emitters/Items/HologramItem_Draw.cs
@@ -3,10 +3,11 @@
 using Microsoft.Xna.Framework.Graphics;
 using Terraria;
 using Terraria.ModLoader;
+using Emitters.Definitions;
 
 
 namespace Emitters.Items {
-	public partial class HologramItem : ModItem, IBaseEmitterItem {
+	public partial class HologramItem : ModItem, IBaseEmitterItem<HologramDefinition> {
 		public override bool PreDrawInInventory(
 					SpriteBatch sb,
 					Vector2 pos,
diff --git a/Emitters/Items/HologramItem_Interactivity.cs b/Emitters/Items/HologramItem_Interactivity.cs
@@ -11,7 +11,7 @@
 
 
 namespace Emitters.Items {
-	public partial class HologramItem : ModItem, IBaseEmitterItem {
+	public partial class HologramItem : ModItem, IBaseEmitterItem<HologramDefinition> {
 		public static bool CanViewHolograms( Player plr, bool withWire ) {
 			return (withWire && WiresUI.Settings.DrawWires) || (
 					plr.HeldItem != null
@@ -145,9 +145,7 @@ public void OpenUI( Item hologramItem ) {
 			var mymod = EmittersMod.Instance;
 			mymod.HologramEditorDialog.Open();
 
-			if( !mymod.HologramEditorDialog.SetItem( hologramItem ) ) {
-				mymod.HologramEditorDialog.Close();
-			}
+			mymod.HologramEditorDialog.SetItem( hologramItem );
 		}
 	}
 }
diff --git a/Emitters/Items/HologramItem_Recipe.cs b/Emitters/Items/HologramItem_Recipe.cs
@@ -1,9 +1,10 @@
 ﻿using Terraria.ID;
 using Terraria.ModLoader;
+using Emitters.Definitions;
 
 
 namespace Emitters.Items {
-	public partial class HologramItem : ModItem, IBaseEmitterItem {
+	public partial class HologramItem : ModItem, IBaseEmitterItem<HologramDefinition> {
 		public override void AddRecipes() {
 			if( !EmittersConfig.Instance.HologramRecipeEnabled ) {
 				return;
diff --git a/Emitters/Items/HologramItem_SaveLoad.cs b/Emitters/Items/HologramItem_SaveLoad.cs
@@ -7,7 +7,7 @@
 
 
 namespace Emitters.Items {
-	public partial class HologramItem : ModItem, IBaseEmitterItem {
+	public partial class HologramItem : ModItem, IBaseEmitterItem<HologramDefinition> {
 		public override void Load( TagCompound tag ) {
 			try {
 				HologramMode mode;
@@ -39,7 +39,7 @@ public override void Load( TagCompound tag ) {
 					shaderTime = tag.GetFloat( "HologramShaderTime" );
 				}
 
-				this.Def = new HologramDefinition(
+				this.SetDefinition( new HologramDefinition(
 					mode: mode,
 					type: type,
 					scale: tag.GetFloat( "HologramScale" ),
@@ -61,7 +61,7 @@ public override void Load( TagCompound tag ) {
 					shaderType: shaderType,
 					shaderTime: shaderTime,
 					isActivated: tag.GetBool( "HologramIsActivated" )
-				);
+				) );
 			} catch { }
 		}
 
diff --git a/Emitters/Items/HologramItem_Tooltips.cs b/Emitters/Items/HologramItem_Tooltips.cs
@@ -2,10 +2,11 @@
 using Microsoft.Xna.Framework;
 using Terraria;
 using Terraria.ModLoader;
+using Emitters.Definitions;
 
 
 namespace Emitters.Items {
-	public partial class HologramItem : ModItem, IBaseEmitterItem {
+	public partial class HologramItem : ModItem, IBaseEmitterItem<HologramDefinition> {
 		public override void ModifyTooltips( List<TooltipLine> tooltips ) {
 			int i = 1;
 			//tooltips.Insert( i++, new TooltipLine( this.mod, "HologramUI", "[c/00FF00:Right-click in inventory to adjust settings]" ) );
diff --git a/Emitters/Items/SoundEmitterItem_Def.cs b/Emitters/Items/SoundEmitterItem_Def.cs
@@ -5,7 +5,7 @@
 
 
 namespace Emitters.Items {
-	public partial class SoundEmitterItem : ModItem, IBaseEmitterItem {
+	public partial class SoundEmitterItem : ModItem, IBaseEmitterItem<SoundEmitterDefinition> {
 		public SoundEmitterDefinition Def { get; private set; } = null;
 		////////////////
 
@@ -56,7 +56,7 @@ public override void SetDefaults() {
 
 		////////////////
 
-		public void SetSoundEmitterDefinition( SoundEmitterDefinition def ) {
+		public void SetDefinition( SoundEmitterDefinition def ) {
 			//Main.NewText( def.ToString() );
 			this.Def = def;
 		}
diff --git a/Emitters/Items/SoundEmitterItem_Draw.cs b/Emitters/Items/SoundEmitterItem_Draw.cs
@@ -3,10 +3,11 @@
 using Microsoft.Xna.Framework.Graphics;
 using Terraria;
 using Terraria.ModLoader;
+using Emitters.Definitions;
 
 
 namespace Emitters.Items {
-	public partial class SoundEmitterItem : ModItem, IBaseEmitterItem {
+	public partial class SoundEmitterItem : ModItem, IBaseEmitterItem<SoundEmitterDefinition> {
 		public override bool PreDrawInInventory(
 					SpriteBatch sb,
 					Vector2 pos,
diff --git a/Emitters/Items/SoundEmitterItem_Interactivity.cs b/Emitters/Items/SoundEmitterItem_Interactivity.cs
@@ -11,7 +11,7 @@
 
 
 namespace Emitters.Items {
-	public partial class SoundEmitterItem : ModItem, IBaseEmitterItem {
+	public partial class SoundEmitterItem : ModItem, IBaseEmitterItem<SoundEmitterDefinition> {
 		public static bool CanViewSoundEmitters( Player plr, bool withWire ) {
 			return (withWire && WiresUI.Settings.DrawWires) || (
 					plr.HeldItem != null
@@ -125,7 +125,7 @@ public override bool UseItem( Player player ) {
 			Timers.SetTimer( timerName, 15, false, () => false );
 
 			if( this.Def == null ) {
-				Main.NewText( "Sound Emitter settings must be first specified (right-click item)." );
+				Main.NewText( "Sound Emitter settings must be first specified (click item's button)." );
 				return base.UseItem( player );
 			}
 
diff --git a/Emitters/Items/SoundEmitterItem_Recipe.cs b/Emitters/Items/SoundEmitterItem_Recipe.cs
@@ -1,9 +1,10 @@
 using Terraria.ID;
 using Terraria.ModLoader;
+using Emitters.Definitions;
 
 
 namespace Emitters.Items {
-	public partial class SoundEmitterItem : ModItem, IBaseEmitterItem {
+	public partial class SoundEmitterItem : ModItem, IBaseEmitterItem<SoundEmitterDefinition> {
 		public override void AddRecipes() {
 			if( !EmittersConfig.Instance.SoundEmitterRecipeEnabled ) {
 				return;
diff --git a/Emitters/Items/SoundEmitterItem_SaveLoad.cs b/Emitters/Items/SoundEmitterItem_SaveLoad.cs
@@ -5,21 +5,21 @@
 
 
 namespace Emitters.Items {
-	public partial class SoundEmitterItem : ModItem, IBaseEmitterItem {
+	public partial class SoundEmitterItem : ModItem, IBaseEmitterItem<SoundEmitterDefinition> {
 		public override void Load( TagCompound tag ) {
 			if( !tag.ContainsKey( "SndEmitterType" ) ) {
 				return;
 			}
 
 			try {
-				this.Def = new SoundEmitterDefinition(
+				this.SetDefinition( new SoundEmitterDefinition(
 					type: tag.GetInt( "SndEmitterType" ),
 					style: tag.GetInt( "SndEmitterStyle" ),
 					volume: tag.GetFloat( "SndEmitterVolume" ),
 					pitch: tag.GetFloat( "SndEmitterPitch" ),
 					delay: tag.GetInt( "SndEmitterDelay" ),
 					isActivated: tag.GetBool( "SndEmitterIsActivated" )
-				);
+				) );
 			} catch { }
 		}
 
diff --git a/Emitters/Items/SoundEmitterItem_Tooltips.cs b/Emitters/Items/SoundEmitterItem_Tooltips.cs
@@ -2,10 +2,11 @@
 using Microsoft.Xna.Framework;
 using Terraria;
 using Terraria.ModLoader;
+using Emitters.Definitions;
 
 
 namespace Emitters.Items {
-	public partial class SoundEmitterItem : ModItem, IBaseEmitterItem {
+	public partial class SoundEmitterItem : ModItem, IBaseEmitterItem<SoundEmitterDefinition> {
 		public override void ModifyTooltips( List<TooltipLine> tooltips ) {
 			int i = 1;
 			//tooltips.Insert( i++, new TooltipLine( this.mod, "SndEmitterUI", "[c/00FF00:Right-click in inventory to adjust settings]" ) );
diff --git a/Emitters/UI/UIEmitterEditorDialog_ItemDef.cs b/Emitters/UI/UIEmitterEditorDialog_ItemDef.cs
diff --git a/Emitters/UI/UIHologramEditorDialog_ItemDef.cs b/Emitters/UI/UIHologramEditorDialog_ItemDef.cs
diff --git a/Emitters/UI/UISoundEmitterEditorDialog_ItemDef.cs b/Emitters/UI/UISoundEmitterEditorDialog_ItemDef.cs

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`
`13`	`13`	`namespace Emitters.Items {`
`14`		`- public partial class HologramItem : ModItem, IBaseEmitterItem {`
	`14`	`+ public partial class HologramItem : ModItem, IBaseEmitterItem<HologramDefinition> {`
`15`	`15`	`public static bool CanViewHolograms( Player plr, bool withWire ) {`
`16`	`16`	`return (withWire && WiresUI.Settings.DrawWires) \|\| (`
`17`	`17`	`plr.HeldItem != null`
`@@ -145,9 +145,7 @@ public void OpenUI( Item hologramItem ) {`
`145`	`145`	`var mymod = EmittersMod.Instance;`
`146`	`146`	`mymod.HologramEditorDialog.Open();`
`147`	`147`
`148`		`- if( !mymod.HologramEditorDialog.SetItem( hologramItem ) ) {`
`149`		`- mymod.HologramEditorDialog.Close();`
`150`		`- }`
	`148`	`+ mymod.HologramEditorDialog.SetItem( hologramItem );`
`151`	`149`	`}`
`152`	`150`	`}`
`153`	`151`	`}`