diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index bc8b16145..e1e0f35c2 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -426,8 +426,8 @@ container.reactorControl=Reaktorfernsteuerung tile.broadcaster_pc.name=Korrupter Sender -tile.radiobox.name=RTG-Betriebener Hochleistungs-UKW-Sender -tile.radiorec.name=UKW Radio +tile.radiobox.name=Rosenberg Ungeziefervernichter [WIP] +tile.radiorec.name=Kaputtes UKW Radio container.radiobox=UKW-Sender container.radiorec=UKW Radio diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 181f3d3e4..16299e21a 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -426,8 +426,8 @@ container.reactorControl=Reactor Remote Control Block tile.broadcaster_pc.name=Corrupted Broadcaster -tile.radiobox.name=RTG-Powered High-Gain FM Transmitter -tile.radiorec.name=FM Radio +tile.radiobox.name=Rosenberg Pest Control Box [WIP] +tile.radiorec.name=Broken FM Radio container.radiobox=FM Transmitter container.radiorec=FM Radio diff --git a/assets/hbm/textures/models/ModelRadio.png b/assets/hbm/textures/models/ModelRadio.png index e7a96af46..a741551e6 100644 Binary files a/assets/hbm/textures/models/ModelRadio.png and b/assets/hbm/textures/models/ModelRadio.png differ diff --git a/assets/hbm/textures/models/ModelRadioAlt.png b/assets/hbm/textures/models/ModelRadioAlt.png new file mode 100644 index 000000000..e7a96af46 Binary files /dev/null and b/assets/hbm/textures/models/ModelRadioAlt.png differ diff --git a/com/hbm/entity/projectile/EntityBulletBase.java b/com/hbm/entity/projectile/EntityBulletBase.java index 89b15fbe2..add9f61d3 100644 --- a/com/hbm/entity/projectile/EntityBulletBase.java +++ b/com/hbm/entity/projectile/EntityBulletBase.java @@ -444,6 +444,10 @@ public class EntityBulletBase extends Entity implements IProjectile { worldObj.spawnEntityInWorld(fx); } worldObj.spawnEntityInWorld(pippo); + + worldObj.playSoundEffect(pippo.posX, + pippo.posY + 50, + pippo.posZ, "hbm:alarm.trainHorn", 100F, 1F); } if(config.boat && !worldObj.isRemote) { @@ -457,6 +461,10 @@ public class EntityBulletBase extends Entity implements IProjectile { worldObj.spawnEntityInWorld(fx); } worldObj.spawnEntityInWorld(pippo); + + worldObj.playSoundEffect(pippo.posX, + pippo.posY + 50, + pippo.posZ, "hbm:alarm.trainHorn", 100F, 1F); } } diff --git a/com/hbm/handler/guncfg/BulletConfigFactory.java b/com/hbm/handler/guncfg/BulletConfigFactory.java index 15f2d91df..892ea5e53 100644 --- a/com/hbm/handler/guncfg/BulletConfigFactory.java +++ b/com/hbm/handler/guncfg/BulletConfigFactory.java @@ -105,9 +105,9 @@ public class BulletConfigFactory { bullet.gravity = 0.005D; bullet.maxAge = 300; bullet.doesRicochet = true; - bullet.ricochetAngle = 3; - bullet.HBRC = 0; - bullet.LBRC = 95; + bullet.ricochetAngle = 10; + bullet.HBRC = 2; + bullet.LBRC = 100; bullet.bounceMod = 0.8; bullet.doesPenetrate = false; bullet.doesBreakGlass = false; diff --git a/com/hbm/handler/guncfg/Gun44MagnumFactory.java b/com/hbm/handler/guncfg/Gun44MagnumFactory.java index 684416015..269659260 100644 --- a/com/hbm/handler/guncfg/Gun44MagnumFactory.java +++ b/com/hbm/handler/guncfg/Gun44MagnumFactory.java @@ -154,6 +154,7 @@ public class Gun44MagnumFactory { bullet.dmgMax = 5; bullet.boxcar = true; bullet.wear = 25; + bullet.doesPenetrate = false; return bullet; } @@ -167,6 +168,7 @@ public class Gun44MagnumFactory { bullet.dmgMax = 5; bullet.boat = true; bullet.wear = 25; + bullet.doesPenetrate = false; return bullet; } diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index eee095c51..852964907 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -2556,7 +2556,7 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.thruster_small, 1)); list.add(new ItemStack(ModItems.photo_panel, 12)); list.add(new ItemStack(ModItems.centrifuge_element, 4)); - list.add(new ItemStack(ModItems.magnet_circular, 3)); + list.add(new ItemStack(ModItems.magnetron, 3)); list.add(new ItemStack(ModItems.plate_polymer, 12)); list.add(ItemBattery.getEmptyBattery(ModItems.battery_lithium_cell_6)); break; diff --git a/com/hbm/items/special/ItemSyringe.java b/com/hbm/items/special/ItemSyringe.java index 24ca09076..c0afc341e 100644 --- a/com/hbm/items/special/ItemSyringe.java +++ b/com/hbm/items/special/ItemSyringe.java @@ -340,23 +340,23 @@ public class ItemSyringe extends Item { { if (!world.isRemote) { + float repair = 0; + + if(this == ModItems.gun_kit_1) { + repair = 0.1F; + world.playSoundAtEntity(player, "hbm:item.spray", 1.0F, 1.0F); + } + if(this == ModItems.gun_kit_2) { + repair = 0.5F; + world.playSoundAtEntity(player, "hbm:item.repair", 1.0F, 1.0F); + } + for(int i = 0; i < 9; i++) { ItemStack gun = player.inventory.mainInventory[i]; if(gun != null && gun.getItem() instanceof ItemGunBase) { - float repair = 0; - - if(this == ModItems.gun_kit_1) { - repair = 0.1F; - world.playSoundAtEntity(player, "hbm:item.spray", 1.0F, 1.0F); - } - if(this == ModItems.gun_kit_2) { - repair = 0.5F; - world.playSoundAtEntity(player, "hbm:item.repair", 1.0F, 1.0F); - } - int full = ((ItemGunBase)gun.getItem()).mainConfig.durability; int wear = ItemGunBase.getItemWear(gun); diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 010773073..3dc775caf 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (3030B)"; + public static final String VERSION = "1.0.27 BETA (3043)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 99bbbe9a7..0873a61f4 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -1498,22 +1498,6 @@ public class MainRegistry recipes.overridePreSetRecipe(new ItemStack(Blocks.sandstone_stairs), new ItemStack(Blocks.sand, 6)); recipes.overridePreSetRecipe(new ItemStack(Blocks.clay), new ItemStack(Items.clay_ball, 4)); recipes.overridePreSetRecipe(new ItemStack(Blocks.hardened_clay), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 0), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 1), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 2), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 3), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 4), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 5), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 6), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 7), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 8), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 9), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 10), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 11), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 12), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 13), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 14), new ItemStack(Items.clay_ball, 4)); - recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 15), new ItemStack(Items.clay_ball, 4)); recipes.overridePreSetRecipe(new ItemStack(Blocks.tnt), new ItemStack(Items.gunpowder, 5)); recipes.overridePreSetRecipe(new ItemStack(ModItems.powder_quartz), new ItemStack(ModItems.powder_lithium_tiny, 1)); recipes.overridePreSetRecipe(new ItemStack(ModItems.powder_lapis), new ItemStack(ModItems.powder_cobalt_tiny, 1)); @@ -1526,6 +1510,11 @@ public class MainRegistry recipes.overridePreSetRecipe(new ItemStack(ModItems.fragment_meteorite), new ItemStack(ModItems.powder_meteorite_tiny, 1)); recipes.overridePreSetRecipe(new ItemStack(ModBlocks.block_meteor), new ItemStack(ModItems.powder_meteorite, 10)); recipes.overridePreSetRecipe(new ItemStack(Items.enchanted_book), new ItemStack(ModItems.powder_magic, 1)); + + for(int i = 0; i < 16; i++) { + recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, i), new ItemStack(Items.clay_ball, 4)); + recipes.overridePreSetRecipe(new ItemStack(Blocks.wool, 1, i), new ItemStack(Items.string, 4)); + } recipes.PrintRecipes(); diff --git a/com/hbm/render/item/ItemRenderGunAnim.java b/com/hbm/render/item/ItemRenderGunAnim.java index 5ba911d25..b34e80403 100644 --- a/com/hbm/render/item/ItemRenderGunAnim.java +++ b/com/hbm/render/item/ItemRenderGunAnim.java @@ -123,6 +123,14 @@ public class ItemRenderGunAnim implements IItemRenderer { GL11.glRotatef(GunB92.getRotationFromAnim(item) * -90, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(off * -0.5F, off * -0.5F, 0.0F); } + + if(item.getItem() == ModItems.gun_bolt_action || item.getItem() == ModItems.gun_bolt_action_green || + item.getItem() == ModItems.gun_lever_action || item.getItem() == ModItems.gun_lever_action_dark) { + GL11.glTranslatef(0.0F, -0.4F, 0.0F); + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); + } if(item.getItem() == ModItems.gun_lever_action || item.getItem() == ModItems.gun_lever_action_dark) leveraction.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunLeverAction.getRotationFromAnim(item)); diff --git a/com/hbm/render/item/ItemRenderMP40.java b/com/hbm/render/item/ItemRenderMP40.java index 8b0cdbce2..1ad36e5d4 100644 --- a/com/hbm/render/item/ItemRenderMP40.java +++ b/com/hbm/render/item/ItemRenderMP40.java @@ -49,6 +49,9 @@ public class ItemRenderMP40 implements IItemRenderer { GL11.glScalef(0.5F, 0.5F, 0.5F); //GL11.glTranslatef(-0.4F, -0.1F, 0.1F); GL11.glTranslatef(-0.8F, -0.2F, 0.0F); + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); break; diff --git a/com/hbm/render/item/ItemRenderOverkill.java b/com/hbm/render/item/ItemRenderOverkill.java index 3ae0bc0d5..5ab7b1282 100644 --- a/com/hbm/render/item/ItemRenderOverkill.java +++ b/com/hbm/render/item/ItemRenderOverkill.java @@ -136,7 +136,10 @@ public class ItemRenderOverkill implements IItemRenderer { item.getItem() == ModItems.gun_revolver_blackjack || item.getItem() == ModItems.gun_revolver_red) { GL11.glScalef(0.60F, 0.60F, 0.60F); - GL11.glTranslatef(0.0F, 0.3F, 0.2F); + GL11.glTranslatef(0.0F, 0.0F, -0.1F); + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); } if(item.getItem() == ModItems.gun_lacunae || @@ -174,12 +177,20 @@ public class ItemRenderOverkill implements IItemRenderer { pip.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); if(item.getItem() == ModItems.gun_calamity) { + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelCalBarrel.png")); barrel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelCalStock.png")); stock.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); } if(item.getItem() == ModItems.gun_calamity_dual) { + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelCalDualStock.png")); saddle.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelCalBarrel.png")); diff --git a/com/hbm/render/item/ItemRenderRevolver.java b/com/hbm/render/item/ItemRenderRevolver.java index 867d12abf..b4a9e0ebc 100644 --- a/com/hbm/render/item/ItemRenderRevolver.java +++ b/com/hbm/render/item/ItemRenderRevolver.java @@ -53,6 +53,10 @@ public class ItemRenderRevolver implements IItemRenderer { GL11.glTranslatef(-0.5F, 0.0F, -0.2F); //GL11.glScalef(2.0F, 2.0F, 2.0F); GL11.glScalef(0.5F, 0.5F, 0.5F); + + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); //((EntityPlayer)data[1]).isSwingInProgress = false; diff --git a/com/hbm/render/item/ItemRenderRevolverCursed.java b/com/hbm/render/item/ItemRenderRevolverCursed.java index d294619ce..a3864186a 100644 --- a/com/hbm/render/item/ItemRenderRevolverCursed.java +++ b/com/hbm/render/item/ItemRenderRevolverCursed.java @@ -45,6 +45,9 @@ public class ItemRenderRevolverCursed implements IItemRenderer { GL11.glTranslatef(-0.5F, 0.0F, -0.2F); //GL11.glScalef(2.0F, 2.0F, 2.0F); GL11.glScalef(0.5F, 0.5F, 0.5F); + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); break; diff --git a/com/hbm/render/item/ItemRenderRevolverGold.java b/com/hbm/render/item/ItemRenderRevolverGold.java index a5b9b6ed1..5e85b6576 100644 --- a/com/hbm/render/item/ItemRenderRevolverGold.java +++ b/com/hbm/render/item/ItemRenderRevolverGold.java @@ -45,6 +45,9 @@ public class ItemRenderRevolverGold implements IItemRenderer { GL11.glTranslatef(-0.5F, 0.0F, -0.2F); //GL11.glScalef(2.0F, 2.0F, 2.0F); GL11.glScalef(0.5F, 0.5F, 0.5F); + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); break; diff --git a/com/hbm/render/item/ItemRenderRevolverIron.java b/com/hbm/render/item/ItemRenderRevolverIron.java index 4fb377454..d0a33f2f6 100644 --- a/com/hbm/render/item/ItemRenderRevolverIron.java +++ b/com/hbm/render/item/ItemRenderRevolverIron.java @@ -45,6 +45,9 @@ public class ItemRenderRevolverIron implements IItemRenderer { GL11.glTranslatef(-0.5F, 0.0F, -0.2F); //GL11.glScalef(2.0F, 2.0F, 2.0F); GL11.glScalef(0.5F, 0.5F, 0.5F); + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); break; diff --git a/com/hbm/render/item/ItemRenderRevolverLead.java b/com/hbm/render/item/ItemRenderRevolverLead.java index d5b2fa5a0..dc76101e3 100644 --- a/com/hbm/render/item/ItemRenderRevolverLead.java +++ b/com/hbm/render/item/ItemRenderRevolverLead.java @@ -45,6 +45,9 @@ public class ItemRenderRevolverLead implements IItemRenderer { GL11.glTranslatef(-0.5F, 0.0F, -0.2F); //GL11.glScalef(2.0F, 2.0F, 2.0F); GL11.glScalef(0.5F, 0.5F, 0.5F); + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); break; diff --git a/com/hbm/render/item/ItemRenderRevolverNightmare.java b/com/hbm/render/item/ItemRenderRevolverNightmare.java index 86e362976..bb7f027aa 100644 --- a/com/hbm/render/item/ItemRenderRevolverNightmare.java +++ b/com/hbm/render/item/ItemRenderRevolverNightmare.java @@ -54,6 +54,9 @@ public class ItemRenderRevolverNightmare implements IItemRenderer { GL11.glTranslatef(-0.5F, 0.0F, -0.2F); //GL11.glScalef(2.0F, 2.0F, 2.0F); GL11.glScalef(0.5F, 0.5F, 0.5F); + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); if(this.item == ModItems.gun_revolver_nightmare) n1.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, item); if(this.item == ModItems.gun_revolver_nightmare2) diff --git a/com/hbm/render/item/ItemRenderRevolverSchrabidium.java b/com/hbm/render/item/ItemRenderRevolverSchrabidium.java index e20925739..70c8b7657 100644 --- a/com/hbm/render/item/ItemRenderRevolverSchrabidium.java +++ b/com/hbm/render/item/ItemRenderRevolverSchrabidium.java @@ -45,6 +45,9 @@ public class ItemRenderRevolverSchrabidium implements IItemRenderer { GL11.glTranslatef(-0.5F, 0.0F, -0.2F); //GL11.glScalef(2.0F, 2.0F, 2.0F); GL11.glScalef(0.5F, 0.5F, 0.5F); + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); break; diff --git a/com/hbm/render/item/ItemRenderRpg.java b/com/hbm/render/item/ItemRenderRpg.java index dd7a96c50..be57d6e2f 100644 --- a/com/hbm/render/item/ItemRenderRpg.java +++ b/com/hbm/render/item/ItemRenderRpg.java @@ -44,8 +44,12 @@ public class ItemRenderRpg implements IItemRenderer { GL11.glPushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelGustav.png")); GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.1F, 0.1F, -0.1F); GL11.glScalef(0.5F, 0.5F, 0.5F); + GL11.glTranslatef(0.4F, -1.0F, -0.7F); + + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); break; diff --git a/com/hbm/render/item/ItemRenderUboinik.java b/com/hbm/render/item/ItemRenderUboinik.java index fc62469db..b029be207 100644 --- a/com/hbm/render/item/ItemRenderUboinik.java +++ b/com/hbm/render/item/ItemRenderUboinik.java @@ -47,8 +47,11 @@ public class ItemRenderUboinik implements IItemRenderer { //GL11.glScalef(2.0F, 2.0F, 2.0F); GL11.glScalef(0.5F, 0.5F, 0.5F); //GL11.glTranslatef(-0.4F, -0.1F, 0.1F); - GL11.glTranslatef(-0.2F, -0.1F, -0.1F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + GL11.glTranslatef(-0.2F, -0.4F, -0.1F); + GL11.glRotatef(-20.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(5.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.2F, 0.0F, -0.2F); + swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, item); GL11.glPopMatrix(); break; case EQUIPPED: @@ -64,7 +67,7 @@ public class ItemRenderUboinik implements IItemRenderer { GL11.glTranslatef(0.5F, -0.2F, 0.0F); GL11.glScalef(0.75F, 0.75F, 0.75F); GL11.glTranslatef(-1.4F, 0.0F, 0.0F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, item); GL11.glPopMatrix(); default: break; } diff --git a/com/hbm/render/model/ModelNightmare.java b/com/hbm/render/model/ModelNightmare.java index 9edac0bb8..750e64b28 100644 --- a/com/hbm/render/model/ModelNightmare.java +++ b/com/hbm/render/model/ModelNightmare.java @@ -8,6 +8,8 @@ package com.hbm.render.model; import org.lwjgl.opengl.GL11; +import com.hbm.items.weapon.ItemGunBase; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -165,17 +167,20 @@ public class ModelNightmare extends ModelBase { Shape11.render(f5); Shape12.render(f5); GL11.glEnable(GL11.GL_CULL_FACE); - if(item.getItemDamage() <= 0) + + int ammo = ItemGunBase.getMag(item); + + if(ammo > 0) Bullet1.render(f5); - if(item.getItemDamage() <= 1) + if(ammo > 1) Bullet2.render(f5); - if(item.getItemDamage() <= 2) + if(ammo > 2) Bullet3.render(f5); - if(item.getItemDamage() <= 3) + if(ammo > 3) Bullet4.render(f5); - if(item.getItemDamage() <= 4) + if(ammo > 4) Bullet5.render(f5); - if(item.getItemDamage() <= 5) + if(ammo > 5) Bullet6.render(f5); } diff --git a/com/hbm/render/model/ModelNightmare2.java b/com/hbm/render/model/ModelNightmare2.java index 9b1732ec2..565ec6997 100644 --- a/com/hbm/render/model/ModelNightmare2.java +++ b/com/hbm/render/model/ModelNightmare2.java @@ -8,6 +8,8 @@ package com.hbm.render.model; import org.lwjgl.opengl.GL11; +import com.hbm.items.weapon.ItemGunBase; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -206,18 +208,7 @@ public class ModelNightmare2 extends ModelBase { Shape11.render(f5); Shape12.render(f5); GL11.glEnable(GL11.GL_CULL_FACE); - if(item.getItemDamage() <= 0) - Bullet1.render(f5); - if(item.getItemDamage() <= 1) - Bullet2.render(f5); - if(item.getItemDamage() <= 2) - Bullet3.render(f5); - if(item.getItemDamage() <= 3) - Bullet4.render(f5); - if(item.getItemDamage() <= 4) - Bullet5.render(f5); - if(item.getItemDamage() <= 5) - Bullet6.render(f5); + Shape13.render(f5); Shape14.render(f5); Shape15.render(f5); @@ -225,6 +216,21 @@ public class ModelNightmare2 extends ModelBase { Shape17.render(f5); Shape18.render(f5); Shape19.render(f5); + + int ammo = ItemGunBase.getMag(item); + + if(ammo > 0) + Bullet1.render(f5); + if(ammo > 1) + Bullet2.render(f5); + if(ammo > 2) + Bullet3.render(f5); + if(ammo > 3) + Bullet4.render(f5); + if(ammo > 4) + Bullet5.render(f5); + if(ammo > 5) + Bullet6.render(f5); } private void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/com/hbm/render/model/ModelUboinik.java b/com/hbm/render/model/ModelUboinik.java index 6dd05595b..467c5d166 100644 --- a/com/hbm/render/model/ModelUboinik.java +++ b/com/hbm/render/model/ModelUboinik.java @@ -8,9 +8,12 @@ package com.hbm.render.model; import org.lwjgl.opengl.GL11; +import com.hbm.items.weapon.ItemGunBase; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; public class ModelUboinik extends ModelBase { // fields @@ -217,8 +220,7 @@ public class ModelUboinik extends ModelBase { setRotation(StockBottom, 0F, 0F, 0F); } - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, ItemStack item) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); Barrel.render(f5); @@ -233,12 +235,22 @@ public class ModelUboinik extends ModelBase { DrumCenter.render(f5); DrumBack.render(f5); DrumBottom.render(f5); - Shell1.render(f5); - Shell2.render(f5); - Shell3.render(f5); - Shell4.render(f5); - Shell5.render(f5); - Shell6.render(f5); + + int ammo = ItemGunBase.getMag(item); + + if(ammo > 5) + Shell5.render(f5); + if(ammo > 4) + Shell4.render(f5); + if(ammo > 3) + Shell3.render(f5); + if(ammo > 2) + Shell2.render(f5); + if(ammo > 1) + Shell1.render(f5); + if(ammo > 0) + Shell6.render(f5); + Clip1.render(f5); Clip2.render(f5); Clip3.render(f5);