diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 58045e8ec..ccdb06584 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -1359,11 +1359,14 @@ item.ammo_20gauge_explosive.name=Kaliber 20 Schrot (Explosiv) item.ammo_20gauge_wither.name=Kaliber 20 Schrot (Wither) item.ammo_5mm.name=5mm Patrone item.ammo_5mm_explosive.name=5mm Patrone (Explosiv) +item.ammo_5mm_du.name=5mm Patrone (DU) item.ammo_50bmg.name=.50 BMG Patrone item.ammo_50bmg_incendiary.name=.50 BMG Patrone (Brand) item.ammo_50bmg_explosive.name=.50 BMG Patrone (Explosiv) +item.ammo_50bmg_du.name=.50 BMG Patrone (DU) item.ammo_9mm.name=9mm Patrone item.ammo_9mm_ap.name=9mm Patrone (Panzerbrechend) +item.ammo_9mm_du.name=9mm Patrone (DU) item.ammo_22lr.name=.22 LR Patrone item.ammo_22lr_ap.name=.22 LR Patrone (Panzerbrechend) item.ammo_folly_taint.name=Silbernes Geschoss (Original) @@ -1371,6 +1374,7 @@ item.ammo_folly_nuclear.name=Silbernes Geschoss (Atomar) item.ammo_folly_du.name=Silbernes Geschoss (DU, Nicht-Explosiv) item.ammo_44.name=.44 Magnum Patrone item.ammo_44_ap.name=.44 Magnum Patrone (Panzerbrechend) +item.ammo_44_du.name=.44 Magnum Patrone (DU) item.ammo_44_pip.name=.44 Magnum Patrone (Güterwagon) item.ammo_44_bj.name=.44 Magnum Patrone (Boot) item.ammo_rocket.name=84mm Rakete @@ -1959,6 +1963,7 @@ item.letter.name=Eilbrief item.polaroid.name=Das Polaroid item.glitch.name=Glitch item.book_secret.name=3-596-50802-9 +item.book_of_.name=Das Buch der item.burnt_bark.name=Verbrannte Rinde item.crystal_horn.name=Kristallhorn diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 579ac3df3..65434cbc8 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -1359,11 +1359,14 @@ item.ammo_20gauge_explosive.name=20 Gauge Buckshot (Explosive) item.ammo_20gauge_wither.name=20 Gauge Buckshot (Withering) item.ammo_5mm.name=5mm Round item.ammo_5mm_explosive.name=5mm Round (Explosive) +item.ammo_5mm_du.name=5mm Round (DU) item.ammo_50bmg.name=.50 BMG Round item.ammo_50bmg_incendiary.name=.50 BMG Round (Incendiary) item.ammo_50bmg_explosive.name=.50 BMG Round (Explosive) +item.ammo_50bmg_du.name=.50 BMG Round (DU) item.ammo_9mm.name=9mm Round item.ammo_9mm_ap.name=9mm Round (Armor Piercing) +item.ammo_9mm_du.name=9mm Round (DU) item.ammo_22lr.name=.22 LR Round item.ammo_22lr_ap.name=.22 LR Round (Armor Piercing) item.ammo_folly.name=Silver Bullet (Original) @@ -1371,6 +1374,7 @@ item.ammo_folly_nuclear.name=Silver Bullet (Nuclear) item.ammo_folly_du.name=Silver Bullet (DU, Non-Explosive) item.ammo_44.name=.44 Magnum Bullet item.ammo_44_ap.name=.44 Magnum Bullet (Armor Piercing) +item.ammo_44_du.name=.44 Magnum Bullet (DU) item.ammo_44_pip.name=.44 Magnum Bullet (Boxcar) item.ammo_44_bj.name=.44 Magnum Bullet (Boat) item.ammo_rocket.name=84mm Rocket @@ -1959,6 +1963,7 @@ item.letter.name=Express Mail item.polaroid.name=The Polaroid item.glitch.name=Glitch item.book_secret.name=3-596-50802-9 +item.book_of_.name=The Book of item.burnt_bark.name=Burnt Bark item.crystal_horn.name=Crystal Horn diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index 8df77013c..ca134c1eb 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -99,6 +99,7 @@ "weapon.follyBuzzer": {"category": "player", "sounds": [{"name": "weapon/follyBuzzer", "stream": false}]}, "weapon.follyAquired": {"category": "player", "sounds": [{"name": "weapon/follyAquiredAlt", "stream": false}]}, "weapon.follyFire": {"category": "player", "sounds": [{"name": "weapon/follyFire", "stream": false}]}, + "weapon.ricochet": {"category": "player", "sounds": ["weapon/ric1", "weapon/ric2", "weapon/ric3", "weapon/ric4", "weapon/ric5"]}, "weapon.reloadTurret": {"category": "player", "sounds": [{"name": "weapon/reloadTurret", "stream": false}]}, "weapon.switchmode1": {"category": "player", "sounds": [{"name": "weapon/switchmode1", "stream": false}]}, diff --git a/assets/hbm/sounds/weapon/ric1.ogg b/assets/hbm/sounds/weapon/ric1.ogg new file mode 100644 index 000000000..7897b8408 Binary files /dev/null and b/assets/hbm/sounds/weapon/ric1.ogg differ diff --git a/assets/hbm/sounds/weapon/ric2.ogg b/assets/hbm/sounds/weapon/ric2.ogg new file mode 100644 index 000000000..4506f5032 Binary files /dev/null and b/assets/hbm/sounds/weapon/ric2.ogg differ diff --git a/assets/hbm/sounds/weapon/ric3.ogg b/assets/hbm/sounds/weapon/ric3.ogg new file mode 100644 index 000000000..09ec853b6 Binary files /dev/null and b/assets/hbm/sounds/weapon/ric3.ogg differ diff --git a/assets/hbm/sounds/weapon/ric4.ogg b/assets/hbm/sounds/weapon/ric4.ogg new file mode 100644 index 000000000..08bcd7ff7 Binary files /dev/null and b/assets/hbm/sounds/weapon/ric4.ogg differ diff --git a/assets/hbm/sounds/weapon/ric5.ogg b/assets/hbm/sounds/weapon/ric5.ogg new file mode 100644 index 000000000..7830ce2fe Binary files /dev/null and b/assets/hbm/sounds/weapon/ric5.ogg differ diff --git a/assets/hbm/sounds/weapon/rocketFlame.ogg b/assets/hbm/sounds/weapon/rocketFlame.ogg new file mode 100644 index 000000000..066e8b666 Binary files /dev/null and b/assets/hbm/sounds/weapon/rocketFlame.ogg differ diff --git a/assets/hbm/textures/items/ammo_44_du.png b/assets/hbm/textures/items/ammo_44_du.png new file mode 100644 index 000000000..f1fa18816 Binary files /dev/null and b/assets/hbm/textures/items/ammo_44_du.png differ diff --git a/assets/hbm/textures/items/ammo_50bmg_du.png b/assets/hbm/textures/items/ammo_50bmg_du.png new file mode 100644 index 000000000..2702520cb Binary files /dev/null and b/assets/hbm/textures/items/ammo_50bmg_du.png differ diff --git a/assets/hbm/textures/items/ammo_5mm_du.png b/assets/hbm/textures/items/ammo_5mm_du.png new file mode 100644 index 000000000..dce156448 Binary files /dev/null and b/assets/hbm/textures/items/ammo_5mm_du.png differ diff --git a/assets/hbm/textures/items/ammo_9mm.png b/assets/hbm/textures/items/ammo_9mm.png index 879ea712a..1a4327e22 100644 Binary files a/assets/hbm/textures/items/ammo_9mm.png and b/assets/hbm/textures/items/ammo_9mm.png differ diff --git a/assets/hbm/textures/items/ammo_9mm_du.png b/assets/hbm/textures/items/ammo_9mm_du.png new file mode 100644 index 000000000..03f636cee Binary files /dev/null and b/assets/hbm/textures/items/ammo_9mm_du.png differ diff --git a/assets/hbm/textures/items/book_of_.png b/assets/hbm/textures/items/book_of_.png index 08da95df5..b2890e301 100644 Binary files a/assets/hbm/textures/items/book_of_.png and b/assets/hbm/textures/items/book_of_.png differ diff --git a/assets/hbm/textures/items/book_of_.png.mcmeta b/assets/hbm/textures/items/book_of_.png.mcmeta new file mode 100644 index 000000000..b84e69f2c --- /dev/null +++ b/assets/hbm/textures/items/book_of_.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 4 + } +} diff --git a/assets/hbm/textures/models/ModelRocket.png b/assets/hbm/textures/models/ModelRocket.png index 36835fb13..9ada99c32 100644 Binary files a/assets/hbm/textures/models/ModelRocket.png and b/assets/hbm/textures/models/ModelRocket.png differ diff --git a/assets/hbm/textures/models/ModelRocketEMP.png b/assets/hbm/textures/models/ModelRocketEMP.png new file mode 100644 index 000000000..5dcff98f2 Binary files /dev/null and b/assets/hbm/textures/models/ModelRocketEMP.png differ diff --git a/assets/hbm/textures/models/ModelRocketGlare.png b/assets/hbm/textures/models/ModelRocketGlare.png new file mode 100644 index 000000000..0a3c2aa52 Binary files /dev/null and b/assets/hbm/textures/models/ModelRocketGlare.png differ diff --git a/assets/hbm/textures/models/ModelRocketHE.png b/assets/hbm/textures/models/ModelRocketHE.png new file mode 100644 index 000000000..275146752 Binary files /dev/null and b/assets/hbm/textures/models/ModelRocketHE.png differ diff --git a/assets/hbm/textures/models/ModelRocketIncendiary.png b/assets/hbm/textures/models/ModelRocketIncendiary.png new file mode 100644 index 000000000..d85bb21cc Binary files /dev/null and b/assets/hbm/textures/models/ModelRocketIncendiary.png differ diff --git a/assets/hbm/textures/models/ModelRocketOld.png b/assets/hbm/textures/models/ModelRocketOld.png new file mode 100644 index 000000000..36835fb13 Binary files /dev/null and b/assets/hbm/textures/models/ModelRocketOld.png differ diff --git a/assets/hbm/textures/models/ModelRocketShrapnel.png b/assets/hbm/textures/models/ModelRocketShrapnel.png new file mode 100644 index 000000000..62fa9befd Binary files /dev/null and b/assets/hbm/textures/models/ModelRocketShrapnel.png differ diff --git a/assets/hbm/textures/models/ModelRocketSleek.png b/assets/hbm/textures/models/ModelRocketSleek.png new file mode 100644 index 000000000..cd8b70153 Binary files /dev/null and b/assets/hbm/textures/models/ModelRocketSleek.png differ diff --git a/com/hbm/entity/projectile/EntityBulletBase.java b/com/hbm/entity/projectile/EntityBulletBase.java index 730851b59..58abf562f 100644 --- a/com/hbm/entity/projectile/EntityBulletBase.java +++ b/com/hbm/entity/projectile/EntityBulletBase.java @@ -189,6 +189,8 @@ public class EntityBulletBase extends Entity implements IProjectile { } /// ZONE 2 END /// + + boolean didBounce = false; if (movement != null) { @@ -253,7 +255,7 @@ public class EntityBulletBase extends Entity implements IProjectile { double angle = Math.abs(VectorUtil.getCrossAngle(vel, face) - 90); - if(angle <= config.ricochetAngle) { + if(angle <= 10000) { switch(movement.sideHit) { case 0: case 1: @@ -265,7 +267,12 @@ public class EntityBulletBase extends Entity implements IProjectile { case 5: motionX *= -1; break; } - System.out.println(angle); + + if(config.plink == 1) + worldObj.playSoundAtEntity(this, "hbm:weapon.ricochet", 0.25F, 1.0F); + if(config.plink == 2) + worldObj.playSoundAtEntity(this, "hbm:weapon.gBounce", 1.0F, 1.0F); + } else { onBlockImpact(movement.blockX, movement.blockY, movement.blockZ); } @@ -273,6 +280,8 @@ public class EntityBulletBase extends Entity implements IProjectile { this.posX += (movement.hitVec.xCoord - this.posX) * 0.6; this.posY += (movement.hitVec.yCoord - this.posY) * 0.6; this.posZ += (movement.hitVec.zCoord - this.posZ) * 0.6; + + didBounce = true; } } } @@ -281,11 +290,13 @@ public class EntityBulletBase extends Entity implements IProjectile { /// ZONE 1 END /// + if(!didBounce) { motionY -= config.gravity; - this.posX += this.motionX * this.config.velocity; - this.posY += this.motionY * this.config.velocity; - this.posZ += this.motionZ * this.config.velocity; - this.setPosition(this.posX, this.posY, this.posZ); + this.posX += this.motionX * this.config.velocity; + this.posY += this.motionY * this.config.velocity; + this.posZ += this.motionZ * this.config.velocity; + this.setPosition(this.posX, this.posY, this.posZ); + } float f2; this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); @@ -307,6 +318,8 @@ public class EntityBulletBase extends Entity implements IProjectile { this.prevRotationYaw += 360.0F; } + if(this.ticksExisted > config.maxAge) + this.setDead(); //this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; //this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; @@ -426,6 +439,10 @@ public class EntityBulletBase extends Entity implements IProjectile { for(PotionEffect effect : config.effects) ((EntityLivingBase)e).addPotionEffect(effect); } + + if(config.instakill && e instanceof EntityLivingBase) { + ((EntityLivingBase)e).setHealth(0.0F); + } } @Override diff --git a/com/hbm/handler/BulletConfigFactory.java b/com/hbm/handler/BulletConfigFactory.java index 83fe8e8a0..0bd0d4cbb 100644 --- a/com/hbm/handler/BulletConfigFactory.java +++ b/com/hbm/handler/BulletConfigFactory.java @@ -1,6 +1,11 @@ package com.hbm.handler; +import java.util.ArrayList; + import com.hbm.items.ModItems; +import com.hbm.potion.HbmPotion; + +import net.minecraft.potion.PotionEffect; public class BulletConfigFactory { @@ -10,7 +15,7 @@ public class BulletConfigFactory { BulletConfiguration bullet = new BulletConfiguration(); - bullet.ammo = ModItems.gun_revolver_lead_ammo; + bullet.ammo = ModItems.gun_revolver_ammo; bullet.velocity = 5.0F; bullet.spread = 0.05F; bullet.dmgMin = 15; @@ -26,6 +31,7 @@ public class BulletConfigFactory { bullet.rainbow = 0; bullet.nuke = 0; bullet.boxcar = false; + bullet.boat = false; bullet.destroysBlocks = false; bullet.style = 0; bullet.plink = 1; @@ -33,5 +39,141 @@ public class BulletConfigFactory { return bullet; } + + /// STANDARD CONFIGS /// + //do not include damage or ammo + protected static BulletConfiguration standardBulletConfig() { + + BulletConfiguration bullet = new BulletConfiguration(); + + bullet.velocity = 5.0F; + bullet.spread = 0.005F; + bullet.gravity = 0D; + bullet.maxAge = 100; + bullet.doesRicochet = true; + bullet.ricochetAngle = 5; + bullet.doesPenetrate = true; + bullet.doesBreakGlass = true; + bullet.incendiary = 0; + bullet.emp = 0; + bullet.rainbow = 0; + bullet.nuke = 0; + bullet.boxcar = false; + bullet.boat = false; + bullet.destroysBlocks = false; + bullet.style = 0; + bullet.plink = 1; + bullet.instakill = false; + + return bullet; + } + + protected static BulletConfiguration standardBuckshotConfig() { + + BulletConfiguration bullet = new BulletConfiguration(); + + bullet.velocity = 5.0F; + bullet.spread = 0.05F; + bullet.gravity = 0D; + bullet.maxAge = 100; + bullet.doesRicochet = true; + bullet.ricochetAngle = 3; + bullet.doesPenetrate = false; + bullet.doesBreakGlass = true; + bullet.incendiary = 0; + bullet.emp = 0; + bullet.rainbow = 0; + bullet.nuke = 0; + bullet.boxcar = false; + bullet.boat = false; + bullet.destroysBlocks = false; + bullet.style = 0; + bullet.plink = 1; + bullet.instakill = false; + + return bullet; + } + + /// ADJUSTED CONFIGS /// + protected static BulletConfiguration getRevIronConfig() { + + BulletConfiguration bullet = standardBulletConfig(); + + bullet.ammo = ModItems.gun_revolver_iron_ammo; + bullet.dmgMin = 5; + bullet.dmgMax = 10; + + return bullet; + } + + protected static BulletConfiguration getRevSteelConfig() { + + BulletConfiguration bullet = standardBulletConfig(); + + bullet.ammo = ModItems.gun_revolver_ammo; + bullet.dmgMin = 10; + bullet.dmgMax = 20; + + return bullet; + } + + protected static BulletConfiguration getRevLeadConfig() { + + BulletConfiguration bullet = standardBulletConfig(); + + bullet.ammo = ModItems.gun_revolver_lead_ammo; + bullet.dmgMin = 5; + bullet.dmgMax = 10; + + bullet.effects = new ArrayList(); + bullet.effects.add(new PotionEffect(HbmPotion.radiation.id, 10 * 20, 4)); + + return bullet; + } + + protected static BulletConfiguration getRevGoldConfig() { + + BulletConfiguration bullet = standardBulletConfig(); + + bullet.ammo = ModItems.gun_revolver_gold_ammo; + bullet.dmgMin = 20; + bullet.dmgMax = 25; + + return bullet; + } + + protected static BulletConfiguration getRevSchrabidiumConfig() { + + BulletConfiguration bullet = standardBulletConfig(); + + bullet.ammo = ModItems.gun_revolver_schrabidium_ammo; + bullet.dmgMin = 10000; + bullet.dmgMax = 100000; + bullet.instakill = true; + + return bullet; + } + + protected static BulletConfiguration getRevCursedConfig() { + + BulletConfiguration bullet = standardBulletConfig(); + + bullet.ammo = ModItems.gun_revolver_cursed_ammo; + bullet.dmgMin = 25; + bullet.dmgMax = 35; + + return bullet; + } + + protected static BulletConfiguration getRevNightmareConfig() { + + BulletConfiguration bullet = standardBulletConfig(); + + bullet.ammo = ModItems.gun_revolver_nightmare_ammo; + bullet.dmgMin = 1; + bullet.dmgMax = 100; + + return bullet; + } } diff --git a/com/hbm/handler/BulletConfiguration.java b/com/hbm/handler/BulletConfiguration.java index d17e2236a..b5ac40d19 100644 --- a/com/hbm/handler/BulletConfiguration.java +++ b/com/hbm/handler/BulletConfiguration.java @@ -47,12 +47,29 @@ public class BulletConfiguration { public boolean boxcar; public boolean boat; public boolean destroysBlocks; + public boolean instakill; //appearance public int style; //additional appearance data, i.e. particle effects public int trail; - //0: no plinking, 1: bullet plink, 2: grenade plink, 3: sing boink + //ricochet sound type public int plink; + public static final int STYLE_NORMAL = 0; + public static final int STYLE_FLECHETTE = 1; + public static final int STYLE_PELLET = 2; + public static final int STYLE_BOLT = 3; + public static final int STYLE_FOLLY = 4; + public static final int STYLE_ROCKET = 5; + public static final int STYLE_STINGER = 6; + public static final int STYLE_NUKE = 7; + public static final int STYLE_MIRV = 8; + + public static final int PLINK_NONE = 0; + public static final int PLINK_BULLET = 1; + public static final int PLINK_GRENADE = 2; + public static final int PLINK_ENERGY = 3; + public static final int PLINK_SING = 4; + } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index b0c0bad0c..9b1418c66 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -818,17 +818,21 @@ public class ModItems { public static Item ammo_20gauge_wither; public static Item ammo_44; public static Item ammo_44_ap; + public static Item ammo_44_du; public static Item ammo_44_pip; public static Item ammo_44_bj; public static Item ammo_5mm; public static Item ammo_5mm_explosive; + public static Item ammo_5mm_du; public static Item ammo_9mm; public static Item ammo_9mm_ap; + public static Item ammo_9mm_du; public static Item ammo_22lr; public static Item ammo_22lr_ap; public static Item ammo_50bmg; public static Item ammo_50bmg_incendiary; public static Item ammo_50bmg_explosive; + public static Item ammo_50bmg_du; public static Item ammo_folly; public static Item ammo_folly_nuclear; public static Item ammo_folly_du; @@ -1396,6 +1400,7 @@ public class ModItems { public static Item glitch; public static Item letter; public static Item book_secret; + public static Item book_of_; public static Item burnt_bark; public static Item smoke1; @@ -2251,13 +2256,17 @@ public class ModItems { ammo_20gauge_wither = new Item().setUnlocalizedName("ammo_20gauge_wither").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge_wither"); ammo_5mm = new Item().setUnlocalizedName("ammo_5mm").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm"); ammo_5mm_explosive = new Item().setUnlocalizedName("ammo_5mm_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_explosive"); + ammo_5mm_du = new Item().setUnlocalizedName("ammo_5mm_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_du"); ammo_9mm = new Item().setUnlocalizedName("ammo_9mm").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm"); ammo_9mm_ap = new Item().setUnlocalizedName("ammo_9mm_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm_ap"); + ammo_9mm_du = new Item().setUnlocalizedName("ammo_9mm_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm_du"); ammo_50bmg = new Item().setUnlocalizedName("ammo_50bmg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg"); ammo_50bmg_incendiary = new Item().setUnlocalizedName("ammo_50bmg_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_incendiary"); ammo_50bmg_explosive = new Item().setUnlocalizedName("ammo_50bmg_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_explosive"); + ammo_50bmg_du = new Item().setUnlocalizedName("ammo_50bmg_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_du"); ammo_44 = new Item().setUnlocalizedName("ammo_44").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44"); ammo_44_ap = new Item().setUnlocalizedName("ammo_44_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_ap"); + ammo_44_du = new Item().setUnlocalizedName("ammo_44_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_du"); ammo_44_pip = new Item().setUnlocalizedName("ammo_44_pip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_pip"); ammo_44_bj = new Item().setUnlocalizedName("ammo_44_bj").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_bj"); ammo_22lr = new Item().setUnlocalizedName("ammo_22lr").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_22lr"); @@ -2851,6 +2860,7 @@ public class ModItems { glitch = new ItemGlitch().setUnlocalizedName("glitch").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":glitch_" + MainRegistry.polaroidID); letter = new ItemStarterKit().setUnlocalizedName("letter").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":letter"); book_secret = new ItemCustomLore().setUnlocalizedName("book_secret").setCreativeTab(MainRegistry.polaroidID == 11 ? MainRegistry.consumableTab : null).setTextureName(RefStrings.MODID + ":book_secret"); + book_of_ = new ItemCustomLore().setUnlocalizedName("book_of_").setCreativeTab(null).setTextureName(RefStrings.MODID + ":book_of_"); burnt_bark = new ItemCustomLore().setUnlocalizedName("burnt_bark").setCreativeTab(null).setTextureName(RefStrings.MODID + ":burnt_bark"); smoke1 = new Item().setUnlocalizedName("smoke1").setTextureName(RefStrings.MODID + ":smoke1"); @@ -3974,17 +3984,21 @@ public class ModItems { GameRegistry.registerItem(ammo_20gauge_wither, ammo_20gauge_wither.getUnlocalizedName()); GameRegistry.registerItem(ammo_44, ammo_44.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_ap, ammo_44_ap.getUnlocalizedName()); + GameRegistry.registerItem(ammo_44_du, ammo_44_du.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_pip, ammo_44_pip.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_bj, ammo_44_bj.getUnlocalizedName()); GameRegistry.registerItem(ammo_5mm, ammo_5mm.getUnlocalizedName()); GameRegistry.registerItem(ammo_5mm_explosive, ammo_5mm_explosive.getUnlocalizedName()); + GameRegistry.registerItem(ammo_5mm_du, ammo_5mm_du.getUnlocalizedName()); GameRegistry.registerItem(ammo_9mm, ammo_9mm.getUnlocalizedName()); GameRegistry.registerItem(ammo_9mm_ap, ammo_9mm_ap.getUnlocalizedName()); + GameRegistry.registerItem(ammo_9mm_du, ammo_9mm_du.getUnlocalizedName()); GameRegistry.registerItem(ammo_22lr, ammo_22lr.getUnlocalizedName()); GameRegistry.registerItem(ammo_22lr_ap, ammo_22lr_ap.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg, ammo_50bmg.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_incendiary, ammo_50bmg_incendiary.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_explosive, ammo_50bmg_explosive.getUnlocalizedName()); + GameRegistry.registerItem(ammo_50bmg_du, ammo_50bmg_du.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket, ammo_rocket.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_he, ammo_rocket_he.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_incendiary, ammo_rocket_incendiary.getUnlocalizedName()); @@ -4387,6 +4401,7 @@ public class ModItems { GameRegistry.registerItem(polaroid, polaroid.getUnlocalizedName()); GameRegistry.registerItem(glitch, glitch.getUnlocalizedName()); GameRegistry.registerItem(book_secret, book_secret.getUnlocalizedName()); + GameRegistry.registerItem(book_of_, book_of_.getUnlocalizedName()); GameRegistry.registerItem(burnt_bark, burnt_bark.getUnlocalizedName()); //Kits diff --git a/com/hbm/items/special/ItemCustomLore.java b/com/hbm/items/special/ItemCustomLore.java index 2ebb19d1b..cc823a653 100644 --- a/com/hbm/items/special/ItemCustomLore.java +++ b/com/hbm/items/special/ItemCustomLore.java @@ -680,6 +680,12 @@ public class ItemCustomLore extends Item { list.add("Explore the other side."); } } + + if(this == ModItems.book_of_) + { + list.add("Denn wer den Walzer richtig tritt,"); + list.add("der ist auch für den Abgang fit."); + } } @Override diff --git a/com/hbm/items/weapon/GunLeverAction.java b/com/hbm/items/weapon/GunLeverAction.java index b239062d9..bcddf5f70 100644 --- a/com/hbm/items/weapon/GunLeverAction.java +++ b/com/hbm/items/weapon/GunLeverAction.java @@ -5,6 +5,8 @@ import java.util.Random; import com.google.common.collect.Multimap; import com.hbm.entity.projectile.EntityBullet; +import com.hbm.entity.projectile.EntityBulletBase; +import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.items.ModItems; import net.minecraft.enchantment.Enchantment; @@ -67,59 +69,39 @@ public class GunLeverAction extends Item { if (j > 10.0F) { f = 10.0F; } - EntityBullet entityarrow1; - EntityBullet entityarrow2; - EntityBullet entityarrow3; - EntityBullet entityarrow4; - EntityBullet entityarrow5; - EntityBullet entityarrow6; - EntityBullet entityarrow7; - EntityBullet entityarrow8; - EntityBullet entityarrow9; - EntityBullet entityarrow10; + EntityBulletBase entityarrow1; + EntityBulletBase entityarrow2; + EntityBulletBase entityarrow3; + EntityBulletBase entityarrow4; + EntityBulletBase entityarrow5; + EntityBulletBase entityarrow6; + EntityBulletBase entityarrow7; + EntityBulletBase entityarrow8; + EntityBulletBase entityarrow9; + EntityBulletBase entityarrow10; if (!p_77615_3_.isSneaking()) { - entityarrow1 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F); - entityarrow1.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow2 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F); - entityarrow2.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow3 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F); - entityarrow3.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow4 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F); - entityarrow4.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow5 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F); - entityarrow5.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow6 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F); - entityarrow6.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow7 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F); - entityarrow7.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow8 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F); - entityarrow8.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow9 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F); - entityarrow9.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow10 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F); - entityarrow10.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); + entityarrow1 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow2 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow3 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow4 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow5 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow6 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow7 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow8 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow9 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow10 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); } else { - entityarrow1 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, false, false); - entityarrow1.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow2 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, false, false); - entityarrow2.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow3 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, false, false); - entityarrow3.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow4 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, false, false); - entityarrow4.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow5 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, false, false); - entityarrow5.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow6 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, false, false); - entityarrow6.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow7 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, false, false); - entityarrow7.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow8 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, false, false); - entityarrow8.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow9 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, false, false); - entityarrow9.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); - entityarrow10 = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, false, false); - entityarrow10.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); + entityarrow1 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow2 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow3 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow4 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow5 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow6 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow7 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow8 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow9 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); + entityarrow10 = new EntityBulletBase(p_77615_2_, BulletConfigSyncingUtil.TEST_CONFIG, p_77615_3_); } p_77615_1_.damageItem(1, p_77615_3_); diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 5d3f11918..cb6dc1bde 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -865,13 +865,17 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_shock, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_20gauge, 'A', "dustDiamond" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_wither, 4), new Object[] { "BCB", "CAC", "BCB", 'B', ModItems.ammo_20gauge, 'A', Blocks.soul_sand, 'C', "dustCoal" })); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_dura_steel }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_u238 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_pip, 1), new Object[] { " B ", "BAB", " B ", 'A', ModItems.ammo_44, 'B', ModItems.powder_magic }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_44_bj, 1), new Object[] { " C ", "BAB", " C ", 'A', ModItems.ammo_44, 'B', ModItems.powder_magic, 'C', "dustDesh" })); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_explosive, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_5mm, 'A', Blocks.tnt }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_5mm, 'A', ModItems.ingot_u238 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_9mm_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_9mm, 'A', ModItems.ingot_dura_steel }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_9mm_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_9mm, 'A', ModItems.ingot_u238 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_22lr_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_22lr, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_incendiary, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.powder_fire }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_explosive, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', Blocks.tnt }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.ingot_u238 }); GameRegistry.addRecipe(new ItemStack(ModItems.folly_bullet, 1), new Object[] { " S ", "STS", "SMS", 'S', ModItems.ingot_starmetal, 'T', ModItems.powder_magic, 'M', ModBlocks.block_meteor }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.folly_bullet_nuclear, 1), new Object[] { " N ", "UTU", "UTU", 'N', ModItems.gun_fatman_ammo, 'U', "ingotIron", 'T', "blockTungsten" })); diff --git a/com/hbm/main/NEIConfig.java b/com/hbm/main/NEIConfig.java index cb7c5ac18..348007d55 100644 --- a/com/hbm/main/NEIConfig.java +++ b/com/hbm/main/NEIConfig.java @@ -72,6 +72,7 @@ public class NEIConfig implements IConfigureNEI { //API.hideItem(new ItemStack(ModItems.rod_euphemium)); if(MainRegistry.polaroidID != 11) { API.hideItem(new ItemStack(ModItems.book_secret)); + API.hideItem(new ItemStack(ModItems.book_of_)); API.hideItem(new ItemStack(ModItems.burnt_bark)); API.hideItem(new ItemStack(ModItems.ams_core_thingy)); } diff --git a/com/hbm/render/entity/RenderBullet.java b/com/hbm/render/entity/RenderBullet.java index a8c968957..8fd3703dd 100644 --- a/com/hbm/render/entity/RenderBullet.java +++ b/com/hbm/render/entity/RenderBullet.java @@ -7,6 +7,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.entity.projectile.EntityBullet; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelBullet; +import com.hbm.render.model.ModelRocket; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; @@ -16,9 +17,11 @@ import net.minecraft.util.ResourceLocation; public class RenderBullet extends Render { private ModelBullet bullet; + private ModelRocket rocket; public RenderBullet() { bullet = new ModelBullet(); + rocket = new ModelRocket(); } @Override @@ -34,7 +37,7 @@ public class RenderBullet extends Render { GL11.glRotatef(new Random(bullet.getEntityId()).nextInt(360), 1.0F, 0.0F, 0.0F); - renderFlechette(); + renderDart(0.75F, 0.0F, 1.0F); GL11.glPopMatrix(); } @@ -52,6 +55,28 @@ public class RenderBullet extends Render { bullet.renderAll(0.0625F); } + private void renderRocket(int type) { + + switch(type) { + case 0: + bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocket.png")); break; + case 1: + bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocketHE.png")); break; + case 2: + bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocketIncendiary.png")); break; + case 3: + bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocketShrapnel.png")); break; + case 4: + bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocketEMP.png")); break; + case 5: + bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocketGlare.png")); break; + case 6: + bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocketSleek.png")); break; + } + + rocket.renderAll(0.0625F); + } + private void renderFlechette() { GL11.glPushMatrix(); GL11.glDisable(GL11.GL_TEXTURE_2D); diff --git a/com/hbm/render/model/ModelRocket.java b/com/hbm/render/model/ModelRocket.java index d27be67f4..78dbc2895 100644 --- a/com/hbm/render/model/ModelRocket.java +++ b/com/hbm/render/model/ModelRocket.java @@ -1,4 +1,4 @@ -// Date: 20.07.2015 22:08:24 +// Date: 20.01.2019 12:33:09 // Template version 1.1 // Java generated by Techne // Keep in mind that you still need to fill in some blanks @@ -12,38 +12,97 @@ import net.minecraft.entity.Entity; public class ModelRocket extends ModelBase { // fields + ModelRenderer Shape1; + ModelRenderer Shape2; + ModelRenderer Shape3; + ModelRenderer Shape4; + ModelRenderer Shape5; + ModelRenderer Shape6; ModelRenderer Shape7; ModelRenderer Shape8; ModelRenderer Shape9; public ModelRocket() { - textureWidth = 64; + textureWidth = 32; textureHeight = 32; - Shape7 = new ModelRenderer(this, 10, 0); - Shape7.addBox(0F, 0F, 0F, 1, 2, 2); - Shape7.setRotationPoint(-3F, -2F, -0.5F); - Shape7.setTextureSize(64, 32); + Shape1 = new ModelRenderer(this, 0, 0); + Shape1.addBox(0F, 0F, 0F, 7, 2, 2); + Shape1.setRotationPoint(0F, -1F, -1F); + Shape1.setTextureSize(32, 32); + Shape1.mirror = true; + setRotation(Shape1, 0F, 0F, 0F); + Shape2 = new ModelRenderer(this, 0, 4); + Shape2.addBox(0F, 0F, 0F, 3, 1, 1); + Shape2.setRotationPoint(-3F, -0.5F, -0.5F); + Shape2.setTextureSize(32, 32); + Shape2.mirror = true; + setRotation(Shape2, 0F, 0F, 0F); + Shape3 = new ModelRenderer(this, 8, 4); + Shape3.addBox(0F, 0F, 0F, 3, 1, 1); + Shape3.setRotationPoint(-3F, -0.5F, -0.5F); + Shape3.setTextureSize(32, 32); + Shape3.mirror = true; + setRotation(Shape3, 0F, 0.1745329F, 0F); + Shape4 = new ModelRenderer(this, 0, 6); + Shape4.addBox(0F, 0F, -1F, 3, 1, 1); + Shape4.setRotationPoint(-3F, -0.5F, 0.5F); + Shape4.setTextureSize(32, 32); + Shape4.mirror = true; + setRotation(Shape4, 0F, -0.1745329F, 0F); + Shape5 = new ModelRenderer(this, 8, 6); + Shape5.addBox(0F, 0F, 0F, 3, 1, 1); + Shape5.setRotationPoint(-3F, -0.5F, -0.5F); + Shape5.setTextureSize(32, 32); + Shape5.mirror = true; + setRotation(Shape5, 0F, 0F, -0.1745329F); + Shape6 = new ModelRenderer(this, 0, 8); + Shape6.addBox(0F, -1F, 0F, 3, 1, 1); + Shape6.setRotationPoint(-3F, 0.5F, -0.5F); + Shape6.setTextureSize(32, 32); + Shape6.mirror = true; + setRotation(Shape6, 0F, 0F, 0.1745329F); + Shape7 = new ModelRenderer(this, 0, 10); + Shape7.addBox(0F, 0F, 0F, 4, 4, 0); + Shape7.setRotationPoint(4F, 0F, 0F); + Shape7.setTextureSize(32, 32); Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0F); - Shape8 = new ModelRenderer(this, 0, 4); - Shape8.addBox(0F, 0F, 0F, 10, 1, 1); - Shape8.setRotationPoint(-8F, -1.5F, 0F); - Shape8.setTextureSize(64, 32); + setRotation(Shape7, 0F, 0F, -0.7853982F); + Shape8 = new ModelRenderer(this, 0, 14); + Shape8.addBox(0F, 0F, 0F, 4, 0, 4); + Shape8.setRotationPoint(4F, 0F, 0F); + Shape8.setTextureSize(32, 32); Shape8.mirror = true; - setRotation(Shape8, 0F, 0F, 0F); - Shape9 = new ModelRenderer(this, 0, 0); - Shape9.addBox(0F, 0F, 0F, 3, 2, 2); - Shape9.setRotationPoint(-6.5F, -2F, -0.5F); - Shape9.setTextureSize(64, 32); + setRotation(Shape8, 0F, 0.7853982F, 0F); + Shape9 = new ModelRenderer(this, 8, 8); + Shape9.addBox(0F, 0F, 0F, 1, 1, 1); + Shape9.setRotationPoint(7F, -0.5F, -0.5F); + Shape9.setTextureSize(32, 32); Shape9.mirror = true; setRotation(Shape9, 0F, 0F, 0F); } - @Override 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); + Shape1.render(f5); + Shape2.render(f5); + Shape3.render(f5); + Shape4.render(f5); + Shape5.render(f5); + Shape6.render(f5); + Shape7.render(f5); + Shape8.render(f5); + Shape9.render(f5); + } + + public void renderAll(float f5) { + Shape1.render(f5); + Shape2.render(f5); + Shape3.render(f5); + Shape4.render(f5); + Shape5.render(f5); + Shape6.render(f5); Shape7.render(f5); Shape8.render(f5); Shape9.render(f5); @@ -55,7 +114,6 @@ public class ModelRocket extends ModelBase { model.rotateAngleZ = z; } - @Override 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/render/model/ModelRocketOld.java b/com/hbm/render/model/ModelRocketOld.java new file mode 100644 index 000000000..a1c846d49 --- /dev/null +++ b/com/hbm/render/model/ModelRocketOld.java @@ -0,0 +1,63 @@ +// Date: 20.07.2015 22:08:24 +// Template version 1.1 +// Java generated by Techne +// Keep in mind that you still need to fill in some blanks +// - ZeuX + +package com.hbm.render.model; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelRocketOld extends ModelBase { + // fields + ModelRenderer Shape7; + ModelRenderer Shape8; + ModelRenderer Shape9; + + public ModelRocketOld() { + textureWidth = 64; + textureHeight = 32; + + Shape7 = new ModelRenderer(this, 10, 0); + Shape7.addBox(0F, 0F, 0F, 1, 2, 2); + Shape7.setRotationPoint(-3F, -2F, -0.5F); + Shape7.setTextureSize(64, 32); + Shape7.mirror = true; + setRotation(Shape7, 0F, 0F, 0F); + Shape8 = new ModelRenderer(this, 0, 4); + Shape8.addBox(0F, 0F, 0F, 10, 1, 1); + Shape8.setRotationPoint(-8F, -1.5F, 0F); + Shape8.setTextureSize(64, 32); + Shape8.mirror = true; + setRotation(Shape8, 0F, 0F, 0F); + Shape9 = new ModelRenderer(this, 0, 0); + Shape9.addBox(0F, 0F, 0F, 3, 2, 2); + Shape9.setRotationPoint(-6.5F, -2F, -0.5F); + Shape9.setTextureSize(64, 32); + Shape9.mirror = true; + setRotation(Shape9, 0F, 0F, 0F); + } + + @Override + 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); + Shape7.render(f5); + Shape8.render(f5); + Shape9.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + @Override + 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); + } + +}