diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 6dc5f5660..eafffdafb 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -1365,6 +1365,9 @@ item.paa_plate.name=PaA-Brustschutzplatte item.paa_legs.name=PaA-Beinverstärkungsschienen item.paa_boots.name=PaA-"olle Latschen" +item.jackt.name=Verdammt stylische Kugeljacke +item.jackt2.name=Verdammt stylische Kugeljacke 2: Tokyo Drift + item.goggles.name=Schutzbrille item.gas_mask.name=Gasmaske item.gas_mask_m65.name=M65-Z Gasmaske diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 5079bfab7..f423d6712 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -1365,6 +1365,9 @@ item.paa_plate.name=PaA Chest Protection Plate item.paa_legs.name=PaA Leg Reinforcements item.paa_boots.name=PaA "good ol' shoes" +item.jackt.name=Damn Stylish Ballistic Jacket +item.jackt2.name=Damn Stylish Ballistic Jacket 2: Tokyo Drift + item.goggles.name=Protection Goggles item.gas_mask.name=Gas Mask item.gas_mask_m65.name=M65-Z Gas Mask diff --git a/assets/hbm/textures/armor/jackt.png b/assets/hbm/textures/armor/jackt.png new file mode 100644 index 000000000..a96382a3e Binary files /dev/null and b/assets/hbm/textures/armor/jackt.png differ diff --git a/assets/hbm/textures/armor/jackt2.png b/assets/hbm/textures/armor/jackt2.png new file mode 100644 index 000000000..29c4718c0 Binary files /dev/null and b/assets/hbm/textures/armor/jackt2.png differ diff --git a/assets/hbm/textures/models/ModelRadio.png b/assets/hbm/textures/models/ModelRadio.png new file mode 100644 index 000000000..e7a96af46 Binary files /dev/null and b/assets/hbm/textures/models/ModelRadio.png differ diff --git a/com/hbm/entity/effect/EntityNukeCloudSmall.java b/com/hbm/entity/effect/EntityNukeCloudSmall.java index 632b1c966..7444391a4 100644 --- a/com/hbm/entity/effect/EntityNukeCloudSmall.java +++ b/com/hbm/entity/effect/EntityNukeCloudSmall.java @@ -45,7 +45,7 @@ public class EntityNukeCloudSmall extends Entity { public void onUpdate() { //super.onUpdate(); this.age++; - this.worldObj.spawnEntityInWorld(new EntityLightningBolt(this.worldObj, this.posX, this.posY + 200, this.posZ)); + this.worldObj.spawnEntityInWorld(new EntityLightningBolt(this.worldObj, this.posX, this.posY + 400, this.posZ)); if(this.age >= this.maxAge) { diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index a823fefcf..977120344 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -998,6 +998,9 @@ public class ModItems { public static Item jetpack_break; public static Item jetpack_fly; public static Item jetpack_vector; + + public static Item jackt; + public static Item jackt2; public static Item schrabidium_sword; public static Item schrabidium_pickaxe; @@ -2272,6 +2275,9 @@ public class ModItems { asbestos_legs = new ArmorAsbestos(MainRegistry.enumArmorMaterialSteel, 7, 2).setUnlocalizedName("asbestos_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":asbestos_legs"); asbestos_boots = new ArmorAsbestos(MainRegistry.enumArmorMaterialSteel, 7, 3).setUnlocalizedName("asbestos_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":asbestos_boots"); + jackt = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 1).setUnlocalizedName("jackt").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jackt"); + jackt2 = new ModArmor(MainRegistry.enumArmorMaterialSteel, 7, 1).setUnlocalizedName("jackt2").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jackt2"); + schrabidium_sword = new SwordSchrabidium(MainRegistry.enumToolMaterialSchrabidium).setUnlocalizedName("schrabidium_sword").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_sword"); schrabidium_pickaxe = new PickaxeSchrabidium(MainRegistry.enumToolMaterialSchrabidium).setUnlocalizedName("schrabidium_pickaxe").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_pickaxe"); schrabidium_axe = new AxeSchrabidium(MainRegistry.enumToolMaterialSchrabidium).setUnlocalizedName("schrabidium_axe").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_axe"); @@ -3638,6 +3644,8 @@ public class ModItems { GameRegistry.registerItem(watch, watch.getUnlocalizedName()); GameRegistry.registerItem(mask_of_infamy, mask_of_infamy.getUnlocalizedName()); GameRegistry.registerItem(australium_iii, australium_iii.getUnlocalizedName()); + GameRegistry.registerItem(jackt, jackt.getUnlocalizedName()); + GameRegistry.registerItem(jackt2, jackt2.getUnlocalizedName()); GameRegistry.registerItem(jetpack_boost, jetpack_boost.getUnlocalizedName()); GameRegistry.registerItem(jetpack_break, jetpack_break.getUnlocalizedName()); GameRegistry.registerItem(jetpack_fly, jetpack_fly.getUnlocalizedName()); diff --git a/com/hbm/items/gear/ModArmor.java b/com/hbm/items/gear/ModArmor.java index 1a94f357c..420843814 100644 --- a/com/hbm/items/gear/ModArmor.java +++ b/com/hbm/items/gear/ModArmor.java @@ -56,6 +56,12 @@ public class ModArmor extends ItemArmor { if(stack.getItem().equals(ModItems.asbestos_legs)) { return (RefStrings.MODID + ":textures/armor/asbestos_2.png"); } + if(stack.getItem().equals(ModItems.jackt)) { + return (RefStrings.MODID + ":textures/armor/jackt.png"); + } + if(stack.getItem().equals(ModItems.jackt2)) { + return (RefStrings.MODID + ":textures/armor/jackt2.png"); + } else return null; } diff --git a/com/hbm/main/ModEventHandler.java b/com/hbm/main/ModEventHandler.java index 8dfc75667..551f07034 100644 --- a/com/hbm/main/ModEventHandler.java +++ b/com/hbm/main/ModEventHandler.java @@ -72,9 +72,8 @@ public class ModEventHandler if(rand.nextInt(128) == 0) entity.setCurrentItemOrArmor(0, new ItemStack(ModItems.crowbar, 1, world.rand.nextInt(100))); if(rand.nextInt(128) == 0) - entity.setCurrentItemOrArmor(0, new ItemStack(ModItems.big_sword, 1, world.rand.nextInt(100))); - if(rand.nextInt(256) == 0) - + entity.setCurrentItemOrArmor(0, new ItemStack(ModItems.geiger_counter, 1)); + if(rand.nextInt(128) == 0) entity.setCurrentItemOrArmor(0, new ItemStack(ModItems.steel_pickaxe, 1, world.rand.nextInt(300))); } if(entity instanceof EntitySkeleton) { diff --git a/com/hbm/render/model/ModelM65.java b/com/hbm/render/model/ModelM65.java index 23373c55f..408d64853 100644 --- a/com/hbm/render/model/ModelM65.java +++ b/com/hbm/render/model/ModelM65.java @@ -31,74 +31,76 @@ public class ModelM65 extends ModelBiped { public ModelM65() { textureWidth = 32; textureHeight = 32; + + float yOffset = 0.5F; mask = new ModelRenderer(this, 0, 0); Shape1 = new ModelRenderer(this, 0, 0); Shape1.addBox(0F, 0F, 0F, 8, 8, 8); - Shape1.setRotationPoint(-4F, -8F, -4F); + Shape1.setRotationPoint(-4F, -8F + yOffset, -4F); Shape1.setTextureSize(32, 32); Shape1.mirror = true; setRotation(Shape1, 0F, 0F, 0F); convertToChild(mask, Shape1); Shape2 = new ModelRenderer(this, 0, 16); Shape2.addBox(0F, 0F, 0F, 3, 3, 1); - Shape2.setRotationPoint(-1.5F, -3.5F, -5F); + Shape2.setRotationPoint(-1.5F, -3.5F + yOffset, -5F); Shape2.setTextureSize(32, 32); Shape2.mirror = true; setRotation(Shape2, 0F, 0F, 0F); convertToChild(mask, Shape2); Shape3 = new ModelRenderer(this, 0, 20); Shape3.addBox(0F, -2F, 0F, 2, 2, 1); - Shape3.setRotationPoint(-1F, -3.5F, -5F); + Shape3.setRotationPoint(-1F, -3.5F + yOffset, -5F); Shape3.setTextureSize(32, 32); Shape3.mirror = true; setRotation(Shape3, -0.4799655F, 0F, 0F); convertToChild(mask, Shape3); Shape4 = new ModelRenderer(this, 8, 16); Shape4.addBox(0F, 0F, -2F, 3, 2, 2); - Shape4.setRotationPoint(-1.5F, -2F, -4F); + Shape4.setRotationPoint(-1.5F, -2F + yOffset, -4F); Shape4.setTextureSize(32, 32); Shape4.mirror = true; setRotation(Shape4, 0.6108652F, 0F, 0F); convertToChild(mask, Shape4); Shape5 = new ModelRenderer(this, 0, 23); Shape5.addBox(0F, 0F, 0F, 3, 3, 0); - Shape5.setRotationPoint(-3.5F, -6F, -4.2F); + Shape5.setRotationPoint(-3.5F, -6F + yOffset, -4.2F); Shape5.setTextureSize(32, 32); Shape5.mirror = true; setRotation(Shape5, 0F, 0F, 0F); convertToChild(mask, Shape5); Shape6 = new ModelRenderer(this, 0, 26); Shape6.addBox(0F, 0F, 0F, 3, 3, 0); - Shape6.setRotationPoint(0.5F, -6F, -4.2F); + Shape6.setRotationPoint(0.5F, -6F + yOffset, -4.2F); Shape6.setTextureSize(32, 32); Shape6.mirror = true; setRotation(Shape6, 0F, 0F, 0F); convertToChild(mask, Shape6); Shape7 = new ModelRenderer(this, 6, 20); Shape7.addBox(0F, 0F, 0F, 2, 2, 1); - Shape7.setRotationPoint(-1F, -3.2F, -6F); + Shape7.setRotationPoint(-1F, -3.2F + yOffset, -6F); Shape7.setTextureSize(32, 32); Shape7.mirror = true; setRotation(Shape7, 0F, 0F, 0F); convertToChild(mask, Shape7); Shape8 = new ModelRenderer(this, 6, 23); Shape8.addBox(0F, 0F, -3F, 2, 2, 1); - Shape8.setRotationPoint(-1F, -2F, -4F); + Shape8.setRotationPoint(-1F, -2F + yOffset, -4F); Shape8.setTextureSize(32, 32); Shape8.mirror = true; setRotation(Shape8, 0.6108652F, 0F, 0F); convertToChild(mask, Shape8); Shape9 = new ModelRenderer(this, 18, 21); Shape9.addBox(0F, -1F, -5F, 3, 4, 2); - Shape9.setRotationPoint(-1.5F, -2F, -4F); + Shape9.setRotationPoint(-1.5F, -2F + yOffset, -4F); Shape9.setTextureSize(32, 32); Shape9.mirror = true; setRotation(Shape9, 0.6108652F, 0F, 0F); convertToChild(mask, Shape9); Shape10 = new ModelRenderer(this, 18, 16); Shape10.addBox(0F, -0.5F, -5F, 4, 3, 2); - Shape10.setRotationPoint(-2F, -2F, -4F); + Shape10.setRotationPoint(-2F, -2F + yOffset, -4F); Shape10.setTextureSize(32, 32); Shape10.mirror = true; setRotation(Shape10, 0.6108652F, 0F, 0F); @@ -128,7 +130,9 @@ public class ModelM65 extends ModelBiped { setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); GL11.glPushMatrix(); double d = 1D / 16D * 18D; + //GL11.glTranslated(0, 1/16D, 0); GL11.glScaled(d, d, d); + GL11.glScaled(1.01D, 1.01D, 1.01D); this.mask.render(par7); GL11.glPopMatrix(); } diff --git a/com/hbm/render/model/ModelRadio.java b/com/hbm/render/model/ModelRadio.java new file mode 100644 index 000000000..aff15971d --- /dev/null +++ b/com/hbm/render/model/ModelRadio.java @@ -0,0 +1,67 @@ +// Date: 14.08.2018 11:02:47 +// Template version 1.1 +// Java generated by Techne +// Keep in mind that you still need to fill in some blanks +// - ZeuX + + + + + + +package net.minecraft.src; + +public class ModelModelRadio extends ModelBase +{ + //fields + ModelRenderer Box; + ModelRenderer Plate; + ModelRenderer Lever; + + public ModelModelRadio() + { + textureWidth = 32; + textureHeight = 32; + + Box = new ModelRenderer(this, 0, 0); + Box.addBox(0F, 0F, 0F, 8, 14, 4); + Box.setRotationPoint(-4F, 9F, -12F); + Box.setTextureSize(32, 32); + Box.mirror = true; + setRotation(Box, 0F, 0F, 0F); + Plate = new ModelRenderer(this, 0, 18); + Plate.addBox(0F, 0F, 0F, 7, 13, 1); + Plate.setRotationPoint(-3.5F, 9.5F, -12.5F); + Plate.setTextureSize(32, 32); + Plate.mirror = true; + setRotation(Plate, 0F, 0F, 0F); + Lever = new ModelRenderer(this, 16, 18); + Lever.addBox(0F, -1F, -1F, 2, 8, 2); + Lever.setRotationPoint(4F, 16F, -10F); + Lever.setTextureSize(32, 32); + Lever.mirror = true; + setRotation(Lever, 0F, 0F, 0F); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + Box.render(f5); + Plate.render(f5); + Lever.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + } + +} diff --git a/com/hbm/sound/SoundLoopBroadcaster.java b/com/hbm/sound/SoundLoopBroadcaster.java index 56b6de21e..9a16d9fca 100644 --- a/com/hbm/sound/SoundLoopBroadcaster.java +++ b/com/hbm/sound/SoundLoopBroadcaster.java @@ -34,6 +34,11 @@ public class SoundLoopBroadcaster extends SoundLoopMachine { if(player != null) { f = (float)Math.sqrt(Math.pow(xPosF - player.posX, 2) + Math.pow(yPosF - player.posY, 2) + Math.pow(zPosF - player.posZ, 2)); volume = func(f, intendedVolume); + + if(!(player.worldObj.getTileEntity((int)xPosF, (int)yPosF, (int)zPosF) instanceof TileEntityBroadcaster)) { + this.donePlaying = true; + volume = 0; + } } else { volume = intendedVolume; }