Commit: 3c3693c35a5a395190341bd1151d966f833b80e0 - bam (git)

VS plugin mod for Basic Armour

Commit MetaInfo

• Révision: 3c3693c35a5a395190341bd1151d966f833b80e0 (tree)
• l'heure: 2019-07-31 05:27:09
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

Incomplete shield bash feature *wip*
Addl. debugging logging

Change Summary

• modified: ArmourMod/Armour/EntityArmourPlayer.cs
• modified: ArmourMod/Armour/ItemArmour.cs
• add: ArmourMod/Armour/ShieldBasher.cs
• add: ArmourMod/assets/armourmod/itemtypes/wearable/item-offhand-buckler-wood.json
• delete: ArmourMod/assets/armourmod/itemtypes/wearable/{item-offhand-buckler.json => item-offhand-buckler-metal.json}
• add: ArmourMod/assets/bunnyviking/shapes/item/armament/shield/shield_buckler.json
• add: ArmourMod/assets/bunnyviking/shapes/item/armament/shield/shield_heater_curved.json
• add: ArmourMod/assets/bunnyviking/shapes/item/armament/shield/shield_heater_straight.json
• add: ArmourMod/assets/bunnyviking/shapes/item/armament/shield/shield_round_basic.json
• add: ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_buckler.png
• add: ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_edging_grip.png
• add: ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_heater.png
• add: ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_heater_back.png
• add: ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_heater_straight.png
• add: ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_heater_straight_back.png
• add: ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_round.png
• add: ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_round_back.png
• add: ArmourMod/assets/bunnyviking/textures/item/armament/shield/weapon_parts_01.png

Modification

--- a/ArmourMod/Armour/EntityArmourPlayer.cs
+++ b/ArmourMod/Armour/EntityArmourPlayer.cs
@@ -7,7 +7,6 @@ using Vintagestory.API.Common;
 using Vintagestory.API.Client;
 using Vintagestory.API.Server;
 
-
 namespace ArmourMod
 {
 	public class EntityArmourPlayer : EntityPlayer
@@ -151,6 +150,10 @@ namespace ArmourMod
 				float beforeDamage = damage;
 				//TODO: evaluate postion vector of strike to determine WHEN position of armour offers protection
 
+				#if DEBUG
+				Logger.VerboseDebug($"DamageSource:{damageSource.Source} HitPos:{damageSource.HitPosition} Type: {damageSource.Type} Entity: {damageSource.SourceEntity} Block: {damageSource.sourceBlock} ORIGIN : {damageSource.sourcePos} ");
+				#endif
+
 				if (DamageFilters  != null && DamageFilters.Count > 0) 
 				{
 					//Evaluate damge type
@@ -158,7 +161,7 @@ namespace ArmourMod
 					//Pass along
 
 					#if DEBUG
-					Logger.VerboseDebug("{0} has Damage Filters#{1}", this.PlayerUID, DamageFilters.Count);
+					Logger.VerboseDebug("{0} has Damage Filters# {1}", this.GetName(), DamageFilters.Count);
 					#endif
 
 					switch (damageSource.Type) {
@@ -199,13 +202,21 @@ namespace ArmourMod
 						Logger.VerboseDebug("Reduced: {0} Dmg from {2}; [{1}]", damage, damageSource.Type.ToString( ), beforeDamage);
 						#endif
 
-						//All worn Armours adsorb damage themselves... 
+						//All worn Armours absorb damage themselves... 
 						List<EnumCharacterDressType> slotsList = this.DamageFilters.Keys.ToList( );
 
 						foreach (var slotId in slotsList) {
-							ItemSlot slot = this.GearInventory[( int )slotId];
-							Item armourItem = slot.Itemstack.Item;
 
+							ItemSlot slot;
+							if (slotId != EnumCharacterDressType.Arm) {
+								slot = this.GearInventory[( int )slotId];
+
+							} else {
+								slot = this.LeftHandItemSlot;
+							}
+
+							Item armourItem = slot.Itemstack.Item;
+							//RESEARCH: Why does this trigger modify events on item slot from server? SPAMMY!
 							armourItem.DamageItem(ServerAPI.World, this, slot, 1);
 						}
 					}
@@ -255,14 +266,14 @@ namespace ArmourMod
 		{
 			var watchedSlot = this.GearInventory[slotId];
 			#if DEBUG
-			Logger.VerboseDebug( "GearSlotModified:{0}", slotId );
+			Logger.VerboseDebug( "GearSlotModified:{0} ({1})", (EnumCharacterDressType)slotId, slotId );
 			#endif
 			if ( !watchedSlot.Empty ) {
 				
 				if ( (watchedSlot.StorageType.HasFlag( EnumItemStorageFlags.Outfit) || watchedSlot.StorageType.HasFlag(EnumItemStorageFlags.Offhand) )
 				    && watchedSlot.Itemstack.Class == EnumItemClass.Item ) {
 					#if DEBUG
-					Logger.VerboseDebug( "Equiped a AF this: {0}", watchedSlot.Itemstack.Item.Code.ToString() );
+					Logger.VerboseDebug( "Equiped this: {0}", watchedSlot.Itemstack.Item.Code.ToString() );
 					#endif
 					//replace / add damage filter when applicable armor item in slot (which ever that is?)
 
@@ -412,10 +423,14 @@ namespace ArmourMod
 		{
 			DamageFilters = new Dictionary<EnumCharacterDressType, DamageFilter>( Enum.GetNames(typeof(EnumCharacterDressType)).Length );
 
-			if ( this.GearInventory.Count > 0 ) {
-				foreach(ItemSlot itemSlot in this.GearInventory ) {
+			if ( this.GearInventory.Count > 0 || this.LeftHandItemSlot.StackSize > 0) {
+
+				var combinedInventory = new List<ItemSlot>(this.GearInventory);
+				combinedInventory.Add(this.LeftHandItemSlot);
 
-					int slotId = this.GearInventory.GetSlotId( itemSlot );
+				foreach(ItemSlot itemSlot in combinedInventory ) {
+
+					int slotId = itemSlot.Inventory.GetSlotId( itemSlot );
 					if ( !itemSlot.Empty ) {
 
 						if ( (itemSlot.StorageType.HasFlag(EnumItemStorageFlags.Outfit) || itemSlot.StorageType.HasFlag(EnumItemStorageFlags.Offhand) ) && itemSlot.Itemstack.Class == EnumItemClass.Item ) {
@@ -423,7 +438,7 @@ namespace ArmourMod
 							if ( CheckIfItemHasDamageFilter(itemSlot) ) 
 							{
 							#if DEBUG
-							CoreAPI.World.Logger.VerboseDebug( "DF: Consider item:{0}", itemSlot.Itemstack.Item.Code.ToString( ) );
+							CoreAPI.World.Logger.VerboseDebug( "DF: Consider thing:{0}", itemSlot.Itemstack.Item.Code.ToString( ) );
 							#endif
 
 							DamageFilter dmgFilt = DamageFilter.ConstructFilter( itemSlot);
@@ -472,7 +487,7 @@ namespace ArmourMod
 			//Encumberance needs direct application / removal here;
 			if (finalFilter.encumberanceMultiplier > 0 && finalFilter.encumberanceMultiplier < 1.0) {
 				this.SetWalkSpeedModifier(armourEncumberanceKey, finalFilter.encumberanceMultiplier, false);
-					Logger.VerboseDebug("New Walk Speed Mult: {0}", this.GetWalkSpeedMultiplier( ));
+					Logger.VerboseDebug("New Walk Speed Mult: {0:N2}", this.GetWalkSpeedMultiplier( ));
 			} else {
 				this.RemoveWalkSpeedModifier(armourEncumberanceKey);
 			}
@@ -545,6 +560,7 @@ namespace ArmourMod
 
 
 
+
 	}
 }
 

--- a/ArmourMod/Armour/ItemArmour.cs
+++ b/ArmourMod/Armour/ItemArmour.cs
@@ -13,13 +13,13 @@ namespace ArmourMod
 {
 	public class ItemArmour : ItemDress
 	{
-		public override void GetHeldItemInfo(ItemStack stack, StringBuilder dsc, IWorldAccessor world, bool withDebugInfo)
+		public override void GetHeldItemInfo(ItemSlot inSlot, StringBuilder dsc, IWorldAccessor world, bool withDebugInfo)	
 		{
 			//base.GetHeldItemInfo(stack, dsc, world, withDebugInfo);
 
 			if (this.Durability > 1) {
 
-				int defDur = stack.Attributes.GetInt("durability", this.Durability);
+				int defDur = inSlot.Itemstack.Attributes.GetInt("durability", this.Durability);
 
 				//byte greenComponent = (byte)(255 * (float)this.Durability / (float)defDur);
 				//byte redComponent = (byte)(0xff - greenComponent);
@@ -30,20 +30,20 @@ namespace ArmourMod
 			}
 
 			//Display Protection values & Weight / dissadvantages
-			var blunt = stack.ItemAttributes["BluntProtection"].AsFloat( );
-			var piercing = stack.ItemAttributes["PiercingProtection"].AsFloat( );
-			var slashing = stack.ItemAttributes["SlashingProtection"].AsFloat( );
-			var crushing = stack.ItemAttributes["CrushingProtection"].AsFloat( );
-			var flame = stack.ItemAttributes["FireProtection"].AsFloat( );
-			var encumberance = stack.ItemAttributes["Encumberance"].AsFloat(1F );
+			var blunt = inSlot.Itemstack.ItemAttributes["BluntProtection"].AsFloat( );
+			var piercing = inSlot.Itemstack.ItemAttributes["PiercingProtection"].AsFloat( );
+			var slashing = inSlot.Itemstack.ItemAttributes["SlashingProtection"].AsFloat( );
+			var crushing = inSlot.Itemstack.ItemAttributes["CrushingProtection"].AsFloat( );
+			var flame = inSlot.Itemstack.ItemAttributes["FireProtection"].AsFloat( );
+			var encumberance = inSlot.Itemstack.ItemAttributes["Encumberance"].AsFloat(1F );
 
 			dsc.AppendFormat($"Blunt {blunt:P1}\n Piercing {piercing:P1}\n Slashing {slashing:P1}\n Crushing {crushing:P1}\n Flame {flame:P1}\n Encumberance {encumberance:N2}X\n");
 
 			EnumCharacterDressType dresstype;
-			string strdress = stack.ItemAttributes["clothescategory"].AsString( );
+			string strdress = inSlot.Itemstack.ItemAttributes["clothescategory"].AsString( );
 
 			if (Enum.TryParse(strdress, true, out dresstype)) {
-				dsc.AppendLine(Lang.Get("Cloth Category: {0}", Lang.Get("clothcategory-" + stack.ItemAttributes["clothescategory"].AsString( ))));
+				dsc.AppendLine(Lang.Get("Cloth Category: {0}", Lang.Get("clothcategory-" + inSlot.Itemstack.ItemAttributes["clothescategory"].AsString( ))));
 			}
 
 		}

--- /dev/null
+++ b/ArmourMod/Armour/ShieldBasher.cs
@@ -0,0 +1,54 @@
+using System;
+
+using Vintagestory.API.Common;
+using Vintagestory.API.Client;
+using Vintagestory.API.Server;
+using Vintagestory.API.MathTools;
+
+
+namespace ArmourMod
+{
+	public class ShieldBasher
+	{
+		protected ICoreAPI CoreAPI;
+		protected ICoreClientAPI ClientAPI;
+		protected ICoreServerAPI ServerAPI;
+		protected ILogger Logger;
+
+		private const string _shieldBaskKey = @"shieldbash";
+
+		public ShieldBasher( )
+		{			
+			ClientAPI.Input.RegisterHotKey(_shieldBaskKey, "Shield Bash", GlKeys.BackSlash, HotkeyType.CharacterControls);
+			ClientAPI.Input.SetHotKeyHandler(_shieldBaskKey, TriggerShieldBash);
+		}
+
+		//CLIENT SIDE!
+		protected bool TriggerShieldBash(KeyCombination keyCmb)
+		{
+			//Send Channel Packet to server...
+
+			//Start, client side animations?
+
+
+
+			return true;//What does this do??
+		}
+
+
+		private void PerformShieldBash(EntitySelection bonkee, EntityPlayer player)
+		{
+			DamageSource damageSource = new DamageSource( );
+
+			//Push away from...self
+			bonkee.Entity.ServerPos.Motion.Add(
+				GameMath.Sin(damageSource.SourceEntity.ServerPos.Yaw + GameMath.PIHALF) / 10,
+				damageSource.SourceEntity.ServerPos.Pitch + GameMath.PIHALF / 10,
+				GameMath.Cos(damageSource.SourceEntity.ServerPos.Yaw + GameMath.PIHALF) / 10
+			);
+
+			(( IServerPlayer )ServerAPI.World.PlayerByUid(player.PlayerUID)).SendPositionToClient( );
+		}
+	}
+}
+

--- /dev/null
+++ b/ArmourMod/assets/armourmod/itemtypes/wearable/item-offhand-buckler-wood.json
@@ -0,0 +1,51 @@
+{
+	code: "buckler-wood",
+	class: "ItemArmour",
+	storageFlags: 257,
+	heldRightTpIdleAnimation: "holdinglanternrighthand",
+	heldLeftTpIdleAnimation: "holdinglanternlefthand",
+	attributes: 
+	{			
+		BluntProtection:0.13,
+		PiercingProtection:0.1,
+		SlashingProtection:0.1,
+		CrushingProtection:0.05,
+		FireProtection:0.01
+	},	
+	shape: {
+		 base: "item/armour/buckler" 
+	},
+	durability: 50,
+	creativeinventory: { "general": ["*"], "items": ["*"], "clothing": ["*"] },
+	textures: { 
+			aged:{ base: "game:block/wood/debarked/aged"},			
+		 	},	
+	fpHandTransform: {
+		translation: { x: 0, y: -0.05, z: -0.6 },
+		rotation: { x: -100, y: -180, z: 90 },
+		origin: { x: 0.5, y: 0, z: 0.5 },
+		scale: 0.8
+	},
+	guiTransform: {
+		translation: { x: 0, y: 1, z: 0 },
+		rotation: { x: 2, y: 0, z: 0 },
+		origin: { x: 0.45, y: 0.55, z: 0.5 },
+		scale: 1.6
+	},
+	tpHandTransform: {
+		translation: { x: 0, y: -0.05, z: -0.6 },
+		rotation: { x: -90, y: -180, z: 90 },
+		origin: { x: 0.5, y: 0, z: 0.5 },
+		scale: 0.8
+	},
+	groundTransform: {
+		rotation: { x: 0, y: -1, z: 90 },
+		origin: { x: 0.39, y: 0.25, z: 0.5 },
+		scale: 2.8
+	},
+	combustibleProps: {
+		burnTemperature: 600,
+		burnDuration: 12,
+	},	
+	materialDensity: 600
+}
\ No newline at end of file

--- /dev/null
+++ b/ArmourMod/assets/bunnyviking/shapes/item/armament/shield/shield_buckler.json
@@ -0,0 +1,132 @@
+{
+	"editor": {
+		"allAngles": false,
+		"singleTexture": false
+	},
+	"textureWidth": 16,
+	"textureHeight": 16,
+	"textures": {
+		"shield_buckler": "shield_buckler"
+	},
+	"elements": [
+		{
+			"name": "buckler_root",
+			"from": [ 6.0, 7.0, 6.0 ], 
+			"to": [ 10.0, 8.0, 10.0 ], 
+			"rotationOrigin": [ 8.0, 7.0, 8.0 ],
+			"rotationX": 90.0,
+			"faces": {
+				"north": { "texture": "#shield_buckler", "uv": [ 2.0, 9.0, 6.0, 10.0 ] },
+				"east": { "texture": "#shield_buckler", "uv": [ 2.0, 9.0, 6.0, 10.0 ] },
+				"south": { "texture": "#shield_buckler", "uv": [ 2.0, 9.0, 6.0, 10.0 ] },
+				"west": { "texture": "#shield_buckler", "uv": [ 2.0, 9.0, 6.0, 10.0 ] },
+				"up": { "texture": "#shield_buckler", "uv": [ 2.0, 2.0, 6.0, 6.0 ] },
+				"down": { "texture": "#shield_buckler", "uv": [ 10.0, 2.0, 14.0, 6.0 ] }
+			},
+			"children": [
+				{
+					"name": "s_01",
+					"from": [ -1.0, -1.0, -1.0 ], 
+					"to": [ 5.0, 0.0, 0.0 ], 
+					"rotationOrigin": [ 2.0, 0.0, 2.0 ],
+					"faces": {
+						"north": { "texture": "#shield_buckler", "uv": [ 1.0, 9.0, 7.0, 10.0 ] },
+						"east": { "texture": "#shield_buckler", "uv": [ 3.5, 9.0, 4.5, 10.0 ] },
+						"south": { "texture": "#shield_buckler", "uv": [ 1.0, 9.0, 7.0, 10.0 ] },
+						"west": { "texture": "#shield_buckler", "uv": [ 3.5, 9.0, 4.5, 10.0 ] },
+						"up": { "texture": "#shield_buckler", "uv": [ 1.0, 1.0, 2.0, 7.0 ], "rotation": 90 },
+						"down": { "texture": "#shield_buckler", "uv": [ 1.0, 1.0, 2.0, 7.0 ], "rotation": 90 }
+					}
+				},
+				{
+					"name": "s_02",
+					"from": [ 0.0, -1.0, -2.0 ], 
+					"to": [ 4.0, 0.0, -1.0 ], 
+					"rotationOrigin": [ 2.0, 0.0, 2.0 ],
+					"faces": {
+						"north": { "texture": "#shield_buckler", "uv": [ 2.0, 9.0, 6.0, 10.0 ] },
+						"east": { "texture": "#shield_buckler", "uv": [ 3.5, 9.0, 4.5, 10.0 ] },
+						"south": { "texture": "#shield_buckler", "uv": [ 2.0, 9.0, 6.0, 10.0 ] },
+						"west": { "texture": "#shield_buckler", "uv": [ 3.5, 9.0, 4.5, 10.0 ] },
+						"up": { "texture": "#shield_buckler", "uv": [ 0.0, 2.0, 1.0, 6.0 ], "rotation": 90 },
+						"down": { "texture": "#shield_buckler", "uv": [ 8.0, 2.0, 9.0, 6.0 ], "rotation": 90 }
+					}
+				},
+				{
+					"name": "s_03",
+					"from": [ 0.0, -1.0, -2.0 ], 
+					"to": [ 4.0, 0.0, 0.0 ], 
+					"rotationOrigin": [ 2.0, 0.0, 2.0 ],
+					"rotationY": 90.0,
+					"faces": {
+						"north": { "texture": "#shield_buckler", "uv": [ 2.0, 9.0, 6.0, 10.0 ] },
+						"east": { "texture": "#shield_buckler", "uv": [ 3.0, 9.0, 5.0, 10.0 ] },
+						"south": { "texture": "#shield_buckler", "uv": [ 2.0, 9.0, 6.0, 10.0 ] },
+						"west": { "texture": "#shield_buckler", "uv": [ 3.0, 9.0, 5.0, 10.0 ] },
+						"up": { "texture": "#shield_buckler", "uv": [ 2.0, 6.0, 6.0, 8.0 ] },
+						"down": { "texture": "#shield_buckler", "uv": [ 10.0, 6.0, 14.0, 8.0 ] }
+					}
+				},
+				{
+					"name": "s_04",
+					"from": [ 0.0, -1.0, -2.0 ], 
+					"to": [ 4.0, 0.0, -1.0 ], 
+					"rotationOrigin": [ 2.0, 0.0, 2.0 ],
+					"rotationY": 180.0,
+					"faces": {
+						"north": { "texture": "#shield_buckler", "uv": [ 2.0, 9.0, 6.0, 10.0 ] },
+						"east": { "texture": "#shield_buckler", "uv": [ 3.5, 9.0, 4.5, 10.0 ] },
+						"south": { "texture": "#shield_buckler", "uv": [ 2.0, 9.0, 6.0, 10.0 ] },
+						"west": { "texture": "#shield_buckler", "uv": [ 3.5, 9.0, 4.5, 10.0 ] },
+						"up": { "texture": "#shield_buckler", "uv": [ 7.0, 2.0, 8.0, 6.0 ], "rotation": 90 },
+						"down": { "texture": "#shield_buckler", "uv": [ 15.0, 2.0, 16.0, 6.0 ], "rotation": 90 }
+					}
+				},
+				{
+					"name": "s_05",
+					"from": [ 0.0, -1.0, -2.0 ], 
+					"to": [ 4.0, 0.0, 0.0 ], 
+					"rotationOrigin": [ 2.0, 0.0, 2.0 ],
+					"rotationY": -90.0,
+					"faces": {
+						"north": { "texture": "#shield_buckler", "uv": [ 2.0, 9.0, 6.0, 10.0 ] },
+						"east": { "texture": "#shield_buckler", "uv": [ 3.0, 9.0, 5.0, 10.0 ] },
+						"south": { "texture": "#shield_buckler", "uv": [ 2.0, 9.0, 6.0, 10.0 ] },
+						"west": { "texture": "#shield_buckler", "uv": [ 3.0, 9.0, 5.0, 10.0 ] },
+						"up": { "texture": "#shield_buckler", "uv": [ 2.0, 0.0, 6.0, 2.0 ] },
+						"down": { "texture": "#shield_buckler", "uv": [ 10.0, 0.0, 14.0, 2.0 ] }
+					}
+				},
+				{
+					"name": "s_06",
+					"from": [ -1.0, -1.0, -1.0 ], 
+					"to": [ 5.0, 0.0, 0.0 ], 
+					"rotationOrigin": [ 2.0, 0.0, 2.0 ],
+					"rotationY": -180.0,
+					"faces": {
+						"north": { "texture": "#shield_buckler", "uv": [ 1.0, 9.0, 7.0, 10.0 ] },
+						"east": { "texture": "#shield_buckler", "uv": [ 3.5, 9.0, 4.5, 10.0 ] },
+						"south": { "texture": "#shield_buckler", "uv": [ 1.0, 9.0, 7.0, 10.0 ] },
+						"west": { "texture": "#shield_buckler", "uv": [ 3.5, 9.0, 4.5, 10.0 ] },
+						"up": { "texture": "#shield_buckler", "uv": [ 6.0, 1.0, 7.0, 7.0 ], "rotation": 90 },
+						"down": { "texture": "#shield_buckler", "uv": [ 14.0, 1.0, 15.0, 7.0 ], "rotation": 90 }
+					}
+				},
+				{
+					"name": "grip",
+					"from": [ -1.0, -1.3, 1.5 ], 
+					"to": [ 5.0, -1.1, 2.5 ], 
+					"shade": false,
+					"rotationOrigin": [ 2.0, -1.1, 1.5 ],
+					"faces": {
+						"north": { "texture": "#shield_buckler", "uv": [ 9.0, 9.0, 15.0, 10.0 ], "rotation": 90, "autoUv": false },
+						"east": { "texture": "#shield_buckler", "uv": [ 9.0, 9.0, 10.0, 10.0 ], "autoUv": false },
+						"south": { "texture": "#shield_buckler", "uv": [ 9.0, 9.0, 15.0, 10.0 ], "autoUv": false },
+						"west": { "texture": "#shield_buckler", "uv": [ 14.0, 9.0, 15.0, 10.0 ], "autoUv": false },
+						"up": { "texture": "#shield_buckler", "uv": [ 9.0, 9.0, 15.0, 10.0 ], "autoUv": false },
+						"down": { "texture": "#shield_buckler", "uv": [ 9.0, 9.0, 15.0, 10.0 ], "autoUv": false }
+					}
+				}
+			]
+		}
+	]}
\ No newline at end of file

--- /dev/null
+++ b/ArmourMod/assets/bunnyviking/shapes/item/armament/shield/shield_heater_curved.json
@@ -0,0 +1,144 @@
+{
+	"editor": {
+		"allAngles": false,
+		"singleTexture": false
+	},
+	"textureWidth": 16,
+	"textureHeight": 16,
+	"textures": {
+		"shield_heater": "shield_heater",
+		"shield_heater_back": "shield_heater_back"
+	},
+	"elements": [
+		{
+			"name": "front",
+			"from": [ 5.0, 16.0, 9.0 ], 
+			"to": [ 11.0, 17.0, 24.0 ], 
+			"rotationOrigin": [ 8.0, 16.0, 9.0 ],
+			"rotationX": 90.0,
+			"faces": {
+				"north": { "texture": "#shield_heater", "uv": [ 15.0, 0.0, 16.0, 6.0 ], "rotation": 90 },
+				"east": { "texture": "#shield_heater", "uv": [ 15.0, 0.0, 16.0, 15.0 ], "rotation": 90 },
+				"south": { "texture": "#shield_heater", "uv": [ 15.0, 0.0, 16.0, 6.0 ], "rotation": 90 },
+				"west": { "texture": "#shield_heater", "uv": [ 15.0, 0.0, 16.0, 15.0 ], "rotation": 90 },
+				"up": { "texture": "#shield_heater", "uv": [ 3.0, 0.0, 9.0, 15.0 ] },
+				"down": { "texture": "#shield_heater_back", "uv": [ 3.0, 0.0, 9.0, 15.0 ] }
+			},
+			"children": [
+				{
+					"name": "sides_01",
+					"from": [ -2.0, -1.0, 0.0 ], 
+					"to": [ 0.0, 0.0, 14.0 ], 
+					"rotationOrigin": [ 0.0, -1.0, 0.0 ],
+					"faces": {
+						"north": { "texture": "#shield_heater", "uv": [ 15.0, 0.0, 16.0, 2.0 ], "rotation": 90 },
+						"east": { "texture": "#shield_heater", "uv": [ 15.0, 0.0, 16.0, 14.0 ], "rotation": 90 },
+						"south": { "texture": "#shield_heater", "uv": [ 15.0, 0.0, 16.0, 2.0 ], "rotation": 90 },
+						"west": { "texture": "#shield_heater", "uv": [ 15.0, 0.0, 16.0, 14.0 ], "rotation": 90 },
+						"up": { "texture": "#shield_heater", "uv": [ 1.0, 0.0, 3.0, 14.0 ] },
+						"down": { "texture": "#shield_heater_back", "uv": [ 1.0, 0.0, 3.0, 14.0 ] }
+					}
+				},
+				{
+					"name": "sides_02",
+					"from": [ 6.0, -1.0, 0.0 ], 
+					"to": [ 8.0, 0.0, 14.0 ], 
+					"rotationOrigin": [ 6.0, -1.0, 0.0 ],
+					"faces": {
+						"north": { "texture": "#shield_heater", "uv": [ 15.0, 0.0, 16.0, 2.0 ], "rotation": 90 },
+						"east": { "texture": "#shield_heater", "uv": [ 15.0, 0.0, 16.0, 14.0 ], "rotation": 90 },
+						"south": { "texture": "#shield_heater", "uv": [ 15.0, 0.0, 16.0, 2.0 ], "rotation": 90 },
+						"west": { "texture": "#shield_heater", "uv": [ 15.0, 0.0, 16.0, 14.0 ], "rotation": 90 },
+						"up": { "texture": "#shield_heater", "uv": [ 9.0, 0.0, 11.0, 14.0 ] },
+						"down": { "texture": "#shield_heater_back", "uv": [ 9.0, 0.0, 11.0, 14.0 ] }
+					}
+				},
+				{
+					"name": "sides_03",
+					"from": [ 8.0, -2.0, 1.0 ], 
+					"to": [ 9.0, -1.0, 13.0 ], 
+					"rotationOrigin": [ 8.0, -2.0, 1.0 ],
+					"faces": {
+						"north": { "texture": "#shield_heater", "uv": [ 15.0, 1.0, 16.0, 2.0 ] },
+						"east": { "texture": "#shield_heater", "uv": [ 15.0, 1.0, 16.0, 13.0 ], "rotation": 90 },
+						"south": { "texture": "#shield_heater", "uv": [ 15.0, 1.0, 16.0, 2.0 ] },
+						"west": { "texture": "#shield_heater", "uv": [ 15.0, 1.0, 16.0, 13.0 ], "rotation": 90 },
+						"up": { "texture": "#shield_heater", "uv": [ 11.0, 1.0, 12.0, 13.0 ] },
+						"down": { "texture": "#shield_heater_back", "uv": [ 11.0, 1.0, 12.0, 13.0 ] }
+					}
+				},
+				{
+					"name": "sides_04",
+					"from": [ -3.0, -2.0, 1.0 ], 
+					"to": [ -2.0, -1.0, 13.0 ], 
+					"rotationOrigin": [ -2.0, -2.0, 1.0 ],
+					"faces": {
+						"north": { "texture": "#shield_heater", "uv": [ 15.0, 1.0, 16.0, 2.0 ], "rotation": 90 },
+						"east": { "texture": "#shield_heater", "uv": [ 15.0, 1.0, 16.0, 13.0 ], "rotation": 90 },
+						"south": { "texture": "#shield_heater", "uv": [ 15.0, 1.0, 16.0, 2.0 ], "rotation": 90 },
+						"west": { "texture": "#shield_heater", "uv": [ 15.0, 1.0, 16.0, 13.0 ], "rotation": 90 },
+						"up": { "texture": "#shield_heater", "uv": [ 0.0, 1.0, 1.0, 13.0 ] },
+						"down": { "texture": "#shield_heater_back", "uv": [ 0.0, 1.0, 1.0, 13.0 ] }
+					}
+				},
+				{
+					"name": "sides_05",
+					"from": [ 1.0, 0.0, 15.0 ], 
+					"to": [ 5.0, 1.0, 16.0 ], 
+					"rotationOrigin": [ 2.0, 0.0, 15.0 ],
+					"faces": {
+						"north": { "texture": "#shield_heater", "uv": [ 15.0, 12.0, 16.0, 16.0 ], "rotation": 90, "autoUv": false },
+						"east": { "texture": "#shield_heater", "uv": [ 15.0, 15.0, 16.0, 16.0 ] },
+						"south": { "texture": "#shield_heater", "uv": [ 15.0, 12.0, 16.0, 16.0 ], "rotation": 90 },
+						"west": { "texture": "#shield_heater", "uv": [ 15.0, 15.0, 16.0, 16.0 ] },
+						"up": { "texture": "#shield_heater", "uv": [ 4.0, 15.0, 8.0, 16.0 ] },
+						"down": { "texture": "#shield_heater_back", "uv": [ 4.0, 15.0, 8.0, 16.0 ] }
+					}
+				},
+				{
+					"name": "grip_01",
+					"from": [ 0.0, -1.0, 4.0 ], 
+					"to": [ 1.0, 0.0, 5.0 ], 
+					"rotationOrigin": [ 1.0, -1.0, 4.0 ],
+					"faces": {
+						"north": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"east": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"south": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"west": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"up": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"down": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ] }
+					}
+				},
+				{
+					"name": "grip_02",
+					"from": [ 5.0, -1.0, 4.0 ], 
+					"to": [ 6.0, 0.0, 5.0 ], 
+					"rotationOrigin": [ 5.0, -1.0, 4.0 ],
+					"faces": {
+						"north": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"east": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"south": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"west": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"up": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"down": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ] }
+					},
+					"children": [
+						{
+							"name": "grip_03",
+							"from": [ -5.0, -0.2, 0.0 ], 
+							"to": [ 1.0, 0.0, 1.0 ], 
+							"rotationOrigin": [ -2.0, 0.0, 0.0 ],
+							"faces": {
+								"north": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 6.0 ], "autoUv": false },
+								"east": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ], "autoUv": false },
+								"south": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 6.0 ], "autoUv": false },
+								"west": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 1.0 ], "autoUv": false },
+								"up": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 6.0 ], "rotation": 90 },
+								"down": { "texture": "#shield_heater", "uv": [ 13.0, 0.0, 14.0, 6.0 ], "rotation": 90 }
+							}
+						}
+					]
+				}
+			]
+		}
+	]}
\ No newline at end of file

--- /dev/null
+++ b/ArmourMod/assets/bunnyviking/shapes/item/armament/shield/shield_heater_straight.json
@@ -0,0 +1,152 @@
+{
+	"editor": {
+		"allAngles": false,
+		"singleTexture": false
+	},
+	"textureWidth": 16,
+	"textureHeight": 16,
+	"textures": {
+		"shield_heater_straight": "shield_heater_straight",
+		"shield_heater_straight_back": "shield_heater_straight_back"
+	},
+	"elements": [
+		{
+			"name": "front",
+			"from": [ 5.0, 16.0, 9.0 ], 
+			"to": [ 11.0, 17.0, 24.0 ], 
+			"shade": false,
+			"rotationOrigin": [ 8.0, 16.0, 9.0 ],
+			"rotationX": 90.0,
+			"faces": {
+				"north": { "texture": "#shield_heater_straight", "uv": [ 15.0, 0.0, 16.0, 6.0 ], "rotation": 90 },
+				"east": { "texture": "#shield_heater_straight", "uv": [ 15.0, 0.0, 16.0, 15.0 ], "rotation": 90 },
+				"south": { "texture": "#shield_heater_straight", "uv": [ 15.0, 0.0, 16.0, 6.0 ], "rotation": 90 },
+				"west": { "texture": "#shield_heater_straight", "uv": [ 15.0, 0.0, 16.0, 15.0 ], "rotation": 90 },
+				"up": { "texture": "#shield_heater_straight", "uv": [ 3.0, 0.0, 9.0, 15.0 ] },
+				"down": { "texture": "#shield_heater_straight_back", "uv": [ 3.0, 0.0, 9.0, 15.0 ] }
+			},
+			"children": [
+				{
+					"name": "sides_01",
+					"from": [ -2.0, 0.0, 0.0 ], 
+					"to": [ 0.0, 1.0, 14.0 ], 
+					"shade": false,
+					"faces": {
+						"north": { "texture": "#shield_heater_straight", "uv": [ 15.0, 0.0, 16.0, 2.0 ], "rotation": 90 },
+						"east": { "texture": "#shield_heater_straight", "uv": [ 15.0, 0.0, 16.0, 14.0 ], "rotation": 90 },
+						"south": { "texture": "#shield_heater_straight", "uv": [ 15.0, 0.0, 16.0, 2.0 ], "rotation": 90 },
+						"west": { "texture": "#shield_heater_straight", "uv": [ 15.0, 0.0, 16.0, 14.0 ], "rotation": 90 },
+						"up": { "texture": "#shield_heater_straight", "uv": [ 1.0, 0.0, 3.0, 14.0 ] },
+						"down": { "texture": "#shield_heater_straight_back", "uv": [ 1.0, 0.0, 3.0, 14.0 ] }
+					}
+				},
+				{
+					"name": "sides_02",
+					"from": [ 6.0, 0.0, 0.0 ], 
+					"to": [ 8.0, 1.0, 14.0 ], 
+					"shade": false,
+					"rotationOrigin": [ 6.0, 0.0, 0.0 ],
+					"faces": {
+						"north": { "texture": "#shield_heater_straight", "uv": [ 15.0, 0.0, 16.0, 2.0 ], "rotation": 90 },
+						"east": { "texture": "#shield_heater_straight", "uv": [ 15.0, 0.0, 16.0, 14.0 ], "rotation": 90 },
+						"south": { "texture": "#shield_heater_straight", "uv": [ 15.0, 0.0, 16.0, 2.0 ], "rotation": 90 },
+						"west": { "texture": "#shield_heater_straight", "uv": [ 15.0, 0.0, 16.0, 14.0 ], "rotation": 90 },
+						"up": { "texture": "#shield_heater_straight", "uv": [ 9.0, 0.0, 11.0, 14.0 ] },
+						"down": { "texture": "#shield_heater_straight_back", "uv": [ 9.0, 0.0, 11.0, 14.0 ] }
+					}
+				},
+				{
+					"name": "sides_03",
+					"from": [ 8.0, 0.0, 1.0 ], 
+					"to": [ 9.0, 1.0, 13.0 ], 
+					"shade": false,
+					"rotationOrigin": [ 8.0, 0.0, 1.0 ],
+					"faces": {
+						"north": { "texture": "#shield_heater_straight", "uv": [ 15.0, 1.0, 16.0, 2.0 ] },
+						"east": { "texture": "#shield_heater_straight", "uv": [ 15.0, 1.0, 16.0, 13.0 ], "rotation": 90 },
+						"south": { "texture": "#shield_heater_straight", "uv": [ 15.0, 1.0, 16.0, 2.0 ] },
+						"west": { "texture": "#shield_heater_straight", "uv": [ 15.0, 1.0, 16.0, 13.0 ], "rotation": 90 },
+						"up": { "texture": "#shield_heater_straight", "uv": [ 11.0, 1.0, 12.0, 13.0 ] },
+						"down": { "texture": "#shield_heater_straight_back", "uv": [ 11.0, 1.0, 12.0, 13.0 ] }
+					}
+				},
+				{
+					"name": "sides_04",
+					"from": [ -3.0, 0.0, 1.0 ], 
+					"to": [ -2.0, 1.0, 13.0 ], 
+					"shade": false,
+					"rotationOrigin": [ -2.0, 0.0, 1.0 ],
+					"faces": {
+						"north": { "texture": "#shield_heater_straight", "uv": [ 15.0, 1.0, 16.0, 2.0 ], "rotation": 90 },
+						"east": { "texture": "#shield_heater_straight", "uv": [ 15.0, 1.0, 16.0, 13.0 ], "rotation": 90 },
+						"south": { "texture": "#shield_heater_straight", "uv": [ 15.0, 1.0, 16.0, 2.0 ], "rotation": 90 },
+						"west": { "texture": "#shield_heater_straight", "uv": [ 15.0, 1.0, 16.0, 13.0 ], "rotation": 90 },
+						"up": { "texture": "#shield_heater_straight", "uv": [ 0.0, 1.0, 1.0, 13.0 ] },
+						"down": { "texture": "#shield_heater_straight_back", "uv": [ 0.0, 1.0, 1.0, 13.0 ] }
+					}
+				},
+				{
+					"name": "sides_05",
+					"from": [ 1.0, 0.0, 15.0 ], 
+					"to": [ 5.0, 1.0, 16.0 ], 
+					"shade": false,
+					"rotationOrigin": [ 2.0, 0.0, 15.0 ],
+					"faces": {
+						"north": { "texture": "#shield_heater_straight", "uv": [ 15.0, 12.0, 16.0, 16.0 ], "rotation": 90, "autoUv": false },
+						"east": { "texture": "#shield_heater_straight", "uv": [ 15.0, 15.0, 16.0, 16.0 ] },
+						"south": { "texture": "#shield_heater_straight", "uv": [ 15.0, 12.0, 16.0, 16.0 ], "rotation": 90 },
+						"west": { "texture": "#shield_heater_straight", "uv": [ 15.0, 15.0, 16.0, 16.0 ] },
+						"up": { "texture": "#shield_heater_straight", "uv": [ 4.0, 15.0, 8.0, 16.0 ] },
+						"down": { "texture": "#shield_heater_straight_back", "uv": [ 4.0, 15.0, 8.0, 16.0 ] }
+					}
+				},
+				{
+					"name": "grip_01",
+					"from": [ 0.0, -1.0, 4.0 ], 
+					"to": [ 1.0, 0.0, 5.0 ], 
+					"shade": false,
+					"rotationOrigin": [ 1.0, -1.0, 4.0 ],
+					"faces": {
+						"north": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"east": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"south": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"west": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"up": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"down": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ] }
+					}
+				},
+				{
+					"name": "grip_02",
+					"from": [ 5.0, -1.0, 4.0 ], 
+					"to": [ 6.0, 0.0, 5.0 ], 
+					"shade": false,
+					"rotationOrigin": [ 5.0, -1.0, 4.0 ],
+					"faces": {
+						"north": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"east": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"south": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"west": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"up": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ] },
+						"down": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ] }
+					},
+					"children": [
+						{
+							"name": "grip_03",
+							"from": [ -5.0, -0.2, 0.0 ], 
+							"to": [ 1.0, 0.0, 1.0 ], 
+							"shade": false,
+							"rotationOrigin": [ -2.0, 0.0, 0.0 ],
+							"faces": {
+								"north": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 6.0 ], "autoUv": false },
+								"east": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ], "autoUv": false },
+								"south": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 6.0 ], "autoUv": false },
+								"west": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 1.0 ], "autoUv": false },
+								"up": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 6.0 ], "rotation": 90 },
+								"down": { "texture": "#shield_heater_straight_back", "uv": [ 13.0, 0.0, 14.0, 6.0 ], "rotation": 90 }
+							}
+						}
+					]
+				}
+			]
+		}
+	]}
\ No newline at end of file

--- /dev/null
+++ b/ArmourMod/assets/bunnyviking/shapes/item/armament/shield/shield_round_basic.json
@@ -0,0 +1,255 @@
+{
+	"editor": {
+		"allAngles": false,
+		"singleTexture": false
+	},
+	"textureWidth": 16,
+	"textureHeight": 16,
+	"textures": {
+		"shield_round_back": "shield_round_back",
+		"shield_round": "shield_round",
+		"shield_edging_grip": "shield_edging_grip"
+	},
+	"elements": [
+		{
+			"name": "shield_root",
+			"from": [ 5.0, 2.0, 1.0 ], 
+			"to": [ 11.0, 3.0, 15.0 ], 
+			"rotationOrigin": [ 8.0, 2.0, 8.0 ],
+			"faces": {
+				"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 6.0, 1.0 ], "autoUv": false },
+				"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
+				"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 6.0, 1.0 ] },
+				"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
+				"up": { "texture": "#shield_round", "uv": [ 5.0, 1.0, 11.0, 15.0 ] },
+				"down": { "texture": "#shield_round_back", "uv": [ 5.0, 1.0, 11.0, 15.0 ] }
+			},
+			"children": [
+				{
+					"name": "001",
+					"from": [ 6.0, 0.0, 0.5 ], 
+					"to": [ 7.0, 1.0, 13.5 ], 
+					"rotationOrigin": [ 3.0, 0.0, 6.5 ],
+					"faces": {
+						"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+						"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 13.0, 1.0 ] },
+						"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+						"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 13.0, 1.0 ] },
+						"up": { "texture": "#shield_round", "uv": [ 11.0, 1.5, 12.0, 14.5 ] },
+						"down": { "texture": "#shield_round_back", "uv": [ 11.0, 1.5, 12.0, 14.5 ] }
+					},
+					"children": [
+						{
+							"name": "002",
+							"from": [ 2.0, 0.0, 1.5 ], 
+							"to": [ 3.0, 1.0, 11.5 ], 
+							"rotationOrigin": [ 2.0, 0.0, 1.5 ],
+							"faces": {
+								"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+								"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 10.0, 1.0 ] },
+								"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+								"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 10.0, 1.0 ] },
+								"up": { "texture": "#shield_round", "uv": [ 13.0, 3.0, 14.0, 13.0 ] },
+								"down": { "texture": "#shield_round_back", "uv": [ 13.0, 3.0, 14.0, 13.0 ] }
+							},
+							"children": [
+								{
+									"name": "003",
+									"from": [ 1.0, 0.0, 2.0 ], 
+									"to": [ 2.0, 1.0, 8.0 ], 
+									"rotationOrigin": [ 1.0, 0.0, 2.0 ],
+									"faces": {
+										"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+										"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 6.0, 1.0 ] },
+										"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+										"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 6.0, 1.0 ] },
+										"up": { "texture": "#shield_round", "uv": [ 14.0, 5.0, 15.0, 11.0 ] },
+										"down": { "texture": "#shield_round_back", "uv": [ 14.0, 5.0, 15.0, 11.0 ] }
+									},
+									"children": [
+										{
+											"name": "004",
+											"from": [ 1.0, 0.0, 1.0 ], 
+											"to": [ 2.0, 1.0, 5.0 ], 
+											"rotationOrigin": [ 1.0, 0.0, 1.0 ],
+											"faces": {
+												"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+												"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 4.0, 1.0 ] },
+												"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+												"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 4.0, 1.0 ] },
+												"up": { "texture": "#shield_round", "uv": [ 15.0, 6.0, 16.0, 10.0 ] },
+												"down": { "texture": "#shield_round_back", "uv": [ 15.0, 6.0, 16.0, 10.0 ] }
+											}
+										}
+									]
+								},
+								{
+									"name": "005",
+									"from": [ -1.0, 0.0, -1.0 ], 
+									"to": [ 0.0, 1.0, 11.0 ], 
+									"rotationOrigin": [ -1.0, 0.0, -1.0 ],
+									"faces": {
+										"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+										"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 12.0, 1.0 ] },
+										"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+										"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 12.0, 1.0 ] },
+										"up": { "texture": "#shield_round", "uv": [ 12.0, 2.0, 13.0, 14.0 ] },
+										"down": { "texture": "#shield_round_back", "uv": [ 12.0, 2.0, 13.0, 14.0 ] }
+									}
+								},
+								{
+									"name": "006",
+									"from": [ -10.0, 0.0, -1.0 ], 
+									"to": [ -9.0, 1.0, 11.0 ], 
+									"rotationOrigin": [ -10.0, 0.0, -1.0 ],
+									"faces": {
+										"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+										"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 12.0, 1.0 ] },
+										"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+										"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 12.0, 1.0 ] },
+										"up": { "texture": "#shield_round", "uv": [ 3.0, 2.0, 4.0, 14.0 ] },
+										"down": { "texture": "#shield_round_back", "uv": [ 3.0, 2.0, 4.0, 14.0 ] }
+									}
+								}
+							]
+						}
+					]
+				},
+				{
+					"name": "007",
+					"from": [ 1.0, 0.0, -1.0 ], 
+					"to": [ 5.0, 1.0, 0.0 ], 
+					"rotationOrigin": [ 1.0, 0.0, 0.0 ],
+					"faces": {
+						"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 4.0, 1.0 ] },
+						"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+						"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 4.0, 1.0 ] },
+						"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+						"up": { "texture": "#shield_round", "uv": [ 6.0, 0.0, 10.0, 1.0 ] },
+						"down": { "texture": "#shield_round_back", "uv": [ 6.0, 0.0, 10.0, 1.0 ] }
+					}
+				},
+				{
+					"name": "008",
+					"from": [ 1.0, 0.0, 14.0 ], 
+					"to": [ 5.0, 1.0, 15.0 ], 
+					"rotationOrigin": [ 1.0, 0.0, 14.0 ],
+					"faces": {
+						"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 4.0, 1.0 ] },
+						"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+						"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 4.0, 1.0 ] },
+						"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+						"up": { "texture": "#shield_round", "uv": [ 6.0, 15.0, 10.0, 16.0 ] },
+						"down": { "texture": "#shield_round_back", "uv": [ 6.0, 15.0, 10.0, 16.0 ] }
+					}
+				},
+				{
+					"name": "009",
+					"from": [ 6.0, 0.0, 1.5 ], 
+					"to": [ 7.0, 1.0, 14.5 ], 
+					"rotationOrigin": [ 3.0, 0.0, 7.5 ],
+					"rotationY": 180.0,
+					"faces": {
+						"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+						"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 13.0, 1.0 ] },
+						"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+						"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 13.0, 1.0 ] },
+						"up": { "texture": "#shield_round", "uv": [ 4.0, 1.5, 5.0, 14.5 ] },
+						"down": { "texture": "#shield_round_back", "uv": [ 4.0, 1.5, 5.0, 14.5 ] }
+					},
+					"children": [
+						{
+							"name": "010",
+							"from": [ 2.0, 0.0, 1.5 ], 
+							"to": [ 3.0, 1.0, 11.5 ], 
+							"rotationOrigin": [ 2.0, 0.0, 1.5 ],
+							"faces": {
+								"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+								"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 10.0, 1.0 ] },
+								"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+								"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 10.0, 1.0 ] },
+								"up": { "texture": "#shield_round", "uv": [ 2.0, 3.0, 3.0, 13.0 ] },
+								"down": { "texture": "#shield_round_back", "uv": [ 2.0, 3.0, 3.0, 13.0 ] }
+							},
+							"children": [
+								{
+									"name": "011",
+									"from": [ 1.0, 0.0, 2.0 ], 
+									"to": [ 2.0, 1.0, 8.0 ], 
+									"rotationOrigin": [ 1.0, 0.0, 2.0 ],
+									"faces": {
+										"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+										"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 6.0, 1.0 ] },
+										"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+										"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 6.0, 1.0 ] },
+										"up": { "texture": "#shield_round", "uv": [ 1.0, 5.0, 2.0, 11.0 ] },
+										"down": { "texture": "#shield_round_back", "uv": [ 1.0, 5.0, 2.0, 11.0 ] }
+									},
+									"children": [
+										{
+											"name": "012",
+											"from": [ 1.0, 0.0, 1.0 ], 
+											"to": [ 2.0, 1.0, 5.0 ], 
+											"rotationOrigin": [ 1.0, 0.0, 1.0 ],
+											"faces": {
+												"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+												"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 4.0, 1.0 ] },
+												"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
+												"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 0.0, 4.0, 1.0 ] },
+												"up": { "texture": "#shield_round", "uv": [ 0.0, 6.0, 1.0, 10.0 ] },
+												"down": { "texture": "#shield_round_back", "uv": [ 0.0, 6.0, 1.0, 10.0 ] }
+											}
+										}
+									]
+								}
+							]
+						}
+					]
+				},
+				{
+					"name": "013",
+					"from": [ 0.0, -1.0, 6.0 ], 
+					"to": [ 1.0, 0.0, 7.0 ], 
+					"rotationOrigin": [ 1.0, -1.0, 6.0 ],
+					"faces": {
+						"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+						"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+						"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+						"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+						"up": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+						"down": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ] }
+					},
+					"children": [
+						{
+							"name": "014",
+							"from": [ 0.0, -0.2, 0.0 ], 
+							"to": [ 6.0, 0.0, 1.0 ], 
+							"rotationOrigin": [ 0.0, -0.2, 0.0 ],
+							"faces": {
+								"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 6.0, 3.0 ], "autoUv": false },
+								"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ], "autoUv": false },
+								"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 6.0, 3.0 ], "autoUv": false },
+								"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ], "autoUv": false },
+								"up": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 6.0, 3.0 ] },
+								"down": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 6.0, 3.0 ] }
+							}
+						}
+					]
+				},
+				{
+					"name": "015",
+					"from": [ 5.0, -1.0, 6.0 ], 
+					"to": [ 6.0, 0.0, 7.0 ], 
+					"rotationOrigin": [ 5.0, -1.0, 6.0 ],
+					"faces": {
+						"north": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+						"east": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+						"south": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+						"west": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+						"up": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+						"down": { "texture": "#shield_edging_grip", "uv": [ 0.0, 2.0, 1.0, 3.0 ] }
+					}
+				}
+			]
+		}
+	]}
\ No newline at end of file

Binary files /dev/null and b/ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_buckler.png differ

Binary files /dev/null and b/ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_edging_grip.png differ

Binary files /dev/null and b/ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_heater.png differ

Binary files /dev/null and b/ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_heater_back.png differ

Binary files /dev/null and b/ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_heater_straight.png differ

Binary files /dev/null and b/ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_heater_straight_back.png differ

Binary files /dev/null and b/ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_round.png differ

Binary files /dev/null and b/ArmourMod/assets/bunnyviking/textures/item/armament/shield/shield_round_back.png differ

Binary files /dev/null and b/ArmourMod/assets/bunnyviking/textures/item/armament/shield/weapon_parts_01.png differ