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 000000000..2fbe4f41d Binary files /dev/null and b/src/main/java/assets/hbm/textures/models/weapons/chernobylsign.png differ 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) {