From 43cde60afe8994707fbb551438828228624d06e3 Mon Sep 17 00:00:00 2001
From: Boblet <hbmmods@gmail.com>
Date: Fri, 14 Aug 2020 12:38:34 +0200
Subject: [PATCH] added chernobyl warning sign battle axe

---
 src/main/java/assets/hbm/lang/de_DE.lang         |   1 +
 src/main/java/assets/hbm/lang/en_US.lang         |   1 +
 .../textures/models/weapons/chernobylsign.png    | Bin 0 -> 1670 bytes
 src/main/java/com/hbm/items/ModItems.java        |   3 +++
 src/main/java/com/hbm/main/ClientProxy.java      |   1 +
 src/main/java/com/hbm/main/ModEventHandler.java  |   4 ++++
 src/main/java/com/hbm/main/ResourceManager.java  |   1 +
 .../hbm/render/item/weapon/ItemRenderShim.java   |   6 ++++--
 8 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/assets/hbm/textures/models/weapons/chernobylsign.png

diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang
index c4e47f4ca..288988896 100644
--- a/src/main/java/assets/hbm/lang/de_DE.lang
+++ b/src/main/java/assets/hbm/lang/de_DE.lang
@@ -646,6 +646,7 @@ item.centrifuge_element.name=Zentrifugenelement
 item.centrifuge_tower.name=Zentrifugenturm
 item.chainsaw.name=Kettensäge
 item.chemistry_template.name=Chemievorlage:
+item.chernobylsign.name=Tschernobyl-Warnschild-Streitaxt
 item.chlorine_pinwheel.name=Chlorgas-Konverter
 item.chocolate_milk.name=Schokomilch
 item.chopper.name=Jagdschrauber
diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang
index e5f63e62a..dd654875b 100644
--- a/src/main/java/assets/hbm/lang/en_US.lang
+++ b/src/main/java/assets/hbm/lang/en_US.lang
@@ -646,6 +646,7 @@ item.centrifuge_element.name=Centrifuge Element
 item.centrifuge_tower.name=Centrifuge Tower
 item.chainsaw.name=Chainsaw
 item.chemistry_template.name=Chemistry Template:
+item.chernobylsign.name=Chernobyl Warning Sign Battle Axe
 item.chlorine_pinwheel.name=Chlorine Pinwheel
 item.chocolate_milk.name=Chocolate Milk
 item.chopper.name=Hunter Chopper
diff --git a/src/main/java/assets/hbm/textures/models/weapons/chernobylsign.png b/src/main/java/assets/hbm/textures/models/weapons/chernobylsign.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fbe4f41d64f350850b4dc8def4e9a7efae90d90
GIT binary patch
literal 1670
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
QzW@LL07*qoM6N<$f|@HZE&u=k

literal 0
HcmV?d00001

diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java
index 5e481526c..3956bd6c4 100644
--- a/src/main/java/com/hbm/items/ModItems.java
+++ b/src/main/java/com/hbm/items/ModItems.java
@@ -1680,6 +1680,7 @@ public class ModItems {
 	public static Item reer_graar;
 	public static Item stopsign;
 	public static Item sopsign;
+	public static Item chernobylsign;
 
 	public static Item crystal_horn;
 	public static Item crystal_charred;
@@ -3796,6 +3797,7 @@ public class ModItems {
 		reer_graar = new ModSword(MainRegistry.tMatTitan).setUnlocalizedName("reer_graar").setFull3D().setTextureName(RefStrings.MODID + ":reer_graar_hd");
 		stopsign = new WeaponSpecial(MainRegistry.tMatAlloy).setUnlocalizedName("stopsign").setTextureName(RefStrings.MODID + ":stopsign");
 		sopsign = new WeaponSpecial(MainRegistry.tMatAlloy).setUnlocalizedName("sopsign").setTextureName(RefStrings.MODID + ":sopsign");
+		chernobylsign = new WeaponSpecial(MainRegistry.tMatAlloy).setUnlocalizedName("chernobylsign").setTextureName(RefStrings.MODID + ":chernobylsign");
 
 		crystal_horn = new ItemCustomLore().setUnlocalizedName("crystal_horn").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":crystal_horn");
 		crystal_charred = new ItemCustomLore().setUnlocalizedName("crystal_charred").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":crystal_charred");
@@ -5435,6 +5437,7 @@ public class ModItems {
 		GameRegistry.registerItem(reer_graar, reer_graar.getUnlocalizedName());
 		GameRegistry.registerItem(stopsign, stopsign.getUnlocalizedName());
 		GameRegistry.registerItem(sopsign, sopsign.getUnlocalizedName());
+		GameRegistry.registerItem(chernobylsign, chernobylsign.getUnlocalizedName());
 		
 		//Multitool
 		GameRegistry.registerItem(multitool_hit, multitool_hit.getUnlocalizedName());
diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java
index b4d2d0897..07ba36307 100644
--- a/src/main/java/com/hbm/main/ClientProxy.java
+++ b/src/main/java/com/hbm/main/ClientProxy.java
@@ -190,6 +190,7 @@ public class ClientProxy extends ServerProxy {
 		MinecraftForgeClient.registerItemRenderer(ModItems.shimmer_axe, new ItemRenderShim());
 		MinecraftForgeClient.registerItemRenderer(ModItems.stopsign, new ItemRenderShim());
 		MinecraftForgeClient.registerItemRenderer(ModItems.sopsign, new ItemRenderShim());
+		MinecraftForgeClient.registerItemRenderer(ModItems.chernobylsign, new ItemRenderShim());
 		MinecraftForgeClient.registerItemRenderer(ModItems.pch, new ItemRenderShim());
 		//guns
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg, new ItemRenderRpg());
diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java
index 44d524993..22c4c2c0f 100644
--- a/src/main/java/com/hbm/main/ModEventHandler.java
+++ b/src/main/java/com/hbm/main/ModEventHandler.java
@@ -123,6 +123,8 @@ public class ModEventHandler
 				entity.setCurrentItemOrArmor(4, new ItemStack(ModItems.gas_mask, 1, world.rand.nextInt(100)));
 			if(rand.nextInt(256) == 0)
 				entity.setCurrentItemOrArmor(4, new ItemStack(ModItems.mask_of_infamy, 1, world.rand.nextInt(100)));
+			if(rand.nextInt(1024) == 0)
+				entity.setCurrentItemOrArmor(3, new ItemStack(ModItems.starmetal_plate, 1, world.rand.nextInt(ModItems.starmetal_plate.getMaxDamage())));
 			
 			if(rand.nextInt(128) == 0)
 				entity.setCurrentItemOrArmor(0, new ItemStack(ModItems.pipe_lead, 1, world.rand.nextInt(100)));
@@ -140,6 +142,8 @@ public class ModEventHandler
 				entity.setCurrentItemOrArmor(0, new ItemStack(ModItems.stopsign));
 			if(rand.nextInt(512) == 0)
 				entity.setCurrentItemOrArmor(0, new ItemStack(ModItems.sopsign));
+			if(rand.nextInt(512) == 0)
+				entity.setCurrentItemOrArmor(0, new ItemStack(ModItems.chernobylsign));
 		}
 		if(entity instanceof EntitySkeleton) {
 			if(rand.nextInt(16) == 0) {
diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java
index 6a8bbf6da..091c5f76d 100644
--- a/src/main/java/com/hbm/main/ResourceManager.java
+++ b/src/main/java/com/hbm/main/ResourceManager.java
@@ -365,6 +365,7 @@ public class ResourceManager {
 	public static final ResourceLocation shimmer_axe_tex = new ResourceLocation(RefStrings.MODID, "textures/models/shimmer_axe.png");
 	public static final ResourceLocation stopsign_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/stopsign.png");
 	public static final ResourceLocation sopsign_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/sopsign.png");
+	public static final ResourceLocation chernobylsign_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/chernobylsign.png");
 	public static final ResourceLocation pch_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/pch.png");
 
 	public static final ResourceLocation brimstone_tex = new ResourceLocation(RefStrings.MODID, "textures/models/brimstone.png");
diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java
index 69429c4ea..e38066e3a 100644
--- a/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java
+++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java
@@ -33,7 +33,7 @@ public class ItemRenderShim implements IItemRenderer {
 		GL11.glPushMatrix();
 		switch(type) {
 		case EQUIPPED_FIRST_PERSON:
-			if(item.getItem() == ModItems.stopsign || item.getItem() == ModItems.sopsign) {
+			if(item.getItem() == ModItems.stopsign || item.getItem() == ModItems.sopsign || item.getItem() == ModItems.chernobylsign) {
 				GL11.glRotatef(180, 0.0F, 1.0F, 0.0F);
 				GL11.glRotatef(-90.0F, 0.0F, 0.0F, 1.0F);
 				GL11.glTranslatef(-1.0F, -1.5F, 0.0F);
@@ -48,6 +48,8 @@ public class ItemRenderShim implements IItemRenderer {
 					Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.stopsign_tex);
 				if(item.getItem() == ModItems.sopsign)
 					Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.sopsign_tex);
+				if(item.getItem() == ModItems.chernobylsign)
+					Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.chernobylsign_tex);
 				if(item.getItem() == ModItems.pch)
 					Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.pch_tex);
 				
@@ -74,7 +76,7 @@ public class ItemRenderShim implements IItemRenderer {
 					ResourceManager.shimmer_sledge.renderAll();
 				if(item.getItem() == ModItems.shimmer_axe)
 					ResourceManager.shimmer_axe.renderAll();
-				if(item.getItem() == ModItems.stopsign || item.getItem() == ModItems.sopsign)
+				if(item.getItem() == ModItems.stopsign || item.getItem() == ModItems.sopsign || item.getItem() == ModItems.chernobylsign)
 					ResourceManager.stopsign.renderAll();
 				
 				if(item.getItem() == ModItems.pch) {