From dfa7b2eacd8047d638b2931ee9927ab69332c59d Mon Sep 17 00:00:00 2001
From: Bob <hbmmods@gmail.com>
Date: Thu, 30 Jul 2020 00:15:54 +0200
Subject: [PATCH] somebody once told me the world is gonna roll me, i ain't the
 sharpest t

ool in the shed
---
 src/main/java/assets/hbm/lang/de_DE.lang      |  1 +
 src/main/java/assets/hbm/lang/en_US.lang      |  1 +
 .../com/hbm/entity/mob/EntityMaskMan.java     | 23 +++++++++++++++++++
 .../entity/mob/ai/EntityAIShootTarget.java    |  4 +++-
 .../com/hbm/render/model/ModelMaskMan.java    |  8 ++++++-
 .../com/hbm/saveddata/RadiationSavedData.java |  5 ++++
 6 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang
index c7ec8feb9..b0bc3b661 100644
--- a/src/main/java/assets/hbm/lang/de_DE.lang
+++ b/src/main/java/assets/hbm/lang/de_DE.lang
@@ -725,6 +725,7 @@ item.coil_gold.name=Goldspule
 item.coil_gold_torus.name=Goldene Ringspule
 item.coil_magnetized_tungsten.name=4000K Hochtemperaturensupraleitermagnetspule
 item.coil_tungsten.name=Heizspirale
+item.coin_maskman.name=Maskenmann-Münze
 item.coke.name=Koks
 item.combine_scrap.name=CMB Schrott
 item.component_emitter.name=Emitterkomponente
diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang
index 1a7c6073f..c3c329dd6 100644
--- a/src/main/java/assets/hbm/lang/en_US.lang
+++ b/src/main/java/assets/hbm/lang/en_US.lang
@@ -725,6 +725,7 @@ item.coil_gold.name=Gold Coil
 item.coil_gold_torus.name=Golden Ring Coil
 item.coil_magnetized_tungsten.name=4000K High Temperature Super Conducting Coil
 item.coil_tungsten.name=Heating Coil
+item.coin_maskman.name=Maskman Coin
 item.coke.name=Coke
 item.combine_scrap.name=CMB Scrap Metal
 item.component_emitter.name=Emitter Component
diff --git a/src/main/java/com/hbm/entity/mob/EntityMaskMan.java b/src/main/java/com/hbm/entity/mob/EntityMaskMan.java
index 407942cf3..360847810 100644
--- a/src/main/java/com/hbm/entity/mob/EntityMaskMan.java
+++ b/src/main/java/com/hbm/entity/mob/EntityMaskMan.java
@@ -43,6 +43,29 @@ public class EntityMaskMan extends EntityMob implements IBossDisplayData {
         this.getEntityAttribute(SharedMonsterAttributes.knockbackResistance).setBaseValue(1.0D);
         this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(1000.0D);
     }
+
+    //public static final int dwTargetPlayer = 12;
+    
+    /*protected void entityInit() {
+        super.entityInit();
+        this.getDataWatcher().addObject(dwTargetPlayer, new Integer(0));
+    }*/
+    
+    public void onLivingUpdate() {
+    	
+    	super.onLivingUpdate();
+		
+    	/*if(worldObj.isRemote) {
+    		
+    	} else {
+    		
+    		if(this.getAITarget() != null) {
+    			this.getDataWatcher().updateObject(dwTargetPlayer, this.getAITarget().getEntityId());
+    		} else {
+    			this.getDataWatcher().updateObject(dwTargetPlayer, 0);
+    		}
+    	}*/
+    }
     
     public boolean isAIEnabled() {
         return true;
diff --git a/src/main/java/com/hbm/entity/mob/ai/EntityAIShootTarget.java b/src/main/java/com/hbm/entity/mob/ai/EntityAIShootTarget.java
index 3f328f096..4efa9240d 100644
--- a/src/main/java/com/hbm/entity/mob/ai/EntityAIShootTarget.java
+++ b/src/main/java/com/hbm/entity/mob/ai/EntityAIShootTarget.java
@@ -51,7 +51,9 @@ public class EntityAIShootTarget extends EntityAIBase {
 
 			EntityBulletBase bullet = new EntityBulletBase(owner.worldObj, BulletConfigSyncingUtil.G20_SHRAPNEL, owner, target, 1.6F, 0);
 			owner.worldObj.spawnEntityInWorld(bullet);
-			owner.playSound("hbm:weapon.sawShoot", 1.0F, 2.0F);
+			owner.playSound("hbm:weapon.calShoot", 1.0F, 1.0F);
 		}
+		
+		this.owner.rotationYaw = this.owner.rotationYawHead;
     }
 }
diff --git a/src/main/java/com/hbm/render/model/ModelMaskMan.java b/src/main/java/com/hbm/render/model/ModelMaskMan.java
index 17dd44545..6861cc2bc 100644
--- a/src/main/java/com/hbm/render/model/ModelMaskMan.java
+++ b/src/main/java/com/hbm/render/model/ModelMaskMan.java
@@ -23,6 +23,11 @@ public class ModelMaskMan extends ModelBase {
 		
 		EntityMaskMan man = (EntityMaskMan)entity;
 		
+		//boolean target = entity.worldObj.getEntityByID(man.getDataWatcher().getWatchableObjectInt(man.dwTargetPlayer)) != null;
+		
+		//if(target)
+		//	GL11.glRotated(-f3, 0, 1, 0);
+		
         float f7 = man.limbSwing - man.limbSwingAmount * (1.0F - f5);
         float f6 = (man.prevLimbSwingAmount + (man.limbSwingAmount - man.prevLimbSwingAmount) * f5) * 0.5F;
         
@@ -34,7 +39,8 @@ public class ModelMaskMan extends ModelBase {
 		
 		GL11.glPushMatrix();
 		GL11.glTranslatef(0.5F, 4F, 0);
-		GL11.glRotated(f3, 0, 1, 0);
+		//if(!target)
+		GL11.glRotated(-f3, 0, 1, 0);
 		ResourceManager.maskman.renderPart("Head");
 		GL11.glPopMatrix();
 		
diff --git a/src/main/java/com/hbm/saveddata/RadiationSavedData.java b/src/main/java/com/hbm/saveddata/RadiationSavedData.java
index d5058f5e6..cca683ad5 100644
--- a/src/main/java/com/hbm/saveddata/RadiationSavedData.java
+++ b/src/main/java/com/hbm/saveddata/RadiationSavedData.java
@@ -124,6 +124,11 @@ public class RadiationSavedData extends WorldSavedData {
 
 	@Override
 	public void readFromNBT(NBTTagCompound nbt) {
+		
+		if(!MainRegistry.enableRads) {
+			return;
+		}
+		
 		int count = nbt.getInteger("radCount");
 		
 		for(int i = 0; i < count; i++) {