diff --git a/changelog b/changelog index 90f5e2046..c4cb01488 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,6 @@ ## Changed * Any bullet that can ricochet (or at least runs the code for it) can now also break glass -* Removed the witch taunter achievement for being unobtainable now +* Removed three old achievements which no longer work due to the gun changes * AJR armor plating now uses niobium instead of saturnite, and yields twice as many items per recipe * Due to the gating change, the saturnite anvil now has a tier equivalent to a bronze anvil @@ -8,6 +8,8 @@ * Fixed 9mm soft points being called ".9mm" * Fixed missing localization for the hard plastic autogen material * Fixed the fat mine's crafting recipe still using the deprecated ammo item -* Removed legacy ammo items from all remaining item pools +* Removed legacy ammo items and guns from all remaining item pools * Fixed the rubber grip not having a recipe -* Fixed the coilgun and bolter not being classified correctly \ No newline at end of file +* Fixed the coilgun and bolter not being classified correctly +* Fixed new death messages not working +* Fixed none of the armors having fall resistance \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index ef7c244cd..70566e374 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1114,10 +1114,7 @@ public class ModBlocks { public static Block rail_large_buffer; public static Block rail_large_switch; public static Block rail_large_switch_flipped; - - public static Block statue_elb; - public static Block statue_elb_g; - public static Block statue_elb_w; + public static Block statue_elb_f; public static Block cheater_virus; @@ -2276,9 +2273,6 @@ public class ModBlocks { volcano_core = new BlockVolcano().setBlockName("volcano_core").setBlockUnbreakable().setResistance(10000.0F).setCreativeTab(MainRegistry.nukeTab).setBlockTextureName(RefStrings.MODID + ":volcano_core"); volcano_rad_core = new BlockVolcano().setBlockName("volcano_rad_core").setBlockUnbreakable().setResistance(10000.0F).setCreativeTab(MainRegistry.nukeTab).setBlockTextureName(RefStrings.MODID + ":volcano_rad_core"); - statue_elb = new DecoBlockAlt(Material.iron).setBlockName("#null").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY); - statue_elb_g = new DecoBlockAlt(Material.iron).setBlockName("#void").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY); - statue_elb_w = new DecoBlockAlt(Material.iron).setBlockName("#ngtv").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY); statue_elb_f = new DecoBlockAlt(Material.iron).setBlockName("#undef").setHardness(Float.POSITIVE_INFINITY).setLightLevel(1.0F).setResistance(Float.POSITIVE_INFINITY); mud_fluid = new MudFluid().setDensity(2500).setViscosity(3000).setLuminosity(5).setTemperature(2773).setUnlocalizedName("mud_fluid"); @@ -3389,9 +3383,6 @@ public class ModBlocks { GameRegistry.registerBlock(crate_jungle, crate_jungle.getUnlocalizedName()); //ElB - GameRegistry.registerBlock(statue_elb, statue_elb.getUnlocalizedName()); - GameRegistry.registerBlock(statue_elb_g, statue_elb_g.getUnlocalizedName()); - GameRegistry.registerBlock(statue_elb_w, statue_elb_w.getUnlocalizedName()); GameRegistry.registerBlock(statue_elb_f, statue_elb_f.getUnlocalizedName()); //Fluids diff --git a/src/main/java/com/hbm/blocks/generic/BlockCrate.java b/src/main/java/com/hbm/blocks/generic/BlockCrate.java index 0ea141491..a951b93e9 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockCrate.java +++ b/src/main/java/com/hbm/blocks/generic/BlockCrate.java @@ -59,19 +59,13 @@ public class BlockCrate extends BlockFalling { BlockCrate.addToListWithWeight(crateList, ModItems.ammo_container, 2); // Weapon Crate - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver, 9); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver_gold, 7); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver_cursed, 7); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_calamity, 3); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_rpg, 7); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_karl, 4); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_panzerschreck, 6); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_hk69, 8); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_mp40, 9); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_uzi_silencer, 5); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_uboinik, 8); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_lever_action, 7); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_bolt_action, 7); + BlockCrate.addToListWithWeight(weaponList, ModItems.gun_light_revolver, 10); + BlockCrate.addToListWithWeight(weaponList, ModItems.gun_maresleg, 7); + BlockCrate.addToListWithWeight(weaponList, ModItems.gun_heavy_revolver, 5); + BlockCrate.addToListWithWeight(weaponList, ModItems.gun_greasegun, 5); + BlockCrate.addToListWithWeight(weaponList, ModItems.gun_liberator, 2); + BlockCrate.addToListWithWeight(weaponList, ModItems.gun_flaregun, 8); + BlockCrate.addToListWithWeight(weaponList, ModItems.gun_panzerschreck, 1); // Lead Crate BlockCrate.addToListWithWeight(leadList, ModItems.ingot_uranium, 10); diff --git a/src/main/java/com/hbm/blocks/generic/DecoBlockAlt.java b/src/main/java/com/hbm/blocks/generic/DecoBlockAlt.java index 97bd5d391..980433dc0 100644 --- a/src/main/java/com/hbm/blocks/generic/DecoBlockAlt.java +++ b/src/main/java/com/hbm/blocks/generic/DecoBlockAlt.java @@ -1,14 +1,9 @@ package com.hbm.blocks.generic; -import java.util.ArrayList; - import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.deco.TileEntityDecoBlockAlt; import com.hbm.tileentity.deco.TileEntityDecoBlockAltF; -import com.hbm.tileentity.deco.TileEntityDecoBlockAltG; -import com.hbm.tileentity.deco.TileEntityDecoBlockAltW; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,7 +12,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -34,37 +28,14 @@ public class DecoBlockAlt extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - //this.blockIcon = iconRegister.registerIcon("stone"); this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":code"); } @Override public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - if(this == ModBlocks.statue_elb) - return new TileEntityDecoBlockAlt(); - if(this == ModBlocks.statue_elb_g) - return new TileEntityDecoBlockAltG(); - if(this == ModBlocks.statue_elb_w) - return new TileEntityDecoBlockAltW(); - if(this == ModBlocks.statue_elb_f) - return new TileEntityDecoBlockAltF(); + if(this == ModBlocks.statue_elb_f) return new TileEntityDecoBlockAltF(); return null; } - - @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) - { - ArrayList drops = new ArrayList(); - drops.add(new ItemStack(Item.getItemFromBlock(ModBlocks.statue_elb))); - if (this == ModBlocks.statue_elb_g || this == ModBlocks.statue_elb_f) - { - drops.add(new ItemStack(ModItems.gun_revolver_cursed, 1, 0)); - } - if (this == ModBlocks.statue_elb_w || this == ModBlocks.statue_elb_f) { - drops.add(new ItemStack(ModItems.watch, 1, 0)); - } - return drops; - } @Override public int getRenderType(){ @@ -84,89 +55,33 @@ public class DecoBlockAlt extends BlockContainer { @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - - if(i == 0) - { + + if(i == 0) { world.setBlockMetadataWithNotify(x, y, z, 2, 2); } - if(i == 1) - { + if(i == 1) { world.setBlockMetadataWithNotify(x, y, z, 5, 2); } - if(i == 2) - { + if(i == 2) { world.setBlockMetadataWithNotify(x, y, z, 3, 2); } - if(i == 3) - { + if(i == 3) { world.setBlockMetadataWithNotify(x, y, z, 4, 2); } } @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if(world.isRemote) - { + if(world.isRemote) { return true; - } else if(!player.isSneaking()) - { - if(player.getCurrentEquippedItem() != null) - { - if(this == ModBlocks.statue_elb) - { - if(player.getCurrentEquippedItem().getItem() == ModItems.gun_revolver_cursed) - { - world.setBlock(x, y, z, ModBlocks.statue_elb_g, world.getBlockMetadata(x, y, z), 2); - - if (!player.capabilities.isCreativeMode) - { - --player.getCurrentEquippedItem().stackSize; - } - return true; - } - - if(player.getCurrentEquippedItem().getItem() == ModItems.watch) - { - world.setBlock(x, y, z, ModBlocks.statue_elb_w, world.getBlockMetadata(x, y, z), 2); - - if (!player.capabilities.isCreativeMode) - { - --player.getCurrentEquippedItem().stackSize; - } - return true; - } - } - if(this == ModBlocks.statue_elb_g) - { - if(player.getCurrentEquippedItem().getItem() == ModItems.watch) - { - world.setBlock(x, y, z, ModBlocks.statue_elb_f, world.getBlockMetadata(x, y, z), 2); - - if (!player.capabilities.isCreativeMode) - { - --player.getCurrentEquippedItem().stackSize; - } - return true; - } - } - if(this == ModBlocks.statue_elb_w) - { - if(player.getCurrentEquippedItem().getItem() == ModItems.gun_revolver_cursed) - { - world.setBlock(x, y, z, ModBlocks.statue_elb_f, world.getBlockMetadata(x, y, z), 2); - - if (!player.capabilities.isCreativeMode) - { - --player.getCurrentEquippedItem().stackSize; - } - return true; - } - } + } else if(!player.isSneaking()) { + + if(player.getCurrentEquippedItem() != null) { boolean cracked = player.getHeldItem().getItem() == ModItems.key_red_cracked; + if((player.getHeldItem().getItem() == ModItems.key_red || cracked)) { if(cracked) player.getHeldItem().stackSize--; - world.func_147480_a(x, y, z, false); - this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + world.func_147480_a(x, y, z, true); return true; } } @@ -175,17 +90,15 @@ public class DecoBlockAlt extends BlockContainer { } @Override - public void setBlockBoundsBasedOnState(IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, int p_149719_4_) - { - float f = 0.0625F; - this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 8*f, 1.0F); - } - - @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - float f = 0.0625F; - this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 8*f, 1.0F); - return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ); + public void setBlockBoundsBasedOnState(IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, int p_149719_4_) { + float f = 0.0625F; + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 8 * f, 1.0F); } + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + float f = 0.0625F; + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 8 * f, 1.0F); + return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ); + } } diff --git a/src/main/java/com/hbm/commands/CommandReloadRecipes.java b/src/main/java/com/hbm/commands/CommandReloadRecipes.java index 6c8c83612..9068adb38 100644 --- a/src/main/java/com/hbm/commands/CommandReloadRecipes.java +++ b/src/main/java/com/hbm/commands/CommandReloadRecipes.java @@ -3,7 +3,6 @@ package com.hbm.commands; import com.hbm.config.ItemPoolConfigJSON; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.recipes.loader.SerializableRecipe; -import com.hbm.main.MainRegistry; import com.hbm.util.ChatBuilder; import com.hbm.util.DamageResistanceHandler; @@ -12,10 +11,6 @@ import net.minecraft.command.ICommandSender; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; -import java.io.File; - - - public class CommandReloadRecipes extends CommandBase { @Override @@ -34,7 +29,7 @@ public class CommandReloadRecipes extends CommandBase { SerializableRecipe.initialize(); ItemPoolConfigJSON.initialize(); DamageResistanceHandler.init(); - Fluids.reloadFluids(); + Fluids.reloadFluids(); sender.addChatMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "Reload complete :)")); } catch(Exception ex) { diff --git a/src/main/java/com/hbm/crafting/WeaponRecipes.java b/src/main/java/com/hbm/crafting/WeaponRecipes.java index bb739955c..1496381ee 100644 --- a/src/main/java/com/hbm/crafting/WeaponRecipes.java +++ b/src/main/java/com/hbm/crafting/WeaponRecipes.java @@ -195,7 +195,6 @@ public class WeaponRecipes { CraftingManager.addShapelessAuto(new ItemStack(ModItems.grenade_gascan, 1), new Object[] { Fluids.GASOLINE_LEADED.getDict(1000), Items.flint }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.grenade_gascan, 1), new Object[] { Fluids.BIOFUEL.getDict(1000), Items.flint }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.grenade_lemon, 1), new Object[] { ModItems.lemon, ModItems.grenade_strong }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.gun_moist_nugget, 12), new Object[] { Items.bread, Items.wheat, Items.cooked_chicken, Items.egg }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_smart, 4), new Object[] { " A ", "ACA", " A ", 'A', ModItems.grenade_strong, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP) }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_mirv, 1), new Object[] { "GGG", "GCG", "GGG", 'G', ModItems.grenade_smart, 'C', ModItems.grenade_generic }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_breach, 1), new Object[] { "G", "G", "P", 'G', ModItems.grenade_smart, 'P', BIGMT.plate() }); diff --git a/src/main/java/com/hbm/entity/EntityMappings.java b/src/main/java/com/hbm/entity/EntityMappings.java index 76c27234b..6e995ce01 100644 --- a/src/main/java/com/hbm/entity/EntityMappings.java +++ b/src/main/java/com/hbm/entity/EntityMappings.java @@ -109,7 +109,6 @@ public class EntityMappings { addEntity(EntityCloudFleijaRainbow.class, "entity_cloud_rainbow", 1000); addEntity(EntityExplosiveBeam.class, "entity_beam_bomb", 1000); addEntity(EntityAAShell.class, "entity_aa_shell", 1000); - addEntity(EntityRocketHoming.class, "entity_stinger", 1000); addEntity(EntityMissileTest.class, "entity_missile_test_mk2", 1000); addEntity(EntityMissileMicro.class, "entity_missile_micronuclear", 1000); addEntity(EntityCloudSolinium.class, "entity_cloud_rainbow", 1000); diff --git a/src/main/java/com/hbm/entity/logic/EntityBomber.java b/src/main/java/com/hbm/entity/logic/EntityBomber.java index 1fcb7bbb7..911a09e28 100644 --- a/src/main/java/com/hbm/entity/logic/EntityBomber.java +++ b/src/main/java/com/hbm/entity/logic/EntityBomber.java @@ -3,7 +3,6 @@ package com.hbm.entity.logic; import com.hbm.config.GeneralConfig; import com.hbm.entity.projectile.EntityBombletZeta; import com.hbm.entity.projectile.EntityBoxcar; -import com.hbm.entity.projectile.EntityRocketHoming; import com.hbm.explosion.ExplosionChaos; import com.hbm.interfaces.NotableComments; import com.hbm.main.MainRegistry; @@ -65,17 +64,6 @@ public class EntityBomber extends EntityPlaneBase { ExplosionChaos.spawnChlorine(worldObj, this.posX, this.posY - 1F, this.posZ, 10, 0.5, 3); } else if(type == 5) { - worldObj.playSoundEffect((double) (posX + 0.5F), (double) (posY + 0.5F), (double) (posZ + 0.5F), "hbm:weapon.missileTakeOff", 10.0F, 0.9F + rand.nextFloat() * 0.2F); - EntityRocketHoming rocket = new EntityRocketHoming(worldObj); - rocket.setIsCritical(true); - rocket.motionY = -1; - rocket.shootingEntity = this; - rocket.homingRadius = 50; - rocket.homingMod = 5; - rocket.posX = posX + rand.nextDouble() - 0.5; - rocket.posY = posY - rand.nextDouble(); - rocket.posZ = posZ + rand.nextDouble() - 0.5; - worldObj.spawnEntityInWorld(rocket); } else if(type == 6) { worldObj.playSoundEffect((double) (posX + 0.5F), (double) (posY + 0.5F), (double) (posZ + 0.5F), "hbm:weapon.missileTakeOff", 10.0F, 0.9F + rand.nextFloat() * 0.2F); diff --git a/src/main/java/com/hbm/entity/projectile/EntityRocket.java b/src/main/java/com/hbm/entity/projectile/EntityRocket.java index d46c15a82..a573b13dc 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityRocket.java +++ b/src/main/java/com/hbm/entity/projectile/EntityRocket.java @@ -24,6 +24,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; +// still in use for cluster munitions - somehow! let this fucking class die already public class EntityRocket extends Entity implements IProjectile { private int field_145791_d = -1; diff --git a/src/main/java/com/hbm/entity/projectile/EntityRocketHoming.java b/src/main/java/com/hbm/entity/projectile/EntityRocketHoming.java deleted file mode 100644 index c035c0833..000000000 --- a/src/main/java/com/hbm/entity/projectile/EntityRocketHoming.java +++ /dev/null @@ -1,750 +0,0 @@ -package com.hbm.entity.projectile; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionNukeSmall; -import com.hbm.handler.radiation.ChunkRadiationManager; -import com.hbm.items.ModItems; -import com.hbm.lib.Library; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.IProjectile; -import net.minecraft.entity.monster.EntityEnderman; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.S2BPacketChangeGameState; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; - -public class EntityRocketHoming extends Entity implements IProjectile -{ - private int field_145791_d = -1; - private int field_145792_e = -1; - private int field_145789_f = -1; - public double gravity = 0.0D; - private Block field_145790_g; - private int inData; - private boolean inGround; - public int canBePickedUp; - public int arrowShake; - public Entity shootingEntity; - private int ticksInGround; - private int ticksInAir; - private double damage = 2.0D; - private int knockbackStrength; - private float explosionStrength; - - // specifies the type of stinger rocket that was fired - /* 0 = Normal - * 1 = HE - * 2 = Incendiary - * 4 = Nuclear - * 42 = bone-seeking - */ - public int type; - - - public EntityRocketHoming(World p_i1753_1_) - { - super(p_i1753_1_); - this.renderDistanceWeight = 10.0D; - this.setSize(0.5F, 0.5F); - } - - public EntityRocketHoming(World p_i1754_1_, double p_i1754_2_, double p_i1754_4_, double p_i1754_6_) - { - super(p_i1754_1_); - this.renderDistanceWeight = 10.0D; - this.setSize(0.5F, 0.5F); - this.setPosition(p_i1754_2_, p_i1754_4_, p_i1754_6_); - this.yOffset = 0.0F; - } - - public EntityRocketHoming(World p_i1755_1_, EntityLivingBase p_i1755_2_, EntityLivingBase p_i1755_3_, float p_i1755_4_, float p_i1755_5_, int rocketType) - { - super(p_i1755_1_); - this.renderDistanceWeight = 10.0D; - this.shootingEntity = p_i1755_2_; - this.type = rocketType; - - if (p_i1755_2_ instanceof EntityPlayer) - { - this.canBePickedUp = 1; - } - - this.posY = p_i1755_2_.posY + p_i1755_2_.getEyeHeight() - 0.10000000149011612D; - double d0 = p_i1755_3_.posX - p_i1755_2_.posX; - double d1 = p_i1755_3_.boundingBox.minY + p_i1755_3_.height / 3.0F - this.posY; - double d2 = p_i1755_3_.posZ - p_i1755_2_.posZ; - double d3 = MathHelper.sqrt_double(d0 * d0 + d2 * d2); - - if (d3 >= 1.0E-7D) - { - float f2 = (float)(Math.atan2(d2, d0) * 180.0D / Math.PI) - 90.0F; - float f3 = (float)(-(Math.atan2(d1, d3) * 180.0D / Math.PI)); - double d4 = d0 / d3; - double d5 = d2 / d3; - this.setLocationAndAngles(p_i1755_2_.posX + d4, this.posY, p_i1755_2_.posZ + d5, f2, f3); - this.yOffset = 0.0F; - float f4 = (float)d3 * 0.2F; - this.setThrowableHeading(d0, d1 + f4, d2, p_i1755_4_, p_i1755_5_); - } - } - - public EntityRocketHoming(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_, float strength, int type) - { - super(p_i1756_1_); - this.renderDistanceWeight = 10.0D; - this.shootingEntity = p_i1756_2_; - this.type = type; - - if (p_i1756_2_ instanceof EntityPlayer) - { - this.canBePickedUp = 1; - } - - this.setSize(0.5F, 0.5F); - this.setLocationAndAngles(p_i1756_2_.posX, p_i1756_2_.posY + p_i1756_2_.getEyeHeight(), p_i1756_2_.posZ, p_i1756_2_.rotationYaw, p_i1756_2_.rotationPitch); - this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F; - this.posY -= 0.10000000149011612D; - this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F; - this.setPosition(this.posX, this.posY, this.posZ); - this.yOffset = 0.0F; - this.motionX = -MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI); - this.motionZ = MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI); - this.motionY = (-MathHelper.sin(this.rotationPitch / 180.0F * (float)Math.PI)); - this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, p_i1756_3_ * 1.5F, 1.0F); - this.explosionStrength = strength; - } - - public EntityRocketHoming(World world, int x, int y, int z, double mx, double my, double mz, double grav) { - super(world); - this.posX = x + 0.5F; - this.posY = y + 0.5F; - this.posZ = z + 0.5F; - - this.motionX = mx; - this.motionY = my; - this.motionZ = mz; - - this.gravity = grav; - } - - @Override - protected void entityInit() - { - this.dataWatcher.addObject(16, Byte.valueOf((byte)0)); - } - - /** - * Similar to setArrowHeading, it's point the throwable entity to a x, y, z direction. - */ - @Override - public void setThrowableHeading(double p_70186_1_, double p_70186_3_, double p_70186_5_, float p_70186_7_, float p_70186_8_) - { - float f2 = MathHelper.sqrt_double(p_70186_1_ * p_70186_1_ + p_70186_3_ * p_70186_3_ + p_70186_5_ * p_70186_5_); - p_70186_1_ /= f2; - p_70186_3_ /= f2; - p_70186_5_ /= f2; - p_70186_1_ += this.rand.nextGaussian() * (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * p_70186_8_; - p_70186_3_ += this.rand.nextGaussian() * (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * p_70186_8_; - p_70186_5_ += this.rand.nextGaussian() * (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * p_70186_8_; - p_70186_1_ *= p_70186_7_; - p_70186_3_ *= p_70186_7_; - p_70186_5_ *= p_70186_7_; - this.motionX = p_70186_1_; - this.motionY = p_70186_3_; - this.motionZ = p_70186_5_; - float f3 = MathHelper.sqrt_double(p_70186_1_ * p_70186_1_ + p_70186_5_ * p_70186_5_); - this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(p_70186_1_, p_70186_5_) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(p_70186_3_, f3) * 180.0D / Math.PI); - this.ticksInGround = 0; - } - - /** - * Sets the position and rotation. Only difference from the other one is no bounding on the rotation. Args: posX, - * posY, posZ, yaw, pitch - */ - @Override - @SideOnly(Side.CLIENT) - public void setPositionAndRotation2(double p_70056_1_, double p_70056_3_, double p_70056_5_, float p_70056_7_, float p_70056_8_, int p_70056_9_) - { - this.setPosition(p_70056_1_, p_70056_3_, p_70056_5_); - this.setRotation(p_70056_7_, p_70056_8_); - } - - /** - * Sets the velocity to the args. Args: x, y, z - */ - @Override - @SideOnly(Side.CLIENT) - public void setVelocity(double p_70016_1_, double p_70016_3_, double p_70016_5_) - { - this.motionX = p_70016_1_; - this.motionY = p_70016_3_; - this.motionZ = p_70016_5_; - - if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) - { - float f = MathHelper.sqrt_double(p_70016_1_ * p_70016_1_ + p_70016_5_ * p_70016_5_); - this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(p_70016_1_, p_70016_5_) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(p_70016_3_, f) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch; - this.prevRotationYaw = this.rotationYaw; - this.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch); - this.ticksInGround = 0; - } - } - - /** - * Called to update the entity's position/logic. - */ - //@Override - @Override - public void onUpdate() - { - super.onUpdate(); - - if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) - { - MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); - } - - Block block = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); - - if (block.getMaterial() != Material.air) - { - block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - - if (axisalignedbb != null && axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) - { - this.inGround = true; - } - } - - if (this.arrowShake > 0) - { - --this.arrowShake; - } - - if (this.inGround) - { - /*int j = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f); - if (block == this.field_145790_g && j == this.inData) - { - ++this.ticksInGround; - if (this.ticksInGround == 1200) - { - this.setDead(); - } - } - else - { - this.inGround = false; - this.motionX *= (double)(this.rand.nextFloat() * 0.2F); - this.motionY *= (double)(this.rand.nextFloat() * 0.2F); - this.motionZ *= (double)(this.rand.nextFloat() * 0.2F); - this.ticksInGround = 0; - this.ticksInAir = 0; - }*/ - - - if (!this.worldObj.isRemote) - { - //this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.5F, true); - Explode(this.type, this.explosionStrength); - /*EntityNukeExplosionAdvanced explosion = new EntityNukeExplosionAdvanced(this.worldObj); - explosion.speed = 25; - explosion.coefficient = 5.0F; - explosion.destructionRange = 20; - explosion.posX = this.posX; - explosion.posY = this.posY; - explosion.posZ = this.posZ; - this.worldObj.spawnEntityInWorld(explosion);*/ - } - this.setDead(); - } - else - { - ++this.ticksInAir; - Vec3 vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - Vec3 vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec31, vec3, false, true, false); - vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - - if (movingobjectposition != null) - { - vec3 = Vec3.createVectorHelper(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); - } - - Entity entity = null; - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); - double d0 = 0.0D; - int i; - float f1; - - for (i = 0; i < list.size(); ++i) - { - Entity entity1 = (Entity)list.get(i); - - if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5)) - { - f1 = 0.3F; - AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand(f1, f1, f1); - MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec31, vec3); - - if (movingobjectposition1 != null) - { - double d1 = vec31.distanceTo(movingobjectposition1.hitVec); - - if (d1 < d0 || d0 == 0.0D) - { - entity = entity1; - d0 = d1; - } - } - } - } - - - if (entity != null) - { - movingobjectposition = new MovingObjectPosition(entity); - } - - if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer) - { - EntityPlayer entityplayer = (EntityPlayer)movingobjectposition.entityHit; - - if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer)this.shootingEntity).canAttackPlayer(entityplayer)) - { - movingobjectposition = null; - } - } - - float f2; - float f4; - - if (movingobjectposition != null) - { - if (movingobjectposition.entityHit != null) - { - f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - int k = MathHelper.ceiling_double_int(f2 * this.damage); - - if (this.getIsCritical()) - { - k += this.rand.nextInt(k / 2 + 2); - } - - DamageSource damagesource = null; - - if (this.shootingEntity == null) - { - damagesource = DamageSource.causeIndirectMagicDamage(this, this); - } - else - { - damagesource = DamageSource.causeIndirectMagicDamage(this, this); - } - - if (this.isBurning() && !(movingobjectposition.entityHit instanceof EntityEnderman)) - { - movingobjectposition.entityHit.setFire(5); - } - - if (movingobjectposition.entityHit.attackEntityFrom(damagesource, k)) - { - if (movingobjectposition.entityHit instanceof EntityLivingBase) - { - EntityLivingBase entitylivingbase = (EntityLivingBase)movingobjectposition.entityHit; - - if (this.knockbackStrength > 0) - { - f4 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - - if (f4 > 0.0F) - { - movingobjectposition.entityHit.addVelocity(this.motionX * this.knockbackStrength * 0.6000000238418579D / f4, 0.1D, this.motionZ * this.knockbackStrength * 0.6000000238418579D / f4); - } - } - - if (this.shootingEntity != null && this.shootingEntity instanceof EntityLivingBase) - { - EnchantmentHelper.func_151384_a(entitylivingbase, this.shootingEntity); - EnchantmentHelper.func_151385_b((EntityLivingBase)this.shootingEntity, entitylivingbase); - } - - if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP) - { - ((EntityPlayerMP)this.shootingEntity).playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0.0F)); - } - } - - if (!(movingobjectposition.entityHit instanceof EntityEnderman)) - { - if (!this.worldObj.isRemote) - { - //this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.5F, true); - Explode(this.type, this.explosionStrength); - } - this.setDead(); - } - } - else - { - if (!this.worldObj.isRemote) - { - //this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.5F, true); - Explode(this.type, this.explosionStrength); - } - this.setDead(); - } - } - else - { - this.field_145791_d = movingobjectposition.blockX; - this.field_145792_e = movingobjectposition.blockY; - this.field_145789_f = movingobjectposition.blockZ; - this.field_145790_g = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); - this.inData = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f); - this.motionX = ((float)(movingobjectposition.hitVec.xCoord - this.posX)); - this.motionY = ((float)(movingobjectposition.hitVec.yCoord - this.posY)); - this.motionZ = ((float)(movingobjectposition.hitVec.zCoord - this.posZ)); - f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - this.posX -= this.motionX / f2 * 0.05000000074505806D; - this.posY -= this.motionY / f2 * 0.05000000074505806D; - this.posZ -= this.motionZ / f2 * 0.05000000074505806D; - this.inGround = true; - this.arrowShake = 7; - this.setIsCritical(false); - - if (this.field_145790_g.getMaterial() != Material.air) - { - this.field_145790_g.onEntityCollidedWithBlock(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this); - } - } - } - - this.posX += this.motionX; - this.posY += this.motionY; - this.posZ += this.motionZ; - f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - - //for (this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f2) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) - { - ; - } - - /*while (this.rotationPitch - this.prevRotationPitch >= 180.0F) - { - this.prevRotationPitch += 360.0F; - } - while (this.rotationYaw - this.prevRotationYaw < -180.0F) - { - this.prevRotationYaw -= 360.0F; - } - while (this.rotationYaw - this.prevRotationYaw >= 180.0F) - { - this.prevRotationYaw += 360.0F; - }*/ - - f1 = 0.05F; - - if (this.isInWater()) - { - for (int l = 0; l < 4; ++l) - { - f4 = 0.25F; - this.worldObj.spawnParticle("bubble", this.posX - this.motionX * f4, this.posY - this.motionY * f4, this.posZ - this.motionZ * f4, this.motionX, this.motionY, this.motionZ); - } - } - - if (this.isWet()) - { - this.extinguish(); - } - - /*this.motionX *= f3; - this.motionY *= f3; - this.motionZ *= f3;*/ - //this.motionY -= gravity; - this.setPosition(this.posX, this.posY, this.posZ); - this.func_145775_I(); - } - - if(!steer()) - lockonTicks = 0; - - if (this.ticksExisted > 250) - this.setDead(); - } - - public int homingRadius = 35; - public int homingMod = 15; - public float acceptance = 120; - int lockonTicks = 0; - boolean hasBeeped = false; - - private boolean steer() { - List all = null; - if(this.type == 42) { - all = worldObj.getEntitiesWithinAABB(EntitySkeleton.class, AxisAlignedBB.getBoundingBox(posX - homingRadius, posY - homingRadius, posZ - homingRadius, posX + homingRadius, posY + homingRadius, posZ + homingRadius)); - } else { - all = worldObj.getEntitiesWithinAABBExcludingEntity(this, AxisAlignedBB.getBoundingBox(posX - homingRadius, posY - homingRadius, posZ - homingRadius, posX + homingRadius, posY + homingRadius, posZ + homingRadius)); - } - - HashMap targetable = new HashMap(); - Vec3 path = Vec3.createVectorHelper(motionX, motionY, motionZ); - double startSpeed = path.lengthVector(); - path.normalize(); - - if(all.isEmpty()) - return false; - - //Iterate through all entities and only allocate ones that can be targeted - for(Entity e : all) { - - if(e == this.shootingEntity) - continue; - - Vec3 rel = Vec3.createVectorHelper(e.posX - posX, e.posY + e.getEyeHeight() - posY, e.posZ - posZ); - double vecProd = rel.xCoord * path.xCoord + rel.yCoord * path.yCoord + rel.zCoord * path.zCoord; - double bot = rel.lengthVector() * path.lengthVector(); - double angle = Math.acos(vecProd / bot) * 180 / Math.PI; - - if(angle <= acceptance); - if(e.height * e.width * e.width >= 0.5D) - if(!Library.isObstructed(worldObj, e.posX, e.posY, e.posZ, posX, posY, posZ)) - targetable.put(e, angle); - } - - if(targetable.isEmpty()) - return false; - - double smallest = Double.POSITIVE_INFINITY; - Entity nearestE = null; - - //Iterate through all entities and choose the one that has the smallest angle - for(Map.Entry entry : targetable.entrySet()) { - if(entry.getValue() < smallest) { - smallest = entry.getValue(); - nearestE = entry.getKey(); - } - } - - if(nearestE == null) - return false; - - Vec3 winVec = Vec3.createVectorHelper(nearestE.posX - posX, nearestE.posY - posY, nearestE.posZ - posZ); - - winVec.normalize(); - - double newX = ((path.xCoord * (smallest * homingMod - 1)) + winVec.xCoord) / (smallest * homingMod); - double newY = ((path.yCoord * (smallest * homingMod - 1)) + winVec.yCoord) / (smallest * homingMod); - double newZ = ((path.zCoord * (smallest * homingMod - 1)) + winVec.zCoord) / (smallest * homingMod); - - Vec3 newPath = Vec3.createVectorHelper(newX, newY, newZ); - newPath.normalize(); - newPath.xCoord *= startSpeed; - newPath.yCoord *= startSpeed; - newPath.zCoord *= startSpeed; - - motionX = newPath.xCoord; - motionY = newPath.yCoord; - motionZ = newPath.zCoord; - this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, (float)startSpeed, 0.0F); - - lockonTicks++; - if(lockonTicks == 5 && !hasBeeped) { - if(this.getIsCritical()) - worldObj.playSoundAtEntity(this, "hbm:weapon.stingerLockOn", 10F, 0.75F); - else - worldObj.playSoundAtEntity(this, "hbm:weapon.stingerLockOn", 10F, 1F); - hasBeeped = true; - } - - return true; - } - - /** - * (abstract) Protected helper method to write subclass entity data to NBT. - */ - @Override - public void writeEntityToNBT(NBTTagCompound p_70014_1_) - { - p_70014_1_.setShort("xTile", (short)this.field_145791_d); - p_70014_1_.setShort("yTile", (short)this.field_145792_e); - p_70014_1_.setShort("zTile", (short)this.field_145789_f); - p_70014_1_.setShort("life", (short)this.ticksInGround); - p_70014_1_.setByte("inTile", (byte)Block.getIdFromBlock(this.field_145790_g)); - p_70014_1_.setByte("inData", (byte)this.inData); - p_70014_1_.setByte("shake", (byte)this.arrowShake); - p_70014_1_.setByte("inGround", (byte)(this.inGround ? 1 : 0)); - p_70014_1_.setByte("pickup", (byte)this.canBePickedUp); - p_70014_1_.setDouble("damage", this.damage); - p_70014_1_.setFloat("strength", (byte)this.explosionStrength); - p_70014_1_.setByte("type", (byte)this.type); - } - - /** - * (abstract) Protected helper method to read subclass entity data from NBT. - */ - @Override - public void readEntityFromNBT(NBTTagCompound p_70037_1_) - { - this.field_145791_d = p_70037_1_.getShort("xTile"); - this.field_145792_e = p_70037_1_.getShort("yTile"); - this.field_145789_f = p_70037_1_.getShort("zTile"); - this.ticksInGround = p_70037_1_.getShort("life"); - this.field_145790_g = Block.getBlockById(p_70037_1_.getByte("inTile") & 255); - this.inData = p_70037_1_.getByte("inData") & 255; - this.arrowShake = p_70037_1_.getByte("shake") & 255; - this.inGround = p_70037_1_.getByte("inGround") == 1; - this.explosionStrength = p_70037_1_.getFloat("strength"); - this.type = p_70037_1_.getByte("type"); - - if (p_70037_1_.hasKey("damage", 99)) - { - this.damage = p_70037_1_.getDouble("damage"); - } - - if (p_70037_1_.hasKey("pickup", 99)) - { - this.canBePickedUp = p_70037_1_.getByte("pickup"); - } - else if (p_70037_1_.hasKey("player", 99)) - { - this.canBePickedUp = p_70037_1_.getBoolean("player") ? 1 : 0; - } - } - - /** - * Called by a player entity when they collide with an entity - */ - @Override - public void onCollideWithPlayer(EntityPlayer p_70100_1_) - { - if (!this.worldObj.isRemote && this.inGround && this.arrowShake <= 0) - { - boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && p_70100_1_.capabilities.isCreativeMode; - - if (this.canBePickedUp == 1 && !p_70100_1_.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_stinger_rocket, 1))) - { - flag = false; - } - - if (flag) - { - p_70100_1_.onItemPickup(this, 1); - this.setDead(); - } - } - } - - /** - * returns if this entity triggers Block.onEntityWalking on the blocks they walk on. used for spiders and wolves to - * prevent them from trampling crops - */ - @Override - protected boolean canTriggerWalking() - { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public float getShadowSize() - { - return 0.0F; - } - - public void setDamage(double p_70239_1_) - { - this.damage = p_70239_1_; - } - - public double getDamage() - { - return this.damage; - } - - /** - * Sets the amount of knockback the arrow applies when it hits a mob. - */ - public void setKnockbackStrength(int p_70240_1_) - { - this.knockbackStrength = p_70240_1_; - } - - /** - * If returns false, the item will not inflict any damage against entities. - */ - @Override - public boolean canAttackWithItem() - { - return false; - } - - /** - * Whether the arrow has a stream of critical hit particles flying behind it. - */ - public void setIsCritical(boolean p_70243_1_) - { - byte b0 = this.dataWatcher.getWatchableObjectByte(16); - - if (p_70243_1_) - { - this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 | 1))); - } - else - { - this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 & -2))); - } - } - - /** - * Whether the arrow has a stream of critical hit particles flying behind it. - */ - public boolean getIsCritical() - { - byte b0 = this.dataWatcher.getWatchableObjectByte(16); - return (b0 & 1) != 0; - } - - public void Explode(int type, float strength) { - switch(type) { - case 42: ChunkRadiationManager.proxy.incrementRad(worldObj, (int)posX, (int)posY, (int)posZ, 2000); - case 0: ExplosionLarge.explode(worldObj, posX, posY, posZ, strength, true, false, true); break; - case 1: ExplosionLarge.explode(worldObj, posX, posY, posZ, strength * 2, true, false, true); break; - case 2: ExplosionLarge.explodeFire(worldObj, posX, posY, posZ, strength, true, false, false); break; - case 4: - //ExplosionLarge.explode(worldObj, posX, posY, posZ, strength * 3, false, false, true); - ExplosionNukeSmall.explode(worldObj, posX, posY, posZ, ExplosionNukeSmall.PARAMS_MEDIUM); - break; - default: break; - } - } -} \ No newline at end of file diff --git a/src/main/java/com/hbm/explosion/ExplosionChaos.java b/src/main/java/com/hbm/explosion/ExplosionChaos.java index ded0a8193..e17620e64 100644 --- a/src/main/java/com/hbm/explosion/ExplosionChaos.java +++ b/src/main/java/com/hbm/explosion/ExplosionChaos.java @@ -751,10 +751,7 @@ public class ExplosionChaos { int Z = zz + z; int ZZ = YY + zz * zz; if (ZZ < r22 + world.rand.nextInt(r22 / 2)) { - if (world.getBlock(X, Y, Z) != Blocks.bedrock && world.getBlock(X, Y, Z) != ModBlocks.statue_elb - && world.getBlock(X, Y, Z) != ModBlocks.statue_elb_g - && world.getBlock(X, Y, Z) != ModBlocks.statue_elb_w - && world.getBlock(X, Y, Z) != ModBlocks.statue_elb_f) + if(world.getBlock(X, Y, Z) != ModBlocks.statue_elb_f) world.setBlock(X, Y, Z, ModBlocks.plasma); } } diff --git a/src/main/java/com/hbm/handler/BulletConfigSyncingUtil.java b/src/main/java/com/hbm/handler/BulletConfigSyncingUtil.java index 29aaf510e..d5e3a24d8 100644 --- a/src/main/java/com/hbm/handler/BulletConfigSyncingUtil.java +++ b/src/main/java/com/hbm/handler/BulletConfigSyncingUtil.java @@ -228,12 +228,6 @@ public class BulletConfigSyncingUtil { public static int ROCKET_TOXIC_LASER = i++; public static int ROCKET_PHOSPHORUS_LASER = i++; - public static int ROCKET_STINGER = i++; - public static int ROCKET_STINGER_HE = i++; - public static int ROCKET_STINGER_INCENDIARY = i++; - public static int ROCKET_STINGER_NUCLEAR = i++; - public static int ROCKET_STINGER_BONES = i++; - public static int SHELL_NORMAL = i++; public static int SHELL_EXPLOSIVE = i++; public static int SHELL_AP = i++; @@ -348,12 +342,6 @@ public class BulletConfigSyncingUtil { configSet.put(ROCKET_TOXIC, GunRocketFactory.getRocketChlorineConfig()); configSet.put(ROCKET_CANISTER, GunRocketFactory.getRocketCanisterConfig()); configSet.put(ROCKET_ERROR, GunRocketFactory.getRocketErrorConfig()); - - configSet.put(ROCKET_STINGER, GunRocketHomingFactory.getRocketStingerConfig()); - configSet.put(ROCKET_STINGER_HE, GunRocketHomingFactory.getRocketStingerHEConfig()); - configSet.put(ROCKET_STINGER_INCENDIARY, GunRocketHomingFactory.getRocketStingerIncendiaryConfig()); - configSet.put(ROCKET_STINGER_NUCLEAR, GunRocketHomingFactory.getRocketStingerNuclearConfig()); - configSet.put(ROCKET_STINGER_BONES, GunRocketHomingFactory.getRocketStingerBonesConfig()); configSet.put(GRENADE_NORMAL, GunGrenadeFactory.getGrenadeConfig()); configSet.put(GRENADE_HE, GunGrenadeFactory.getGrenadeHEConfig()); diff --git a/src/main/java/com/hbm/handler/guncfg/GunRocketHomingFactory.java b/src/main/java/com/hbm/handler/guncfg/GunRocketHomingFactory.java deleted file mode 100644 index 27603435a..000000000 --- a/src/main/java/com/hbm/handler/guncfg/GunRocketHomingFactory.java +++ /dev/null @@ -1,257 +0,0 @@ -package com.hbm.handler.guncfg; - -import java.util.ArrayList; - -import com.hbm.entity.projectile.EntityRocketHoming; -import com.hbm.handler.BulletConfigSyncingUtil; -import com.hbm.handler.BulletConfiguration; -import com.hbm.handler.GunConfiguration; -import com.hbm.inventory.RecipesCommon.ComparableStack; -import com.hbm.items.ItemAmmoEnums.AmmoStinger; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.sedna.Crosshair; -import com.hbm.lib.HbmCollection.EnumGunManufacturer; -import net.minecraft.entity.player.EntityPlayer; - -public class GunRocketHomingFactory { - - public static GunConfiguration getStingerConfig() { - - GunConfiguration config = new GunConfiguration(); - - config.rateOfFire = 20; - config.roundsPerCycle = 1; - config.gunMode = GunConfiguration.MODE_NORMAL; - config.firingMode = GunConfiguration.FIRE_MANUAL; - config.reloadDuration = 20; - config.firingDuration = 0; - config.ammoCap = 1; - config.reloadType = GunConfiguration.RELOAD_SINGLE; - config.allowsInfinity = true; - config.crosshair = Crosshair.L_KRUCK; - config.firingSound = "hbm:weapon.rpgShoot"; - config.reloadSound = GunConfiguration.RSOUND_LAUNCHER; - config.reloadSoundEnd = false; - - config.name = "stinger"; - config.manufacturer = EnumGunManufacturer.RAYTHEON; - config.comment.add("Woosh, beep-beep-beep!"); - - config.config = new ArrayList(); - config.config.add(BulletConfigSyncingUtil.ROCKET_STINGER); - config.config.add(BulletConfigSyncingUtil.ROCKET_STINGER_HE); - config.config.add(BulletConfigSyncingUtil.ROCKET_STINGER_INCENDIARY); - config.config.add(BulletConfigSyncingUtil.ROCKET_STINGER_NUCLEAR); - config.config.add(BulletConfigSyncingUtil.ROCKET_STINGER_BONES); - config.durability = 250; - - return config; - } - - public static GunConfiguration getSkyStingerConfig() { -GunConfiguration config = new GunConfiguration(); - - config.rateOfFire = 20; - config.roundsPerCycle = 1; - config.gunMode = GunConfiguration.MODE_NORMAL; - config.firingMode = GunConfiguration.FIRE_MANUAL; - config.reloadDuration = 20; - config.firingDuration = 0; - config.ammoCap = 1; - config.reloadType = GunConfiguration.RELOAD_SINGLE; - config.allowsInfinity = true; - config.crosshair = Crosshair.L_KRUCK; - config.firingSound = "hbm:weapon.rpgShoot"; - config.reloadSound = GunConfiguration.RSOUND_LAUNCHER; - config.reloadSoundEnd = false; - - config.name = "stingerOneSky"; - config.manufacturer = EnumGunManufacturer.EQUESTRIA; - config.comment.add("Oh, I get it, because of the...nyeees!"); - config.comment.add("It all makes sense now!"); - config.comment.add(""); - config.comment.add("Rockets travel faster, are Three times stronger"); - config.comment.add("and fires a second rocket for free"); - config.comment.add(""); - config.comment.add("[LEGENDARY WEAPON]"); - - config.config = new ArrayList(); - config.config.add(BulletConfigSyncingUtil.ROCKET_STINGER); - config.config.add(BulletConfigSyncingUtil.ROCKET_STINGER_HE); - config.config.add(BulletConfigSyncingUtil.ROCKET_STINGER_INCENDIARY); - config.config.add(BulletConfigSyncingUtil.ROCKET_STINGER_NUCLEAR); - config.config.add(BulletConfigSyncingUtil.ROCKET_STINGER_BONES); - config.durability = 1000; - - return config; - } - - public static BulletConfiguration getRocketStingerConfig() { - BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - - bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket.stackFromEnum(AmmoStinger.STOCK)); - bullet.dmgMin = 20; - bullet.dmgMax = 25; - bullet.explosive = 4F; - bullet.trail = 0; - - bullet.bntUpdate = (bulletnt) -> { - - if(!bulletnt.worldObj.isRemote) { - - EntityPlayer player = bulletnt.worldObj.getClosestPlayerToEntity(bulletnt, -1.0D); - EntityRocketHoming rocket = new EntityRocketHoming(bulletnt.worldObj, player, 1.0F, 5.0F, 0); - if(player.getHeldItem().getItem() == ModItems.gun_skystinger && !player.isSneaking()) { - EntityRocketHoming rocket2 = new EntityRocketHoming(bulletnt.worldObj, player, 1.5F, 15.0F, 0); - rocket = new EntityRocketHoming(bulletnt.worldObj, player, 1.5F, 15.0F, 0); - rocket.setIsCritical(true); - rocket2.setIsCritical(true); - bulletnt.worldObj.spawnEntityInWorld(rocket2); - } - rocket.homingMod = 5; - rocket.homingRadius = 25; - bulletnt.worldObj.spawnEntityInWorld(rocket); - bulletnt.setDead(); - - } - }; - return bullet; - } - - public static BulletConfiguration getRocketStingerHEConfig() { - BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - - bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket.stackFromEnum(AmmoStinger.HE)); - bullet.dmgMin = 30; - bullet.dmgMax = 35; - bullet.explosive = 8F; - bullet.trail = 0; - bullet.wear = 15; - - bullet.bntUpdate = (bulletnt) -> { - - if(!bulletnt.worldObj.isRemote) { - - EntityPlayer player = bulletnt.worldObj.getClosestPlayerToEntity(bulletnt, -1.0D); - EntityRocketHoming rocket = new EntityRocketHoming(bulletnt.worldObj, player, 1.0F, 5.0F, 1); - if(player.getHeldItem().getItem() == ModItems.gun_skystinger && !player.isSneaking()) { - EntityRocketHoming rocket2 = new EntityRocketHoming(bulletnt.worldObj, player, 1.5F, 15.0F, 1); - rocket = new EntityRocketHoming(bulletnt.worldObj, player, 1.5F, 15.0F, 1); - rocket.setIsCritical(true); - rocket2.setIsCritical(true); - bulletnt.worldObj.spawnEntityInWorld(rocket2); - } - rocket.homingMod = 5; - rocket.homingRadius = 25; - bulletnt.worldObj.spawnEntityInWorld(rocket); - bulletnt.setDead(); - - } - }; - return bullet; - } - - public static BulletConfiguration getRocketStingerIncendiaryConfig() { - BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - - bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket.stackFromEnum(AmmoStinger.INCENDIARY)); - bullet.dmgMin = 15; - bullet.dmgMax = 20; - bullet.explosive = 4F; - bullet.trail = 0; - bullet.wear = 12; - - bullet.bntUpdate = (bulletnt) -> { - - if(!bulletnt.worldObj.isRemote) { - - EntityPlayer player = bulletnt.worldObj.getClosestPlayerToEntity(bulletnt, -1.0D); - EntityRocketHoming rocket = new EntityRocketHoming(bulletnt.worldObj, player, 1.0F, 5.0F, 2); - if(player.getHeldItem().getItem() == ModItems.gun_skystinger && !player.isSneaking()) { - EntityRocketHoming rocket2 = new EntityRocketHoming(bulletnt.worldObj, player, 1.5F, 15.0F, 2); - rocket = new EntityRocketHoming(bulletnt.worldObj, player, 1.5F, 15.0F, 2); - rocket.setIsCritical(true); - rocket2.setIsCritical(true); - bulletnt.worldObj.spawnEntityInWorld(rocket2); - } - rocket.homingMod = 5; - rocket.homingRadius = 25; - bulletnt.worldObj.spawnEntityInWorld(rocket); - bulletnt.setDead(); - - } - }; - return bullet; - } - - public static BulletConfiguration getRocketStingerNuclearConfig() { - BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - - bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket.stackFromEnum(AmmoStinger.NUCLEAR)); - bullet.dmgMin = 50; - bullet.dmgMax = 55; - bullet.explosive = 15F; - bullet.trail = 0; - bullet.wear = 30; - - bullet.bntUpdate = (bulletnt) -> { - - if(!bulletnt.worldObj.isRemote) { - - EntityPlayer player = bulletnt.worldObj.getClosestPlayerToEntity(bulletnt, -1.0D); - - if(player.getDistanceToEntity(bulletnt) < 16) { - EntityRocketHoming rocket = new EntityRocketHoming(bulletnt.worldObj, player, 1.0F, 5.0F, 4); - if(player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.gun_skystinger && !player.isSneaking()) { - EntityRocketHoming rocket2 = new EntityRocketHoming(bulletnt.worldObj, player, 1.5F, 15.0F, 4); - rocket = new EntityRocketHoming(bulletnt.worldObj, player, 1.5F, 15.0F, 4); - rocket.setIsCritical(true); - rocket2.setIsCritical(true); - bulletnt.worldObj.spawnEntityInWorld(rocket2); - } - rocket.homingMod = 5; - rocket.homingRadius = 25; - bulletnt.worldObj.spawnEntityInWorld(rocket); - } - bulletnt.setDead(); - - } - }; - return bullet; - } - - public static BulletConfiguration getRocketStingerBonesConfig() { - BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); - - bullet.ammo = new ComparableStack(ModItems.ammo_stinger_rocket.stackFromEnum(AmmoStinger.BONES)); - bullet.dmgMin = 20; - bullet.dmgMax = 25; - bullet.explosive = 8F; - bullet.trail = 0; - - bullet.bntUpdate = (bulletnt) -> { - - if(!bulletnt.worldObj.isRemote) { - - EntityPlayer player = bulletnt.worldObj.getClosestPlayerToEntity(bulletnt, -1.0D); - - if(player.getDistanceToEntity(bulletnt) < 16) { - EntityRocketHoming rocket = new EntityRocketHoming(bulletnt.worldObj, player, 1.0F, 5.0F, 42); - if(player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.gun_skystinger && !player.isSneaking()) { - EntityRocketHoming rocket2 = new EntityRocketHoming(bulletnt.worldObj, player, 1.5F, 15.0F, 42); - rocket = new EntityRocketHoming(bulletnt.worldObj, player, 1.5F, 15.0F, 42); - rocket.setIsCritical(true); - rocket2.setIsCritical(true); - bulletnt.worldObj.spawnEntityInWorld(rocket2); - } - rocket.homingMod = 5; - rocket.homingRadius = 25; - bulletnt.worldObj.spawnEntityInWorld(rocket); - } - bulletnt.setDead(); - - } - }; - return bullet; - } -} \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 805be6ed7..13f1b5727 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -35,6 +35,7 @@ import com.hbm.items.machine.ItemCircuit.EnumCircuitType; import com.hbm.items.machine.ItemDrillbit.EnumDrillType; import com.hbm.items.machine.ItemPistons.EnumPistonType; import com.hbm.items.weapon.ItemAmmoHIMARS; +import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import com.hbm.main.MainRegistry; import cpw.mods.fml.common.Loader; @@ -169,9 +170,6 @@ public class AssemblerRecipes extends SerializableRecipe { makeRecipe(new ComparableStack(ModBlocks.therm_endo, 1), new AStack[] {new OreDictStack(TI.plate(), 12), new ComparableStack(ModItems.powder_ice, 32), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED), new ComparableStack(ModItems.coil_gold, 4), },250); makeRecipe(new ComparableStack(ModBlocks.therm_exo, 1), new AStack[] {new OreDictStack(TI.plate(), 12), new OreDictStack(P_RED.dust(), 32), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED), new ComparableStack(ModItems.coil_gold, 4), },250); makeRecipe(new ComparableStack(ModItems.spawn_chopper, 1), new AStack[] {new ComparableStack(ModItems.chopper_blades, 5), new ComparableStack(ModItems.chopper_gun, 1), new ComparableStack(ModItems.chopper_head, 1), new ComparableStack(ModItems.chopper_tail, 1), new ComparableStack(ModItems.chopper_torso, 1), new ComparableStack(ModItems.chopper_wing, 2), },300); - makeRecipe(new ComparableStack(ModItems.gun_defabricator, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 2), new OreDictStack(ANY_PLASTIC.ingot(), 8), new OreDictStack(IRON.plate(), 5), new ComparableStack(ModItems.mechanism_special, 3), new ComparableStack(Items.diamond, 1), new ComparableStack(ModItems.plate_dalekanium, 3), },200); - makeRecipe(new ComparableStack(ModItems.gun_osipr_ammo, 24), new AStack[] {new OreDictStack(STEEL.plate(), 2), new OreDictStack(REDSTONE.dust(), 1), new ComparableStack(Items.glowstone_dust, 1), },50); - makeRecipe(new ComparableStack(ModItems.gun_osipr_ammo2, 1), new AStack[] {new OreDictStack(CMB.plate(), 4), new OreDictStack(REDSTONE.dust(), 7), new ComparableStack(ModItems.powder_power, 3), },200); makeRecipe(new ComparableStack(ModItems.grenade_fire, 1), new AStack[] {new ComparableStack(ModItems.grenade_frag, 1), new OreDictStack(P_RED.dust(), 1), new OreDictStack(CU.plate(), 2), },150); makeRecipe(new ComparableStack(ModItems.grenade_shrapnel, 1), new AStack[] {new ComparableStack(ModItems.grenade_frag, 1), new ComparableStack(ModItems.pellet_buckshot, 1), new OreDictStack(STEEL.plate(), 2), },150); makeRecipe(new ComparableStack(ModItems.grenade_cluster, 1), new AStack[] {new ComparableStack(ModItems.grenade_frag, 1), new ComparableStack(ModItems.pellet_cluster, 1), new OreDictStack(STEEL.plate(), 2), },200); @@ -179,7 +177,7 @@ public class AssemblerRecipes extends SerializableRecipe { makeRecipe(new ComparableStack(ModItems.grenade_electric, 1), new AStack[] {new ComparableStack(ModItems.grenade_generic, 1), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.CAPACITOR.ordinal()), new OreDictStack(GOLD.plate(), 2), },200); makeRecipe(new ComparableStack(ModItems.grenade_pulse, 4), new AStack[] {new OreDictStack(STEEL.plate(), 1), new OreDictStack(IRON.plate(), 3), new OreDictStack(MINGRADE.wireFine(), 6), new ComparableStack(Items.diamond, 1), },300); makeRecipe(new ComparableStack(ModItems.grenade_plasma, 2), new AStack[] {new OreDictStack(STEEL.plate(), 3), new OreDictStack(ALLOY.plate(), 1), new ComparableStack(ModItems.coil_advanced_torus, 1), new ComparableStack(ModItems.cell_deuterium, 1), new ComparableStack(ModItems.cell_tritium, 1), },300); - makeRecipe(new ComparableStack(ModItems.grenade_tau, 2), new AStack[] {new OreDictStack(PB.plate(), 3), new OreDictStack(ALLOY.plate(), 1), new ComparableStack(ModItems.coil_advanced_torus, 1), new ComparableStack(ModItems.gun_xvl1456_ammo, 1), },300); + makeRecipe(new ComparableStack(ModItems.grenade_tau, 2), new AStack[] {new OreDictStack(PB.plate(), 3), new OreDictStack(ALLOY.plate(), 1), new ComparableStack(ModItems.coil_advanced_torus, 1), new ComparableStack(ModItems.ammo_standard, 1, EnumAmmo.TAU_URANIUM), },300); makeRecipe(new ComparableStack(ModItems.grenade_schrabidium, 1), new AStack[] {new ComparableStack(ModItems.grenade_flare, 1), new OreDictStack(SA326.dust(), 1), new OreDictStack(OreDictManager.getReflector(), 2), },300); makeRecipe(new ComparableStack(ModItems.grenade_nuclear, 1), new AStack[] {new OreDictStack(IRON.plate(), 1), new OreDictStack(STEEL.plate(), 1), new OreDictStack(PU239.nugget(), 2), new OreDictStack(MINGRADE.wireFine(), 2), },200); makeRecipe(new ComparableStack(ModItems.grenade_zomg, 1), new AStack[] {new ComparableStack(ModItems.plate_paa, 3), new OreDictStack(OreDictManager.getReflector(), 1), new ComparableStack(ModItems.coil_magnetized_tungsten, 3), new ComparableStack(ModItems.powder_power, 3), },300); @@ -585,17 +583,6 @@ public class AssemblerRecipes extends SerializableRecipe { new ComparableStack(ModItems.circuit, 4, EnumCircuitType.BASIC) }, 600); - makeRecipe(new ComparableStack(ModItems.gun_zomg, 1), new AStack[] { - new ComparableStack(ModItems.crystal_xen, 2), - new ComparableStack(ModItems.singularity_counter_resonant, 1), - new ComparableStack(ModItems.mechanism_special, 3), - new ComparableStack(ModItems.plate_paa, 12), - new OreDictStack(OreDictManager.getReflector(), 8), - new ComparableStack(ModItems.coil_magnetized_tungsten, 5), - new ComparableStack(ModItems.powder_magic, 4), - new OreDictStack(ASBESTOS.ingot(), 8) - }, 200); - makeRecipe(new ComparableStack(ModItems.ammo_75bolt, 2, ItemAmmoEnums.Ammo75Bolt.STOCK.ordinal()), new AStack[] { new OreDictStack(STEEL.plate(), 4), new OreDictStack(ANY_PLASTICEXPLOSIVE.ingot(), 2), diff --git a/src/main/java/com/hbm/itempool/ItemPoolsLegacy.java b/src/main/java/com/hbm/itempool/ItemPoolsLegacy.java index 22fc4ae6b..f35e2d41c 100644 --- a/src/main/java/com/hbm/itempool/ItemPoolsLegacy.java +++ b/src/main/java/com/hbm/itempool/ItemPoolsLegacy.java @@ -47,7 +47,7 @@ public class ItemPoolsLegacy { weighted(ModItems.ammo_standard, EnumAmmo.G12_BP.ordinal(), 3, 6, 3), weighted(ModItems.ammo_standard, EnumAmmo.G26_FLARE_SUPPLY.ordinal(), 1, 1, 1), weighted(ModItems.gun_kit_1, 0, 1, 3, 4), - weighted(ModItems.gun_lever_action, 0, 1, 1, 1), + weighted(ModItems.gun_maresleg, 0, 1, 1, 1), weighted(ModItems.casing_9, 0, 4, 10, 3), weighted(ModItems.casing_50, 0, 4, 10, 3), weighted(ModItems.cordite, 0, 4, 6, 5), diff --git a/src/main/java/com/hbm/itempool/ItemPoolsRedRoom.java b/src/main/java/com/hbm/itempool/ItemPoolsRedRoom.java index 7506e218c..7dae73826 100644 --- a/src/main/java/com/hbm/itempool/ItemPoolsRedRoom.java +++ b/src/main/java/com/hbm/itempool/ItemPoolsRedRoom.java @@ -37,7 +37,6 @@ public class ItemPoolsRedRoom { weighted(ModItems.flask_infusion, 0, 1, 1, 5), weighted(ModBlocks.boxcar, 0, 1, 1, 5), weighted(ModItems.book_of_, 0, 1, 1, 5), - weighted(ModItems.gun_revolver_pip, 0, 1, 1, 5) }; }}; diff --git a/src/main/java/com/hbm/itempool/ItemPoolsSingle.java b/src/main/java/com/hbm/itempool/ItemPoolsSingle.java index f37e39e4c..8d8e4778b 100644 --- a/src/main/java/com/hbm/itempool/ItemPoolsSingle.java +++ b/src/main/java/com/hbm/itempool/ItemPoolsSingle.java @@ -42,9 +42,9 @@ public class ItemPoolsSingle { new ItemPool(POOL_VAULT_RUSTY) {{ this.pool = new WeightedRandomChestContent[] { weighted(Items.gold_ingot, 0, 3, 14, 1), - weighted(ModItems.gun_uac_pistol, 0, 1, 1, 2), + weighted(ModItems.gun_heavy_revolver, 0, 1, 1, 2), weighted(ModItems.pin, 0, 8, 8, 1), - weighted(ModItems.gun_calamity, 0, 1, 1, 1), + weighted(ModItems.gun_am180, 0, 1, 1, 1), weighted(ModItems.bottle_quantum, 0, 1, 3, 1), weighted(ModItems.ingot_advanced_alloy, 0, 4, 12, 1), weighted(ModItems.ammo_standard, EnumAmmo.BMG50_FMJ.ordinal(), 24, 48, 1), @@ -69,7 +69,6 @@ public class ItemPoolsSingle { weighted(ModItems.grenade_smart, 0, 1, 6, 1), weighted(ModItems.powder_yellowcake, 0, 16, 24, 1), weighted(ModItems.gun_uzi, 0, 1, 1, 1), - weighted(ModItems.gun_uzi_silencer, 0, 1, 1, 1), weighted(ModItems.circuit, EnumCircuitType.VACUUM_TUBE.ordinal(), 12, 16, 1), weighted(ModItems.circuit, EnumCircuitType.CHIP.ordinal(), 2, 6, 1) }; @@ -89,7 +88,7 @@ public class ItemPoolsSingle { weighted(ModItems.grenade_mirv, 0, 1, 1, 1), weighted(ModItems.powder_yellowcake, 0, 26, 42, 1), weighted(ModItems.ingot_u235, 0, 3, 6, 1), - weighted(ModItems.gun_revolver_pip, 0, 1, 1, 1), + weighted(ModItems.gun_heavy_revolver, 0, 1, 1, 1), weighted(ModItems.circuit, EnumCircuitType.CHIP.ordinal(), 18, 32, 1), weighted(ModItems.circuit, EnumCircuitType.BASIC.ordinal(), 6, 12, 1) }; @@ -99,8 +98,8 @@ public class ItemPoolsSingle { this.pool = new WeightedRandomChestContent[] { weighted(ModItems.ammo_container, 0, 3, 6, 1), weighted(ModItems.ammo_standard, EnumAmmo.NUKE_DEMO.ordinal(), 2, 3, 1), - weighted(ModItems.gun_mirv, 0, 1, 1, 1), - weighted(ModItems.gun_proto, 0, 1, 1, 1), + weighted(ModItems.gun_carbine, 0, 1, 1, 1), + weighted(ModItems.gun_congolake, 0, 1, 1, 1), weighted(ModItems.gun_b92, 0, 1, 1, 1), weighted(ModItems.ingot_combine_steel, 0, 16, 28, 1), weighted(ModItems.man_core, 0, 1, 1, 1), diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 375492d2c..d93cdf577 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1538,8 +1538,6 @@ public class ModItems { public static Item gun_bolt_action_green; public static Item gun_bolt_action_saturnite; public static Item gun_mymy; - public static Item gun_b92; - public static Item gun_b92_ammo; public static Item gun_b93; public static Item gun_xvl1456; public static Item gun_xvl1456_ammo; @@ -1549,9 +1547,6 @@ public class ModItems { public static Item gun_immolator; public static Item gun_immolator_ammo; public static Item gun_cryolator; - public static Item gun_cryocannon; - public static Item gun_cryolator_ammo; - public static Item gun_fireext; public static Item gun_mp; public static Item gun_bolter_digamma; public static Item gun_zomg; @@ -1576,6 +1571,12 @@ public class ModItems { public static Item gun_glass_cannon; public static Item gun_lunatic_marksman; public static Item gun_uac_pistol; + + public static Item gun_b92; + public static Item gun_b92_ammo; + public static Item gun_cryocannon; + public static Item gun_cryolator_ammo; + public static Item gun_fireext; public static Item gun_debug; public static Item ammo_debug; diff --git a/src/main/java/com/hbm/items/food/ItemNugget.java b/src/main/java/com/hbm/items/food/ItemNugget.java deleted file mode 100644 index b6da8bc71..000000000 --- a/src/main/java/com/hbm/items/food/ItemNugget.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hbm.items.food; - -import java.util.List; - -import com.hbm.items.ModItems; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemStack; - -public class ItemNugget extends ItemFood { - - public ItemNugget(int p_i45340_1_, boolean p_i45340_2_) { - super(p_i45340_1_, p_i45340_2_); - } - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - - if (this == ModItems.gun_moist_nugget) { - list.add("A Mosin-Na...no wait, it's"); - list.add("just a moist nugget."); - } - } - -} diff --git a/src/main/java/com/hbm/items/special/ItemGlitch.java b/src/main/java/com/hbm/items/special/ItemGlitch.java index 040fd10d6..077ae4ab0 100644 --- a/src/main/java/com/hbm/items/special/ItemGlitch.java +++ b/src/main/java/com/hbm/items/special/ItemGlitch.java @@ -92,7 +92,7 @@ public class ItemGlitch extends Item implements IBatteryItem { } break; case 13: - player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_pip)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_heavy_revolver_lilmac)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle_sparkle)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.geiger_counter)); player.addChatMessage(new ChatComponentText("Have some free stuff. You'll need it for that one cryptic achievement.")); diff --git a/src/main/java/com/hbm/items/special/ItemStarterKit.java b/src/main/java/com/hbm/items/special/ItemStarterKit.java index 67cebf52f..2438f08ec 100644 --- a/src/main/java/com/hbm/items/special/ItemStarterKit.java +++ b/src/main/java/com/hbm/items/special/ItemStarterKit.java @@ -463,9 +463,7 @@ public class ItemStarterKit extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.euphemium_plate, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.euphemium_legs, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.euphemium_boots, 1)); - player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.statue_elb), 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_cursed, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.watch, 1)); + player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.statue_elb_f), 1)); } if(this == ModItems.hazmat_kit) diff --git a/src/main/java/com/hbm/items/weapon/sedna/BulletConfig.java b/src/main/java/com/hbm/items/weapon/sedna/BulletConfig.java index d0f860c98..2f5325075 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/BulletConfig.java +++ b/src/main/java/com/hbm/items/weapon/sedna/BulletConfig.java @@ -26,7 +26,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSourceIndirect; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.WorldServer; @@ -145,8 +144,8 @@ public class BulletConfig implements Cloneable { DamageSource dmg; - if(shooter != null) dmg = new EntityDamageSourceIndirect(dmgClass.name(), projectile, shooter); - else dmg = new DamageSource(dmgClass.name()); + if(shooter != null) dmg = new DamageSourceSednaWithAttacker(dmgClass.name(), projectile, shooter); + else dmg = new DamageSourceSednaNoAttacker(dmgClass.name()); switch(dmgClass) { case PHYSICAL: dmg.setProjectile(); break; diff --git a/src/main/java/com/hbm/items/weapon/sedna/DamageSourceSednaNoAttacker.java b/src/main/java/com/hbm/items/weapon/sedna/DamageSourceSednaNoAttacker.java new file mode 100644 index 000000000..889583f0d --- /dev/null +++ b/src/main/java/com/hbm/items/weapon/sedna/DamageSourceSednaNoAttacker.java @@ -0,0 +1,21 @@ +package com.hbm.items.weapon.sedna; + +import java.util.Locale; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IChatComponent; + +public class DamageSourceSednaNoAttacker extends DamageSource { + + public DamageSourceSednaNoAttacker(String type) { + super(type.toLowerCase(Locale.US)); + } + + @Override + public IChatComponent func_151519_b(EntityLivingBase died) { + IChatComponent diedName = died.func_145748_c_(); + return new ChatComponentTranslation("death.sedna." + this.damageType, diedName); + } +} diff --git a/src/main/java/com/hbm/items/weapon/sedna/DamageSourceSednaWithAttacker.java b/src/main/java/com/hbm/items/weapon/sedna/DamageSourceSednaWithAttacker.java new file mode 100644 index 000000000..e63ab3097 --- /dev/null +++ b/src/main/java/com/hbm/items/weapon/sedna/DamageSourceSednaWithAttacker.java @@ -0,0 +1,32 @@ +package com.hbm.items.weapon.sedna; + +import java.util.Locale; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.ChatStyle; +import net.minecraft.util.IChatComponent; + +public class DamageSourceSednaWithAttacker extends DamageSourceSednaNoAttacker { + + public Entity projectile; + public Entity shooter; + + public DamageSourceSednaWithAttacker(String type, Entity projectile, Entity shooter) { + super(type.toLowerCase(Locale.US)); + this.projectile = projectile; + this.shooter = shooter; + } + + @Override public Entity getSourceOfDamage() { return this.projectile; } //what even uses this, except for the wackass "shot by bullet" death messages? + @Override public Entity getEntity() { return this.shooter; } + + @Override + public IChatComponent func_151519_b(EntityLivingBase died) { + IChatComponent diedName = died.func_145748_c_(); + IChatComponent shooterName = shooter != null ? shooter.func_145748_c_() : new ChatComponentText("Unknown").setChatStyle(new ChatStyle().setObfuscated(true)); + return new ChatComponentTranslation("death.sedna." + this.damageType + ".attacker", diedName, shooterName); + } +} diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/ConfettiUtil.java b/src/main/java/com/hbm/items/weapon/sedna/factory/ConfettiUtil.java index 78f42363a..7bf6381df 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/ConfettiUtil.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/ConfettiUtil.java @@ -1,5 +1,7 @@ package com.hbm.items.weapon.sedna.factory; +import java.util.Locale; + import com.hbm.packet.PacketDispatcher; import com.hbm.packet.toclient.AuxParticlePacketNT; import com.hbm.particle.helper.AshesCreator; @@ -16,8 +18,8 @@ public class ConfettiUtil { public static void decideConfetti(EntityLivingBase entity, DamageSource source) { if(entity.isEntityAlive()) return; - if(source.damageType.equals(DamageClass.LASER.name())) pulverize(entity); - if(source.damageType.equals(DamageClass.ELECTRIC.name())) pulverize(entity); + if(source.damageType.equals(DamageClass.LASER.name().toLowerCase(Locale.US))) pulverize(entity); + if(source.damageType.equals(DamageClass.ELECTRIC.name().toLowerCase(Locale.US))) pulverize(entity); if(source.isExplosion()) gib(entity); if(source.isFireDamage()) cremate(entity); } diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/Lego.java b/src/main/java/com/hbm/items/weapon/sedna/factory/Lego.java index d8226936d..1613291de 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/Lego.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/Lego.java @@ -272,7 +272,7 @@ public class Lego { public static void standardExplode(EntityBulletBaseMK4 bullet, MovingObjectPosition mop, float range) { standardExplode(bullet, mop, range, 1F); } public static void standardExplode(EntityBulletBaseMK4 bullet, MovingObjectPosition mop, float range, float damageMod) { - ExplosionVNT vnt = new ExplosionVNT(bullet.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, range); + ExplosionVNT vnt = new ExplosionVNT(bullet.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, range, bullet.getThrower()); vnt.setEntityProcessor(new EntityProcessorCrossSmooth(1, bullet.damage * damageMod).setupPiercing(bullet.config.armorThresholdNegation, bullet.config.armorPiercingPercent)); vnt.setPlayerProcessor(new PlayerProcessorStandard()); vnt.setSFX(new ExplosionEffectWeapon(10, 2.5F, 1F)); diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java index 59568effd..b814c14c4 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java @@ -80,7 +80,7 @@ public class XFactory40mm { }; public static BiConsumer LAMBDA_STANDARD_EXPLODE_DEMO = (bullet, mop) -> { if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3) return; - ExplosionVNT vnt = new ExplosionVNT(bullet.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, 5F); + ExplosionVNT vnt = new ExplosionVNT(bullet.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, 5F, bullet.getThrower()); vnt.setBlockAllocator(new BlockAllocatorStandard()); vnt.setBlockProcessor(new BlockProcessorStandard()); vnt.setEntityProcessor(new EntityProcessorCrossSmooth(1, bullet.damage)); diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryEnergy.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryEnergy.java index 8280ee681..02a18afd0 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryEnergy.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryEnergy.java @@ -63,7 +63,7 @@ public class XFactoryEnergy { mop.hitVec.zCoord += dir.offsetZ * 0.5; } - ExplosionVNT vnt = new ExplosionVNT(beam.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, 2F); + ExplosionVNT vnt = new ExplosionVNT(beam.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, 2F, beam.getThrower()); vnt.setEntityProcessor(new EntityProcessorCrossSmooth(1, beam.damage).setDamageClass(beam.config.dmgClass)); vnt.setPlayerProcessor(new PlayerProcessorStandard()); vnt.explode(); diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryRocket.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryRocket.java index d0bc0683c..5cb0217f7 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryRocket.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryRocket.java @@ -95,7 +95,7 @@ public class XFactoryRocket { }; public static BiConsumer LAMBDA_STANDARD_EXPLODE_DEMO = (bullet, mop) -> { if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3) return; - ExplosionVNT vnt = new ExplosionVNT(bullet.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, 5F); + ExplosionVNT vnt = new ExplosionVNT(bullet.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, 5F, bullet.getThrower()); vnt.setBlockAllocator(new BlockAllocatorStandard()); vnt.setBlockProcessor(new BlockProcessorStandard()); vnt.setEntityProcessor(new EntityProcessorCrossSmooth(1, bullet.damage)); diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 61421d0c2..77f3f86c7 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -579,7 +579,6 @@ public class ClientProxy extends ServerProxy { RenderingRegistry.registerEntityRenderingHandler(EntityBobmazon.class, new RenderMinerRocket()); RenderingRegistry.registerEntityRenderingHandler(EntityTom.class, new RenderTom()); RenderingRegistry.registerEntityRenderingHandler(EntityAAShell.class, new RenderMirv()); - RenderingRegistry.registerEntityRenderingHandler(EntityRocketHoming.class, new RenderSRocket()); RenderingRegistry.registerEntityRenderingHandler(EntityChopperMine.class, new RenderChopperMine()); RenderingRegistry.registerEntityRenderingHandler(EntityRubble.class, new RenderRubble()); RenderingRegistry.registerEntityRenderingHandler(EntityShrapnel.class, new RenderShrapnel()); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 81be175c9..80c8a07cb 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -168,9 +168,7 @@ public class MainRegistry { public static Achievement achSacrifice; public static Achievement achImpossible; public static Achievement achTOB; - public static Achievement achFreytag; public static Achievement achPotato; - public static Achievement achC44; public static Achievement achC20_5; public static Achievement achFiend; public static Achievement achFiend2; @@ -662,9 +660,7 @@ public class MainRegistry { achImpossible = new Achievement("achievement.impossible", "impossible", 18, 10, ModItems.nothing, null).initIndependentStat().setSpecial().registerStat(); achTOB = new Achievement("achievement.tasteofblood", "tasteofblood", 3, 10, new ItemStack(ModItems.fluid_icon, 1, Fluids.ASCHRAB.getID()), null).initIndependentStat().setSpecial().registerStat(); achGoFish = new Achievement("achievement.goFish", "goFish", 5, 10, DictFrame.fromOne(ModItems.achievement_icon, EnumAchievementType.GOFISH), null).initIndependentStat().setSpecial().registerStat(); - achFreytag = new Achievement("achievement.freytag", "freytag", 0, -4, ModItems.gun_mp40, null).initIndependentStat().setSpecial().registerStat(); achPotato = new Achievement("achievement.potato", "potato", -2, -2, ModItems.battery_potatos, null).initIndependentStat().setSpecial().registerStat(); - achC44 = new Achievement("achievement.c44", "c44", 2, -4, ModItems.gun_revolver_pip, null).initIndependentStat().setSpecial().registerStat(); achC20_5 = new Achievement("achievement.c20_5", "c20_5", 3, 6, DictFrame.fromOne(ModItems.achievement_icon, EnumAchievementType.QUESTIONMARK), null).initIndependentStat().setSpecial().registerStat(); achFiend = new Achievement("achievement.fiend", "fiend", -6, 8, ModItems.shimmer_sledge, null).initIndependentStat().setSpecial().registerStat(); achFiend2 = new Achievement("achievement.fiend2", "fiend2", -4, 9, ModItems.shimmer_axe, null).initIndependentStat().setSpecial().registerStat(); @@ -738,9 +734,7 @@ public class MainRegistry { achImpossible, achTOB, achGoFish, - achFreytag, achPotato, - achC44, achC20_5, achFiend, achFiend2, @@ -1499,8 +1493,10 @@ public class MainRegistry { ignoreMappings.add("hbm:item.clip_euthanasia"); ignoreMappings.add("hbm:item.clip_defabricator"); ignoreMappings.add("hbm:item.ammo_folly_du"); - - /// REMAP /// + ignoreMappings.add("hbm:tile.statue_elb"); + ignoreMappings.add("hbm:tile.statue_elb_g"); + ignoreMappings.add("hbm:tile.statue_elb_w"); + remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); remapItems.put("hbm:item.man_explosive8", ModItems.explosive_lenses); remapItems.put("hbm:item.briquette_lignite", ModItems.briquette); diff --git a/src/main/java/com/hbm/main/NEIConfig.java b/src/main/java/com/hbm/main/NEIConfig.java index a536f63e9..074178316 100644 --- a/src/main/java/com/hbm/main/NEIConfig.java +++ b/src/main/java/com/hbm/main/NEIConfig.java @@ -49,9 +49,6 @@ public class NEIConfig implements IConfigureNEI { API.hideItem(new ItemStack(ModBlocks.machine_nuke_furnace_on)); API.hideItem(new ItemStack(ModBlocks.machine_rtg_furnace_on)); API.hideItem(new ItemStack(ModBlocks.reinforced_lamp_on)); - API.hideItem(new ItemStack(ModBlocks.statue_elb)); - API.hideItem(new ItemStack(ModBlocks.statue_elb_g)); - API.hideItem(new ItemStack(ModBlocks.statue_elb_w)); API.hideItem(new ItemStack(ModBlocks.statue_elb_f)); API.hideItem(new ItemStack(ModBlocks.cheater_virus)); API.hideItem(new ItemStack(ModBlocks.cheater_virus_seed)); diff --git a/src/main/java/com/hbm/render/entity/projectile/RenderBaleflare.java b/src/main/java/com/hbm/render/entity/projectile/RenderBaleflare.java deleted file mode 100644 index f3c1d9fc9..000000000 --- a/src/main/java/com/hbm/render/entity/projectile/RenderBaleflare.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hbm.render.entity.projectile; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelBaleflare; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; - -public class RenderBaleflare extends Render { - - private ModelBaleflare miniNuke; - - public RenderBaleflare() { - miniNuke = new ModelBaleflare(); - } - - @Override - public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { - - GL11.glPushMatrix(); - GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); - GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_ + 180, 0.0F, 0.0F, 1.0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); - - bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/BaleFlare.png")); - miniNuke.renderAll(0.0625F); - GL11.glPopMatrix(); - } - - @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { - return new ResourceLocation(RefStrings.MODID + ":textures/models/BaleFlare.png"); - } -} diff --git a/src/main/java/com/hbm/render/entity/projectile/RenderBullet.java b/src/main/java/com/hbm/render/entity/projectile/RenderBullet.java index f2cd70fc3..6c57fbd37 100644 --- a/src/main/java/com/hbm/render/entity/projectile/RenderBullet.java +++ b/src/main/java/com/hbm/render/entity/projectile/RenderBullet.java @@ -11,7 +11,6 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.render.model.ModelBaleflare; import com.hbm.render.model.ModelBullet; import com.hbm.render.util.RenderSparks; import com.hbm.util.Tuple.Pair; @@ -31,11 +30,9 @@ import net.minecraft.util.Vec3; public class RenderBullet extends Render { private ModelBullet bullet; - private ModelBaleflare bf; public RenderBullet() { bullet = new ModelBullet(); - bf = new ModelBaleflare(); } @Override @@ -65,14 +62,10 @@ public class RenderBullet extends Render { case BulletConfiguration.STYLE_PELLET: renderBuckshot(); break; case BulletConfiguration.STYLE_ROCKET: renderRocket(trail); break; case BulletConfiguration.STYLE_GRENADE: renderGrenade(trail); break; - case BulletConfiguration.STYLE_NUKE: renderNuke(0); break; - case BulletConfiguration.STYLE_MIRV: renderNuke(1); break; - case BulletConfiguration.STYLE_BF: renderNuke(2); break; case BulletConfiguration.STYLE_ORB: renderOrb(trail); break; case BulletConfiguration.STYLE_METEOR: renderMeteor(trail); break; case BulletConfiguration.STYLE_APDS: renderAPDS(); break; case BulletConfiguration.STYLE_BLADE: renderBlade(); break; - case BulletConfiguration.STYLE_BARREL: renderNuke(3); break; case BulletConfiguration.STYLE_TAU: renderTau(bullet, trail, f1); break; case BulletConfiguration.STYLE_LEADBURSTER: renderLeadburster(bullet, f1); break; default: renderBullet(trail); break; @@ -185,41 +178,6 @@ public class RenderBullet extends Render { GL11.glShadeModel(GL11.GL_FLAT); } - private void renderNuke(int type) { - - switch(type) { - case 0: - GL11.glScaled(0.5, 0.5, 0.5); - GL11.glRotated(90, 0, 0, 1); - GL11.glRotated(90, 0, 1, 0); - GL11.glShadeModel(GL11.GL_SMOOTH); - bindTexture(ResourceManager.mini_nuke_tex); - ResourceManager.projectiles.renderPart("MiniNuke"); - GL11.glShadeModel(GL11.GL_FLAT); - break; - case 1: - GL11.glScaled(0.5, 0.5, 0.5); - GL11.glRotated(90, 0, 0, 1); - GL11.glRotated(90, 0, 1, 0); - GL11.glShadeModel(GL11.GL_SMOOTH); - bindTexture(ResourceManager.mini_mirv_tex); - ResourceManager.projectiles.renderPart("MiniMIRV"); - GL11.glShadeModel(GL11.GL_FLAT); - break; - case 2: - bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/BaleFlare.png")); - bf.renderAll(0.0625F); break; - case 3: - GL11.glRotated(90, 0, 0, 1); - GL11.glRotated(90, 0, 1, 0); - GL11.glTranslated(0, -0.5, 0); - bindTexture(ResourceManager.waste_drum_tex); - ResourceManager.waste_drum.renderAll(); - break; - } - - } - private void renderOrb(int type) { GL11.glEnable(GL11.GL_CULL_FACE); diff --git a/src/main/java/com/hbm/render/entity/projectile/RenderMiniMIRV.java b/src/main/java/com/hbm/render/entity/projectile/RenderMiniMIRV.java deleted file mode 100644 index 6a225cc32..000000000 --- a/src/main/java/com/hbm/render/entity/projectile/RenderMiniMIRV.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hbm.render.entity.projectile; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelMIRV; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; - -public class RenderMiniMIRV extends Render { - - private ModelMIRV miniNuke; - - public RenderMiniMIRV() { - miniNuke = new ModelMIRV(); - } - - @Override - public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { - - GL11.glPushMatrix(); - GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); - GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_ + 180, 0.0F, 0.0F, 1.0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); - - bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/Mirv.png")); - miniNuke.renderAll(0.0625F); - GL11.glPopMatrix(); - } - - @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { - return new ResourceLocation(RefStrings.MODID + ":textures/models/Mirv.png"); - } -} diff --git a/src/main/java/com/hbm/render/entity/projectile/RenderMiniNuke.java b/src/main/java/com/hbm/render/entity/projectile/RenderMiniNuke.java deleted file mode 100644 index 6295fb83b..000000000 --- a/src/main/java/com/hbm/render/entity/projectile/RenderMiniNuke.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hbm.render.entity.projectile; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelMiniNuke; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; - -public class RenderMiniNuke extends Render { - - private ModelMiniNuke miniNuke; - - public RenderMiniNuke() { - miniNuke = new ModelMiniNuke(); - } - - @Override - public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { - - GL11.glPushMatrix(); - GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); - GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_ + 180, 0.0F, 0.0F, 1.0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); - - bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/MiniNuke.png")); - miniNuke.renderAll(0.0625F); - GL11.glPopMatrix(); - } - - @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { - return new ResourceLocation(RefStrings.MODID + ":textures/models/MiniNuke.png"); - } -} diff --git a/src/main/java/com/hbm/render/entity/projectile/RenderMirv.java b/src/main/java/com/hbm/render/entity/projectile/RenderMirv.java index 810ad9960..7c7e57866 100644 --- a/src/main/java/com/hbm/render/entity/projectile/RenderMirv.java +++ b/src/main/java/com/hbm/render/entity/projectile/RenderMirv.java @@ -25,17 +25,17 @@ public class RenderMirv extends Render { public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { GL11.glPushMatrix(); - GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); - GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_, 0.0F, 0.0F, 1.0F); - - bindTexture(boyTexture); - boyModel.renderAll(); + GL11.glTranslatef((float) p_76986_2_, (float) p_76986_4_, (float) p_76986_6_); + GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_, 0.0F, 0.0F, 1.0F); + + bindTexture(boyTexture); + boyModel.renderAll(); GL11.glPopMatrix(); } @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { - return new ResourceLocation(RefStrings.MODID +":textures/models/TheGadget3_.png"); + return new ResourceLocation(RefStrings.MODID + ":textures/models/TheGadget3_.png"); } } diff --git a/src/main/java/com/hbm/render/entity/projectile/RenderSRocket.java b/src/main/java/com/hbm/render/entity/projectile/RenderSRocket.java deleted file mode 100644 index 7ac3f210e..000000000 --- a/src/main/java/com/hbm/render/entity/projectile/RenderSRocket.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.hbm.render.entity.projectile; - -import org.lwjgl.opengl.GL11; - -import com.hbm.entity.projectile.EntityRocketHoming; -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelSRocket; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; - -public class RenderSRocket extends Render { - - private ModelSRocket missile; - - public RenderSRocket() { - missile = new ModelSRocket(); - } - - public void doRender(EntityRocketHoming rocket, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, - float p_76986_9_) { - GL11.glPushMatrix(); - GL11.glTranslatef((float) p_76986_2_, (float) p_76986_4_, (float) p_76986_6_); - GL11.glRotatef(rocket.prevRotationYaw + (rocket.rotationYaw - rocket.prevRotationYaw) * p_76986_9_ - 90.0F, - 0.0F, 1.0F, 0.0F); - GL11.glRotatef(rocket.prevRotationPitch + (rocket.rotationPitch - rocket.prevRotationPitch) * p_76986_9_ + 180, - 0.0F, 0.0F, 1.0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); - - if(rocket.getIsCritical()) - bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelSVTRocket.png")); - else - bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelSRocket.png")); - missile.renderAll(0.0625F); - GL11.glPopMatrix(); - } - - @Override - public void doRender(Entity rocket, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, - float p_76986_9_) { - doRender((EntityRocketHoming)rocket, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); - } - - @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { - return new ResourceLocation(RefStrings.MODID + ":textures/models/ModelSRocket.png"); - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderBFLauncher.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderBFLauncher.java deleted file mode 100644 index 5893a0c46..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderBFLauncher.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelBFLauncher; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderBFLauncher implements IItemRenderer { - - protected ModelBFLauncher swordModel; - - public ItemRenderBFLauncher() { - swordModel = new ModelBFLauncher(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/BFLauncher.png")); - GL11.glRotatef(-150.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-0.8F, -0.1F, -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: - case ENTITY: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/BFLauncher.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.5F, -0.2F, 0.0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); - 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/src/main/java/com/hbm/render/item/weapon/ItemRenderBaleflare.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderBaleflare.java deleted file mode 100644 index 96671ff58..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderBaleflare.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelBaleflare; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderBaleflare implements IItemRenderer { - - protected ModelBaleflare swordModel; - - public ItemRenderBaleflare() { - swordModel = new ModelBaleflare(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/BaleFlare.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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.glScalef(1.5F, 1.5F, 1.5F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - break; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/BaleFlare.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - //GL11.glScalef(2.0F, 2.0F, 2.0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderBenelli.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderBenelli.java deleted file mode 100644 index c7c3a19d0..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderBenelli.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.main.ResourceManager; -import com.hbm.render.anim.HbmAnimations; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderBenelli implements IItemRenderer -{ - public ItemRenderBenelli() {} - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch (type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - case INVENTORY: - return true; - default: - return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING); - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - EntityPlayer player = Minecraft.getMinecraft().thePlayer; - GL11.glPushMatrix(); - - GL11.glShadeModel(GL11.GL_SMOOTH); - - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.benelli_tex); - final float scale1 = 0.2F; - final double scale2 = 0.065D; - final double scale3 = 0.52D; - - switch (type) { - case EQUIPPED_FIRST_PERSON:// In hand from POV - GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - if (player.isSneaking()) { - GL11.glRotatef(25.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(-5F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-1.007F, 0F, -2.5F); - } - else { - GL11.glRotatef(-10F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(20.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.5F, -2.5F); - } - - GL11.glScalef(scale1, scale1, scale1); - - HbmAnimations.applyRelevantTransformation("Body"); - ResourceManager.benelli.renderPart("Body"); - - GL11.glPushMatrix(); - - HbmAnimations.applyRelevantTransformation("Bolt"); - ResourceManager.benelli.renderPart("Bolt"); - - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - - HbmAnimations.applyRelevantTransformation("Drum"); - ResourceManager.benelli.renderPart("Drum"); - - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - - HbmAnimations.applyRelevantTransformation("Shell"); - ResourceManager.benelli.renderPart("Shell"); - - GL11.glPopMatrix(); - - break; - case EQUIPPED:// In hand from other's POV - GL11.glRotatef(15F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-170, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-15F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(-0.4F, 0.05F, -0.5F); - GL11.glScaled(scale2 - scale2 * 2, scale2, scale2); - - GL11.glPushMatrix(); - GL11.glPopMatrix(); - break; - case ENTITY:// Dropped entity - GL11.glScaled(0.0625D, 0.0625D, 0.0625D); - break; - case INVENTORY:// Inventory icon - GL11.glScaled(scale3, scale3, -scale3); - GL11.glTranslatef(14.4F, 15.0F, 0.0F); - GL11.glRotatef(270.0F, 10.0F, 0.0F, 0.0F); - GL11.glRotatef(52.5F, 0.0F, 10.0F, 0.0F); - GL11.glRotatef(270.0F, 0.0F, 0.0F, 10.0F); - default: - break; - } - - if(type != ItemRenderType.EQUIPPED_FIRST_PERSON) - ResourceManager.benelli.renderAll(); - GL11.glPopMatrix(); - - } - -} \ No newline at end of file diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderCryolator.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderCryolator.java deleted file mode 100644 index ce1505174..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderCryolator.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelCryolator; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderCryolator implements IItemRenderer { - - protected ModelCryolator swordModel; - - public ItemRenderCryolator() { - swordModel = new ModelCryolator(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelCryolator.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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.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.glPopMatrix(); - break; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelCryolator.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.5F, -0.2F, 0.0F); - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glTranslatef(-0.8F, 0.0F, 0.0F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } -} \ No newline at end of file diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderEMPRay.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderEMPRay.java deleted file mode 100644 index cf4889d23..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderEMPRay.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelEMPRay; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderEMPRay implements IItemRenderer { - - protected ModelEMPRay swordModel; - - public ItemRenderEMPRay() { - swordModel = new ModelEMPRay(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - float f = 0; - - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelEMPRay.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-0.5F, 0.0F, -0.2F); - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glTranslatef(-0.8F, -0.2F, 0.0F); - GL11.glRotatef(-15.0F, 0.0F, 0.0F, 1.0F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, f); - GL11.glPopMatrix(); - break; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelEMPRay.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.5F, -0.2F, 0.0F); - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glTranslatef(-1.8F, -0.2F, 0.2F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, f); - GL11.glPopMatrix(); - default: break; - } - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderFatMan.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderFatMan.java deleted file mode 100644 index e669de40f..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderFatMan.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelFatman; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderFatMan implements IItemRenderer { - - protected ModelFatman swordModel; - - public ItemRenderFatMan() { - swordModel = new ModelFatman(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/FatmanLauncher.png")); - GL11.glRotatef(-150.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-0.8F, -0.1F, -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: - case ENTITY: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/FatmanLauncher.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.5F, -0.2F, 0.0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); - 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/src/main/java/com/hbm/render/item/weapon/ItemRenderGunAnim.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderGunAnim.java index 77455bf52..055b53708 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderGunAnim.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderGunAnim.java @@ -6,8 +6,6 @@ import com.hbm.items.ModItems; import com.hbm.items.weapon.GunB92; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelB92; -import com.hbm.render.model.ModelB93; -import com.hbm.render.model.ModelLeverAction; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; @@ -16,14 +14,10 @@ import net.minecraftforge.client.IItemRenderer; public class ItemRenderGunAnim implements IItemRenderer { - protected ModelLeverAction flippedGun; protected ModelB92 b92; - protected ModelB93 b93; public ItemRenderGunAnim() { - flippedGun = new ModelLeverAction(); b92 = new ModelB92(); - b93 = new ModelB93(); } @Override @@ -51,24 +45,14 @@ public class ItemRenderGunAnim implements IItemRenderer { GL11.glEnable(GL11.GL_CULL_FACE); - if(item.getItem() == ModItems.gun_lever_action_sonata) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLeverAction.png")); if(item.getItem() == ModItems.gun_b92) Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelB92SM.png")); - if(item.getItem() == ModItems.gun_b93) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelB93.png")); GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(-0.5F, 0.0F, -0.2F); GL11.glScalef(0.5F, 0.5F, 0.5F); GL11.glScalef(0.5F, 0.5F, 0.5F); GL11.glTranslatef(-0.2F, -0.1F, -0.1F); - - if(item.getItem() == ModItems.gun_lever_action_sonata) { - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(15F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(2.3F, 0.2F, 0.8F); - } if(item.getItem() == ModItems.gun_b92 && GunB92.getRotationFromAnim(item) > 0) { float off = GunB92.getRotationFromAnim(item) * 2; @@ -76,15 +60,8 @@ public class ItemRenderGunAnim implements IItemRenderer { GL11.glTranslatef(off * -0.5F, off * -0.5F, 0.0F); } - if(item.getItem() == ModItems.gun_b93 && GunB92.getRotationFromAnim(item) > 0) { - float off = GunB92.getRotationFromAnim(item) * 2; - 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_b92) b92.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunB92.getTransFromAnim(item)); - if(item.getItem() == ModItems.gun_b93) - b93.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunB92.getTransFromAnim(item)); GL11.glPopMatrix(); break; @@ -92,20 +69,8 @@ public class ItemRenderGunAnim implements IItemRenderer { case ENTITY: GL11.glPushMatrix(); GL11.glEnable(GL11.GL_CULL_FACE); - if(item.getItem() == ModItems.gun_lever_action || item.getItem() == ModItems.gun_lever_action_sonata) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLeverAction.png")); - if(item.getItem() == ModItems.gun_bolt_action) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelBoltActionDark.png")); - if(item.getItem() == ModItems.gun_lever_action_dark) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLeverActionDark.png")); - if(item.getItem() == ModItems.gun_bolt_action_green) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelBoltActionGreen.png")); - if(item.getItem() == ModItems.gun_bolt_action_saturnite) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelBoltActionSaturnite.png")); if(item.getItem() == ModItems.gun_b92) Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelB92SM.png")); - if(item.getItem() == ModItems.gun_b93) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelB93.png")); GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); @@ -115,16 +80,8 @@ public class ItemRenderGunAnim implements IItemRenderer { GL11.glScalef(0.5F, 0.5F, 0.5F); GL11.glTranslatef(-0.3F, -0.4F, 0.15F); - if(item.getItem() == ModItems.gun_lever_action_sonata) { - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(25F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(2.3F, 0.2F, 0.8F); - } - if(item.getItem() == ModItems.gun_b92) b92.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunB92.getTransFromAnim(item)); - if(item.getItem() == ModItems.gun_b93) - b93.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunB92.getTransFromAnim(item)); GL11.glPopMatrix(); default: break; } diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderImmolator.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderImmolator.java deleted file mode 100644 index f5d298186..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderImmolator.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelImmolator; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderImmolator implements IItemRenderer { - - protected ModelImmolator swordModel; - - public ItemRenderImmolator() { - swordModel = new ModelImmolator(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelImmolator.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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.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.glPopMatrix(); - break; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelImmolator.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.5F, -0.2F, 0.0F); - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glTranslatef(-0.8F, 0.0F, 0.0F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderLunaticSniper.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderLunaticSniper.java deleted file mode 100644 index a5de274b8..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderLunaticSniper.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.main.ResourceManager; -import com.hbm.render.anim.HbmAnimations; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderLunaticSniper implements IItemRenderer { - - public ItemRenderLunaticSniper() { - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - case INVENTORY: - return true; - default: - return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION); - } - - static final String slide = "Slide_Cube.020_Cube.007"; - static final String everythingElse = "Full_Cylinder.007"; - static final String spentShell = "Spent_Casing_Casing"; - static final String fullRound = "Full_Round_Bullet"; - - static final float scale1 = 0.2F; - static final float scale2 = 0.1F; - static final float scale3 = 0.15F; - static final float scale4 = 0.7F; - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - GL11.glPushMatrix(); - double[] recoil = HbmAnimations.getRelevantTransformation("RECOIL"); -// double[] eject = HbmAnimations.getRelevantTransformation("EJECT"); - double[] tilt = HbmAnimations.getRelevantTransformation("TILT"); -// double[] insert = HbmAnimations.getRelevantTransformation("INSERT_ROUND"); - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.lunatic_sniper_tex); - - GL11.glShadeModel(GL11.GL_SMOOTH); - - switch (type) { - case EQUIPPED_FIRST_PERSON:// In hand from POV - - if(Minecraft.getMinecraft().thePlayer.isSneaking()) { - GL11.glPopMatrix(); - return; - } - - GL11.glRotatef(-10F, 0F, 1F, 0F); - GL11.glRotatef(-10F, 0F, 0F, 1F); - GL11.glRotatef(90F, 1F, 0F, 0F); - GL11.glRotatef(-58.5F, 0F, 1F, 0F); - GL11.glRotatef(90F, 0F, 0F, 1F); - GL11.glTranslatef(-0.5F, 0F, 0F); - GL11.glScalef(scale1, scale1, scale1); - - /// Begin animations /// - - // Move on recoil - GL11.glTranslated(0, 0, recoil[1] * 10); - GL11.glRotated(recoil[0] * 10, 0, 0, 1); - // Move on reload - GL11.glPushMatrix(); - GL11.glRotated(tilt[0] * 2, 0, 0, 1); - GL11.glRotated(-tilt[1] * 2, 0, 1, 0); - GL11.glTranslated(0, 0, -tilt[1] / 8); - ResourceManager.lunatic_sniper.renderPart(everythingElse); - GL11.glPopMatrix(); - // Release slide - GL11.glPushMatrix(); - GL11.glRotated(tilt[0] * 2, 0, 0, 1); - GL11.glRotated(-tilt[1] * 2, 0, 1, 0); - GL11.glTranslated(0, 0, -tilt[2] * 15); - ResourceManager.lunatic_sniper.renderPart(slide); - GL11.glPopMatrix(); - // Drop in new round - GL11.glPushMatrix(); - GL11.glRotated(tilt[0], 0, 0, 1); - GL11.glTranslated(0, tilt[1], tilt[2]); - ResourceManager.lunatic_sniper.renderPart(fullRound); - GL11.glPopMatrix(); - // Eject casing - GL11.glPushMatrix(); - GL11.glTranslated(0, 2, 0);//FIXME Where on earth is it?! -// ResourceManager.lunatic_sniper.renderPart(spentShell); - GL11.glPopMatrix(); - break; - case EQUIPPED:// In hand from other's POV - GL11.glRotatef(-5F, 0F, 1F, 0F); - GL11.glRotatef(-5F, 0F, 0F, 1F); - GL11.glRotatef(90F, 1F, 0F, 0F); - GL11.glRotatef(-50F, 0F, 1F, 0F); - GL11.glRotatef(90F, 0F, 0F, 1F); - GL11.glTranslatef(-0.05F, -0.2F, -0.75F); - GL11.glScalef(scale2 - scale2 * 2, scale2, scale2); - GL11.glPushMatrix(); -// GL11.glTranslated(eject[0] / 2, 0, -5); -// ResourceManager.lunatic_sniper.renderPart(spentShell); - GL11.glPopMatrix(); - break; - case ENTITY:// Dropped item - GL11.glScalef(scale3, scale3, scale3); - break; - case INVENTORY: - GL11.glTranslatef(10F, 11.5F, 0F); - GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-135F, 1.0F, 0.0F, 0.0F); - GL11.glScalef(-scale4, scale4, scale4); - break; - default: - break; - } - - if(type != ItemRenderType.EQUIPPED_FIRST_PERSON) { - ResourceManager.lunatic_sniper.renderAllExcept(fullRound, spentShell); - } - - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glPopMatrix(); - } - -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderM2.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderM2.java deleted file mode 100644 index b4b01c472..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderM2.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.main.ResourceManager; -import com.hbm.render.anim.HbmAnimations; -import com.hbm.render.item.ItemRenderBase; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; - -public class ItemRenderM2 extends ItemRenderBase { - - public ItemRenderM2() { } - - static final float scale1 = 0.35F, scale2 = 2.25F, scale3 = 0.25F, scale4 = 0.5F; - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) - { - switch (type) { - case ENTITY: - GL11.glTranslated(0, -0.25, 0); - GL11.glRotatef(90, 0, 1, 0); - GL11.glScalef(scale4, scale4, scale4); - break; - case EQUIPPED: - GL11.glScalef(scale1, scale1, -scale1); - GL11.glRotatef(-90, 0, 1, 0); - GL11.glTranslatef(-0.4f, 0.5f, -5); - GL11.glRotatef(30, 1, 0, 0); - break; - case EQUIPPED_FIRST_PERSON: - - if (Minecraft.getMinecraft().thePlayer.isSneaking()) { - GL11.glRotatef(-90, 0, 1, 0); - GL11.glTranslatef(-0.96f, -0.9f, -2); - GL11.glRotatef(-5.75f, 0, 1, 1);// Just of by 0.15 - - /* vvv remove to restore original look vvv */ - GL11.glRotatef(1.9F, 0, 0, 1); - GL11.glTranslatef(0.06F, 0, 0); - GL11.glRotatef(-0.2F, 0, 1, 0); - GL11.glRotatef(1F, 1, 0, 0); - GL11.glTranslatef(0, 1.15F, -1.75F); - - } else { - GL11.glRotatef(-95, 0, 1, 0); - GL11.glTranslatef(0, -1, -3); - } - GL11.glRotatef(25, 1, 0, 0); - - double[] recoil = HbmAnimations.getRelevantTransformation("RECOIL"); - GL11.glTranslated(0, 0, recoil[0] * 0.35); - - break; - case INVENTORY: - GL11.glScalef(scale2, scale2, scale2); - GL11.glTranslated(2.75, 5, 0); - GL11.glRotatef(90, 0, 1, 0); - GL11.glRotatef(-45, 1, 0, 0); - GL11.glRotatef(180, 0, 0, 1); - break; - default: break; - } - GL11.glShadeModel(GL11.GL_SMOOTH); - Minecraft.getMinecraft().getTextureManager().bindTexture(ResourceManager.m2_tex); - ResourceManager.m2.renderAll(); - GL11.glShadeModel(GL11.GL_FLAT); - } -} \ No newline at end of file diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderMIRV.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderMIRV.java deleted file mode 100644 index db3d40b87..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderMIRV.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelMIRV; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderMIRV implements IItemRenderer { - - protected ModelMIRV swordModel; - - public ItemRenderMIRV() { - swordModel = new ModelMIRV(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/Mirv.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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.glScalef(1.5F, 1.5F, 1.5F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - break; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/Mirv.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - //GL11.glScalef(2.0F, 2.0F, 2.0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderMIRVLauncher.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderMIRVLauncher.java deleted file mode 100644 index f7d174b2b..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderMIRVLauncher.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelMIRVLauncher; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderMIRVLauncher implements IItemRenderer { - - protected ModelMIRVLauncher swordModel; - - public ItemRenderMIRVLauncher() { - swordModel = new ModelMIRVLauncher(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/MIRVLauncher.png")); - GL11.glRotatef(-150.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-0.8F, -0.1F, -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: - case ENTITY: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/MIRVLauncher.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.5F, -0.2F, 0.0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); - 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/src/main/java/com/hbm/render/item/weapon/ItemRenderMP.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderMP.java deleted file mode 100644 index 8c957bd95..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderMP.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelMP; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderMP implements IItemRenderer { - - protected ModelMP swordModel; - - public ItemRenderMP() { - swordModel = new ModelMP(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING); - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelMP.png")); - - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glTranslatef(1.0F, 0.75F, 0.0F); - GL11.glRotatef(150F, 0.0F, 0.0F, -1.0F); - GL11.glScalef(0.75F, 0.75F, 0.75F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - break; - - case EQUIPPED: - GL11.glTranslatef(0.35F, 0.5F, 0.0F); - GL11.glRotatef(100F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(170F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(15F, 0.0F, 0.0F, -1.0F); - GL11.glScalef(0.75F, 0.75F, 0.75F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - break; - - case ENTITY: - GL11.glTranslatef(0.0F, 1.0F, 0.0F); - GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); - GL11.glScalef(0.75F, 0.75F, 0.75F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - break; - - default: break; - } - - GL11.glPopMatrix(); - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderMP40.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderMP40.java deleted file mode 100644 index 27f454765..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderMP40.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelMP40; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderMP40 implements IItemRenderer { - - protected ModelMP40 swordModel; - - public ItemRenderMP40() { - swordModel = new ModelMP40(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelMP40.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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.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; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelMP40.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.5F, -0.2F, 0.0F); - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glTranslatef(-1.8F, -0.2F, 0.2F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderMiniNuke.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderMiniNuke.java deleted file mode 100644 index 6a5d094dd..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderMiniNuke.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelMiniNuke; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderMiniNuke implements IItemRenderer { - - protected ModelMiniNuke swordModel; - - public ItemRenderMiniNuke() { - swordModel = new ModelMiniNuke(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/MiniNuke.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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.glScalef(1.5F, 1.5F, 1.5F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - break; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/MiniNuke.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - //GL11.glScalef(2.0F, 2.0F, 2.0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderNukeGadget.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderNukeGadget.java deleted file mode 100644 index 2b188c95c..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderNukeGadget.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; - -public class ItemRenderNukeGadget implements IItemRenderer { - - private IModelCustom gadgetModel; - private ResourceLocation gadgetTexture; - float f = -1; - - public ItemRenderNukeGadget() { - gadgetModel = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/TheGadget3.obj")); - gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png"); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(gadgetTexture); - //GL11.glRotatef(0.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(15.0F, 0.0F, 0.0F, -1.0F); - GL11.glTranslatef(0.8F, 0.2F, 0.5F); - GL11.glScalef(0.25F, 0.25F, 0.25F); - gadgetModel.renderAll(); - GL11.glPopMatrix(); - default: break; - } - } - -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderOSIPR.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderOSIPR.java deleted file mode 100644 index 9dd1937ae..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderOSIPR.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelOSIPR; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderOSIPR implements IItemRenderer { - - protected ModelOSIPR swordModel; - - public ItemRenderOSIPR() { - swordModel = new ModelOSIPR(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelOSIPR.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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.glTranslatef(-0.4F, -0.2F, -0.1F); - GL11.glRotatef(-15.0F, 0.0F, 0.0F, 1.0F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - break; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelOSIPR.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.5F, -0.2F, 0.0F); - //GL11.glScalef(1.5F, 1.5F, 1.5F); - GL11.glTranslatef(-0.4F, -0.1F, 0.0F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderOverkill.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderOverkill.java deleted file mode 100644 index b2e9e2d6e..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderOverkill.java +++ /dev/null @@ -1,271 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGunBase; -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelDefabricator; -import com.hbm.render.model.ModelEuthanasia; -import com.hbm.render.model.ModelHP; -import com.hbm.render.model.ModelJack; -import com.hbm.render.model.ModelLacunae; -import com.hbm.render.model.ModelSpark; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderOverkill implements IItemRenderer { - - protected ModelJack powerJack; - protected ModelSpark sparkPlug; - protected ModelHP hppLaserjet; - protected ModelEuthanasia euthanasia; - protected ModelDefabricator defab; - protected ModelLacunae lacunae; - - public ItemRenderOverkill() { - powerJack = new ModelJack(); - sparkPlug = new ModelSpark(); - hppLaserjet = new ModelHP(); - euthanasia = new ModelEuthanasia(); - defab = new ModelDefabricator(); - lacunae = new ModelLacunae(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - float f = 0; - - if((Entity)data[1] instanceof EntityPlayer) - f = ((EntityPlayer)data[1]).getItemInUseDuration(); - - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - - if(item.getItem() == ModItems.gun_jack) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelJack.png")); - if(item.getItem() == ModItems.gun_spark) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelSpark.png")); - if(item.getItem() == ModItems.gun_hp) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelHP.png")); - if(item.getItem() == ModItems.gun_euthanasia) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelEuthanasia.png")); - if(item.getItem() == ModItems.gun_defabricator) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelDefabricator.png")); - if(item.getItem() == ModItems.gun_revolver_pip) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPip.png")); - if(item.getItem() == ModItems.gun_revolver_nopip) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipNoScope.png")); - if(item.getItem() == ModItems.gun_revolver_blackjack) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipGrey.png")); - if(item.getItem() == ModItems.gun_revolver_silver) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipSilver.png")); - if(item.getItem() == ModItems.gun_revolver_red) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipRed.png")); - if(item.getItem() == ModItems.gun_lacunae) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLacunaeReal.png")); - - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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.glTranslatef(-0.4F, -0.1F, 0.1F); - GL11.glTranslatef(-0.2F, -0.1F, -0.1F); - - if(item.getItem() == ModItems.gun_defabricator) - GL11.glTranslatef(0, 0.5F, 0.4F); - - if(item.getItem() == ModItems.gun_revolver_pip || - item.getItem() == ModItems.gun_revolver_nopip || - item.getItem() == ModItems.gun_revolver_blackjack || - item.getItem() == ModItems.gun_revolver_silver || - item.getItem() == ModItems.gun_revolver_red) { - GL11.glScalef(0.60F, 0.60F, 0.60F); - 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) { - GL11.glRotatef(-15.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180, 0, 1, 0); - GL11.glTranslatef(0.5F, 0.3F, -0.2F); - } - - if(item.getItem() == ModItems.gun_jack) - powerJack.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_spark) - sparkPlug.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_hp) - hppLaserjet.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_euthanasia) - euthanasia.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_defabricator) - defab.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - - if(item.getItem() == ModItems.gun_lacunae) - lacunae.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, ItemGunBase.readNBT(item, "rot")); - - GL11.glPopMatrix(); - break; - case EQUIPPED: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - if(item.getItem() == ModItems.gun_jack) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelJack.png")); - if(item.getItem() == ModItems.gun_spark) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelSpark.png")); - if(item.getItem() == ModItems.gun_hp) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelHP.png")); - if(item.getItem() == ModItems.gun_euthanasia) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelEuthanasia.png")); - if(item.getItem() == ModItems.gun_defabricator) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelDefabricator.png")); - if(item.getItem() == ModItems.gun_revolver_pip) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPip.png")); - if(item.getItem() == ModItems.gun_revolver_nopip) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipNoScope.png")); - if(item.getItem() == ModItems.gun_revolver_blackjack) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipGrey.png")); - if(item.getItem() == ModItems.gun_revolver_silver) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipSilver.png")); - if(item.getItem() == ModItems.gun_revolver_red) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipRed.png")); - if(item.getItem() == ModItems.gun_lacunae) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLacunaeReal.png")); - - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.5F, -0.2F, 0.0F); - //GL11.glScalef(0.75F, 0.75F, 0.75F); - GL11.glTranslatef(-1.4F, 0.0F, 0.0F); - if(item.getItem() == ModItems.gun_jack) - GL11.glTranslatef(0.3F, 0, 0); - if(item.getItem() == ModItems.gun_spark) - GL11.glTranslatef(0.4F, 0, 0); - if(item.getItem() == ModItems.gun_hp) - GL11.glTranslatef(0.5F, 0.2F, 0); - if(item.getItem() == ModItems.gun_defabricator) - GL11.glTranslatef(0.5F, 0.6F, -0.2F); - - if(item.getItem() == ModItems.gun_revolver_pip || - item.getItem() == ModItems.gun_revolver_nopip || - item.getItem() == ModItems.gun_revolver_blackjack || - item.getItem() == ModItems.gun_revolver_silver || - item.getItem() == ModItems.gun_revolver_red) { - GL11.glScalef(0.60F, 0.60F, 0.60F); - GL11.glTranslatef(0.7F, 0.3F, 0.0F); - } - if(item.getItem() == ModItems.gun_lacunae) { - GL11.glRotatef(5.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(185, 0, 1, 0); - GL11.glTranslatef(0.5F, 0.6F, 0.2F); - } - - if(item.getItem() == ModItems.gun_jack) - powerJack.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_spark) - sparkPlug.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_hp) - hppLaserjet.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_euthanasia) - euthanasia.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_defabricator) - defab.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - - if(item.getItem() == ModItems.gun_lacunae) - lacunae.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, f); - - GL11.glPopMatrix(); - break; - case ENTITY: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - if(item.getItem() == ModItems.gun_jack) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelJack.png")); - if(item.getItem() == ModItems.gun_spark) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelSpark.png")); - if(item.getItem() == ModItems.gun_hp) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelHP.png")); - if(item.getItem() == ModItems.gun_euthanasia) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelEuthanasia.png")); - if(item.getItem() == ModItems.gun_defabricator) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelDefabricator.png")); - if(item.getItem() == ModItems.gun_revolver_pip) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPip.png")); - if(item.getItem() == ModItems.gun_revolver_nopip) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipNoScope.png")); - if(item.getItem() == ModItems.gun_revolver_blackjack) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipGrey.png")); - if(item.getItem() == ModItems.gun_revolver_silver) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipSilver.png")); - if(item.getItem() == ModItems.gun_revolver_red) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipRed.png")); - if(item.getItem() == ModItems.gun_lacunae) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLacunaeReal.png")); - - - GL11.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); - - if(item.getItem() == ModItems.gun_revolver_pip || - item.getItem() == ModItems.gun_revolver_nopip || - item.getItem() == ModItems.gun_revolver_blackjack || - item.getItem() == ModItems.gun_revolver_silver || - item.getItem() == ModItems.gun_revolver_red) { - GL11.glScalef(0.60F, 0.60F, 0.60F); - } - if(item.getItem() == ModItems.gun_calamity) { - GL11.glScalef(0.75F, 0.75F, 0.75F); - } - if(item.getItem() == ModItems.gun_lacunae) { - GL11.glTranslatef(0, -1, 0); - GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); - } - - if(item.getItem() == ModItems.gun_jack) - powerJack.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_spark) - sparkPlug.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_hp) - hppLaserjet.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_euthanasia) - euthanasia.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_defabricator) - defab.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - - if(item.getItem() == ModItems.gun_lacunae) - lacunae.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, f); - - GL11.glPopMatrix(); - break; - default: break; - } - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolver.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolver.java deleted file mode 100644 index b7f8ce1c0..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolver.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelRevolver; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderRevolver implements IItemRenderer { - - protected ModelRevolver swordModel; - - public ItemRenderRevolver() { - swordModel = new ModelRevolver(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - - if(item.getItem() == ModItems.gun_revolver) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolver.png")); - if(item.getItem() == ModItems.gun_revolver_saturnite) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolverSaturnite.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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; - - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - break; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - if(item.getItem() == ModItems.gun_revolver) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolver.png")); - if(item.getItem() == ModItems.gun_revolver_saturnite) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolverSaturnite.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - //GL11.glScalef(2.0F, 2.0F, 2.0F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } - -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverCursed.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverCursed.java deleted file mode 100644 index 937c936bb..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverCursed.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelGun; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderRevolverCursed implements IItemRenderer { - - protected ModelGun swordModel; - - public ItemRenderRevolverCursed() { - swordModel = new ModelGun(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelGun.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelGun.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - //GL11.glScalef(2.0F, 2.0F, 2.0F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } - -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverGold.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverGold.java deleted file mode 100644 index 76cb564ea..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverGold.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelRevolver; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderRevolverGold implements IItemRenderer { - - protected ModelRevolver swordModel; - - public ItemRenderRevolverGold() { - swordModel = new ModelRevolver(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolverGold.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolverGold.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - //GL11.glScalef(2.0F, 2.0F, 2.0F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } - -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverInverted.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverInverted.java deleted file mode 100644 index c2f5b537d..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverInverted.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.main.ResourceManager; -import com.hbm.render.model.ModelRevolver; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderRevolverInverted implements IItemRenderer { - - protected ModelRevolver swordModel; - - public ItemRenderRevolverInverted() { - swordModel = new ModelRevolver(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING); - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - boolean inUse = false; - if(data != null && data.length > 1 && data[1] instanceof EntityPlayer) - inUse = (((EntityPlayer)data[1]).getItemInUse() != null && ((EntityPlayer)data[1]).getItemInUse().getItemUseAction() == EnumAction.bow); - - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_CULL_FACE); - - switch(type) { - - case EQUIPPED_FIRST_PERSON: - - double s0 = 1.5D; - GL11.glTranslated(0.75, 0.5, 0); - GL11.glScaled(s0, s0, s0); - GL11.glRotated(100, 0, -1, 0); - GL11.glRotated(25, 1, 0, 0); - - if(inUse) { - GL11.glTranslated(-0.4, 0, 0); - GL11.glRotated(198, 0, 1, 0); - GL11.glRotated(-10, 1, 0, 0); - } - - break; - - case EQUIPPED: - - double scale = 1.5D; - GL11.glRotated(195, 0, 1, 0); - GL11.glRotated(-10, 0, 0, 1); - GL11.glRotated(-10, 1, 0, 0); - GL11.glTranslated(-0.5, 0.1, -0.25); - GL11.glScaled(scale, scale, scale); - - if(inUse) { - GL11.glTranslated(-0.05, 0, 0); - GL11.glRotated(-15, 0, 0, 1); - GL11.glRotated(160, 0, 1, 0); - } - - break; - - case ENTITY: - - double s1 = 1D; - GL11.glScaled(s1, s1, s1); - GL11.glRotated(90, 0, 1, 0); - - break; - - case INVENTORY: - - GL11.glEnable(GL11.GL_LIGHTING); - - double s = 17D; - GL11.glTranslated(8, 8, 0); - GL11.glRotated(-135, 0, 0, 1); - GL11.glRotated(90, 0, 1, 0); - GL11.glScaled(s, s, -s); - - break; - - default: break; - } - - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ff_gun_bright); - ResourceManager.ff_python.renderPart("Body"); - ResourceManager.ff_python.renderPart("Cylinder"); - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ff_wood); - ResourceManager.ff_python.renderPart("Grip"); - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ff_iron); - ResourceManager.ff_python.renderPart("Hammer"); - - GL11.glPopMatrix(); - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverIron.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverIron.java deleted file mode 100644 index a84199cf8..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverIron.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelRevolver; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderRevolverIron implements IItemRenderer { - - protected ModelRevolver swordModel; - - public ItemRenderRevolverIron() { - swordModel = new ModelRevolver(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolverIron.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolverIron.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - //GL11.glScalef(2.0F, 2.0F, 2.0F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } - -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverLead.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverLead.java deleted file mode 100644 index 6833e5184..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverLead.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelRevolver; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderRevolverLead implements IItemRenderer { - - protected ModelRevolver swordModel; - - public ItemRenderRevolverLead() { - swordModel = new ModelRevolver(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolverLead.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolverLead.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - //GL11.glScalef(2.0F, 2.0F, 2.0F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverSchrabidium.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverSchrabidium.java deleted file mode 100644 index 0766c6fb5..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverSchrabidium.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelRevolver; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderRevolverSchrabidium implements IItemRenderer { - - protected ModelRevolver swordModel; - - public ItemRenderRevolverSchrabidium() { - swordModel = new ModelRevolver(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolverSchrabidium.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolverSchrabidium.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - //GL11.glScalef(2.0F, 2.0F, 2.0F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } - -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderRpg.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRpg.java deleted file mode 100644 index 147288168..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderRpg.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelGustav; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderRpg implements IItemRenderer { - - protected ModelGustav swordModel; - - public ItemRenderRpg() { - swordModel = new ModelGustav(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - if(item.getItem() == ModItems.gun_rpg) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelGustav.png")); - if(item.getItem() == ModItems.gun_karl) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelGustavYellow.png")); - - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glTranslatef(0.4F, -1.0F, -0.7F); - - if(item.getItem() == ModItems.gun_panzerschreck) { - GL11.glScalef(1.5F, 1.5F, 1.5F); - - if(Minecraft.getMinecraft().thePlayer.isSneaking()) - GL11.glTranslatef(-0.2F, -0.3F, -0.5F); - else - GL11.glTranslatef(-0.1F, 0.0F, 0.0F); - } else { - GL11.glTranslatef(0F, -0.1F, -0.4F); - } - - 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_rpg) - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_karl) - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - break; - case EQUIPPED: - case ENTITY: - GL11.glPushMatrix(); - if(item.getItem() == ModItems.gun_rpg) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelGustav.png")); - if(item.getItem() == ModItems.gun_karl) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelGustavYellow.png")); - - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.9F, 0.0F, 0.1F); - - if(item.getItem() == ModItems.gun_panzerschreck) { - GL11.glTranslatef(-0.5F, -0.1F, 0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); - } - - if(item.getItem() == ModItems.gun_rpg) - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - if(item.getItem() == ModItems.gun_karl) - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } - -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderStinger.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderStinger.java deleted file mode 100644 index 5e5b5d36d..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderStinger.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.items.ModItems; -import com.hbm.main.ResourceManager; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderStinger implements IItemRenderer { - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - ResourceLocation stingerTex = item.getItem() == ModItems.gun_stinger ? ResourceManager.stinger_tex : ResourceManager.sky_stinger_tex; - Minecraft.getMinecraft().renderEngine.bindTexture(stingerTex); - GL11.glPushMatrix(); - - switch(type) { - - case EQUIPPED_FIRST_PERSON: - - double s0 = 0.25D; - GL11.glRotated(25, 0, 0, 1); - GL11.glTranslated(-0.5, -0.7, -0.5); - GL11.glRotated(-100, 0, 1, 0); - GL11.glScaled(s0, s0, s0); - - break; - - case EQUIPPED: - - double scale = 0.25D; - GL11.glScaled(scale, scale, scale); - GL11.glRotatef(20F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-170, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-15F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(-2F, -3F, 4.0F); - - break; - - case ENTITY: - - double s1 = 0.2D; - GL11.glScaled(s1, s1, s1); - GL11.glTranslatef(0F, -2.5F, 0F); - break; - - case INVENTORY: - - GL11.glEnable(GL11.GL_LIGHTING); - - double s = 1.75D; - GL11.glTranslated(4, 11, 0); - GL11.glRotated(90, 0, 1, 0); - GL11.glRotated(135, 1, 0, 0); - GL11.glScaled(s, s, -s); - - break; - - default: break; - } - ResourceManager.stinger.renderAll(); - GL11.glPopMatrix(); - } -} \ No newline at end of file diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderUACPistol.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderUACPistol.java deleted file mode 100644 index 2ce940cc0..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderUACPistol.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.main.ResourceManager; -import com.hbm.render.anim.HbmAnimations; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderUACPistol implements IItemRenderer { - Minecraft mc = Minecraft.getMinecraft(); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return type == ItemRenderType.FIRST_PERSON_MAP ? false : true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION); - } - - static final String lower = "lower_pistol_0"; - static final String mag = "mag_pistol_0"; - static final String slide = "slide_pistol_0"; - static final String trigger = "trigger_pistol_0"; - static final String hammer = "bool_obj_bool_obj_data.002"; - - static final float scale1 = 0.05F; - static final float scale2 = 0.025F; - static final float scale3 = 0.05F; - static final float scale4 = 0.55F; - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - GL11.glPushMatrix(); - mc.renderEngine.bindTexture(ResourceManager.uac_pistol_tex); - EntityPlayer player = mc.thePlayer; - GL11.glShadeModel(GL11.GL_SMOOTH); - - double[] slideAnim = HbmAnimations.getRelevantTransformation("SLIDE"); - double[] hammerAnim = HbmAnimations.getRelevantTransformation("HAMMER"); - - switch(type) { - case ENTITY:// Dropped item - GL11.glScalef(scale1, scale1, scale1); - break; - case EQUIPPED:// In hand from other's POV - GL11.glScalef(scale2, scale2, scale2); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glRotatef(-45F, 1F, 0F, 0F); - GL11.glTranslatef(0F, -12F, 30F); - - GL11.glPushMatrix(); - ResourceManager.uac_pistol.renderOnly(trigger, mag, lower); - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - GL11.glTranslated(slideAnim[0], slideAnim[1], slideAnim[2] * 2); - ResourceManager.uac_pistol.renderPart(slide); - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - GL11.glRotated(hammerAnim[0], 1F, 0F, 0F); - ResourceManager.uac_pistol.renderPart(hammer); - GL11.glPopMatrix(); - break; - case EQUIPPED_FIRST_PERSON:// In hand from POV - GL11.glScalef(scale3, scale3, scale3); - GL11.glRotatef(90F, 0F, 1F, 0F); - if(player.isSneaking()) { - GL11.glRotatef(-25F, 1F, 0F, 0F); - GL11.glRotatef(-5F, 0F, 1F, 0F); - GL11.glTranslatef(20.15F, 3.5F, 18F); - } else { - GL11.glRotatef(-25F, 1F, 0F, 0F); - GL11.glTranslatef(-3F, -5F, 20F); - } - GL11.glPushMatrix(); - GL11.glTranslated(slideAnim[0], slideAnim[1], slideAnim[2] * 2); - ResourceManager.uac_pistol.renderPart(slide); - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - GL11.glRotated(hammerAnim[0], 1F, 0F, 0F); - ResourceManager.uac_pistol.renderPart(hammer); - GL11.glPopMatrix(); - break; - case INVENTORY: - GL11.glScalef(scale4, scale4, scale4); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glRotatef(150F, 1F, 0F, 0F); - GL11.glTranslatef(0F, -8F, -24F); - break; - default: - break; - } - if(type != ItemRenderType.EQUIPPED_FIRST_PERSON && type != ItemRenderType.EQUIPPED) - ResourceManager.uac_pistol.renderAll(); - else - ResourceManager.uac_pistol.renderOnly(trigger, mag, lower); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glPopMatrix(); - } - -} \ No newline at end of file diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderUZI.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderUZI.java deleted file mode 100644 index 75466cb35..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderUZI.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelUzi; -import com.hbm.render.model.ModelUziBarrel; -import com.hbm.render.model.ModelUziSilencer; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderUZI implements IItemRenderer { - - protected ModelUzi uzi; - protected ModelUziBarrel barrel; - protected ModelUziSilencer silencer; - - public ItemRenderUZI() { - uzi = new ModelUzi(); - barrel = new ModelUziBarrel(); - silencer = new ModelUziSilencer(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - GL11.glScalef(0.25F, 0.25F, 0.25F); - GL11.glTranslatef(-2.5F, -0.5F, -0.9F); - - GL11.glRotatef(-15.0F, 0.0F, 0.0F, 1.0F); - - if(item.getItem() == ModItems.gun_uzi || item.getItem() == ModItems.gun_uzi_silencer) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUzi.png")); - if(item.getItem() == ModItems.gun_uzi_saturnite || item.getItem() == ModItems.gun_uzi_saturnite_silencer) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUziSaturnite.png")); - - uzi.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - - if(item.getItem() == ModItems.gun_uzi || item.getItem() == ModItems.gun_uzi_saturnite) { - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUziBarrel.png")); - barrel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - } - - if(item.getItem() == ModItems.gun_uzi_silencer || item.getItem() == ModItems.gun_uzi_saturnite_silencer) { - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUziSilencer.png")); - silencer.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - } - - GL11.glPopMatrix(); - break; - case EQUIPPED: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); - - GL11.glScalef(0.5F, 0.5F, 0.5F); - - GL11.glTranslatef(0.2F, -0.8F, -1.0F); - - if(item.getItem() == ModItems.gun_uzi || item.getItem() == ModItems.gun_uzi_silencer) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUzi.png")); - if(item.getItem() == ModItems.gun_uzi_saturnite || item.getItem() == ModItems.gun_uzi_saturnite_silencer) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUziSaturnite.png")); - uzi.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - - if(item.getItem() == ModItems.gun_uzi || item.getItem() == ModItems.gun_uzi_saturnite) { - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUziBarrel.png")); - barrel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - } - - if(item.getItem() == ModItems.gun_uzi_silencer || item.getItem() == ModItems.gun_uzi_saturnite_silencer) { - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUziSilencer.png")); - silencer.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - } - - GL11.glPopMatrix(); - break; - case ENTITY: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); - - GL11.glScalef(0.5F, 0.5F, 0.5F); - - GL11.glTranslatef(0.0F, -1.0F, 0.0F); - - if(item.getItem() == ModItems.gun_uzi || item.getItem() == ModItems.gun_uzi_silencer) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUzi.png")); - if(item.getItem() == ModItems.gun_uzi_saturnite || item.getItem() == ModItems.gun_uzi_saturnite_silencer) - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUziSaturnite.png")); - uzi.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - - if(item.getItem() == ModItems.gun_uzi || item.getItem() == ModItems.gun_uzi_saturnite) { - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUziBarrel.png")); - barrel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - } - - if(item.getItem() == ModItems.gun_uzi_silencer || item.getItem() == ModItems.gun_uzi_saturnite_silencer) { - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUziSilencer.png")); - silencer.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - } - - GL11.glPopMatrix(); - default: break; - } - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderUboinik.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderUboinik.java deleted file mode 100644 index 173716ef6..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderUboinik.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelUboinik; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderUboinik implements IItemRenderer { - - protected ModelUboinik swordModel; - - public ItemRenderUboinik() { - swordModel = new ModelUboinik(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUboinik.png")); - GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - 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.glTranslatef(-0.4F, -0.1F, 0.1F); - 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: - case ENTITY: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelUboinik.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); - 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, item); - GL11.glPopMatrix(); - default: break; - } - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponBolter.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponBolter.java deleted file mode 100644 index 0b1da0139..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponBolter.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGunBase; -import com.hbm.main.ResourceManager; -import com.hbm.render.anim.HbmAnimations; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderWeaponBolter implements IItemRenderer { - - public ItemRenderWeaponBolter() { } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - case INVENTORY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - - return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING); - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glShadeModel(GL11.GL_SMOOTH); - - if(item.getItem() == ModItems.gun_bolter) - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.bolter_tex); - if(item.getItem() == ModItems.gun_bolter_digamma) - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.bolter_digamma_tex); - - switch(type) { - - case EQUIPPED_FIRST_PERSON: - - double s0 = 0.25D; - GL11.glRotated(25, 0, 0, 1); - GL11.glTranslated(1.25, -0.25, -0.25); - GL11.glRotated(-100, 0, 1, 0); - GL11.glScaled(s0, s0, s0); - - double[] recoil = HbmAnimations.getRelevantTransformation("RECOIL"); - GL11.glRotated(recoil[0] * 5, 1, 0, 0); - GL11.glTranslated(0, 0, recoil[0]); - - double[] tilt = HbmAnimations.getRelevantTransformation("TILT"); - GL11.glTranslated(0, tilt[0], 3); - GL11.glRotated(tilt[0] * 35, 1, 0, 0); - GL11.glTranslated(0, 0, -3); - - ResourceManager.bolter.renderPart("Body"); - - double[] mag = HbmAnimations.getRelevantTransformation("MAG"); - GL11.glPushMatrix(); - GL11.glTranslated(0, 0, 5); - GL11.glRotated(mag[0] * 60 * (mag[2] == 1 ? 2.5 : 1), -1, 0, 0); - GL11.glTranslated(0, 0, -5); - ResourceManager.bolter.renderPart("Mag"); - if(mag[2] != 1) ResourceManager.bolter.renderPart("Bullet"); - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - double[] casing = HbmAnimations.getRelevantTransformation("EJECT"); - GL11.glTranslated(casing[2] * 5, casing[2] * 2, 0); - GL11.glRotated(casing[2] * 60, 1, 0, 0); - ResourceManager.bolter.renderPart("Casing"); - GL11.glPopMatrix(); - - break; - - case EQUIPPED: - - double scale = 0.25D; - GL11.glScaled(scale, scale, scale); - GL11.glRotatef(15F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-170, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-15F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(-2F, -0.9F, -0.75F); - - break; - - case ENTITY: - - double s1 = 0.2D; - GL11.glScaled(s1, s1, s1); - GL11.glTranslated(0, 1, 0); - GL11.glRotatef(90, 0, 1, 0); - - break; - - case INVENTORY: - - GL11.glEnable(GL11.GL_LIGHTING); - - double s = 2.5D; - GL11.glTranslated(6, 10, 0); - GL11.glRotated(90, 0, 1, 0); - GL11.glRotated(135, 1, 0, 0); - GL11.glScaled(s, s, -s); - - break; - - default: break; - } - - if(type != ItemRenderType.EQUIPPED_FIRST_PERSON) { - ResourceManager.bolter.renderAll(); - } - - GL11.glShadeModel(GL11.GL_FLAT); - - GL11.glPushMatrix(); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240F, 240F); - - FontRenderer font = Minecraft.getMinecraft().fontRenderer; - String s = ((ItemGunBase) item.getItem()).getMag(item) + ""; - float f3 = 0.04F; - GL11.glTranslatef(0.025F - (font.getStringWidth(s) / 2) * 0.04F, 2.11F, 2.91F); - GL11.glScalef(f3, -f3, f3); - GL11.glRotatef(45, 1, 0, 0); - GL11.glNormal3f(0.0F, 0.0F, -1.0F * f3); - font.drawString(s, 0, 0, 0xff0000); - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glPopAttrib(); - GL11.glPopMatrix(); - - GL11.glPopMatrix(); - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponFFNightmareDark.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponFFNightmareDark.java deleted file mode 100644 index 52f7d4226..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponFFNightmareDark.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.main.ResourceManager; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderWeaponFFNightmareDark implements IItemRenderer { - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - case INVENTORY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - - return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING); - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glShadeModel(GL11.GL_SMOOTH); - - switch(type) { - - case EQUIPPED_FIRST_PERSON: - - double s0 = 0.4D; - GL11.glTranslated(0.75, 0.45, 0); - GL11.glScaled(s0, s0, s0); - GL11.glRotated(170, 0, 1, 0); - GL11.glRotated(25, 0, 0, -1); - - break; - - case EQUIPPED: - - double scale = 0.4D; - GL11.glRotated(105, 0, 1, 0); - GL11.glRotated(-10, 1, 0, 0); - GL11.glRotated(10, 0, 0, 1); - GL11.glTranslated(-0.125, 0.1, 0.5); - GL11.glScaled(scale, scale, scale); - - break; - - case ENTITY: - - double s1 = 0.25D; - GL11.glScaled(s1, s1, s1); - GL11.glRotated(90, 0, 1, 0); - - break; - - case INVENTORY: - - GL11.glEnable(GL11.GL_LIGHTING); - - double s = 3D; - GL11.glTranslated(10, 9, 0); - GL11.glRotated(-135, 0, 0, 1); - GL11.glRotated(180, 0, 1, 0); - GL11.glScaled(s, s, -s); - - break; - - default: break; - } - - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ff_nightmare_tex); - ResourceManager.nightmare_dark.renderAll(); - - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glPopMatrix(); - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponGlass.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponGlass.java deleted file mode 100644 index 418636da7..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponGlass.java +++ /dev/null @@ -1,178 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.handler.BulletConfiguration; -import com.hbm.items.weapon.ItemEnergyGunBase; -import com.hbm.main.ResourceManager; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderWeaponGlass implements IItemRenderer { - - public ItemRenderWeaponGlass() { } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - case INVENTORY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - - return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING); - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_CULL_FACE); - - - switch(type) { - - case EQUIPPED_FIRST_PERSON: - - double s0 = 0.5D; - GL11.glRotated(25, 0, 0, 1); - GL11.glTranslated(2.25, 0.0, 0.125); - GL11.glRotatef(-10, 0, 1, 0); - GL11.glScaled(s0, s0, s0); - - break; - - case EQUIPPED: - - double scale = 0.25D; - GL11.glScaled(-scale, scale, scale); - GL11.glRotatef(20F, -3.0F, -0.75F, -1.0F); - GL11.glRotatef(-170, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30F, 2.0F, -1F, -5.0F); - GL11.glTranslatef(5F, -0.35F, 0.25F); - - break; - - case ENTITY: - - double s1 = 0.5D; - GL11.glScaled(s1, s1, s1); - - break; - - case INVENTORY: - - double s = 1.65D; - GL11.glTranslatef(8F, 8F, 0F); - GL11.glRotated(90, 0, 0, 1); - GL11.glRotated(135, 0, 0, 1); - GL11.glScaled(s, s, s); - - break; - - default: break; - } - - GL11.glShadeModel(GL11.GL_SMOOTH); - - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_TEXTURE_2D); - - GL11.glEnable(GL11.GL_BLEND); - GL11.glAlphaFunc(GL11.GL_GREATER, 0); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - GL11.glColor4f(0.9F, 1.0F, 1.0F, 0.5F); - GL11.glDepthMask(false); - - ResourceManager.glass_cannon.renderPart("Gun"); - - GL11.glDepthMask(true); - GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_LIGHTING); - - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.glass_cannon_panel_tex); - ResourceManager.glass_cannon.renderPart("Panel"); - - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_TEXTURE_2D); - - int color = 0xFFFFFF; - double freq = 1; - - if(item.getItem() instanceof ItemEnergyGunBase) { - BulletConfiguration config = ((ItemEnergyGunBase)item.getItem()).getConfig(item); - String name = config.modeName; - switch(name) { - case "weapon.elecGun.glass_cannon.radio": color = 0xaa2200; freq = 0.5; break; - case "weapon.elecGun.glass_cannon.micro": color = 0xdc221f; freq = 1; break; - case "weapon.elecGun.glass_cannon.ir": color = 0xfc3d3a; freq = 1.5; break; - case "weapon.elecGun.glass_cannon.visible": color = 0x8fe325; freq = 2; break; - case "weapon.elecGun.glass_cannon.uv": color = 0x37d5f3; freq = 2.5; break; - case "weapon.elecGun.glass_cannon.xray": color = 0x2542fd; freq = 3; break; - case "weapon.elecGun.glass_cannon.gamma": color = 0xdc20f3; freq = 3.5; break; - } - } - - float px = 0.0625F; - GL11.glTranslatef(-2F, px * 18, -px * 14); - GL11.glRotatef(90, 0, 1, 0); - GL11.glTranslatef(-0.7F, -0.86F, -0.33F); - - Tessellator tess = Tessellator.instance; - tess.startDrawing(GL11.GL_QUADS); - - int sub = 32; - double width = px * 21.25; - double len = width / sub; - double time = System.currentTimeMillis() / -100D; - double amplitude = 0.075; - - tess.setColorOpaque_I(color); - - for(int i = 0; i < sub; i++) { - double h0 = Math.sin(freq * i * 0.5 + time) * amplitude; - double h1 = Math.sin(freq * (i + 1) * 0.5 + time) * amplitude; - tess.addVertex(0, -px * 0.25 + h1, len * (i + 1)); - tess.addVertex(0, px * 0.25 + h1, len * (i + 1)); - tess.addVertex(0, px * 0.25 + h0, len * i); - tess.addVertex(0, -px * 0.25 + h0, len * i); - } - tess.setColorOpaque_F(1F, 1F, 1F); - - tess.draw(); - - GL11.glEnable(GL11.GL_TEXTURE_2D); - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glPopAttrib(); - - GL11.glShadeModel(GL11.GL_FLAT); - - GL11.glPopMatrix(); - - } - -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponVortex.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponVortex.java deleted file mode 100644 index 80de6557d..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponVortex.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.main.ResourceManager; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderWeaponVortex implements IItemRenderer { - - public ItemRenderWeaponVortex() { } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - case INVENTORY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - - return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING); - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_CULL_FACE); - - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.vortex_tex); - - switch(type) { - - case EQUIPPED_FIRST_PERSON: - - double s0 = 0.05D; - GL11.glScaled(s0, s0, s0); - GL11.glRotated(25, 0, 0, 1); - GL11.glRotated(-5, 0, 1, 0); - GL11.glTranslated(17, -5, -5); - - break; - - case EQUIPPED: - - double scale = 0.075D; - GL11.glScaled(scale, scale, scale); - GL11.glRotated(-75, 0, 1, 0); - GL11.glRotated(-10, 0, 0, 1); - GL11.glRotated(15, 1, 0, 0); - GL11.glTranslated(7, -4, -6); - - break; - - case ENTITY: - - double s1 = 0.05D; - GL11.glScaled(s1, s1, s1); - - break; - - case INVENTORY: - - GL11.glEnable(GL11.GL_LIGHTING); - - double s = 0.3D; - GL11.glTranslated(7, 11, 0); - GL11.glRotated(-135, 0, 0, 1); - GL11.glScaled(s, s, -s); - - break; - - default: break; - } - - ResourceManager.vortex.renderAll(); - - GL11.glPopMatrix(); - } -} diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderZOMG.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderZOMG.java deleted file mode 100644 index f30dfa967..000000000 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderZOMG.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.hbm.render.item.weapon; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelZOMG; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderZOMG implements IItemRenderer { - - protected ModelZOMG swordModel; - - public ItemRenderZOMG() { - swordModel = new ModelZOMG(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - switch(type) { - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - case ENTITY: - return true; - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelZOMG.png")); - GL11.glRotatef(-150.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-0.5F, 0.0F, -0.2F); - GL11.glScalef(0.75F, 0.75F, 0.75F); - GL11.glTranslatef(-0.4F, -0.5F, -0.1F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - break; - - case EQUIPPED: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelZOMG.png")); - GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.2F, -0.5F); - GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.5F, -0.2F, 0.0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); - GL11.glTranslatef(-0.4F, -0.1F, -0.1F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - break; - - case ENTITY: - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_CULL_FACE); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelZOMG.png")); - GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); - GL11.glTranslatef(0F, -0.5F, 0F); - swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - default: break; - } - } -} diff --git a/src/main/java/com/hbm/render/model/ModelB93.java b/src/main/java/com/hbm/render/model/ModelB93.java deleted file mode 100644 index 5b42ca2ef..000000000 --- a/src/main/java/com/hbm/render/model/ModelB93.java +++ /dev/null @@ -1,487 +0,0 @@ -// Date: 26.04.2018 22:13:08 -// 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 org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.entity.Entity; - -public class ModelB93 extends ModelBase { - // fields - ModelRenderer Muzzle1; - ModelRenderer Barrel1; - ModelRenderer Barrel2; - ModelRenderer Grip; - ModelRenderer Front1; - ModelRenderer Front2; - ModelRenderer Body; - ModelRenderer Top; - ModelRenderer GripBottom; - ModelRenderer Handle; - ModelRenderer HandleBack; - ModelRenderer Frame1; - ModelRenderer Frame2; - ModelRenderer Frame3; - ModelRenderer Trigger; - ModelRenderer BackPlate1; - ModelRenderer Back; - ModelRenderer BackPlate2; - ModelRenderer Pump1; - ModelRenderer Pump2; - ModelRenderer BodyPlate; - ModelRenderer Muz1; - ModelRenderer Muz2; - ModelRenderer Muz3; - ModelRenderer Damp1; - ModelRenderer Damp2; - ModelRenderer Damp3; - ModelRenderer DampFront; - ModelRenderer EmitterRod; - ModelRenderer EmitterCrystal; - ModelRenderer EmitterClamp1; - ModelRenderer EmitterClamp2; - ModelRenderer EmitterClamp3; - ModelRenderer EmitterClamp4; - ModelRenderer EmitterClamp5; - ModelRenderer EmitterClamp6; - ModelRenderer EmitterClamp7; - ModelRenderer EmitterClamp8; - ModelRenderer PowBox; - ModelRenderer PowPanel; - ModelRenderer Nix1; - ModelRenderer Nix2; - ModelRenderer Nix3; - ModelRenderer Nix11; - ModelRenderer Nix21; - ModelRenderer Nix31; - ModelRenderer Nix12; - ModelRenderer Nix22; - ModelRenderer Nix32; - ModelRenderer Pylon; - ModelRenderer Wire1; - ModelRenderer Wire2; - ModelRenderer Wire3; - ModelRenderer PowPylon; - - public ModelB93() { - textureWidth = 128; - textureHeight = 64; - - Muzzle1 = new ModelRenderer(this, 22, 36); - Muzzle1.addBox(0F, 0F, 0F, 2, 3, 2); - Muzzle1.setRotationPoint(-24F, 0.5F, -1F); - Muzzle1.setTextureSize(64, 32); - Muzzle1.mirror = true; - setRotation(Muzzle1, 0F, 0F, 0F); - Barrel1 = new ModelRenderer(this, 0, 0); - Barrel1.addBox(0F, 0F, 0F, 24, 2, 3); - Barrel1.setRotationPoint(-24F, 1F, -1.5F); - Barrel1.setTextureSize(64, 32); - Barrel1.mirror = true; - setRotation(Barrel1, 0F, 0F, 0F); - Barrel2 = new ModelRenderer(this, 0, 5); - Barrel2.addBox(0F, 0F, 0F, 22, 1, 2); - Barrel2.setRotationPoint(-22F, 0.5F, -1F); - Barrel2.setTextureSize(64, 32); - Barrel2.mirror = true; - setRotation(Barrel2, 0F, 0F, 0F); - Grip = new ModelRenderer(this, 0, 8); - Grip.addBox(0F, 0F, 0F, 20, 3, 4); - Grip.setRotationPoint(-20F, 3F, -2F); - Grip.setTextureSize(64, 32); - Grip.mirror = true; - setRotation(Grip, 0F, 0F, 0F); - Front1 = new ModelRenderer(this, 10, 36); - Front1.addBox(0F, 0F, 0F, 2, 4, 4); - Front1.setRotationPoint(-22F, 0.5F, -2F); - Front1.setTextureSize(64, 32); - Front1.mirror = true; - setRotation(Front1, 0F, 0F, 0F); - Front2 = new ModelRenderer(this, 0, 36); - Front2.addBox(0F, 0F, 0F, 2, 6, 3); - Front2.setRotationPoint(-22F, 0F, -1.5F); - Front2.setTextureSize(64, 32); - Front2.mirror = true; - setRotation(Front2, 0F, 0F, 0F); - Body = new ModelRenderer(this, 0, 15); - Body.addBox(0F, 0F, 0F, 15, 7, 4); - Body.setRotationPoint(0F, 0.5F, -2F); - Body.setTextureSize(64, 32); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - Top = new ModelRenderer(this, 28, 60); - Top.addBox(0F, 0F, 0F, 15, 1, 3); - Top.setRotationPoint(0F, 0F, -1.5F); - Top.setTextureSize(64, 32); - Top.mirror = true; - setRotation(Top, 0F, 0F, 0F); - GripBottom = new ModelRenderer(this, 24, 43); - GripBottom.addBox(0F, 0F, 0F, 18, 1, 2); - GripBottom.setRotationPoint(-18F, 5.5F, -1F); - GripBottom.setTextureSize(64, 32); - GripBottom.mirror = true; - setRotation(GripBottom, 0F, 0F, 0F); - Handle = new ModelRenderer(this, 0, 45); - Handle.addBox(0F, 0F, 0F, 6, 15, 4); - Handle.setRotationPoint(6F, 7F, -2F); - Handle.setTextureSize(64, 32); - Handle.mirror = true; - setRotation(Handle, 0F, 0F, -0.2268928F); - HandleBack = new ModelRenderer(this, 20, 46); - HandleBack.addBox(5.5F, 0F, 0F, 1, 15, 3); - HandleBack.setRotationPoint(6F, 7F, -1.5F); - HandleBack.setTextureSize(64, 32); - HandleBack.mirror = true; - setRotation(HandleBack, 0F, 0F, -0.2268928F); - Frame1 = new ModelRenderer(this, 28, 57); - Frame1.addBox(0F, 0F, 0F, 7, 1, 2); - Frame1.setRotationPoint(0.5F, 11F, -1F); - Frame1.setTextureSize(64, 32); - Frame1.mirror = true; - setRotation(Frame1, 0F, 0F, 0F); - Frame2 = new ModelRenderer(this, 28, 51); - Frame2.addBox(0F, 0F, 0F, 2, 4, 2); - Frame2.setRotationPoint(-2F, 6.5F, -1F); - Frame2.setTextureSize(64, 32); - Frame2.mirror = true; - setRotation(Frame2, 0F, 0F, 0F); - Frame3 = new ModelRenderer(this, 46, 57); - Frame3.addBox(0F, -1F, 0F, 3, 1, 2); - Frame3.setRotationPoint(-2F, 10.5F, -1F); - Frame3.setTextureSize(64, 32); - Frame3.mirror = true; - setRotation(Frame3, 0F, 0F, 0.5235988F); - Trigger = new ModelRenderer(this, 36, 53); - Trigger.addBox(0F, 0F, 0F, 2, 3, 1); - Trigger.setRotationPoint(4F, 7F, -0.5F); - Trigger.setTextureSize(64, 32); - Trigger.mirror = true; - setRotation(Trigger, 0F, 0F, 0.1919862F); - BackPlate1 = new ModelRenderer(this, 56, 53); - BackPlate1.addBox(-1F, 0F, 0F, 1, 4, 3); - BackPlate1.setRotationPoint(15F, 0F, -1.5F); - BackPlate1.setTextureSize(64, 32); - BackPlate1.mirror = true; - setRotation(BackPlate1, 0F, 0F, -0.5235988F); - Back = new ModelRenderer(this, 42, 49); - Back.addBox(0F, 0F, 0F, 2, 4, 4); - Back.setRotationPoint(15F, 3.5F, -2F); - Back.setTextureSize(64, 32); - Back.mirror = true; - setRotation(Back, 0F, 0F, 0F); - BackPlate2 = new ModelRenderer(this, 48, 5); - BackPlate2.addBox(-2F, 0F, 0F, 2, 4, 4); - BackPlate2.setRotationPoint(15F, 0.5F, -2F); - BackPlate2.setTextureSize(64, 32); - BackPlate2.mirror = true; - setRotation(BackPlate2, 0F, 0F, -0.4886922F); - Pump1 = new ModelRenderer(this, 46, 29); - Pump1.addBox(0F, 0F, 0F, 7, 2, 2); - Pump1.setRotationPoint(10F, 1F, -1F); - Pump1.setTextureSize(64, 32); - Pump1.mirror = true; - setRotation(Pump1, 0F, 0F, 0F); - Pump2 = new ModelRenderer(this, 44, 33); - Pump2.addBox(0F, 0F, 0F, 3, 3, 7); - Pump2.setRotationPoint(17F, 0.5F, -3.5F); - Pump2.setTextureSize(64, 32); - Pump2.mirror = true; - setRotation(Pump2, 0F, 0F, 0F); - BodyPlate = new ModelRenderer(this, 0, 26); - BodyPlate.addBox(0F, 0F, 0F, 14, 5, 5); - BodyPlate.setRotationPoint(1.5F, 2F, -2.5F); - BodyPlate.setTextureSize(64, 32); - BodyPlate.mirror = true; - setRotation(BodyPlate, 0F, 0F, 0F); - Muz1 = new ModelRenderer(this, 90, 3); - Muz1.addBox(0F, 0F, 0F, 2, 5, 3); - Muz1.setRotationPoint(-26F, -0.5F, -1.5F); - Muz1.setTextureSize(64, 32); - Muz1.mirror = true; - setRotation(Muz1, 0F, 0F, 0F); - Muz2 = new ModelRenderer(this, 64, 2); - Muz2.addBox(0F, 0F, 0F, 2, 3, 5); - Muz2.setRotationPoint(-26F, 0.5F, -2.5F); - Muz2.setTextureSize(64, 32); - Muz2.mirror = true; - setRotation(Muz2, 0F, 0F, 0F); - Muz3 = new ModelRenderer(this, 78, 3); - Muz3.addBox(0F, 0F, 0F, 2, 4, 4); - Muz3.setRotationPoint(-26F, 0F, -2F); - Muz3.setTextureSize(64, 32); - Muz3.mirror = true; - setRotation(Muz3, 0F, 0F, 0F); - Damp1 = new ModelRenderer(this, 64, 53); - Damp1.addBox(0F, 0F, 0F, 24, 7, 4); - Damp1.setRotationPoint(-50F, -1.5F, -2F); - Damp1.setTextureSize(64, 32); - Damp1.mirror = true; - setRotation(Damp1, 0F, 0F, 0F); - Damp2 = new ModelRenderer(this, 64, 42); - Damp2.addBox(0F, 0F, 0F, 24, 4, 7); - Damp2.setRotationPoint(-50F, 0F, -3.5F); - Damp2.setTextureSize(64, 32); - Damp2.mirror = true; - setRotation(Damp2, 0F, 0F, 0F); - Damp3 = new ModelRenderer(this, 64, 30); - Damp3.addBox(0F, 0F, 0F, 24, 6, 6); - Damp3.setRotationPoint(-50F, -1F, -3F); - Damp3.setTextureSize(64, 32); - Damp3.mirror = true; - setRotation(Damp3, 0F, 0F, 0F); - DampFront = new ModelRenderer(this, 64, 22); - DampFront.addBox(0F, 0F, 0F, 2, 4, 4); - DampFront.setRotationPoint(-51.1F, 0F, -2F); - DampFront.setTextureSize(64, 32); - DampFront.mirror = true; - setRotation(DampFront, 0F, 0F, 0F); - EmitterRod = new ModelRenderer(this, 64, 18); - EmitterRod.addBox(0F, 0F, 0F, 4, 2, 2); - EmitterRod.setRotationPoint(-55F, 1F, -1F); - EmitterRod.setTextureSize(64, 32); - EmitterRod.mirror = true; - setRotation(EmitterRod, 0F, 0F, 0F); - EmitterCrystal = new ModelRenderer(this, 76, 24); - EmitterCrystal.addBox(0F, -1.5F, -1.5F, 3, 3, 3); - EmitterCrystal.setRotationPoint(-57F, 2F, 0F); - EmitterCrystal.setTextureSize(64, 32); - EmitterCrystal.mirror = true; - setRotation(EmitterCrystal, 0.7853982F, 0F, 0F); - EmitterClamp1 = new ModelRenderer(this, 88, 27); - EmitterClamp1.addBox(-5F, 0F, 0F, 5, 2, 1); - EmitterClamp1.setRotationPoint(-50F, 1F, -0.5F); - EmitterClamp1.setTextureSize(64, 32); - EmitterClamp1.mirror = true; - setRotation(EmitterClamp1, 0F, 0F, 1.047198F); - EmitterClamp2 = new ModelRenderer(this, 88, 24); - EmitterClamp2.addBox(-5F, -2F, 0F, 5, 2, 1); - EmitterClamp2.setRotationPoint(-50F, 3F, -0.5F); - EmitterClamp2.setTextureSize(64, 32); - EmitterClamp2.mirror = true; - setRotation(EmitterClamp2, 0F, 0F, -1.047198F); - EmitterClamp3 = new ModelRenderer(this, 100, 27); - EmitterClamp3.addBox(-5F, 0F, 0F, 5, 1, 2); - EmitterClamp3.setRotationPoint(-50F, 1.5F, -1F); - EmitterClamp3.setTextureSize(64, 32); - EmitterClamp3.mirror = true; - setRotation(EmitterClamp3, 0F, -1.047198F, 0F); - EmitterClamp4 = new ModelRenderer(this, 100, 24); - EmitterClamp4.addBox(-5F, 0F, -2F, 5, 1, 2); - EmitterClamp4.setRotationPoint(-50F, 1.5F, 1F); - EmitterClamp4.setTextureSize(64, 32); - EmitterClamp4.mirror = true; - setRotation(EmitterClamp4, 0F, 1.047198F, 0F); - EmitterClamp5 = new ModelRenderer(this, 76, 22); - EmitterClamp5.addBox(-6F, 0F, 0F, 7, 1, 1); - EmitterClamp5.setRotationPoint(-53F, -4F, -0.5F); - EmitterClamp5.setTextureSize(64, 32); - EmitterClamp5.mirror = true; - setRotation(EmitterClamp5, 0F, 0F, -0.5235988F); - EmitterClamp6 = new ModelRenderer(this, 76, 20); - EmitterClamp6.addBox(-6F, -1F, 0F, 7, 1, 1); - EmitterClamp6.setRotationPoint(-53F, 8F, -0.5F); - EmitterClamp6.setTextureSize(64, 32); - EmitterClamp6.mirror = true; - setRotation(EmitterClamp6, 0F, 0F, 0.5235988F); - EmitterClamp7 = new ModelRenderer(this, 92, 22); - EmitterClamp7.addBox(-6F, 0F, 0F, 7, 1, 1); - EmitterClamp7.setRotationPoint(-53F, 1.5F, -6F); - EmitterClamp7.setTextureSize(64, 32); - EmitterClamp7.mirror = true; - setRotation(EmitterClamp7, 0F, 0.5235988F, 0F); - EmitterClamp8 = new ModelRenderer(this, 92, 20); - EmitterClamp8.addBox(-6F, 0F, -1F, 7, 1, 1); - EmitterClamp8.setRotationPoint(-53F, 1.5F, 6F); - EmitterClamp8.setTextureSize(64, 32); - EmitterClamp8.mirror = true; - setRotation(EmitterClamp8, 0F, -0.5235988F, 0F); - PowBox = new ModelRenderer(this, 76, 11); - PowBox.addBox(0F, 0F, 0F, 10, 5, 4); - PowBox.setRotationPoint(4F, 2F, 2.5F); - PowBox.setTextureSize(64, 32); - PowBox.mirror = true; - setRotation(PowBox, 0F, 0F, 0F); - PowPanel = new ModelRenderer(this, 44, 24); - PowPanel.addBox(0F, 0F, 0F, 9, 4, 1); - PowPanel.setRotationPoint(4.5F, 2.5F, 6F); - PowPanel.setTextureSize(64, 32); - PowPanel.mirror = true; - setRotation(PowPanel, 0F, 0F, 0F); - Nix1 = new ModelRenderer(this, 56, 17); - Nix1.addBox(0F, 0F, 0F, 2, 5, 2); - Nix1.setRotationPoint(11F, -3F, 4F); - Nix1.setTextureSize(64, 32); - Nix1.mirror = true; - setRotation(Nix1, 0F, 0F, 0F); - Nix2 = new ModelRenderer(this, 48, 17); - Nix2.addBox(0F, 0F, 0F, 2, 5, 2); - Nix2.setRotationPoint(8F, -3F, 4F); - Nix2.setTextureSize(64, 32); - Nix2.mirror = true; - setRotation(Nix2, 0F, 0F, 0F); - Nix3 = new ModelRenderer(this, 40, 17); - Nix3.addBox(0F, 0F, 0F, 2, 5, 2); - Nix3.setRotationPoint(5F, -3F, 4F); - Nix3.setTextureSize(64, 32); - Nix3.mirror = true; - setRotation(Nix3, 0F, 0F, 0F); - Nix11 = new ModelRenderer(this, 72, 15); - Nix11.addBox(0F, 0F, 0F, 1, 2, 1); - Nix11.setRotationPoint(11.5F, -5F, 4.5F); - Nix11.setTextureSize(64, 32); - Nix11.mirror = true; - setRotation(Nix11, 0F, 0F, 0F); - Nix21 = new ModelRenderer(this, 68, 15); - Nix21.addBox(0F, 0F, 0F, 1, 2, 1); - Nix21.setRotationPoint(8.5F, -5F, 4.5F); - Nix21.setTextureSize(64, 32); - Nix21.mirror = true; - setRotation(Nix21, 0F, 0F, 0F); - Nix31 = new ModelRenderer(this, 64, 15); - Nix31.addBox(0F, 0F, 0F, 1, 2, 1); - Nix31.setRotationPoint(5.5F, -5F, 4.5F); - Nix31.setTextureSize(64, 32); - Nix31.mirror = true; - setRotation(Nix31, 0F, 0F, 0F); - Nix12 = new ModelRenderer(this, 72, 10); - Nix12.addBox(0F, 0F, 0F, 1, 4, 1); - Nix12.setRotationPoint(11.5F, -1.5F, 4.5F); - Nix12.setTextureSize(64, 32); - Nix12.mirror = true; - setRotation(Nix12, 0F, 0F, 0F); - Nix22 = new ModelRenderer(this, 68, 10); - Nix22.addBox(0F, 0F, 0F, 1, 4, 1); - Nix22.setRotationPoint(8.5F, -1.5F, 4.5F); - Nix22.setTextureSize(64, 32); - Nix22.mirror = true; - setRotation(Nix22, 0F, 0F, 0F); - Nix32 = new ModelRenderer(this, 64, 10); - Nix32.addBox(0F, 0F, 0F, 1, 4, 1); - Nix32.setRotationPoint(5.5F, -1.5F, 4.5F); - Nix32.setTextureSize(64, 32); - Nix32.mirror = true; - setRotation(Nix32, 0F, 0F, 0F); - Pylon = new ModelRenderer(this, 114, 24); - Pylon.addBox(0F, 0F, 0F, 2, 2, 4); - Pylon.setRotationPoint(-35F, 1F, 3.5F); - Pylon.setTextureSize(64, 32); - Pylon.mirror = true; - setRotation(Pylon, 0F, 0F, 0F); - Wire1 = new ModelRenderer(this, 82, 0); - Wire1.addBox(0F, 0F, 0F, 20, 0, 3); - Wire1.setRotationPoint(-24F, 7F, 4F); - Wire1.setTextureSize(64, 32); - Wire1.mirror = true; - setRotation(Wire1, 0F, 0F, 0F); - Wire2 = new ModelRenderer(this, 104, 3); - Wire2.addBox(0F, 0F, 0F, 9, 0, 3); - Wire2.setRotationPoint(-4F, 7F, 4F); - Wire2.setTextureSize(64, 32); - Wire2.mirror = true; - setRotation(Wire2, 0F, 0F, -0.4363323F); - Wire3 = new ModelRenderer(this, 100, 6); - Wire3.addBox(-11F, 0F, 0F, 11, 0, 3); - Wire3.setRotationPoint(-24F, 7F, 4F); - Wire3.setTextureSize(64, 32); - Wire3.mirror = true; - setRotation(Wire3, 0F, 0F, 0.4363323F); - PowPylon = new ModelRenderer(this, 108, 17); - PowPylon.addBox(0F, 0F, 0F, 2, 2, 5); - PowPylon.setRotationPoint(2.5F, 3F, 2.5F); - PowPylon.setTextureSize(64, 32); - PowPylon.mirror = true; - setRotation(PowPylon, 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); - Muzzle1.render(f5); - Barrel1.render(f5); - Barrel2.render(f5); - Grip.render(f5); - Front1.render(f5); - Front2.render(f5); - Body.render(f5); - Top.render(f5); - GripBottom.render(f5); - Handle.render(f5); - HandleBack.render(f5); - Frame1.render(f5); - Frame2.render(f5); - Frame3.render(f5); - Trigger.render(f5); - BackPlate1.render(f5); - Back.render(f5); - BackPlate2.render(f5); - Pump1.render(f5); - Pump2.render(f5); - BodyPlate.render(f5); - Muz1.render(f5); - Muz2.render(f5); - Muz3.render(f5); - Damp1.render(f5); - Damp2.render(f5); - Damp3.render(f5); - DampFront.render(f5); - EmitterRod.render(f5); - EmitterCrystal.render(f5); - EmitterClamp1.render(f5); - EmitterClamp2.render(f5); - EmitterClamp3.render(f5); - EmitterClamp4.render(f5); - EmitterClamp5.render(f5); - EmitterClamp6.render(f5); - EmitterClamp7.render(f5); - EmitterClamp8.render(f5); - PowBox.render(f5); - PowPanel.render(f5); - Nix11.render(f5); - Nix21.render(f5); - Nix31.render(f5); - Nix12.render(f5); - Nix22.render(f5); - Nix32.render(f5); - GL11.glEnable(GL11.GL_BLEND); - //GL11.glDisable(GL11.GL_ALPHA_TEST); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - Nix1.render(f5); - Nix2.render(f5); - Nix3.render(f5); - GL11.glDisable(GL11.GL_BLEND); - Pylon.render(f5); - Wire1.render(f5); - Wire2.render(f5); - Wire3.render(f5); - PowPylon.render(f5); - } - - public void renderAnim(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, float tran) { - - Pump1.offsetX += tran; - Pump2.offsetX += tran; - - render(entity, f, f1, f2, f3, f4, f5); - - Pump1.offsetX -= tran; - Pump2.offsetX -= tran; - } - - 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/src/main/java/com/hbm/render/model/ModelBFLauncher.java b/src/main/java/com/hbm/render/model/ModelBFLauncher.java deleted file mode 100644 index dadb9847e..000000000 --- a/src/main/java/com/hbm/render/model/ModelBFLauncher.java +++ /dev/null @@ -1,261 +0,0 @@ -// Date: 14.11.2016 11:46:56 -// 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 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 ModelBFLauncher extends ModelBase { - // fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - ModelRenderer Shape27; - ModelRenderer Shape28; - ModelRenderer Shape30; - ModelRenderer Shape31; - ModelRenderer Shape32; - ModelRenderer Shape33; - ModelRenderer Shape13; - ModelRenderer Shape14; - ModelRenderer Shape15; - ModelRenderer Shape16; - ModelRenderer Shape17; - ModelRenderer Shape18; - ModelRenderer Shape19; - ModelRenderer Shape20; - - public ModelBFLauncher() { - textureWidth = 128; - textureHeight = 64; - - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 40, 2, 4); - Shape1.setRotationPoint(-20F, 0F, 0F); - Shape1.setTextureSize(128, 64); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 6); - Shape2.addBox(0F, 0F, 0F, 6, 2, 2); - Shape2.setRotationPoint(-19F, 2F, 1F); - Shape2.setTextureSize(128, 64); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 10); - Shape3.addBox(0F, 0F, 0F, 1, 4, 1); - Shape3.setRotationPoint(-12F, 2F, 1.5F); - Shape3.setTextureSize(128, 64); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 16, 6); - Shape4.addBox(0F, 0F, 0F, 6, 1, 4); - Shape4.setRotationPoint(-10F, 2F, 0F); - Shape4.setTextureSize(128, 64); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 0, 15); - Shape5.addBox(0F, 0F, 0F, 2, 3, 1); - Shape5.setRotationPoint(-7F, 3F, 1.5F); - Shape5.setTextureSize(128, 64); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 4, 10); - Shape6.addBox(0F, 0F, 0F, 3, 3, 1); - Shape6.setRotationPoint(-10F, 3F, 1.5F); - Shape6.setTextureSize(128, 64); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 12, 10); - Shape7.addBox(-1F, 0F, 0F, 1, 2, 1); - Shape7.setRotationPoint(-7F, 3F, 1.5F); - Shape7.setTextureSize(128, 64); - Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0.5235988F); - Shape8 = new ModelRenderer(this, 36, 6); - Shape8.addBox(0F, 0F, 0F, 10, 1, 4); - Shape8.setRotationPoint(-3F, 2F, 0F); - Shape8.setTextureSize(128, 64); - Shape8.mirror = true; - setRotation(Shape8, 0F, 0F, 0F); - Shape9 = new ModelRenderer(this, 64, 6); - Shape9.addBox(0F, 0F, 0F, 2, 3, 2); - Shape9.setRotationPoint(7F, 2F, 1F); - Shape9.setTextureSize(128, 64); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - Shape10 = new ModelRenderer(this, 88, 0); - Shape10.addBox(0F, 0F, 0F, 3, 4, 4); - Shape10.setRotationPoint(17F, -4F, 0F); - Shape10.setTextureSize(128, 64); - Shape10.mirror = true; - setRotation(Shape10, 0F, 0F, 0F); - Shape11 = new ModelRenderer(this, 72, 6); - Shape11.addBox(0F, 0F, 0F, 2, 3, 1); - Shape11.setRotationPoint(18F, -7F, 0F); - Shape11.setTextureSize(128, 64); - Shape11.mirror = true; - setRotation(Shape11, 0F, 0F, 0F); - Shape12 = new ModelRenderer(this, 78, 6); - Shape12.addBox(0F, 0F, 0F, 2, 3, 1); - Shape12.setRotationPoint(18F, -7F, 3F); - Shape12.setTextureSize(128, 64); - Shape12.mirror = true; - setRotation(Shape12, 0F, 0F, 0F); - Shape27 = new ModelRenderer(this, 18, 27); - Shape27.addBox(0F, 0F, 0F, 2, 5, 1); - Shape27.setRotationPoint(13F, -5F, 1.5F); - Shape27.setTextureSize(128, 64); - Shape27.mirror = true; - setRotation(Shape27, 0F, 0F, 0F); - Shape28 = new ModelRenderer(this, 84, 6); - Shape28.addBox(0F, 0F, 0F, 1, 3, 1); - Shape28.setRotationPoint(16F, -3F, 1.5F); - Shape28.setTextureSize(128, 64); - Shape28.mirror = true; - setRotation(Shape28, 0F, 0F, 0F); - Shape30 = new ModelRenderer(this, 30, 15); - Shape30.addBox(0F, 0F, 0F, 12, 2, 2); - Shape30.setRotationPoint(-7F, -1F, 4F); - Shape30.setTextureSize(128, 64); - Shape30.mirror = true; - setRotation(Shape30, 0F, 0F, 0F); - Shape31 = new ModelRenderer(this, 44, 19); - Shape31.addBox(0F, 0F, 0F, 14, 1, 1); - Shape31.setRotationPoint(5F, -0.5F, 4.5F); - Shape31.setTextureSize(128, 64); - Shape31.mirror = true; - setRotation(Shape31, 0F, 0F, 0F); - Shape32 = new ModelRenderer(this, 12, 27); - Shape32.addBox(0F, 0F, 0F, 1, 1, 1); - Shape32.setRotationPoint(18F, -0.5F, 3.5F); - Shape32.setTextureSize(128, 64); - Shape32.mirror = true; - setRotation(Shape32, 0F, 0F, 0F); - Shape33 = new ModelRenderer(this, 24, 29); - Shape33.addBox(0F, 0F, 0F, 31, 1, 2); - Shape33.setRotationPoint(-18F, -1F, 1F); - Shape33.setTextureSize(128, 64); - Shape33.mirror = true; - setRotation(Shape33, 0F, 0F, 0F); - Shape13 = new ModelRenderer(this, 0, 34); - Shape13.addBox(0F, 0F, 0F, 22, 5, 3); - Shape13.setRotationPoint(-15F, -6F, 0.5F); - Shape13.setTextureSize(128, 64); - Shape13.mirror = true; - setRotation(Shape13, 0F, 0F, 0F); - Shape14 = new ModelRenderer(this, 0, 42); - Shape14.addBox(0F, 0F, 0F, 22, 3, 5); - Shape14.setRotationPoint(-15F, -5F, -0.5F); - Shape14.setTextureSize(128, 64); - Shape14.mirror = true; - setRotation(Shape14, 0F, 0F, 0F); - Shape15 = new ModelRenderer(this, 0, 50); - Shape15.addBox(0F, 0F, 0F, 1, 3, 3); - Shape15.setRotationPoint(-16F, -5F, 0.5F); - Shape15.setTextureSize(128, 64); - Shape15.mirror = true; - setRotation(Shape15, 0F, 0F, 0F); - Shape16 = new ModelRenderer(this, 8, 50); - Shape16.addBox(0F, 0F, 0F, 2, 3, 3); - Shape16.setRotationPoint(7F, -5F, 0.5F); - Shape16.setTextureSize(128, 64); - Shape16.mirror = true; - setRotation(Shape16, 0F, 0F, 0F); - Shape17 = new ModelRenderer(this, 18, 50); - Shape17.addBox(0F, 0F, 0F, 4, 1, 3); - Shape17.setRotationPoint(9F, -2F, 0.5F); - Shape17.setTextureSize(128, 64); - Shape17.mirror = true; - setRotation(Shape17, 0F, 0F, 0F); - Shape18 = new ModelRenderer(this, 32, 50); - Shape18.addBox(0F, 0F, 0F, 4, 1, 3); - Shape18.setRotationPoint(9F, -6F, 0.5F); - Shape18.setTextureSize(128, 64); - Shape18.mirror = true; - setRotation(Shape18, 0F, 0F, 0F); - Shape19 = new ModelRenderer(this, 46, 50); - Shape19.addBox(0F, 0F, 0F, 4, 3, 1); - Shape19.setRotationPoint(9F, -5F, -0.5F); - Shape19.setTextureSize(128, 64); - Shape19.mirror = true; - setRotation(Shape19, 0F, 0F, 0F); - Shape20 = new ModelRenderer(this, 56, 50); - Shape20.addBox(0F, 0F, 0F, 4, 3, 1); - Shape20.setRotationPoint(9F, -5F, 3.5F); - Shape20.setTextureSize(128, 64); - Shape20.mirror = true; - setRotation(Shape20, 0F, 0F, 0F); - } - - 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); - Shape1.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Shape2.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Shape6.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Shape7.render(f5); - Shape8.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Shape9.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape27.render(f5); - Shape28.render(f5); - Shape30.render(f5); - Shape31.render(f5); - Shape32.render(f5); - Shape33.render(f5); - - int ammo = ItemGunBase.getMag(item); - if(ammo > 0) { - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - Shape19.render(f5); - Shape20.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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelBaleflare.java b/src/main/java/com/hbm/render/model/ModelBaleflare.java deleted file mode 100644 index 1449240eb..000000000 --- a/src/main/java/com/hbm/render/model/ModelBaleflare.java +++ /dev/null @@ -1,114 +0,0 @@ -// Date: 14.11.2016 12:21:58 -// 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 ModelBaleflare extends ModelBase { - // fields - ModelRenderer Shape9; - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - - public ModelBaleflare() { - textureWidth = 128; - textureHeight = 32; - - Shape9 = new ModelRenderer(this, 0, 0); - Shape9.addBox(0F, 0F, 0F, 22, 5, 3); - Shape9.setRotationPoint(-11F, -2.5F, -1.5F); - Shape9.setTextureSize(128, 32); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - Shape1 = new ModelRenderer(this, 0, 8); - Shape1.addBox(0F, 0F, 0F, 22, 3, 5); - Shape1.setRotationPoint(-11F, -1.5F, -2.5F); - Shape1.setTextureSize(128, 32); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 16); - Shape2.addBox(0F, 0F, 0F, 1, 3, 3); - Shape2.setRotationPoint(-12F, -1.5F, -1.5F); - Shape2.setTextureSize(128, 32); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 8, 16); - Shape3.addBox(0F, 0F, 0F, 2, 3, 3); - Shape3.setRotationPoint(11F, -1.5F, -1.5F); - Shape3.setTextureSize(128, 32); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 18, 16); - Shape4.addBox(0F, 0F, 0F, 4, 1, 3); - Shape4.setRotationPoint(13F, 1.5F, -1.5F); - Shape4.setTextureSize(128, 32); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 32, 16); - Shape5.addBox(0F, 0F, 0F, 4, 1, 3); - Shape5.setRotationPoint(13F, -2.5F, -1.5F); - Shape5.setTextureSize(128, 32); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 46, 16); - Shape6.addBox(0F, 0F, 0F, 4, 3, 1); - Shape6.setRotationPoint(13F, -1.5F, -2.5F); - Shape6.setTextureSize(128, 32); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 56, 16); - Shape7.addBox(0F, 0F, 0F, 4, 3, 1); - Shape7.setRotationPoint(13F, -1.5F, 1.5F); - Shape7.setTextureSize(128, 32); - Shape7.mirror = true; - setRotation(Shape7, 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); - Shape9.render(f5); - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.render(f5); - Shape7.render(f5); - } - - public void renderAll(float f5) { - Shape9.render(f5); - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.render(f5); - Shape7.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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelCalBarrel.java b/src/main/java/com/hbm/render/model/ModelCalBarrel.java deleted file mode 100644 index 81bf3b31e..000000000 --- a/src/main/java/com/hbm/render/model/ModelCalBarrel.java +++ /dev/null @@ -1,108 +0,0 @@ -// Date: 24.10.2018 09:56:30 -// 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 org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelCalBarrel extends ModelBase { - // fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - - public ModelCalBarrel() { - textureWidth = 128; - textureHeight = 32; - - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 30, 6, 3); - Shape1.setRotationPoint(-30F, 0F, -1.5F); - Shape1.setTextureSize(128, 32); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 19); - Shape2.addBox(0F, 0F, 0F, 30, 3, 6); - Shape2.setRotationPoint(-30F, 1.5F, -3F); - Shape2.setTextureSize(128, 32); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 9); - Shape3.addBox(0F, 0F, 0F, 30, 5, 5); - Shape3.setRotationPoint(-30F, 0.5F, -2.5F); - Shape3.setTextureSize(128, 32); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 0, 28); - Shape4.addBox(0F, 0F, 0F, 1, 2, 2); - Shape4.setRotationPoint(-30.5F, 0.5F, -1F); - Shape4.setTextureSize(128, 32); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 6, 28); - Shape5.addBox(0F, 0F, 0F, 3, 2, 2); - Shape5.setRotationPoint(-33F, 3.5F, -1F); - Shape5.setTextureSize(128, 32); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 66, 0); - Shape6.addBox(0F, 0F, 0F, 4, 2, 4); - Shape6.setRotationPoint(-20F, -1F, -2F); - Shape6.setTextureSize(128, 32); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 82, 0); - Shape7.addBox(0F, -1F, -4F, 4, 1, 4); - Shape7.setRotationPoint(-20F, -1F, 2F); - Shape7.setTextureSize(128, 32); - Shape7.mirror = true; - setRotation(Shape7, -0.3490659F, 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); - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.render(f5); - Shape7.render(f5); - } - - public void renderAll(float f5) { - GL11.glPushMatrix(); - GL11.glTranslated(0, 1D/16D * 1, 0); - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.render(f5); - Shape7.render(f5); - GL11.glPopMatrix(); - } - - 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/src/main/java/com/hbm/render/model/ModelCalDualStock.java b/src/main/java/com/hbm/render/model/ModelCalDualStock.java deleted file mode 100644 index a9b94fdfd..000000000 --- a/src/main/java/com/hbm/render/model/ModelCalDualStock.java +++ /dev/null @@ -1,243 +0,0 @@ -// Date: 24.10.2018 10:31:22 -// 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 org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelCalDualStock extends ModelBase { - // fields - ModelRenderer Shape8; - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - ModelRenderer Shape13; - ModelRenderer Shape14; - ModelRenderer Shape15; - ModelRenderer Shape16; - ModelRenderer Shape17; - ModelRenderer Shape18; - ModelRenderer Shape19; - ModelRenderer Shape20; - ModelRenderer Shape21; - ModelRenderer Shape22; - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - - public ModelCalDualStock() { - textureWidth = 64; - textureHeight = 32; - - Shape8 = new ModelRenderer(this, 0, 0); - Shape8.addBox(0F, 0F, 0F, 15, 6, 3); - Shape8.setRotationPoint(0F, 1F, -1.5F); - Shape8.setTextureSize(64, 32); - Shape8.mirror = true; - setRotation(Shape8, 0F, 0F, 0F); - Shape9 = new ModelRenderer(this, 0, 9); - Shape9.addBox(0F, 0F, 0F, 6, 1, 2); - Shape9.setRotationPoint(7F, 7F, -1F); - Shape9.setTextureSize(64, 32); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - Shape10 = new ModelRenderer(this, 0, 12); - Shape10.addBox(0F, 0F, 0F, 2, 5, 2); - Shape10.setRotationPoint(10F, 8F, -1F); - Shape10.setTextureSize(64, 32); - Shape10.mirror = true; - setRotation(Shape10, 0F, 0F, -0.2617994F); - Shape11 = new ModelRenderer(this, 0, 26); - Shape11.addBox(0F, 0F, 0F, 3, 4, 2); - Shape11.setRotationPoint(19F, 3F, -1F); - Shape11.setTextureSize(64, 32); - Shape11.mirror = true; - setRotation(Shape11, 0F, 0F, 0F); - Shape12 = new ModelRenderer(this, 0, 22); - Shape12.addBox(-4F, 0F, 0F, 4, 2, 2); - Shape12.setRotationPoint(19F, 3F, -1F); - Shape12.setTextureSize(64, 32); - Shape12.mirror = true; - setRotation(Shape12, 0F, 0F, -0.1115358F); - Shape13 = new ModelRenderer(this, 10, 28); - Shape13.addBox(-5F, -2F, 0F, 5, 2, 2); - Shape13.setRotationPoint(19F, 7F, -1F); - Shape13.setTextureSize(64, 32); - Shape13.mirror = true; - setRotation(Shape13, 0F, 0F, 0.2617994F); - Shape14 = new ModelRenderer(this, 12, 23); - Shape14.addBox(0F, 0F, 0F, 1, 3, 2); - Shape14.setRotationPoint(22F, 3F, -1F); - Shape14.setTextureSize(64, 32); - Shape14.mirror = true; - setRotation(Shape14, 0F, 0F, 0.3490659F); - Shape15 = new ModelRenderer(this, 42, 0); - Shape15.addBox(0F, 0F, 0F, 3, 5, 8); - Shape15.setRotationPoint(3F, 4F, -9.5F); - Shape15.setTextureSize(64, 32); - Shape15.mirror = true; - setRotation(Shape15, 0F, 0F, 0F); - Shape16 = new ModelRenderer(this, 36, 0); - Shape16.addBox(0F, 0F, 0F, 2, 1, 1); - Shape16.setRotationPoint(3.5F, 3.5F, -4F); - Shape16.setTextureSize(64, 32); - Shape16.mirror = true; - setRotation(Shape16, 0F, 0F, 0F); - Shape17 = new ModelRenderer(this, 36, 0); - Shape17.addBox(0F, 0F, 0F, 2, 1, 1); - Shape17.setRotationPoint(3.5F, 2.7F, -3.5F); - Shape17.setTextureSize(64, 32); - Shape17.mirror = true; - setRotation(Shape17, 0F, 0F, 0F); - Shape18 = new ModelRenderer(this, 36, 0); - Shape18.addBox(0F, 0F, 0F, 2, 1, 1); - Shape18.setRotationPoint(3.5F, 2.2F, -2.8F); - Shape18.setTextureSize(64, 32); - Shape18.mirror = true; - setRotation(Shape18, 0F, 0F, 0F); - Shape19 = new ModelRenderer(this, 36, 0); - Shape19.addBox(0F, 0F, 0F, 2, 1, 1); - Shape19.setRotationPoint(3.5F, 1.8F, -2F); - Shape19.setTextureSize(64, 32); - Shape19.mirror = true; - setRotation(Shape19, 0F, 0F, 0F); - Shape20 = new ModelRenderer(this, 16, 9); - Shape20.addBox(0F, 0F, 0F, 6, 1, 4); - Shape20.setRotationPoint(7F, 4F, -2F); - Shape20.setTextureSize(64, 32); - Shape20.mirror = true; - setRotation(Shape20, 0F, 0F, 0F); - Shape21 = new ModelRenderer(this, 8, 12); - Shape21.addBox(0F, 0F, 0F, 2, 1, 1); - Shape21.setRotationPoint(11F, 0F, 0F); - Shape21.setTextureSize(64, 32); - Shape21.mirror = true; - setRotation(Shape21, 0F, 0F, 0F); - Shape22 = new ModelRenderer(this, 8, 14); - Shape22.addBox(0F, 0F, 0F, 2, 1, 2); - Shape22.setRotationPoint(11F, -1F, 0F); - Shape22.setTextureSize(64, 32); - Shape22.mirror = true; - setRotation(Shape22, -0.3490659F, 0F, 0F); - Shape1 = new ModelRenderer(this, 42, 0); - Shape1.addBox(0F, 0F, 0F, 3, 5, 8); - Shape1.setRotationPoint(3F, 4F, 1.5F); - Shape1.setTextureSize(64, 32); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 36, 0); - Shape2.addBox(0F, 0F, 0F, 2, 1, 1); - Shape2.setRotationPoint(3.5F, 3.5F, 3F); - Shape2.setTextureSize(64, 32); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 36, 0); - Shape3.addBox(0F, 0F, 0F, 2, 1, 1); - Shape3.setRotationPoint(3.5F, 2.7F, 2.5F); - Shape3.setTextureSize(64, 32); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 36, 0); - Shape4.addBox(0F, 0F, 0F, 2, 1, 1); - Shape4.setRotationPoint(3.5F, 2.2F, 1.8F); - Shape4.setTextureSize(64, 32); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 36, 0); - Shape5.addBox(0F, 0F, 0F, 2, 1, 1); - Shape5.setRotationPoint(3.5F, 1.8F, 1F); - Shape5.setTextureSize(64, 32); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 18, 17); - Shape6.addBox(0F, 0F, 0F, 1, 5, 6); - Shape6.setRotationPoint(-1F, 1F, -3F); - Shape6.setTextureSize(64, 32); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 32, 13); - Shape7.addBox(0F, 0F, 0F, 1, 4, 15); - Shape7.setRotationPoint(-2F, 2F, -7.5F); - Shape7.setTextureSize(64, 32); - Shape7.mirror = true; - setRotation(Shape7, 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); - Shape8.render(f5); - Shape9.render(f5); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - Shape19.render(f5); - Shape20.render(f5); - Shape21.render(f5); - Shape22.render(f5); - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.render(f5); - Shape7.render(f5); - } - - public void renderAll(float f5) { - GL11.glPushMatrix(); - GL11.glTranslated(1D/16D * 2, 0, 0); - Shape8.render(f5); - Shape9.render(f5); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - Shape19.render(f5); - Shape20.render(f5); - Shape21.render(f5); - Shape22.render(f5); - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.render(f5); - Shape7.render(f5); - GL11.glPopMatrix(); - } - - 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/src/main/java/com/hbm/render/model/ModelCalStock.java b/src/main/java/com/hbm/render/model/ModelCalStock.java deleted file mode 100644 index f6902b24c..000000000 --- a/src/main/java/com/hbm/render/model/ModelCalStock.java +++ /dev/null @@ -1,175 +0,0 @@ -// Date: 24.10.2018 10:23:38 -// 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 ModelCalStock extends ModelBase { - // fields - ModelRenderer Shape8; - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - ModelRenderer Shape13; - ModelRenderer Shape14; - ModelRenderer Shape15; - ModelRenderer Shape16; - ModelRenderer Shape17; - ModelRenderer Shape18; - ModelRenderer Shape19; - ModelRenderer Shape20; - ModelRenderer Shape21; - ModelRenderer Shape22; - - public ModelCalStock() { - textureWidth = 64; - textureHeight = 32; - - Shape8 = new ModelRenderer(this, 0, 0); - Shape8.addBox(0F, 0F, 0F, 15, 6, 3); - Shape8.setRotationPoint(0F, 1F, -1.5F); - Shape8.setTextureSize(64, 32); - Shape8.mirror = true; - setRotation(Shape8, 0F, 0F, 0F); - Shape9 = new ModelRenderer(this, 0, 9); - Shape9.addBox(0F, 0F, 0F, 6, 1, 2); - Shape9.setRotationPoint(7F, 7F, -1F); - Shape9.setTextureSize(64, 32); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - Shape10 = new ModelRenderer(this, 0, 12); - Shape10.addBox(0F, 0F, 0F, 2, 5, 2); - Shape10.setRotationPoint(10F, 8F, -1F); - Shape10.setTextureSize(64, 32); - Shape10.mirror = true; - setRotation(Shape10, 0F, 0F, -0.2617994F); - Shape11 = new ModelRenderer(this, 0, 26); - Shape11.addBox(0F, 0F, 0F, 3, 4, 2); - Shape11.setRotationPoint(19F, 3F, -1F); - Shape11.setTextureSize(64, 32); - Shape11.mirror = true; - setRotation(Shape11, 0F, 0F, 0F); - Shape12 = new ModelRenderer(this, 0, 22); - Shape12.addBox(-4F, 0F, 0F, 4, 2, 2); - Shape12.setRotationPoint(19F, 3F, -1F); - Shape12.setTextureSize(64, 32); - Shape12.mirror = true; - setRotation(Shape12, 0F, 0F, -0.1115358F); - Shape13 = new ModelRenderer(this, 10, 28); - Shape13.addBox(-5F, -2F, 0F, 5, 2, 2); - Shape13.setRotationPoint(19F, 7F, -1F); - Shape13.setTextureSize(64, 32); - Shape13.mirror = true; - setRotation(Shape13, 0F, 0F, 0.2617994F); - Shape14 = new ModelRenderer(this, 12, 23); - Shape14.addBox(0F, 0F, 0F, 1, 3, 2); - Shape14.setRotationPoint(22F, 3F, -1F); - Shape14.setTextureSize(64, 32); - Shape14.mirror = true; - setRotation(Shape14, 0F, 0F, 0.3490659F); - Shape15 = new ModelRenderer(this, 42, 0); - Shape15.addBox(0F, 0F, 0F, 3, 5, 8); - Shape15.setRotationPoint(3F, 4F, -9.5F); - Shape15.setTextureSize(64, 32); - Shape15.mirror = true; - setRotation(Shape15, 0F, 0F, 0F); - Shape16 = new ModelRenderer(this, 36, 0); - Shape16.addBox(0F, 0F, 0F, 2, 1, 1); - Shape16.setRotationPoint(3.5F, 3.5F, -4F); - Shape16.setTextureSize(64, 32); - Shape16.mirror = true; - setRotation(Shape16, 0F, 0F, 0F); - Shape17 = new ModelRenderer(this, 36, 0); - Shape17.addBox(0F, 0F, 0F, 2, 1, 1); - Shape17.setRotationPoint(3.5F, 2.7F, -3.5F); - Shape17.setTextureSize(64, 32); - Shape17.mirror = true; - setRotation(Shape17, 0F, 0F, 0F); - Shape18 = new ModelRenderer(this, 36, 0); - Shape18.addBox(0F, 0F, 0F, 2, 1, 1); - Shape18.setRotationPoint(3.5F, 2.2F, -2.8F); - Shape18.setTextureSize(64, 32); - Shape18.mirror = true; - setRotation(Shape18, 0F, 0F, 0F); - Shape19 = new ModelRenderer(this, 36, 0); - Shape19.addBox(0F, 0F, 0F, 2, 1, 1); - Shape19.setRotationPoint(3.5F, 1.8F, -2F); - Shape19.setTextureSize(64, 32); - Shape19.mirror = true; - setRotation(Shape19, 0F, 0F, 0F); - Shape20 = new ModelRenderer(this, 16, 9); - Shape20.addBox(0F, 0F, 0F, 6, 1, 4); - Shape20.setRotationPoint(7F, 4F, -2F); - Shape20.setTextureSize(64, 32); - Shape20.mirror = true; - setRotation(Shape20, 0F, 0F, 0F); - Shape21 = new ModelRenderer(this, 8, 12); - Shape21.addBox(0F, 0F, 0F, 2, 1, 1); - Shape21.setRotationPoint(11F, 0F, 0F); - Shape21.setTextureSize(64, 32); - Shape21.mirror = true; - setRotation(Shape21, 0F, 0F, 0F); - Shape22 = new ModelRenderer(this, 8, 14); - Shape22.addBox(0F, 0F, 0F, 2, 1, 2); - Shape22.setRotationPoint(11F, -1F, 0F); - Shape22.setTextureSize(64, 32); - Shape22.mirror = true; - setRotation(Shape22, -0.3490659F, 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); - Shape8.render(f5); - Shape9.render(f5); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - Shape19.render(f5); - Shape20.render(f5); - Shape21.render(f5); - Shape22.render(f5); - } - - public void renderAll(float f5) { - Shape8.render(f5); - Shape9.render(f5); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - Shape19.render(f5); - Shape20.render(f5); - Shape21.render(f5); - Shape22.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/src/main/java/com/hbm/render/model/ModelCryolator.java b/src/main/java/com/hbm/render/model/ModelCryolator.java deleted file mode 100644 index e73a18fca..000000000 --- a/src/main/java/com/hbm/render/model/ModelCryolator.java +++ /dev/null @@ -1,417 +0,0 @@ -// Date: 26.11.2016 20:13:04 -// 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 org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelCryolator extends ModelBase { - // fields - ModelRenderer Body; - ModelRenderer Barrel1; - ModelRenderer Barrel2; - ModelRenderer BarrelBack; - ModelRenderer BarrelNozzle; - ModelRenderer TankF1; - ModelRenderer TankF2; - ModelRenderer TankF3; - ModelRenderer TankB1; - ModelRenderer TankB2; - ModelRenderer TankB3; - ModelRenderer Drum1; - ModelRenderer Drum2; - ModelRenderer BodyBACK; - ModelRenderer PipeLPlate; - ModelRenderer BodyBottom; - ModelRenderer Handle; - ModelRenderer Trigger; - ModelRenderer CoolingBlock; - ModelRenderer BodyCenter; - ModelRenderer PipeRPlate; - ModelRenderer StockTop; - ModelRenderer StockFront; - ModelRenderer StockBack; - ModelRenderer StockBottom; - ModelRenderer PipeLPlateB; - ModelRenderer PipeRPlateB; - ModelRenderer StockConnector; - ModelRenderer PipeTL; - ModelRenderer PipeBL; - ModelRenderer PipeTR; - ModelRenderer PipeBR; - ModelRenderer PipeL; - ModelRenderer PipiR; - ModelRenderer ConnectorFront; - ModelRenderer ConnectorBFront; - ModelRenderer ConnectorBBack; - ModelRenderer Connector; - ModelRenderer ConnectorStrut; - ModelRenderer PipeLarge; - ModelRenderer PipeLargeBack; - ModelRenderer PipiLargeConnector; - ModelRenderer PlateFront; - ModelRenderer ScaffoldFront; - ModelRenderer ScaffoldBottom; - ModelRenderer ScaffoldBack; - - public ModelCryolator() { - textureWidth = 128; - textureHeight = 64; - - Body = new ModelRenderer(this, 0, 6); - Body.addBox(0F, 0F, 0F, 15, 2, 3); - Body.setRotationPoint(-12F, 0F, -1.5F); - Body.setTextureSize(128, 64); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - Barrel1 = new ModelRenderer(this, 0, 57); - Barrel1.addBox(0F, 0F, 0F, 2, 4, 3); - Barrel1.setRotationPoint(-15F, 0F, -1.5F); - Barrel1.setTextureSize(128, 64); - Barrel1.mirror = true; - setRotation(Barrel1, 0F, 0F, 0F); - Barrel2 = new ModelRenderer(this, 10, 57); - Barrel2.addBox(0F, 0F, 0F, 2, 3, 4); - Barrel2.setRotationPoint(-15F, 0.5F, -2F); - Barrel2.setTextureSize(128, 64); - Barrel2.mirror = true; - setRotation(Barrel2, 0F, 0F, 0F); - BarrelBack = new ModelRenderer(this, 0, 51); - BarrelBack.addBox(0F, 0F, 0F, 1, 3, 3); - BarrelBack.setRotationPoint(-13F, 0.5F, -1.5F); - BarrelBack.setTextureSize(128, 64); - BarrelBack.mirror = true; - setRotation(BarrelBack, 0F, 0F, 0F); - BarrelNozzle = new ModelRenderer(this, 0, 49); - BarrelNozzle.addBox(0F, 0F, 0F, 1, 1, 1); - BarrelNozzle.setRotationPoint(-15.5F, 0.5F, -0.5F); - BarrelNozzle.setTextureSize(128, 64); - BarrelNozzle.mirror = true; - setRotation(BarrelNozzle, 0F, 0F, 0F); - TankF1 = new ModelRenderer(this, 22, 55); - TankF1.addBox(0F, 0F, 0F, 4, 5, 4); - TankF1.setRotationPoint(-10.5F, 2F, -2F); - TankF1.setTextureSize(128, 64); - TankF1.mirror = true; - setRotation(TankF1, 0F, 0F, 0F); - TankF2 = new ModelRenderer(this, 38, 56); - TankF2.addBox(0F, 0F, 0F, 6, 4, 4); - TankF2.setRotationPoint(-11.5F, 2.5F, -2F); - TankF2.setTextureSize(128, 64); - TankF2.mirror = true; - setRotation(TankF2, 0F, 0F, 0F); - TankF3 = new ModelRenderer(this, 58, 55); - TankF3.addBox(0F, 0F, 0F, 4, 4, 5); - TankF3.setRotationPoint(-10.5F, 2.5F, -2.5F); - TankF3.setTextureSize(128, 64); - TankF3.mirror = true; - setRotation(TankF3, 0F, 0F, 0F); - TankB1 = new ModelRenderer(this, 8, 52); - TankB1.addBox(0F, 0F, 0F, 4, 2, 3); - TankB1.setRotationPoint(-5F, 3F, -1.5F); - TankB1.setTextureSize(128, 64); - TankB1.mirror = true; - setRotation(TankB1, 0F, 0F, 0F); - TankB2 = new ModelRenderer(this, 0, 42); - TankB2.addBox(0F, 0F, 0F, 2, 4, 3); - TankB2.setRotationPoint(-4F, 2F, -1.5F); - TankB2.setTextureSize(128, 64); - TankB2.mirror = true; - setRotation(TankB2, 0F, 0F, 0F); - TankB3 = new ModelRenderer(this, 0, 36); - TankB3.addBox(0F, 0F, 0F, 2, 2, 4); - TankB3.setRotationPoint(-4F, 3F, -2F); - TankB3.setTextureSize(128, 64); - TankB3.mirror = true; - setRotation(TankB3, 0F, 0F, 0F); - Drum1 = new ModelRenderer(this, 38, 49); - Drum1.addBox(0F, 0F, 0F, 6, 4, 3); - Drum1.setRotationPoint(-2F, 6F, -4F); - Drum1.setTextureSize(128, 64); - Drum1.mirror = true; - setRotation(Drum1, 0F, 0F, 0F); - Drum2 = new ModelRenderer(this, 24, 46); - Drum2.addBox(0F, 0F, 0F, 4, 6, 3); - Drum2.setRotationPoint(-1F, 5F, -4F); - Drum2.setTextureSize(128, 64); - Drum2.mirror = true; - setRotation(Drum2, 0F, 0F, 0F); - BodyBACK = new ModelRenderer(this, 38, 44); - BodyBACK.addBox(0F, 0F, 0F, 7, 2, 3); - BodyBACK.setRotationPoint(3F, 0F, -1.5F); - BodyBACK.setTextureSize(128, 64); - BodyBACK.mirror = true; - setRotation(BodyBACK, 0F, 0F, 0.2617994F); - PipeLPlate = new ModelRenderer(this, 10, 46); - PipeLPlate.addBox(0F, 0F, 0F, 2, 4, 2); - PipeLPlate.setRotationPoint(-1F, 1F, -3F); - PipeLPlate.setTextureSize(128, 64); - PipeLPlate.mirror = true; - setRotation(PipeLPlate, 0F, 0F, 0F); - BodyBottom = new ModelRenderer(this, 26, 41); - BodyBottom.addBox(0F, 0F, 0F, 4, 3, 2); - BodyBottom.setRotationPoint(3F, 2F, -1F); - BodyBottom.setTextureSize(128, 64); - BodyBottom.mirror = true; - setRotation(BodyBottom, 0F, 0F, 0F); - Handle = new ModelRenderer(this, 0, 29); - Handle.addBox(0F, 0F, 0F, 2, 5, 2); - Handle.setRotationPoint(5F, 5F, -1F); - Handle.setTextureSize(128, 64); - Handle.mirror = true; - setRotation(Handle, 0F, 0F, -0.2617994F); - Trigger = new ModelRenderer(this, 10, 43); - Trigger.addBox(0F, 0F, 0F, 3, 2, 1); - Trigger.setRotationPoint(3F, 5F, -0.5F); - Trigger.setTextureSize(128, 64); - Trigger.mirror = true; - setRotation(Trigger, 0F, 0F, 0F); - CoolingBlock = new ModelRenderer(this, 58, 46); - CoolingBlock.addBox(0F, 0F, 0F, 3, 6, 3); - CoolingBlock.setRotationPoint(-1F, 6F, 0.5F); - CoolingBlock.setTextureSize(128, 64); - CoolingBlock.mirror = true; - setRotation(CoolingBlock, 0F, 0F, 0.2617994F); - BodyCenter = new ModelRenderer(this, 12, 33); - BodyCenter.addBox(0F, 0F, 0F, 3, 8, 2); - BodyCenter.setRotationPoint(-0.5F, 2F, -1F); - BodyCenter.setTextureSize(128, 64); - BodyCenter.mirror = true; - setRotation(BodyCenter, 0F, 0F, 0F); - PipeRPlate = new ModelRenderer(this, 0, 21); - PipeRPlate.addBox(0F, 0F, 0F, 2, 6, 2); - PipeRPlate.setRotationPoint(-1F, 1F, 1F); - PipeRPlate.setTextureSize(128, 64); - PipeRPlate.mirror = true; - setRotation(PipeRPlate, 0F, 0F, 0F); - StockTop = new ModelRenderer(this, 38, 39); - StockTop.addBox(0F, 0F, 0F, 6, 2, 3); - StockTop.setRotationPoint(9F, 1.8F, -1.5F); - StockTop.setTextureSize(128, 64); - StockTop.mirror = true; - setRotation(StockTop, 0F, 0F, 0F); - StockFront = new ModelRenderer(this, 30, 34); - StockFront.addBox(0F, 0F, 0F, 2, 5, 2); - StockFront.setRotationPoint(10F, 3F, -1F); - StockFront.setTextureSize(128, 64); - StockFront.mirror = true; - setRotation(StockFront, 0F, 0F, 0F); - StockBack = new ModelRenderer(this, 38, 32); - StockBack.addBox(0F, 0F, 0F, 2, 5, 2); - StockBack.setRotationPoint(13F, 3F, -1F); - StockBack.setTextureSize(128, 64); - StockBack.mirror = true; - setRotation(StockBack, 0F, 0F, 0F); - StockBottom = new ModelRenderer(this, 46, 35); - StockBottom.addBox(0F, 0F, 0F, 1, 2, 2); - StockBottom.setRotationPoint(12F, 6F, -1F); - StockBottom.setTextureSize(128, 64); - StockBottom.mirror = true; - setRotation(StockBottom, 0F, 0F, 0F); - PipeLPlateB = new ModelRenderer(this, 8, 28); - PipeLPlateB.addBox(0F, 0F, 0F, 3, 3, 2); - PipeLPlateB.setRotationPoint(4F, 2F, -3F); - PipeLPlateB.setTextureSize(128, 64); - PipeLPlateB.mirror = true; - setRotation(PipeLPlateB, 0F, 0F, 0F); - PipeRPlateB = new ModelRenderer(this, 8, 23); - PipeRPlateB.addBox(0F, 0F, 0F, 3, 3, 2); - PipeRPlateB.setRotationPoint(4F, 2F, 1F); - PipeRPlateB.setTextureSize(128, 64); - PipeRPlateB.mirror = true; - setRotation(PipeRPlateB, 0F, 0F, 0F); - StockConnector = new ModelRenderer(this, 22, 30); - StockConnector.addBox(0F, -1F, 0F, 5, 1, 3); - StockConnector.setRotationPoint(6F, 5F, -1.5F); - StockConnector.setTextureSize(128, 64); - StockConnector.mirror = true; - setRotation(StockConnector, 0F, 0F, 0.3490659F); - PipeTL = new ModelRenderer(this, 58, 44); - PipeTL.addBox(0F, 0F, 0F, 12, 1, 1); - PipeTL.setRotationPoint(-3F, 2.3F, -2.5F); - PipeTL.setTextureSize(128, 64); - PipeTL.mirror = true; - setRotation(PipeTL, 0F, 0F, 0F); - PipeBL = new ModelRenderer(this, 56, 40); - PipeBL.addBox(0F, 0F, 0F, 10, 1, 1); - PipeBL.setRotationPoint(-1F, 3.7F, -2.5F); - PipeBL.setTextureSize(128, 64); - PipeBL.mirror = true; - setRotation(PipeBL, 0F, 0F, 0F); - PipeTR = new ModelRenderer(this, 56, 42); - PipeTR.addBox(0F, 0F, 0F, 12, 1, 1); - PipeTR.setRotationPoint(-3F, 2.3F, 1.5F); - PipeTR.setTextureSize(128, 64); - PipeTR.mirror = true; - setRotation(PipeTR, 0F, 0F, 0F); - PipeBR = new ModelRenderer(this, 56, 38); - PipeBR.addBox(0F, 0F, 0F, 10, 1, 1); - PipeBR.setRotationPoint(-1F, 3.7F, 1.5F); - PipeBR.setTextureSize(128, 64); - PipeBR.mirror = true; - setRotation(PipeBR, 0F, 0F, 0F); - PipeL = new ModelRenderer(this, 52, 36); - PipeL.addBox(0F, 0F, 0F, 11, 1, 1); - PipeL.setRotationPoint(-13F, 1.5F, -2.5F); - PipeL.setTextureSize(128, 64); - PipeL.mirror = true; - setRotation(PipeL, 0F, 0F, 0F); - PipiR = new ModelRenderer(this, 52, 34); - PipiR.addBox(0F, 0F, 0F, 11, 1, 1); - PipiR.setRotationPoint(-13F, 1.5F, 1.5F); - PipiR.setTextureSize(128, 64); - PipiR.mirror = true; - setRotation(PipiR, 0F, 0F, 0F); - ConnectorFront = new ModelRenderer(this, 0, 17); - ConnectorFront.addBox(0F, 0F, 0F, 3, 3, 1); - ConnectorFront.setRotationPoint(-14.5F, 4F, -0.5F); - ConnectorFront.setTextureSize(128, 64); - ConnectorFront.mirror = true; - setRotation(ConnectorFront, 0F, 0F, 0F); - ConnectorBFront = new ModelRenderer(this, 8, 18); - ConnectorBFront.addBox(0F, 0F, -1F, 1, 4, 1); - ConnectorBFront.setRotationPoint(-14F, 6F, 0.5F); - ConnectorBFront.setTextureSize(128, 64); - ConnectorBFront.mirror = true; - setRotation(ConnectorBFront, -0.7853982F, 0F, 0F); - ConnectorBBack = new ModelRenderer(this, 12, 18); - ConnectorBBack.addBox(0F, 0F, -1F, 1, 4, 1); - ConnectorBBack.setRotationPoint(-3F, 6F, 0.5F); - ConnectorBBack.setTextureSize(128, 64); - ConnectorBBack.mirror = true; - setRotation(ConnectorBBack, -0.7853982F, 0F, 0F); - Connector = new ModelRenderer(this, 18, 26); - Connector.addBox(0F, 3.5F, -1.5F, 12, 2, 2); - Connector.setRotationPoint(-14F, 6F, 0.5F); - Connector.setTextureSize(128, 64); - Connector.mirror = true; - setRotation(Connector, -0.7853982F, 0F, 0F); - ConnectorStrut = new ModelRenderer(this, 18, 24); - ConnectorStrut.addBox(0F, 2F, -1F, 10, 1, 1); - ConnectorStrut.setRotationPoint(-13F, 6F, 0.5F); - ConnectorStrut.setTextureSize(128, 64); - ConnectorStrut.mirror = true; - setRotation(ConnectorStrut, -0.7853982F, 0F, 0F); - PipeLarge = new ModelRenderer(this, 46, 30); - PipeLarge.addBox(0F, 0F, 0F, 8, 2, 2); - PipeLarge.setRotationPoint(-9.5F, 7F, -1F); - PipeLarge.setTextureSize(128, 64); - PipeLarge.mirror = true; - setRotation(PipeLarge, 0F, 0F, 0F); - PipeLargeBack = new ModelRenderer(this, 46, 22); - PipeLargeBack.addBox(0F, 0F, 0F, 2, 7, 1); - PipeLargeBack.setRotationPoint(-4F, 2F, 2F); - PipeLargeBack.setTextureSize(128, 64); - PipeLargeBack.mirror = true; - setRotation(PipeLargeBack, 0F, 0F, 0F); - PipiLargeConnector = new ModelRenderer(this, 40, 23); - PipiLargeConnector.addBox(0F, 0F, 0F, 2, 2, 1); - PipiLargeConnector.setRotationPoint(-4F, 7F, 1F); - PipiLargeConnector.setTextureSize(128, 64); - PipiLargeConnector.mirror = true; - setRotation(PipiLargeConnector, 0F, 0F, 0F); - PlateFront = new ModelRenderer(this, 20, 15); - PlateFront.addBox(0F, 0F, 0F, 1, 4, 5); - PlateFront.setRotationPoint(-13F, 1.5F, -2.5F); - PlateFront.setTextureSize(128, 64); - PlateFront.mirror = true; - setRotation(PlateFront, 0F, 0F, 0.6108652F); - ScaffoldFront = new ModelRenderer(this, 0, 13); - ScaffoldFront.addBox(0F, 0F, 0F, 1, 1, 3); - ScaffoldFront.setRotationPoint(-13F, 7F, -0.5F); - ScaffoldFront.setTextureSize(128, 64); - ScaffoldFront.mirror = true; - setRotation(ScaffoldFront, 0F, 0F, 0F); - ScaffoldBottom = new ModelRenderer(this, 0, 11); - ScaffoldBottom.addBox(0F, 0F, 0F, 8, 1, 1); - ScaffoldBottom.setRotationPoint(-12F, 7F, 1.5F); - ScaffoldBottom.setTextureSize(128, 64); - ScaffoldBottom.mirror = true; - setRotation(ScaffoldBottom, 0F, 0F, 0F); - ScaffoldBack = new ModelRenderer(this, 32, 18); - ScaffoldBack.addBox(0F, 0F, 0F, 1, 5, 1); - ScaffoldBack.setRotationPoint(-5F, 2.5F, 1.5F); - ScaffoldBack.setTextureSize(128, 64); - ScaffoldBack.mirror = true; - setRotation(ScaffoldBack, 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); - Body.render(f5); - Barrel1.render(f5); - Barrel2.render(f5); - BarrelBack.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - BarrelNozzle.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - TankF1.render(f5); - TankF2.render(f5); - TankF3.render(f5); - TankB1.render(f5); - TankB2.render(f5); - TankB3.render(f5); - Drum1.render(f5); - Drum2.render(f5); - BodyBACK.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - PipeLPlate.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - BodyBottom.render(f5); - Handle.render(f5); - Trigger.render(f5); - CoolingBlock.render(f5); - BodyCenter.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - PipeRPlate.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - StockTop.render(f5); - StockFront.render(f5); - StockBack.render(f5); - StockBottom.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - PipeLPlateB.render(f5); - PipeRPlateB.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - StockConnector.render(f5); - PipeTL.render(f5); - PipeBL.render(f5); - PipeTR.render(f5); - PipeBR.render(f5); - PipeL.render(f5); - PipiR.render(f5); - ConnectorFront.render(f5); - ConnectorBFront.render(f5); - ConnectorBBack.render(f5); - Connector.render(f5); - ConnectorStrut.render(f5); - PipeLarge.render(f5); - PipeLargeBack.render(f5); - PipiLargeConnector.render(f5); - PlateFront.render(f5); - ScaffoldFront.render(f5); - ScaffoldBottom.render(f5); - ScaffoldBack.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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelDefabricator.java b/src/main/java/com/hbm/render/model/ModelDefabricator.java deleted file mode 100755 index bc156eb79..000000000 --- a/src/main/java/com/hbm/render/model/ModelDefabricator.java +++ /dev/null @@ -1,231 +0,0 @@ -//This File was created with the Minecraft-SMP Modelling Toolbox 2.3.0.0 -// Copyright (C) 2017 Minecraft-SMP.de -// This file is for Flan's Flying Mod Version 4.0.x+ - -// Model: Defabricator -// Model Creator: -// Created on:05.06.2017 - 11:21:40 -// Last changed on: 05.06.2017 - 11:21:40 - -package com.hbm.render.model; - -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelDefabricator extends ModelBase -{ - int textureX = 128; - int textureY = 64; - ModelRenderer[] modeldefabricatorModel; - - public ModelDefabricator() - { - textureWidth = 128; - textureHeight = 64; - modeldefabricatorModel = new ModelRenderer[40]; - modeldefabricatorModel[0] = new ModelRenderer(this, 1, 1); // Box 0 - modeldefabricatorModel[1] = new ModelRenderer(this, 25, 1); // Box 1 - modeldefabricatorModel[2] = new ModelRenderer(this, 41, 1); // Box 2 - modeldefabricatorModel[3] = new ModelRenderer(this, 57, 1); // Box 3 - modeldefabricatorModel[4] = new ModelRenderer(this, 89, 1); // Box 4 - modeldefabricatorModel[5] = new ModelRenderer(this, 105, 1); // Box 5 - modeldefabricatorModel[6] = new ModelRenderer(this, 1, 9); // Box 6 - modeldefabricatorModel[7] = new ModelRenderer(this, 25, 9); // Box 7 - modeldefabricatorModel[8] = new ModelRenderer(this, 49, 1); // Box 8 - modeldefabricatorModel[9] = new ModelRenderer(this, 57, 9); // Box 9 - modeldefabricatorModel[10] = new ModelRenderer(this, 33, 9); // Box 10 - modeldefabricatorModel[11] = new ModelRenderer(this, 89, 9); // Box 11 - modeldefabricatorModel[12] = new ModelRenderer(this, 113, 9); // Box 12 - modeldefabricatorModel[13] = new ModelRenderer(this, 17, 1); // Box 13 - modeldefabricatorModel[14] = new ModelRenderer(this, 1, 17); // Box 14 - modeldefabricatorModel[15] = new ModelRenderer(this, 17, 17); // Box 15 - modeldefabricatorModel[16] = new ModelRenderer(this, 41, 17); // Box 16 - modeldefabricatorModel[17] = new ModelRenderer(this, 73, 17); // Box 17 - modeldefabricatorModel[18] = new ModelRenderer(this, 97, 17); // Box 18 - modeldefabricatorModel[19] = new ModelRenderer(this, 113, 17); // Box 19 - modeldefabricatorModel[20] = new ModelRenderer(this, 1, 25); // Box 20 - modeldefabricatorModel[21] = new ModelRenderer(this, 9, 25); // Box 21 - modeldefabricatorModel[22] = new ModelRenderer(this, 17, 25); // Box 22 - modeldefabricatorModel[23] = new ModelRenderer(this, 33, 25); // Box 23 - modeldefabricatorModel[24] = new ModelRenderer(this, 49, 25); // Box 24 - modeldefabricatorModel[25] = new ModelRenderer(this, 65, 25); // Box 25 - modeldefabricatorModel[26] = new ModelRenderer(this, 81, 25); // Box 26 - modeldefabricatorModel[27] = new ModelRenderer(this, 97, 1); // Box 27 - modeldefabricatorModel[28] = new ModelRenderer(this, 1, 33); // Box 28 - modeldefabricatorModel[29] = new ModelRenderer(this, 105, 17); // Box 29 - modeldefabricatorModel[30] = new ModelRenderer(this, 89, 25); // Box 30 - modeldefabricatorModel[31] = new ModelRenderer(this, 49, 33); // Box 31 - modeldefabricatorModel[32] = new ModelRenderer(this, 1, 41); // Box 32 - modeldefabricatorModel[33] = new ModelRenderer(this, 89, 25); // Box 33 - modeldefabricatorModel[34] = new ModelRenderer(this, 89, 33); // Box 34 - modeldefabricatorModel[35] = new ModelRenderer(this, 41, 41); // Box 35 - modeldefabricatorModel[36] = new ModelRenderer(this, 105, 25); // Box 36 - modeldefabricatorModel[37] = new ModelRenderer(this, 113, 25); // Box 39 - modeldefabricatorModel[38] = new ModelRenderer(this, 121, 25); // Box 40 - modeldefabricatorModel[39] = new ModelRenderer(this, 57, 41); // Box 41 - - modeldefabricatorModel[0].addBox(0F, 0F, 0F, 5, 2, 3); // Box 0 - modeldefabricatorModel[0].setRotationPoint(0F, 0.5F, -1.5F); - - modeldefabricatorModel[1].addBox(0F, 0F, 0F, 5, 3, 2); // Box 1 - modeldefabricatorModel[1].setRotationPoint(0F, 0F, -1F); - - modeldefabricatorModel[2].addBox(0F, 0F, 0F, 2, 7, 3); // Box 2 - modeldefabricatorModel[2].setRotationPoint(-2F, -2F, -1.5F); - - modeldefabricatorModel[3].addBox(0F, 0F, 0F, 11, 1, 3); // Box 3 - modeldefabricatorModel[3].setRotationPoint(0F, -2F, -1.5F); - - modeldefabricatorModel[4].addBox(0F, 0F, 0F, 1, 3, 3); // Box 4 - modeldefabricatorModel[4].setRotationPoint(10F, -1F, -1.5F); - - modeldefabricatorModel[5].addBox(0F, 0F, 0F, 6, 1, 2); // Box 5 - modeldefabricatorModel[5].setRotationPoint(0F, 4F, -1F); - - modeldefabricatorModel[6].addBox(0F, -1F, 0F, 6, 1, 2); // Box 6 - modeldefabricatorModel[6].setRotationPoint(6F, 5F, -1F); - modeldefabricatorModel[6].rotateAngleZ = -0.61086524F; - - modeldefabricatorModel[7].addBox(0F, 0F, 0F, 1, 2, 2); // Box 7 - modeldefabricatorModel[7].setRotationPoint(5F, 0.5F, -1F); - - modeldefabricatorModel[8].addBox(0F, 0F, 0F, 4, 1, 1); // Box 8 - modeldefabricatorModel[8].setRotationPoint(6F, 1F, -0.5F); - - modeldefabricatorModel[9].addBox(0F, 0F, 0F, 12, 1, 2); // Box 9 - modeldefabricatorModel[9].setRotationPoint(11F, 0F, -1F); - - modeldefabricatorModel[10].addBox(0F, 0F, 0F, 1, 6, 2); // Box 10 - modeldefabricatorModel[10].setRotationPoint(22F, -6F, -1F); - - modeldefabricatorModel[11].addBox(0F, 0F, 0F, 8, 2, 2); // Box 11 - modeldefabricatorModel[11].setRotationPoint(14F, -2.5F, -1F); - - modeldefabricatorModel[12].addBox(0F, 0F, 0F, 3, 1, 1); // Box 12 - modeldefabricatorModel[12].setRotationPoint(11F, -2F, -0.5F); - - modeldefabricatorModel[13].addBox(0F, 0F, 0F, 1, 1, 1); // Box 13 - modeldefabricatorModel[13].setRotationPoint(1F, 3.5F, -0.5F); - - modeldefabricatorModel[14].addBox(0F, 0F, 0F, 5, 1, 2); // Box 14 - modeldefabricatorModel[14].setRotationPoint(13.5F, -4.5F, -1F); - - modeldefabricatorModel[15].addBox(0F, 0F, 0F, 4, 1, 2); // Box 15 - modeldefabricatorModel[15].setRotationPoint(18F, -5F, -1F); - - modeldefabricatorModel[16].addBox(0F, 0F, 0F, 10, 1, 2); // Box 16 - modeldefabricatorModel[16].setRotationPoint(4F, -5F, -1F); - - modeldefabricatorModel[17].addBox(-6F, 0F, 0F, 6, 1, 2); // Box 17 - modeldefabricatorModel[17].setRotationPoint(4F, -5F, -1F); - modeldefabricatorModel[17].rotateAngleZ = -0.52359878F; - - modeldefabricatorModel[18].addBox(0F, 0F, 0F, 1, 3, 3); // Box 18 - modeldefabricatorModel[18].setRotationPoint(22F, -9F, -1.5F); - - modeldefabricatorModel[19].addBox(0F, 0F, 0F, 5, 2, 2); // Box 19 - modeldefabricatorModel[19].setRotationPoint(17F, -8.5F, -1F); - - modeldefabricatorModel[20].addBox(-4F, -3F, 0F, 1, 3, 2); // Box 20 - modeldefabricatorModel[20].setRotationPoint(4F, -5F, -1F); - modeldefabricatorModel[20].rotateAngleZ = -0.52359878F; - - modeldefabricatorModel[21].addBox(-4F, -4F, 0F, 1, 1, 2); // Box 21 - modeldefabricatorModel[21].setRotationPoint(4F, -5F, -1F); - modeldefabricatorModel[21].rotateAngleZ = -0.52359878F; - - modeldefabricatorModel[22].addBox(0F, 0F, 0F, 4, 3, 2); // Box 22 - modeldefabricatorModel[22].setRotationPoint(-6F, 0F, -1F); - - modeldefabricatorModel[23].addBox(0F, 0F, 0F, 4, 2, 3); // Box 23 - modeldefabricatorModel[23].setRotationPoint(-6F, 0.5F, -1.5F); - - modeldefabricatorModel[24].addBox(0F, 0F, 0F, 5, 2, 2); // Box 24 - modeldefabricatorModel[24].setRotationPoint(-11F, 0.5F, -1F); - - modeldefabricatorModel[25].addBox(0F, 0F, 0F, 2, 3, 2); // Box 25 - modeldefabricatorModel[25].setRotationPoint(-10.5F, 0F, -1F); - - modeldefabricatorModel[26].addBox(0F, 0F, 0F, 2, 2, 3); // Box 26 - modeldefabricatorModel[26].setRotationPoint(-10.5F, 0.5F, -1.5F); - - modeldefabricatorModel[27].addBox(0F, -2.5F, -0.5F, 1, 1, 1); // Box 27 - modeldefabricatorModel[27].setRotationPoint(-3F, 1.5F, 0F); - - modeldefabricatorModel[28].addBox(0F, -3F, -0.5F, 20, 1, 1); // Box 28 - modeldefabricatorModel[28].setRotationPoint(-23F, 1.5F, 0F); - - modeldefabricatorModel[29].addBox(0F, -2.5F, -0.5F, 1, 1, 1); // Box 29 - modeldefabricatorModel[29].setRotationPoint(-3F, 1.5F, 0F); - modeldefabricatorModel[29].rotateAngleX = 2.0943951F; - - modeldefabricatorModel[30].addBox(0F, -2.5F, -0.5F, 1, 1, 1); // Box 30 - modeldefabricatorModel[30].setRotationPoint(-3F, 1.5F, 0F); - modeldefabricatorModel[30].rotateAngleX = -2.0943951F; - - modeldefabricatorModel[31].addBox(0F, -3F, -0.5F, 20, 1, 1); // Box 31 - modeldefabricatorModel[31].setRotationPoint(-23F, 1.5F, 0F); - modeldefabricatorModel[31].rotateAngleX = -2.0943951F; - - modeldefabricatorModel[32].addBox(0F, -3F, -0.5F, 20, 1, 1); // Box 32 - modeldefabricatorModel[32].setRotationPoint(-23F, 1.5F, 0F); - modeldefabricatorModel[32].rotateAngleX = 2.0943951F; - - modeldefabricatorModel[33].addBox(0F, -2F, -3F, 2, 1, 6); // Box 33 - modeldefabricatorModel[33].setRotationPoint(-22F, 1.5F, 0F); - modeldefabricatorModel[33].rotateAngleX = 1.04719755F; - - modeldefabricatorModel[34].addBox(0F, -2F, -3F, 2, 1, 6); // Box 34 - modeldefabricatorModel[34].setRotationPoint(-22F, 1.5F, 0F); - modeldefabricatorModel[34].rotateAngleX = -3.14159265F; - - modeldefabricatorModel[35].addBox(0F, -2F, -3F, 2, 1, 6); // Box 35 - modeldefabricatorModel[35].setRotationPoint(-22F, 1.5F, 0F); - modeldefabricatorModel[35].rotateAngleX = -1.04719755F; - - modeldefabricatorModel[36].addBox(0.5F, -2.5F, -0.5F, 1, 1, 1); // Box 36 - modeldefabricatorModel[36].setRotationPoint(-24F, 1.5F, 0F); - - modeldefabricatorModel[37].addBox(0.5F, -2.5F, -0.5F, 1, 1, 1); // Box 39 - modeldefabricatorModel[37].setRotationPoint(-24F, 1.5F, 0F); - modeldefabricatorModel[37].rotateAngleX = 2.0943951F; - - modeldefabricatorModel[38].addBox(0.5F, -2.5F, -0.5F, 1, 1, 1); // Box 40 - modeldefabricatorModel[38].setRotationPoint(-24F, 1.5F, 0F); - modeldefabricatorModel[38].rotateAngleX = -2.0943951F; - - modeldefabricatorModel[39].addBox(0F, 0F, 0F, 13, 0, 1); // Box 41 - modeldefabricatorModel[39].setRotationPoint(5F, -5F, -0.5F); - modeldefabricatorModel[39].rotateAngleZ = 0.17453293F; - - for(int i = 0; i < 40; i++) - { - modeldefabricatorModel[i].setTextureSize(textureX, textureY); - modeldefabricatorModel[i].mirror = true; - } - } - - @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); - for(int i = 0; i < 40; i++) - { - if(i == 20) - GL11.glDisable(GL11.GL_CULL_FACE); - modeldefabricatorModel[i].render(f5); - if(i == 20) - GL11.glEnable(GL11.GL_CULL_FACE); - } - } - - @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); - } -} \ No newline at end of file diff --git a/src/main/java/com/hbm/render/model/ModelEMPRay.java b/src/main/java/com/hbm/render/model/ModelEMPRay.java deleted file mode 100644 index 54f8d321f..000000000 --- a/src/main/java/com/hbm/render/model/ModelEMPRay.java +++ /dev/null @@ -1,393 +0,0 @@ -// Date: 07.11.2016 21:36:37 -// 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 ModelEMPRay extends ModelBase -{ - //fields - ModelRenderer Body; - ModelRenderer BodyConnector; - ModelRenderer BodyFront; - ModelRenderer BodyPlateLeft; - ModelRenderer BodyPlateRight; - ModelRenderer BodyPlateBottom; - ModelRenderer Rib1; - ModelRenderer Rib2; - ModelRenderer Rib3; - ModelRenderer Rib4; - ModelRenderer Rib5; - ModelRenderer Rib6; - ModelRenderer Rib7; - ModelRenderer Stock; - ModelRenderer StockBottom; - ModelRenderer StockPlate; - ModelRenderer CrankPivot; - ModelRenderer CrankPlate; - ModelRenderer CrankHandleBase; - ModelRenderer CrankHandle; - ModelRenderer HandlePivot; - ModelRenderer HandleLeft; - ModelRenderer HandleRight; - ModelRenderer Handle; - ModelRenderer ShieldTop; - ModelRenderer ShieldBottom; - ModelRenderer Battery; - ModelRenderer BatteryTop; - ModelRenderer BatteryBottom; - ModelRenderer Wire; - ModelRenderer SpindelPivot; - ModelRenderer SpindelBase1; - ModelRenderer Coil1; - ModelRenderer SpindelTip1; - ModelRenderer SpindelBase2; - ModelRenderer Coil2; - ModelRenderer SpindelTip2; - ModelRenderer SpindelBase3; - ModelRenderer Coil3; - ModelRenderer SpindelTip3; - ModelRenderer WireRight; - ModelRenderer WireLeft; - - public ModelEMPRay() - { - textureWidth = 256; - textureHeight = 128; - - Body = new ModelRenderer(this, 0, 96); - Body.addBox(0F, 0F, 0F, 20, 16, 16); - Body.setRotationPoint(0F, 0F, -8F); - Body.setTextureSize(64, 32); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - BodyConnector = new ModelRenderer(this, 0, 80); - BodyConnector.addBox(0F, 0F, 0F, 15, 8, 8); - BodyConnector.setRotationPoint(-15F, 0F, -4F); - BodyConnector.setTextureSize(64, 32); - BodyConnector.mirror = true; - setRotation(BodyConnector, 0F, 0F, 0F); - BodyFront = new ModelRenderer(this, 72, 96); - BodyFront.addBox(0F, 0F, 0F, 5, 16, 16); - BodyFront.setRotationPoint(-20F, 0F, -8F); - BodyFront.setTextureSize(64, 32); - BodyFront.mirror = true; - setRotation(BodyFront, 0F, 0F, 0F); - BodyPlateLeft = new ModelRenderer(this, 46, 84); - BodyPlateLeft.addBox(-16F, 0F, 0F, 16, 8, 4); - BodyPlateLeft.setRotationPoint(0F, 0F, -8F); - BodyPlateLeft.setTextureSize(64, 32); - BodyPlateLeft.mirror = true; - setRotation(BodyPlateLeft, 0F, 0.2617994F, 0F); - BodyPlateRight = new ModelRenderer(this, 86, 84); - BodyPlateRight.addBox(-16F, 0F, -4F, 16, 8, 4); - BodyPlateRight.setRotationPoint(0F, 0F, 8F); - BodyPlateRight.setTextureSize(64, 32); - BodyPlateRight.mirror = true; - setRotation(BodyPlateRight, 0F, -0.2617994F, 0F); - BodyPlateBottom = new ModelRenderer(this, 0, 65); - BodyPlateBottom.addBox(-18F, -7F, 0F, 18, 7, 8); - BodyPlateBottom.setRotationPoint(0F, 16F, -4F); - BodyPlateBottom.setTextureSize(64, 32); - BodyPlateBottom.mirror = true; - setRotation(BodyPlateBottom, 0F, 0F, 0.4886922F); - Rib1 = new ModelRenderer(this, 240, 0); - Rib1.addBox(0F, 0F, 0F, 0, 8, 8); - Rib1.setRotationPoint(-13.5F, 8F, -4F); - Rib1.setTextureSize(64, 32); - Rib1.mirror = true; - setRotation(Rib1, 0F, 0F, 0F); - Rib2 = new ModelRenderer(this, 222, 0); - Rib2.addBox(0F, 0F, 0F, 0, 8, 9); - Rib2.setRotationPoint(-11.5F, 8F, -4.5F); - Rib2.setTextureSize(64, 32); - Rib2.mirror = true; - setRotation(Rib2, 0F, 0F, 0F); - Rib3 = new ModelRenderer(this, 202, 0); - Rib3.addBox(0F, 0F, 0F, 0, 8, 10); - Rib3.setRotationPoint(-9.5F, 8F, -5F); - Rib3.setTextureSize(64, 32); - Rib3.mirror = true; - setRotation(Rib3, 0F, 0F, 0F); - Rib4 = new ModelRenderer(this, 180, 0); - Rib4.addBox(0F, 0F, 0F, 0, 8, 11); - Rib4.setRotationPoint(-7.5F, 8F, -5.5F); - Rib4.setTextureSize(64, 32); - Rib4.mirror = true; - setRotation(Rib4, 0F, 0F, 0F); - Rib5 = new ModelRenderer(this, 156, 0); - Rib5.addBox(0F, 0F, 0F, 0, 8, 12); - Rib5.setRotationPoint(-5.5F, 8F, -6F); - Rib5.setTextureSize(64, 32); - Rib5.mirror = true; - setRotation(Rib5, 0F, 0F, 0F); - Rib6 = new ModelRenderer(this, 130, 0); - Rib6.addBox(0F, 0F, 0F, 0, 8, 13); - Rib6.setRotationPoint(-3.5F, 8F, -6.5F); - Rib6.setTextureSize(64, 32); - Rib6.mirror = true; - setRotation(Rib6, 0F, 0F, 0F); - Rib7 = new ModelRenderer(this, 102, 0); - Rib7.addBox(0F, 0F, 0F, 0, 8, 14); - Rib7.setRotationPoint(-1.5F, 8F, -7F); - Rib7.setTextureSize(64, 32); - Rib7.mirror = true; - setRotation(Rib7, 0F, 0F, 0F); - Stock = new ModelRenderer(this, 114, 116); - Stock.addBox(0F, 0F, 0F, 25, 6, 6); - Stock.setRotationPoint(20F, 10F, -3F); - Stock.setTextureSize(64, 32); - Stock.mirror = true; - setRotation(Stock, 0F, 0F, 0F); - StockBottom = new ModelRenderer(this, 114, 104); - StockBottom.addBox(0F, 0F, 0F, 4, 6, 6); - StockBottom.setRotationPoint(41F, 16F, -3F); - StockBottom.setTextureSize(64, 32); - StockBottom.mirror = true; - setRotation(StockBottom, 0F, 0F, 0F); - StockPlate = new ModelRenderer(this, 134, 92); - StockPlate.addBox(0F, -18F, 0F, 6, 18, 6); - StockPlate.setRotationPoint(41F, 22F, -3F); - StockPlate.setTextureSize(64, 32); - StockPlate.mirror = true; - setRotation(StockPlate, 0F, 0F, -1.22173F); - CrankPivot = new ModelRenderer(this, 0, 63); - CrankPivot.addBox(0F, -0.5F, -0.5F, 3, 1, 1); - CrankPivot.setRotationPoint(20F, 2F, 0F); - CrankPivot.setTextureSize(64, 32); - CrankPivot.mirror = true; - setRotation(CrankPivot, -0.4363323F, 0F, 0F); - CrankPlate = new ModelRenderer(this, 0, 55); - CrankPlate.addBox(0F, -1F, -1F, 1, 6, 2); - CrankPlate.setRotationPoint(21.5F, 2F, 0F); - CrankPlate.setTextureSize(64, 32); - CrankPlate.mirror = true; - setRotation(CrankPlate, -0.4363323F, 0F, 0F); - CrankHandleBase = new ModelRenderer(this, 0, 53); - CrankHandleBase.addBox(0F, 3.5F, -0.5F, 2, 1, 1); - CrankHandleBase.setRotationPoint(22F, 2F, 0F); - CrankHandleBase.setTextureSize(64, 32); - CrankHandleBase.mirror = true; - setRotation(CrankHandleBase, -0.4363323F, 0F, 0F); - CrankHandle = new ModelRenderer(this, 0, 49); - CrankHandle.addBox(0F, 3F, -1F, 6, 2, 2); - CrankHandle.setRotationPoint(24F, 2F, 0F); - CrankHandle.setTextureSize(64, 32); - CrankHandle.mirror = true; - setRotation(CrankHandle, -0.4363323F, 0F, 0F); - HandlePivot = new ModelRenderer(this, 52, 60); - HandlePivot.addBox(-1F, -1F, 0F, 2, 2, 22); - HandlePivot.setRotationPoint(7F, 7F, -11F); - HandlePivot.setTextureSize(64, 32); - HandlePivot.mirror = true; - setRotation(HandlePivot, 0F, 0F, 0.4363323F); - HandleLeft = new ModelRenderer(this, 100, 67); - HandleLeft.addBox(-1.5F, -14F, 0F, 3, 16, 1); - HandleLeft.setRotationPoint(7F, 7F, -9.5F); - HandleLeft.setTextureSize(64, 32); - HandleLeft.mirror = true; - setRotation(HandleLeft, 0F, 0F, 0.4363323F); - HandleRight = new ModelRenderer(this, 108, 67); - HandleRight.addBox(-1.5F, -14F, 0F, 3, 16, 1); - HandleRight.setRotationPoint(7F, 7F, 8.5F); - HandleRight.setTextureSize(64, 32); - HandleRight.mirror = true; - setRotation(HandleRight, 0F, 0F, 0.4363323F); - Handle = new ModelRenderer(this, 52, 31); - Handle.addBox(-2.5F, -19F, 0F, 5, 5, 24); - Handle.setRotationPoint(7F, 7F, -12F); - Handle.setTextureSize(64, 32); - Handle.mirror = true; - setRotation(Handle, 0F, 0F, 0.4363323F); - ShieldTop = new ModelRenderer(this, 64, 0); - ShieldTop.addBox(0F, 0F, 0F, 0, 12, 18); - ShieldTop.setRotationPoint(-11F, -14F, -9F); - ShieldTop.setTextureSize(64, 32); - ShieldTop.mirror = true; - setRotation(ShieldTop, 0F, 0F, 0F); - ShieldBottom = new ModelRenderer(this, 36, 0); - ShieldBottom.addBox(0F, 0F, 0F, 0, 9, 14); - ShieldBottom.setRotationPoint(-11F, -2F, -7F); - ShieldBottom.setTextureSize(64, 32); - ShieldBottom.mirror = true; - setRotation(ShieldBottom, 0F, 0F, -0.6981317F); - Battery = new ModelRenderer(this, 10, 56); - Battery.addBox(0F, 0F, 0F, 4, 6, 3); - Battery.setRotationPoint(13F, 6F, -11F); - Battery.setTextureSize(64, 32); - Battery.mirror = true; - setRotation(Battery, 0F, 0F, 0F); - BatteryTop = new ModelRenderer(this, 24, 60); - BatteryTop.addBox(0F, 0F, 0F, 5, 1, 4); - BatteryTop.setRotationPoint(12.5F, 5F, -11.5F); - BatteryTop.setTextureSize(64, 32); - BatteryTop.mirror = true; - setRotation(BatteryTop, 0F, 0F, 0F); - BatteryBottom = new ModelRenderer(this, 24, 55); - BatteryBottom.addBox(0F, 0F, 0F, 5, 1, 4); - BatteryBottom.setRotationPoint(12.5F, 12F, -11.5F); - BatteryBottom.setTextureSize(64, 32); - BatteryBottom.mirror = true; - setRotation(BatteryBottom, 0F, 0F, 0F); - Wire = new ModelRenderer(this, 0, 44); - Wire.addBox(0F, -4F, 0F, 2, 4, 1); - Wire.setRotationPoint(14F, 5F, -10F); - Wire.setTextureSize(64, 32); - Wire.mirror = true; - setRotation(Wire, -0.5235988F, 0F, 0F); - SpindelPivot = new ModelRenderer(this, 0, 36); - SpindelPivot.addBox(0F, 0F, 0F, 4, 3, 3); - SpindelPivot.setRotationPoint(-24F, 8.5F, -1.5F); - SpindelPivot.setTextureSize(64, 32); - SpindelPivot.mirror = true; - setRotation(SpindelPivot, 0F, 0F, 0F); - SpindelBase1 = new ModelRenderer(this, 0, 27); - SpindelBase1.addBox(0F, -5F, -1F, 2, 5, 2); - SpindelBase1.setRotationPoint(-23F, 10F, 0F); - SpindelBase1.setTextureSize(64, 32); - SpindelBase1.mirror = true; - setRotation(SpindelBase1, 0F, 0F, 0F); - Coil1 = new ModelRenderer(this, 0, 17); - Coil1.addBox(0F, -6F, -2F, 12, 4, 4); - Coil1.setRotationPoint(-35F, 10F, 0F); - Coil1.setTextureSize(64, 32); - Coil1.mirror = true; - setRotation(Coil1, 0F, 0F, 0F); - SpindelTip1 = new ModelRenderer(this, 0, 11); - SpindelTip1.addBox(0F, -5F, -1F, 1, 2, 2); - SpindelTip1.setRotationPoint(-36F, 10F, 0F); - SpindelTip1.setTextureSize(64, 32); - SpindelTip1.mirror = true; - setRotation(SpindelTip1, 0F, 0F, 0F); - SpindelBase2 = new ModelRenderer(this, 0, 27); - SpindelBase2.addBox(0F, -5F, -1F, 2, 5, 2); - SpindelBase2.setRotationPoint(-23F, 10F, 0F); - SpindelBase2.setTextureSize(64, 32); - SpindelBase2.mirror = true; - setRotation(SpindelBase2, 2.094395F, 0F, 0F); - Coil2 = new ModelRenderer(this, 0, 17); - Coil2.addBox(0F, -6F, -2F, 12, 4, 4); - Coil2.setRotationPoint(-35F, 10F, 0F); - Coil2.setTextureSize(64, 32); - Coil2.mirror = true; - setRotation(Coil2, 2.094395F, 0F, 0F); - SpindelTip2 = new ModelRenderer(this, 0, 11); - SpindelTip2.addBox(0F, -5F, -1F, 1, 2, 2); - SpindelTip2.setRotationPoint(-36F, 10F, 0F); - SpindelTip2.setTextureSize(64, 32); - SpindelTip2.mirror = true; - setRotation(SpindelTip2, 2.094395F, 0F, 0F); - SpindelBase3 = new ModelRenderer(this, 0, 27); - SpindelBase3.addBox(0F, -5F, -1F, 2, 5, 2); - SpindelBase3.setRotationPoint(-23F, 10F, 0F); - SpindelBase3.setTextureSize(64, 32); - SpindelBase3.mirror = true; - setRotation(SpindelBase3, -2.094395F, 0F, 0F); - Coil3 = new ModelRenderer(this, 0, 17); - Coil3.addBox(0F, -6F, -2F, 12, 4, 4); - Coil3.setRotationPoint(-35F, 10F, 0F); - Coil3.setTextureSize(64, 32); - Coil3.mirror = true; - setRotation(Coil3, -2.094395F, 0F, 0F); - SpindelTip3 = new ModelRenderer(this, 0, 11); - SpindelTip3.addBox(0F, -5F, -1F, 1, 2, 2); - SpindelTip3.setRotationPoint(-36F, 10F, 0F); - SpindelTip3.setTextureSize(64, 32); - SpindelTip3.mirror = true; - setRotation(SpindelTip3, -2.094395F, 0F, 0F); - WireRight = new ModelRenderer(this, 0, 2); - WireRight.addBox(0F, 0F, 0F, 15, 1, 1); - WireRight.setRotationPoint(-15F, 13F, 4F); - WireRight.setTextureSize(64, 32); - WireRight.mirror = true; - setRotation(WireRight, 0F, 0F, 0F); - WireLeft = new ModelRenderer(this, 0, 0); - WireLeft.addBox(0F, 0F, 0F, 15, 1, 1); - WireLeft.setRotationPoint(-15F, 13F, -5F); - WireLeft.setTextureSize(64, 32); - WireLeft.mirror = true; - setRotation(WireLeft, 0F, 0F, 0F); - } - - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, float rot) - { - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - Body.render(f5); - BodyConnector.render(f5); - BodyFront.render(f5); - BodyPlateLeft.render(f5); - BodyPlateRight.render(f5); - BodyPlateBottom.render(f5); - Rib1.render(f5); - Rib2.render(f5); - Rib3.render(f5); - Rib4.render(f5); - Rib5.render(f5); - Rib6.render(f5); - Rib7.render(f5); - Stock.render(f5); - StockBottom.render(f5); - StockPlate.render(f5); - CrankPivot.render(f5); - CrankPlate.render(f5); - CrankHandleBase.render(f5); - CrankHandle.render(f5); - HandlePivot.render(f5); - HandleLeft.render(f5); - HandleRight.render(f5); - Handle.render(f5); - ShieldTop.render(f5); - ShieldBottom.render(f5); - Battery.render(f5); - BatteryTop.render(f5); - BatteryBottom.render(f5); - Wire.render(f5); - SpindelPivot.render(f5); - SpindelBase1.rotateAngleX += rot; - Coil1.rotateAngleX += rot; - SpindelTip1.rotateAngleX += rot; - SpindelBase2.rotateAngleX += rot; - Coil2.rotateAngleX += rot; - SpindelTip2.rotateAngleX += rot; - SpindelBase3.rotateAngleX += rot; - Coil3.rotateAngleX += rot; - SpindelTip3.rotateAngleX += rot; - SpindelBase1.render(f5); - Coil1.render(f5); - SpindelTip1.render(f5); - SpindelBase2.render(f5); - Coil2.render(f5); - SpindelTip2.render(f5); - SpindelBase3.render(f5); - Coil3.render(f5); - SpindelTip3.render(f5); - WireRight.render(f5); - WireLeft.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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelEuthanasia.java b/src/main/java/com/hbm/render/model/ModelEuthanasia.java deleted file mode 100644 index 5d55bbabb..000000000 --- a/src/main/java/com/hbm/render/model/ModelEuthanasia.java +++ /dev/null @@ -1,169 +0,0 @@ -// Date: 21.02.2017 21:26:09 -// 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 ModelEuthanasia extends ModelBase -{ - //fields - ModelRenderer Barrel; - ModelRenderer Tank; - ModelRenderer ConnectorBF; - ModelRenderer ConnectorBB; - ModelRenderer ConnectorBeam; - ModelRenderer ConnectorTF; - ModelRenderer ConnectorTB; - ModelRenderer Body; - ModelRenderer Plate; - ModelRenderer Beam; - ModelRenderer Stock; - ModelRenderer StockBack; - ModelRenderer StockPlate; - ModelRenderer Handle; - ModelRenderer Trigger; - - public ModelEuthanasia() - { - textureWidth = 64; - textureHeight = 64; - - Barrel = new ModelRenderer(this, 0, 0); - Barrel.addBox(0F, 0F, 0F, 18, 3, 3); - Barrel.setRotationPoint(-11F, 0.5F, -1.5F); - Barrel.setTextureSize(64, 64); - Barrel.mirror = true; - setRotation(Barrel, 0F, 0F, 0F); - Tank = new ModelRenderer(this, 0, 6); - Tank.addBox(0F, 0F, 0F, 9, 5, 5); - Tank.setRotationPoint(-3F, -0.5F, -2.5F); - Tank.setTextureSize(64, 64); - Tank.mirror = true; - setRotation(Tank, 0F, 0F, 0F); - ConnectorBF = new ModelRenderer(this, 52, 0); - ConnectorBF.addBox(0F, 0F, 0F, 2, 8, 4); - ConnectorBF.setRotationPoint(-6F, 0F, -2F); - ConnectorBF.setTextureSize(64, 64); - ConnectorBF.mirror = true; - setRotation(ConnectorBF, 0F, 0F, 0F); - ConnectorBB = new ModelRenderer(this, 28, 6); - ConnectorBB.addBox(0F, 0F, 0F, 2, 8, 4); - ConnectorBB.setRotationPoint(7F, 0F, -2F); - ConnectorBB.setTextureSize(64, 64); - ConnectorBB.mirror = true; - setRotation(ConnectorBB, 0F, 0F, 0F); - ConnectorBeam = new ModelRenderer(this, 0, 18); - ConnectorBeam.addBox(0F, 0F, 0F, 11, 2, 4); - ConnectorBeam.setRotationPoint(-4F, 6F, -2F); - ConnectorBeam.setTextureSize(64, 64); - ConnectorBeam.mirror = true; - setRotation(ConnectorBeam, 0F, 0F, 0F); - ConnectorTF = new ModelRenderer(this, 40, 12); - ConnectorTF.addBox(0F, 0F, 0F, 2, 8, 4); - ConnectorTF.setRotationPoint(-9F, -4F, -2F); - ConnectorTF.setTextureSize(64, 64); - ConnectorTF.mirror = true; - setRotation(ConnectorTF, 0F, 0F, 0F); - ConnectorTB = new ModelRenderer(this, 52, 12); - ConnectorTB.addBox(0F, 0F, 0F, 2, 8, 4); - ConnectorTB.setRotationPoint(9F, -4F, -2F); - ConnectorTB.setTextureSize(64, 64); - ConnectorTB.mirror = true; - setRotation(ConnectorTB, 0F, 0F, 0F); - Body = new ModelRenderer(this, 0, 24); - Body.addBox(0F, 0F, 0F, 4, 5, 4); - Body.setRotationPoint(11F, -1F, -2F); - Body.setTextureSize(64, 64); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - Plate = new ModelRenderer(this, 16, 24); - Plate.addBox(0F, 0F, 0F, 5, 3, 4); - Plate.setRotationPoint(11F, -4F, -2F); - Plate.setTextureSize(64, 64); - Plate.mirror = true; - setRotation(Plate, 0F, 0F, 0.6457718F); - Beam = new ModelRenderer(this, 0, 33); - Beam.addBox(0F, 0F, 0F, 16, 1, 1); - Beam.setRotationPoint(-7F, -3.5F, -0.5F); - Beam.setTextureSize(64, 64); - Beam.mirror = true; - setRotation(Beam, 0F, 0F, 0F); - Stock = new ModelRenderer(this, 0, 35); - Stock.addBox(0F, 0F, 0F, 10, 2, 2); - Stock.setRotationPoint(15F, 1F, -1F); - Stock.setTextureSize(64, 64); - Stock.mirror = true; - setRotation(Stock, 0F, 0F, 0F); - StockBack = new ModelRenderer(this, 0, 39); - StockBack.addBox(0F, 0F, 0F, 1, 4, 2); - StockBack.setRotationPoint(24F, 3F, -1F); - StockBack.setTextureSize(64, 64); - StockBack.mirror = true; - setRotation(StockBack, 0F, 0F, 0F); - StockPlate = new ModelRenderer(this, 6, 39); - StockPlate.addBox(0F, -5F, 0F, 1, 5, 2); - StockPlate.setRotationPoint(24F, 7F, -1F); - StockPlate.setTextureSize(64, 64); - StockPlate.mirror = true; - setRotation(StockPlate, 0F, 0F, -0.2094395F); - Handle = new ModelRenderer(this, 12, 39); - Handle.addBox(0F, 0F, 0F, 2, 6, 2); - Handle.setRotationPoint(13F, 4F, -1F); - Handle.setTextureSize(64, 64); - Handle.mirror = true; - setRotation(Handle, 0F, 0F, -0.2094395F); - Trigger = new ModelRenderer(this, 20, 39); - Trigger.addBox(0F, 0F, 0F, 1, 4, 2); - Trigger.setRotationPoint(12F, 4F, -1F); - Trigger.setTextureSize(64, 64); - Trigger.mirror = true; - setRotation(Trigger, 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); - Barrel.render(f5); - Tank.render(f5); - ConnectorBF.render(f5); - ConnectorBB.render(f5); - ConnectorBeam.render(f5); - ConnectorTF.render(f5); - ConnectorTB.render(f5); - Body.render(f5); - Plate.render(f5); - Beam.render(f5); - Stock.render(f5); - StockBack.render(f5); - StockPlate.render(f5); - Handle.render(f5); - Trigger.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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelFatman.java b/src/main/java/com/hbm/render/model/ModelFatman.java deleted file mode 100644 index fc65ff140..000000000 --- a/src/main/java/com/hbm/render/model/ModelFatman.java +++ /dev/null @@ -1,318 +0,0 @@ -// Date: 26.01.2016 14:54:33 -// 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 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 ModelFatman extends ModelBase { - // fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - ModelRenderer Shape13; - ModelRenderer Shape14; - ModelRenderer Shape15; - ModelRenderer Shape16; - ModelRenderer Shape17; - ModelRenderer Shape18; - ModelRenderer Shape19; - ModelRenderer Shape20; - ModelRenderer Shape21; - ModelRenderer Shape22; - ModelRenderer Shape23; - ModelRenderer Shape24; - ModelRenderer Shape25; - ModelRenderer Shape26; - ModelRenderer Shape27; - ModelRenderer Shape28; - ModelRenderer Shape29; - ModelRenderer Shape30; - ModelRenderer Shape31; - ModelRenderer Shape32; - ModelRenderer Shape33; - - public ModelFatman() { - textureWidth = 128; - textureHeight = 64; - - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 40, 2, 4); - Shape1.setRotationPoint(-20F, 0F, 0F); - Shape1.setTextureSize(128, 64); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 6); - Shape2.addBox(0F, 0F, 0F, 6, 2, 2); - Shape2.setRotationPoint(-19F, 2F, 1F); - Shape2.setTextureSize(128, 64); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 10); - Shape3.addBox(0F, 0F, 0F, 1, 4, 1); - Shape3.setRotationPoint(-12F, 2F, 1.5F); - Shape3.setTextureSize(128, 64); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 16, 6); - Shape4.addBox(0F, 0F, 0F, 6, 1, 4); - Shape4.setRotationPoint(-10F, 2F, 0F); - Shape4.setTextureSize(128, 64); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 0, 15); - Shape5.addBox(0F, 0F, 0F, 2, 3, 1); - Shape5.setRotationPoint(-7F, 3F, 1.5F); - Shape5.setTextureSize(128, 64); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 4, 10); - Shape6.addBox(0F, 0F, 0F, 3, 3, 1); - Shape6.setRotationPoint(-10F, 3F, 1.5F); - Shape6.setTextureSize(128, 64); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 12, 10); - Shape7.addBox(-1F, 0F, 0F, 1, 2, 1); - Shape7.setRotationPoint(-7F, 3F, 1.5F); - Shape7.setTextureSize(128, 64); - Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0.5235988F); - Shape8 = new ModelRenderer(this, 36, 6); - Shape8.addBox(0F, 0F, 0F, 10, 1, 4); - Shape8.setRotationPoint(-3F, 2F, 0F); - Shape8.setTextureSize(128, 64); - Shape8.mirror = true; - setRotation(Shape8, 0F, 0F, 0F); - Shape9 = new ModelRenderer(this, 64, 6); - Shape9.addBox(0F, 0F, 0F, 2, 3, 2); - Shape9.setRotationPoint(7F, 2F, 1F); - Shape9.setTextureSize(128, 64); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - Shape10 = new ModelRenderer(this, 88, 0); - Shape10.addBox(0F, 0F, 0F, 3, 4, 4); - Shape10.setRotationPoint(17F, -4F, 0F); - Shape10.setTextureSize(128, 64); - Shape10.mirror = true; - setRotation(Shape10, 0F, 0F, 0F); - Shape11 = new ModelRenderer(this, 72, 6); - Shape11.addBox(0F, 0F, 0F, 2, 3, 1); - Shape11.setRotationPoint(18F, -7F, 0F); - Shape11.setTextureSize(128, 64); - Shape11.mirror = true; - setRotation(Shape11, 0F, 0F, 0F); - Shape12 = new ModelRenderer(this, 78, 6); - Shape12.addBox(0F, 0F, 0F, 2, 3, 1); - Shape12.setRotationPoint(18F, -7F, 3F); - Shape12.setTextureSize(128, 64); - Shape12.mirror = true; - setRotation(Shape12, 0F, 0F, 0F); - Shape13 = new ModelRenderer(this, 0, 19); - Shape13.addBox(0F, -4F, 0F, 22, 4, 0); - Shape13.setRotationPoint(-17F, 0F, 1F); - Shape13.setTextureSize(128, 64); - Shape13.mirror = true; - setRotation(Shape13, 0.4363323F, 0F, 0F); - Shape14 = new ModelRenderer(this, 16, 11); - Shape14.addBox(0F, 0F, 0F, 33, 1, 1); - Shape14.setRotationPoint(-17F, -4F, -1F); - Shape14.setTextureSize(128, 64); - Shape14.mirror = true; - setRotation(Shape14, 0F, 0F, 0F); - Shape15 = new ModelRenderer(this, 0, 23); - Shape15.addBox(0F, -4F, 0F, 22, 4, 0); - Shape15.setRotationPoint(-17F, 0F, 3F); - Shape15.setTextureSize(128, 64); - Shape15.mirror = true; - setRotation(Shape15, -0.4363323F, 0F, 0F); - Shape16 = new ModelRenderer(this, 16, 13); - Shape16.addBox(0F, 0F, 0F, 33, 1, 1); - Shape16.setRotationPoint(-17F, -4F, 4F); - Shape16.setTextureSize(128, 64); - Shape16.mirror = true; - setRotation(Shape16, 0F, 0F, 0F); - Shape17 = new ModelRenderer(this, 44, 25); - Shape17.addBox(0F, -4F, 0F, 8, 4, 0); - Shape17.setRotationPoint(8F, 0F, 1F); - Shape17.setTextureSize(128, 64); - Shape17.mirror = true; - setRotation(Shape17, 0.4363323F, 0F, 0F); - Shape18 = new ModelRenderer(this, 44, 21); - Shape18.addBox(0F, -4F, 0F, 8, 4, 0); - Shape18.setRotationPoint(8F, 0F, 3F); - Shape18.setTextureSize(128, 64); - Shape18.mirror = true; - setRotation(Shape18, -0.4363323F, 0F, 0F); - Shape19 = new ModelRenderer(this, 0, 37); - Shape19.addBox(0F, 0F, 0F, 5, 4, 2); - Shape19.setRotationPoint(5F, -6F, 1F); - Shape19.setTextureSize(128, 64); - Shape19.mirror = true; - setRotation(Shape19, 0F, 0F, 0F); - Shape20 = new ModelRenderer(this, 0, 31); - Shape20.addBox(0F, 0F, 0F, 5, 2, 4); - Shape20.setRotationPoint(5F, -5F, 0F); - Shape20.setTextureSize(128, 64); - Shape20.mirror = true; - setRotation(Shape20, 0F, 0F, 0F); - Shape21 = new ModelRenderer(this, 0, 27); - Shape21.addBox(0F, 0F, 0F, 1, 2, 2); - Shape21.setRotationPoint(4F, -5F, 1F); - Shape21.setTextureSize(128, 64); - Shape21.mirror = true; - setRotation(Shape21, 0F, 0F, 0F); - Shape22 = new ModelRenderer(this, 6, 27); - Shape22.addBox(0F, 0F, 0F, 1, 2, 2); - Shape22.setRotationPoint(10F, -5F, 1F); - Shape22.setTextureSize(128, 64); - Shape22.mirror = true; - setRotation(Shape22, 0F, 0F, 0F); - Shape23 = new ModelRenderer(this, 8, 43); - Shape23.addBox(0F, 0F, 0F, 2, 2, 1); - Shape23.setRotationPoint(11F, -5F, 0F); - Shape23.setTextureSize(128, 64); - Shape23.mirror = true; - setRotation(Shape23, 0F, 0F, 0F); - Shape24 = new ModelRenderer(this, 8, 46); - Shape24.addBox(0F, 0F, 0F, 2, 2, 1); - Shape24.setRotationPoint(11F, -5F, 3F); - Shape24.setTextureSize(128, 64); - Shape24.mirror = true; - setRotation(Shape24, 0F, 0F, 0F); - Shape25 = new ModelRenderer(this, 0, 43); - Shape25.addBox(0F, 0F, 0F, 2, 1, 2); - Shape25.setRotationPoint(11F, -6F, 1F); - Shape25.setTextureSize(128, 64); - Shape25.mirror = true; - setRotation(Shape25, 0F, 0F, 0F); - Shape26 = new ModelRenderer(this, 0, 46); - Shape26.addBox(0F, 0F, 0F, 2, 1, 2); - Shape26.setRotationPoint(11F, -3F, 1F); - Shape26.setTextureSize(128, 64); - Shape26.mirror = true; - setRotation(Shape26, 0F, 0F, 0F); - Shape27 = new ModelRenderer(this, 18, 27); - Shape27.addBox(0F, 0F, 0F, 2, 5, 1); - Shape27.setRotationPoint(13F, -5F, 1.5F); - Shape27.setTextureSize(128, 64); - Shape27.mirror = true; - setRotation(Shape27, 0F, 0F, 0F); - Shape28 = new ModelRenderer(this, 84, 6); - Shape28.addBox(0F, 0F, 0F, 1, 3, 1); - Shape28.setRotationPoint(16F, -3F, 1.5F); - Shape28.setTextureSize(128, 64); - Shape28.mirror = true; - setRotation(Shape28, 0F, 0F, 0F); - Shape29 = new ModelRenderer(this, 6, 15); - Shape29.addBox(0F, 0F, 0F, 10, 2, 2); - Shape29.setRotationPoint(3F, -2F, 1F); - Shape29.setTextureSize(128, 64); - Shape29.mirror = true; - setRotation(Shape29, 0F, 0F, 0F); - Shape30 = new ModelRenderer(this, 30, 15); - Shape30.addBox(0F, 0F, 0F, 12, 2, 2); - Shape30.setRotationPoint(-7F, -1F, 4F); - Shape30.setTextureSize(128, 64); - Shape30.mirror = true; - setRotation(Shape30, 0F, 0F, 0F); - Shape31 = new ModelRenderer(this, 44, 19); - Shape31.addBox(0F, 0F, 0F, 14, 1, 1); - Shape31.setRotationPoint(5F, -0.5F, 4.5F); - Shape31.setTextureSize(128, 64); - Shape31.mirror = true; - setRotation(Shape31, 0F, 0F, 0F); - Shape32 = new ModelRenderer(this, 12, 27); - Shape32.addBox(0F, 0F, 0F, 1, 1, 1); - Shape32.setRotationPoint(18F, -0.5F, 3.5F); - Shape32.setTextureSize(128, 64); - Shape32.mirror = true; - setRotation(Shape32, 0F, 0F, 0F); - Shape33 = new ModelRenderer(this, 24, 29); - Shape33.addBox(0F, 0F, 0F, 21, 1, 2); - Shape33.setRotationPoint(-18F, -1F, 1F); - Shape33.setTextureSize(128, 64); - Shape33.mirror = true; - setRotation(Shape33, 0F, 0F, 0F); - } - - 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); - Shape1.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Shape2.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Shape6.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Shape7.render(f5); - Shape8.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Shape9.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - - int ammo = ItemGunBase.getMag(item); - if(ammo > 0) { - Shape19.render(f5); - Shape20.render(f5); - Shape21.render(f5); - Shape22.render(f5); - Shape23.render(f5); - Shape24.render(f5); - Shape25.render(f5); - Shape26.render(f5); - } - - Shape27.render(f5); - Shape28.render(f5); - Shape29.render(f5); - Shape30.render(f5); - Shape31.render(f5); - Shape32.render(f5); - Shape33.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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelGustav.java b/src/main/java/com/hbm/render/model/ModelGustav.java deleted file mode 100644 index 43fcd28bc..000000000 --- a/src/main/java/com/hbm/render/model/ModelGustav.java +++ /dev/null @@ -1,313 +0,0 @@ -// Date: 21.01.2019 10:38:11 -// 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 org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelGustav extends ModelBase { - // fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - ModelRenderer Shape13; - ModelRenderer Shape14; - ModelRenderer Shape15; - ModelRenderer Shape16; - ModelRenderer Shape17; - ModelRenderer Shape18; - ModelRenderer Shape19; - ModelRenderer Shape20; - ModelRenderer Shape21; - ModelRenderer Shape22; - ModelRenderer Shape23; - ModelRenderer Shape24; - ModelRenderer Shape25; - ModelRenderer Shape26; - ModelRenderer Shape27; - ModelRenderer Shape28; - ModelRenderer Shape29; - ModelRenderer Shape30; - ModelRenderer Shape31; - ModelRenderer Shape32; - ModelRenderer Shape33; - ModelRenderer Shape34; - - public ModelGustav() { - textureWidth = 128; - textureHeight = 32; - - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 40, 1, 3); - Shape1.setRotationPoint(-30F, 0F, -1.5F); - Shape1.setTextureSize(128, 32); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 4); - Shape2.addBox(0F, 0F, 0F, 40, 1, 1); - Shape2.setRotationPoint(-30F, -0.5F, -2F); - Shape2.setTextureSize(128, 32); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 6); - Shape3.addBox(0F, 0F, 0F, 40, 1, 1); - Shape3.setRotationPoint(-30F, -0.5F, 1F); - Shape3.setTextureSize(128, 32); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 0, 8); - Shape4.addBox(0F, 0F, 0F, 40, 3, 1); - Shape4.setRotationPoint(-30F, -3F, -2.5F); - Shape4.setTextureSize(128, 32); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 0, 12); - Shape5.addBox(0F, 0F, 0F, 40, 3, 1); - Shape5.setRotationPoint(-30F, -3F, 1.5F); - Shape5.setTextureSize(128, 32); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 0, 16); - Shape6.addBox(0F, 0F, 0F, 40, 1, 1); - Shape6.setRotationPoint(-30F, -3.5F, -2F); - Shape6.setTextureSize(128, 32); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 0, 18); - Shape7.addBox(0F, 0F, 0F, 40, 1, 1); - Shape7.setRotationPoint(-30F, -3.5F, 1F); - Shape7.setTextureSize(128, 32); - Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0F); - Shape8 = new ModelRenderer(this, 0, 20); - Shape8.addBox(0F, 0F, 0F, 40, 1, 3); - Shape8.setRotationPoint(-30F, -4F, -1.5F); - Shape8.setTextureSize(128, 32); - Shape8.mirror = true; - setRotation(Shape8, 0F, 0F, 0F); - Shape9 = new ModelRenderer(this, 0, 24); - Shape9.addBox(0F, 0F, 0F, 2, 5, 1); - Shape9.setRotationPoint(-23F, 1F, -0.5F); - Shape9.setTextureSize(128, 32); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - Shape10 = new ModelRenderer(this, 6, 24); - Shape10.addBox(0F, 0F, 0F, 4, 1, 1); - Shape10.setRotationPoint(-16F, 1F, -0.5F); - Shape10.setTextureSize(128, 32); - Shape10.mirror = true; - setRotation(Shape10, 0F, 0F, 0F); - Shape11 = new ModelRenderer(this, 6, 26); - Shape11.addBox(0F, 0F, 0F, 2, 4, 1); - Shape11.setRotationPoint(-14F, 2F, -0.5F); - Shape11.setTextureSize(128, 32); - Shape11.mirror = true; - setRotation(Shape11, 0F, 0F, 0F); - Shape12 = new ModelRenderer(this, 16, 24); - Shape12.addBox(0F, 0F, 0F, 2, 1, 1); - Shape12.setRotationPoint(-16F, 2F, -0.5F); - Shape12.setTextureSize(128, 32); - Shape12.mirror = true; - setRotation(Shape12, 0F, 0F, 0F); - Shape13 = new ModelRenderer(this, 22, 24); - Shape13.addBox(0F, 0F, 0F, 7, 1, 1); - Shape13.setRotationPoint(-4F, -7F, -0.5F); - Shape13.setTextureSize(128, 32); - Shape13.mirror = true; - setRotation(Shape13, 0F, 0F, 0F); - Shape14 = new ModelRenderer(this, 38, 24); - Shape14.addBox(0F, 0F, 0F, 5, 1, 1); - Shape14.setRotationPoint(3F, -7F, -0.5F); - Shape14.setTextureSize(128, 32); - Shape14.mirror = true; - setRotation(Shape14, 0F, 0F, 0.6108652F); - Shape15 = new ModelRenderer(this, 50, 24); - Shape15.addBox(-5F, 0F, 0F, 5, 1, 1); - Shape15.setRotationPoint(-4F, -7F, -0.5F); - Shape15.setTextureSize(128, 32); - Shape15.mirror = true; - setRotation(Shape15, 0F, 0F, -0.6108652F); - Shape16 = new ModelRenderer(this, 104, 0); - Shape16.addBox(0F, 0F, 0F, 7, 5, 5); - Shape16.setRotationPoint(10F, -4F, -2.5F); - Shape16.setTextureSize(128, 32); - Shape16.mirror = true; - setRotation(Shape16, 0F, 0F, 0F); - Shape17 = new ModelRenderer(this, 86, 0); - Shape17.addBox(0F, 0F, 0F, 3, 3, 2); - Shape17.setRotationPoint(17F, -3F, -1F); - Shape17.setTextureSize(128, 32); - Shape17.mirror = true; - setRotation(Shape17, 0F, 0F, 0F); - Shape18 = new ModelRenderer(this, 82, 5); - Shape18.addBox(0F, 0F, 0F, 3, 2, 3); - Shape18.setRotationPoint(17F, -2.5F, -1.5F); - Shape18.setTextureSize(128, 32); - Shape18.mirror = true; - setRotation(Shape18, 0F, 0F, 0F); - Shape19 = new ModelRenderer(this, 82, 10); - Shape19.addBox(0F, 0F, 0F, 4, 4, 3); - Shape19.setRotationPoint(20F, -3.5F, -1.5F); - Shape19.setTextureSize(128, 32); - Shape19.mirror = true; - setRotation(Shape19, 0F, 0F, 0F); - Shape20 = new ModelRenderer(this, 96, 10); - Shape20.addBox(0F, 0F, 0F, 4, 3, 4); - Shape20.setRotationPoint(20F, -3F, -2F); - Shape20.setTextureSize(128, 32); - Shape20.mirror = true; - setRotation(Shape20, 0F, 0F, 0F); - Shape21 = new ModelRenderer(this, 112, 10); - Shape21.addBox(0F, 0F, 0F, 4, 5, 4); - Shape21.setRotationPoint(24F, -4F, -2F); - Shape21.setTextureSize(128, 32); - Shape21.mirror = true; - setRotation(Shape21, 0F, 0F, 0F); - Shape22 = new ModelRenderer(this, 86, 17); - Shape22.addBox(0F, 0F, 0F, 4, 4, 5); - Shape22.setRotationPoint(24F, -3.5F, -2.5F); - Shape22.setTextureSize(128, 32); - Shape22.mirror = true; - setRotation(Shape22, 0F, 0F, 0F); - Shape23 = new ModelRenderer(this, 96, 0); - Shape23.addBox(0F, 0F, 0F, 2, 5, 2); - Shape23.setRotationPoint(-4F, 1F, -1F); - Shape23.setTextureSize(128, 32); - Shape23.mirror = true; - setRotation(Shape23, 0F, 0F, 0F); - Shape24 = new ModelRenderer(this, 104, 17); - Shape24.addBox(0F, 0F, 0F, 1, 5, 1); - Shape24.setRotationPoint(-3.5F, 6F, -0.5F); - Shape24.setTextureSize(128, 32); - Shape24.mirror = true; - setRotation(Shape24, 0F, 0F, 0F); - Shape25 = new ModelRenderer(this, 96, 7); - Shape25.addBox(0F, 0F, 0F, 2, 1, 2); - Shape25.setRotationPoint(-4F, 11F, -1F); - Shape25.setTextureSize(128, 32); - Shape25.mirror = true; - setRotation(Shape25, 0F, 0F, 0F); - Shape26 = new ModelRenderer(this, 120, 19); - Shape26.addBox(0F, 0F, 0F, 2, 5, 2); - Shape26.setRotationPoint(-1.5F, 1F, -1F); - Shape26.setTextureSize(128, 32); - Shape26.mirror = true; - setRotation(Shape26, 0F, 0F, 0F); - Shape27 = new ModelRenderer(this, 114, 19); - Shape27.addBox(-1F, -6F, 0F, 1, 6, 2); - Shape27.setRotationPoint(0.5F, 6F, -1F); - Shape27.setTextureSize(128, 32); - Shape27.mirror = true; - setRotation(Shape27, 0F, 0F, 0.2617994F); - Shape28 = new ModelRenderer(this, 12, 26); - Shape28.addBox(0F, 0F, 0F, 5, 2, 2); - Shape28.setRotationPoint(11F, -2.5F, -4.5F); - Shape28.setTextureSize(128, 32); - Shape28.mirror = true; - setRotation(Shape28, 0F, 0F, 0F); - Shape29 = new ModelRenderer(this, 26, 26); - Shape29.addBox(0F, 0F, 0F, 2, 2, 2); - Shape29.setRotationPoint(-18F, -3F, -4.5F); - Shape29.setTextureSize(128, 32); - Shape29.mirror = true; - setRotation(Shape29, 0F, 0F, 0F); - Shape30 = new ModelRenderer(this, 12, 30); - Shape30.addBox(0F, 0F, 0F, 5, 1, 1); - Shape30.setRotationPoint(-21F, -1F, -3.5F); - Shape30.setTextureSize(128, 32); - Shape30.mirror = true; - setRotation(Shape30, 0F, 0F, 0F); - Shape31 = new ModelRenderer(this, 62, 24); - Shape31.addBox(0F, 0F, 0F, 7, 1, 1); - Shape31.setRotationPoint(-21F, -3.5F, -5.5F); - Shape31.setTextureSize(128, 32); - Shape31.mirror = true; - setRotation(Shape31, 0F, 0F, 0F); - Shape32 = new ModelRenderer(this, 34, 26); - Shape32.addBox(0F, 0F, 0F, 1, 2, 2); - Shape32.setRotationPoint(-14F, -4F, -6F); - Shape32.setTextureSize(128, 32); - Shape32.mirror = true; - setRotation(Shape32, 0F, 0F, 0F); - Shape33 = new ModelRenderer(this, 40, 26); - Shape33.addBox(0F, -2F, 0F, 1, 2, 2); - Shape33.setRotationPoint(-13F, -2F, -6F); - Shape33.setTextureSize(128, 32); - Shape33.mirror = true; - setRotation(Shape33, 0F, 0F, -0.4363323F); - Shape34 = new ModelRenderer(this, 78, 24); - Shape34.addBox(0F, 0F, 0F, 3, 1, 1); - Shape34.setRotationPoint(-29F, -2F, -3F); - Shape34.setTextureSize(128, 32); - Shape34.mirror = true; - setRotation(Shape34, 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); - GL11.glDisable(GL11.GL_CULL_FACE); - 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); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - Shape19.render(f5); - Shape20.render(f5); - Shape21.render(f5); - Shape22.render(f5); - Shape23.render(f5); - Shape24.render(f5); - Shape25.render(f5); - Shape26.render(f5); - Shape27.render(f5); - Shape28.render(f5); - Shape29.render(f5); - Shape30.render(f5); - Shape31.render(f5); - Shape32.render(f5); - Shape33.render(f5); - Shape34.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - } - - 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/src/main/java/com/hbm/render/model/ModelHP.java b/src/main/java/com/hbm/render/model/ModelHP.java deleted file mode 100644 index dcdf2ec40..000000000 --- a/src/main/java/com/hbm/render/model/ModelHP.java +++ /dev/null @@ -1,194 +0,0 @@ -// Date: 21.02.2017 20:44:50 -// 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 org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.entity.Entity; - -public class ModelHP extends ModelBase -{ - //fields - ModelRenderer Printer; - ModelRenderer Hatch; - ModelRenderer Display; - ModelRenderer Stock; - ModelRenderer StockBottom; - ModelRenderer StockPlate; - ModelRenderer Barrel; - ModelRenderer Lens1; - ModelRenderer Lens2; - ModelRenderer Lens3; - ModelRenderer Beam; - ModelRenderer Handle; - ModelRenderer Dot; - ModelRenderer Back; - ModelRenderer BackShaft; - ModelRenderer Muzzle; - ModelRenderer BarrelPlate; - - public ModelHP() - { - textureWidth = 64; - textureHeight = 64; - - Printer = new ModelRenderer(this, 0, 0); - Printer.addBox(0F, 0F, 0F, 12, 9, 6); - Printer.setRotationPoint(-6F, -3F, -3F); - Printer.setTextureSize(64, 64); - Printer.mirror = true; - setRotation(Printer, 0F, 0F, 0F); - Hatch = new ModelRenderer(this, 0, 15); - Hatch.addBox(0F, 0F, 0F, 6, 5, 1); - Hatch.setRotationPoint(-3F, -1F, -3F); - Hatch.setTextureSize(64, 64); - Hatch.mirror = true; - setRotation(Hatch, 0F, 0F, 0F); - Display = new ModelRenderer(this, 14, 15); - Display.addBox(0F, -2F, 0F, 2, 2, 1); - Display.setRotationPoint(3.5F, 0F, -3F); - Display.setTextureSize(64, 64); - Display.mirror = true; - setRotation(Display, 0.7853982F, 0F, 0F); - Stock = new ModelRenderer(this, 0, 21); - Stock.addBox(0F, 0F, 0F, 12, 3, 2); - Stock.setRotationPoint(6F, 0F, -1F); - Stock.setTextureSize(64, 64); - Stock.mirror = true; - setRotation(Stock, 0F, 0F, 0F); - StockBottom = new ModelRenderer(this, 20, 15); - StockBottom.addBox(0F, 0F, 0F, 3, 3, 2); - StockBottom.setRotationPoint(15F, 3F, -1F); - StockBottom.setTextureSize(64, 64); - StockBottom.mirror = true; - setRotation(StockBottom, 0F, 0F, 0F); - StockPlate = new ModelRenderer(this, 0, 26); - StockPlate.addBox(-8F, -3F, 0F, 8, 3, 2); - StockPlate.setRotationPoint(15F, 6F, -1F); - StockPlate.setTextureSize(64, 64); - StockPlate.mirror = true; - setRotation(StockPlate, 0F, 0F, 0.3839724F); - Barrel = new ModelRenderer(this, 0, 31); - Barrel.addBox(0F, 0F, 0F, 15, 2, 2); - Barrel.setRotationPoint(-21F, 0F, -1F); - Barrel.setTextureSize(64, 64); - Barrel.mirror = true; - setRotation(Barrel, 0F, 0F, 0F); - Lens1 = new ModelRenderer(this, 0, 35); - Lens1.addBox(0F, 0F, 0F, 1, 3, 3); - Lens1.setRotationPoint(-19F, -3F, -1.5F); - Lens1.setTextureSize(64, 64); - Lens1.mirror = true; - setRotation(Lens1, 0F, 0F, 0F); - Lens2 = new ModelRenderer(this, 8, 35); - Lens2.addBox(0F, 0F, 0F, 1, 4, 4); - Lens2.setRotationPoint(-16F, -3.5F, -2F); - Lens2.setTextureSize(64, 64); - Lens2.mirror = true; - setRotation(Lens2, 0F, 0F, 0F); - Lens3 = new ModelRenderer(this, 0, 41); - Lens3.addBox(0F, 0F, 0F, 1, 3, 3); - Lens3.setRotationPoint(-13F, -3F, -1.466667F); - Lens3.setTextureSize(64, 64); - Lens3.mirror = true; - setRotation(Lens3, 0F, 0F, 0F); - Beam = new ModelRenderer(this, 0, 47); - Beam.addBox(0F, 0F, 0F, 12, 1, 1); - Beam.setRotationPoint(-18F, -2F, -0.5F); - Beam.setTextureSize(64, 64); - Beam.mirror = true; - setRotation(Beam, 0F, 0F, 0F); - Handle = new ModelRenderer(this, 18, 35); - Handle.addBox(0F, 0F, 0F, 2, 6, 1); - Handle.setRotationPoint(-16F, 2F, -0.5F); - Handle.setTextureSize(64, 64); - Handle.mirror = true; - setRotation(Handle, 0F, 0F, -0.1745329F); - Dot = new ModelRenderer(this, 0, 49); - Dot.addBox(0F, 0F, 0F, 2, 1, 1); - Dot.setRotationPoint(-20F, 2F, -0.5F); - Dot.setTextureSize(64, 64); - Dot.mirror = true; - setRotation(Dot, 0F, 0F, 0F); - Back = new ModelRenderer(this, 0, 51); - Back.addBox(-1F, -3F, 0F, 1, 3, 2); - Back.setRotationPoint(7F, 0F, -1F); - Back.setTextureSize(64, 64); - Back.mirror = true; - setRotation(Back, 0F, 0F, -0.3490659F); - BackShaft = new ModelRenderer(this, 0, 56); - BackShaft.addBox(0F, 0F, 0F, 4, 1, 1); - BackShaft.setRotationPoint(6F, -1F, -0.5F); - BackShaft.setTextureSize(64, 64); - BackShaft.mirror = true; - setRotation(BackShaft, 0F, 0F, 0F); - Muzzle = new ModelRenderer(this, 0, 58); - Muzzle.addBox(0F, 0F, 0F, 1, 2, 2); - Muzzle.setRotationPoint(-6.5F, -2.5F, -1F); - Muzzle.setTextureSize(64, 64); - Muzzle.mirror = true; - setRotation(Muzzle, 0F, 0F, 0F); - BarrelPlate = new ModelRenderer(this, 6, 58); - BarrelPlate.addBox(-4F, -2F, 0F, 4, 2, 1); - BarrelPlate.setRotationPoint(-6F, 4F, -0.5F); - BarrelPlate.setTextureSize(64, 64); - BarrelPlate.mirror = true; - setRotation(BarrelPlate, 0F, 0F, 0.5235988F); - } - - @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); - Printer.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Hatch.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Display.render(f5); - Stock.render(f5); - StockBottom.render(f5); - StockPlate.render(f5); - Barrel.render(f5); - GL11.glEnable(GL11.GL_BLEND); - //GL11.glDisable(GL11.GL_ALPHA_TEST); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - Lens1.render(f5); - Lens2.render(f5); - Lens3.render(f5); - Beam.render(f5); - GL11.glDisable(GL11.GL_BLEND); - Handle.render(f5); - Dot.render(f5); - Back.render(f5); - BackShaft.render(f5); - Muzzle.render(f5); - BarrelPlate.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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelImmolator.java b/src/main/java/com/hbm/render/model/ModelImmolator.java deleted file mode 100644 index c94ca7deb..000000000 --- a/src/main/java/com/hbm/render/model/ModelImmolator.java +++ /dev/null @@ -1,247 +0,0 @@ -// Date: 22.11.2016 22:40:09 -// 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 ModelImmolator extends ModelBase { - // fields - ModelRenderer CylinderBase; - ModelRenderer CylinderFront; - ModelRenderer PipeBBase; - ModelRenderer PipeB; - ModelRenderer TipBase; - ModelRenderer PipeL; - ModelRenderer PipeLFront; - ModelRenderer TipFront; - ModelRenderer ChamberH; - ModelRenderer ChamberW; - ModelRenderer PipeTBack; - ModelRenderer PipeTBase; - ModelRenderer PipeT; - ModelRenderer PipeTFront; - ModelRenderer Body; - ModelRenderer Tank; - ModelRenderer HandleBase; - ModelRenderer HandleBar; - ModelRenderer HandleGrip; - ModelRenderer BodyPlate; - ModelRenderer ValveFront; - ModelRenderer ValveCenter; - ModelRenderer Stock; - ModelRenderer LatchBase; - ModelRenderer LatchHandle; - ModelRenderer ValveBack; - - public ModelImmolator() { - textureWidth = 64; - textureHeight = 32; - - CylinderBase = new ModelRenderer(this, 0, 0); - CylinderBase.addBox(0F, 0F, 0F, 2, 4, 4); - CylinderBase.setRotationPoint(0F, 0F, -2F); - CylinderBase.setTextureSize(64, 32); - CylinderBase.mirror = true; - setRotation(CylinderBase, 0F, 0F, 0F); - CylinderFront = new ModelRenderer(this, 0, 8); - CylinderFront.addBox(0F, 0F, 0F, 1, 3, 3); - CylinderFront.setRotationPoint(-1F, 0.5F, -1.5F); - CylinderFront.setTextureSize(64, 32); - CylinderFront.mirror = true; - setRotation(CylinderFront, 0F, 0F, 0F); - PipeBBase = new ModelRenderer(this, 0, 14); - PipeBBase.addBox(0F, 0F, 0F, 2, 2, 2); - PipeBBase.setRotationPoint(-2F, 2F, 0F); - PipeBBase.setTextureSize(64, 32); - PipeBBase.mirror = true; - setRotation(PipeBBase, 0F, 0F, 0F); - PipeB = new ModelRenderer(this, 0, 18); - PipeB.addBox(0F, 0F, 0F, 8, 1, 1); - PipeB.setRotationPoint(-10F, 2.5F, 0.5F); - PipeB.setTextureSize(64, 32); - PipeB.mirror = true; - setRotation(PipeB, 0F, 0F, 0F); - TipBase = new ModelRenderer(this, 8, 8); - TipBase.addBox(0F, 0F, 0F, 2, 2, 2); - TipBase.setRotationPoint(-12F, 1.5F, -0.5F); - TipBase.setTextureSize(64, 32); - TipBase.mirror = true; - setRotation(TipBase, 0F, 0F, 0F); - PipeL = new ModelRenderer(this, 0, 20); - PipeL.addBox(0F, 0F, 0F, 7, 1, 1); - PipeL.setRotationPoint(-7F, 2.5F, -1.5F); - PipeL.setTextureSize(64, 32); - PipeL.mirror = true; - setRotation(PipeL, 0F, 0F, 0F); - PipeLFront = new ModelRenderer(this, 0, 22); - PipeLFront.addBox(-4F, 0F, 0F, 4, 1, 1); - PipeLFront.setRotationPoint(-7F, 2.5F, -1.5F); - PipeLFront.setTextureSize(64, 32); - PipeLFront.mirror = true; - setRotation(PipeLFront, 0F, 0.4363323F, 0F); - TipFront = new ModelRenderer(this, 8, 12); - TipFront.addBox(0F, 0F, 0F, 2, 1, 1); - TipFront.setRotationPoint(-14F, 2F, 0F); - TipFront.setTextureSize(64, 32); - TipFront.mirror = true; - setRotation(TipFront, 0F, 0F, 0F); - ChamberH = new ModelRenderer(this, 24, 0); - ChamberH.addBox(0F, 0F, 0F, 4, 5, 4); - ChamberH.setRotationPoint(2F, -0.5F, -2F); - ChamberH.setTextureSize(64, 32); - ChamberH.mirror = true; - setRotation(ChamberH, 0F, 0F, 0F); - ChamberW = new ModelRenderer(this, 40, 0); - ChamberW.addBox(0F, 0F, 0F, 4, 4, 5); - ChamberW.setRotationPoint(2F, 0F, -2.5F); - ChamberW.setTextureSize(64, 32); - ChamberW.mirror = true; - setRotation(ChamberW, 0F, 0F, 0F); - PipeTBack = new ModelRenderer(this, 0, 24); - PipeTBack.addBox(0F, 0F, 0F, 6, 1, 1); - PipeTBack.setRotationPoint(0F, -2F, 2.5F); - PipeTBack.setTextureSize(64, 32); - PipeTBack.mirror = true; - setRotation(PipeTBack, -0.4363323F, 0F, 0F); - PipeTBase = new ModelRenderer(this, 8, 14); - PipeTBase.addBox(0F, 1F, 0F, 1, 2, 1); - PipeTBase.setRotationPoint(1F, -2F, 2.5F); - PipeTBase.setTextureSize(64, 32); - PipeTBase.mirror = true; - setRotation(PipeTBase, -0.4363323F, 0F, 0F); - PipeT = new ModelRenderer(this, 0, 26); - PipeT.addBox(-9F, 0F, 0F, 9, 1, 1); - PipeT.setRotationPoint(0F, -2F, 2.5F); - PipeT.setTextureSize(64, 32); - PipeT.mirror = true; - setRotation(PipeT, -0.4363323F, -0.296706F, -0.4014257F); - PipeTFront = new ModelRenderer(this, 0, 28); - PipeTFront.addBox(0F, 0F, 0F, 3, 1, 1); - PipeTFront.setRotationPoint(-10F, 1.5F, 0F); - PipeTFront.setTextureSize(64, 32); - PipeTFront.mirror = true; - setRotation(PipeTFront, 0F, 0F, 0F); - Body = new ModelRenderer(this, 24, 9); - Body.addBox(0F, 0F, 0F, 10, 4, 4); - Body.setRotationPoint(6F, 0.5F, -1.5F); - Body.setTextureSize(64, 32); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - Tank = new ModelRenderer(this, 12, 0); - Tank.addBox(0F, 0F, 0F, 3, 3, 2); - Tank.setRotationPoint(6F, 1F, -3F); - Tank.setTextureSize(64, 32); - Tank.mirror = true; - setRotation(Tank, 0F, 0F, 0F); - HandleBase = new ModelRenderer(this, 24, 17); - HandleBase.addBox(0F, 0F, 0F, 2, 2, 1); - HandleBase.setRotationPoint(4F, 1F, -3F); - HandleBase.setTextureSize(64, 32); - HandleBase.mirror = true; - setRotation(HandleBase, 0F, 0F, 0F); - HandleBar = new ModelRenderer(this, 30, 17); - HandleBar.addBox(0F, 0F, 0F, 1, 1, 2); - HandleBar.setRotationPoint(4.5F, 1.5F, -5F); - HandleBar.setTextureSize(64, 32); - HandleBar.mirror = true; - setRotation(HandleBar, 0F, 0F, 0F); - HandleGrip = new ModelRenderer(this, 36, 17); - HandleGrip.addBox(0F, 0F, -2F, 1, 1, 2); - HandleGrip.setRotationPoint(4.5F, 1.5F, -5F); - HandleGrip.setTextureSize(64, 32); - HandleGrip.mirror = true; - setRotation(HandleGrip, 0F, -0.3490659F, 0F); - BodyPlate = new ModelRenderer(this, 24, 20); - BodyPlate.addBox(0F, 0F, 0F, 10, 1, 2); - BodyPlate.setRotationPoint(6F, 0F, 0F); - BodyPlate.setTextureSize(64, 32); - BodyPlate.mirror = true; - setRotation(BodyPlate, 0F, 0F, 0F); - ValveFront = new ModelRenderer(this, 0, 30); - ValveFront.addBox(0F, 0F, 0F, 1, 1, 1); - ValveFront.setRotationPoint(8F, -0.5F, 0.5F); - ValveFront.setTextureSize(64, 32); - ValveFront.mirror = true; - setRotation(ValveFront, 0F, 0F, 0F); - ValveCenter = new ModelRenderer(this, 4, 30); - ValveCenter.addBox(0F, 0F, 0F, 1, 1, 1); - ValveCenter.setRotationPoint(11F, -0.5F, 0.5F); - ValveCenter.setTextureSize(64, 32); - ValveCenter.mirror = true; - setRotation(ValveCenter, 0F, 0F, 0F); - Stock = new ModelRenderer(this, 24, 23); - Stock.addBox(0F, 0F, 0F, 2, 4, 2); - Stock.setRotationPoint(16F, 0.5F, 0F); - Stock.setTextureSize(64, 32); - Stock.mirror = true; - setRotation(Stock, 0F, 0F, 0F); - LatchBase = new ModelRenderer(this, 8, 28); - LatchBase.addBox(0F, 0F, 0F, 2, 1, 1); - LatchBase.setRotationPoint(16F, 0.5F, 2F); - LatchBase.setTextureSize(64, 32); - LatchBase.mirror = true; - setRotation(LatchBase, 0F, 0F, 0F); - LatchHandle = new ModelRenderer(this, 32, 23); - LatchHandle.addBox(0F, 0F, 0F, 2, 3, 1); - LatchHandle.setRotationPoint(16F, 0.5F, 3F); - LatchHandle.setTextureSize(64, 32); - LatchHandle.mirror = true; - setRotation(LatchHandle, 0F, 0F, 0F); - ValveBack = new ModelRenderer(this, 8, 30); - ValveBack.addBox(0F, 0F, 0F, 1, 1, 1); - ValveBack.setRotationPoint(17.5F, 1F, 0.5F); - ValveBack.setTextureSize(64, 32); - ValveBack.mirror = true; - setRotation(ValveBack, 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); - CylinderBase.render(f5); - CylinderFront.render(f5); - PipeBBase.render(f5); - PipeB.render(f5); - TipBase.render(f5); - PipeL.render(f5); - PipeLFront.render(f5); - TipFront.render(f5); - ChamberH.render(f5); - ChamberW.render(f5); - PipeTBack.render(f5); - PipeTBase.render(f5); - PipeT.render(f5); - PipeTFront.render(f5); - Body.render(f5); - Tank.render(f5); - HandleBase.render(f5); - HandleBar.render(f5); - HandleGrip.render(f5); - BodyPlate.render(f5); - ValveFront.render(f5); - ValveCenter.render(f5); - Stock.render(f5); - LatchBase.render(f5); - LatchHandle.render(f5); - ValveBack.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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelJack.java b/src/main/java/com/hbm/render/model/ModelJack.java deleted file mode 100644 index c0621d054..000000000 --- a/src/main/java/com/hbm/render/model/ModelJack.java +++ /dev/null @@ -1,129 +0,0 @@ -// Date: 14.02.2017 18:33:04 -// 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 ModelJack extends ModelBase -{ - //fields - ModelRenderer BarrelBR; - ModelRenderer BarrelBL; - ModelRenderer BarrelTR; - ModelRenderer BarrelTL; - ModelRenderer Body; - ModelRenderer Back; - ModelRenderer Plate; - ModelRenderer StockMain; - ModelRenderer StockBottom; - ModelRenderer StockPlate; - - public ModelJack() - { - textureWidth = 64; - textureHeight = 64; - - BarrelBR = new ModelRenderer(this, 0, 6); - BarrelBR.addBox(0F, 0F, 0F, 21, 3, 3); - BarrelBR.setRotationPoint(-18F, 0F, 0.2F); - BarrelBR.setTextureSize(64, 64); - BarrelBR.mirror = true; - setRotation(BarrelBR, 0F, 0F, 0F); - BarrelBL = new ModelRenderer(this, 0, 0); - BarrelBL.addBox(0F, 0F, 0F, 21, 3, 3); - BarrelBL.setRotationPoint(-18F, 0F, -3.2F); - BarrelBL.setTextureSize(64, 64); - BarrelBL.mirror = true; - setRotation(BarrelBL, 0F, 0F, 0F); - BarrelTR = new ModelRenderer(this, 0, 12); - BarrelTR.addBox(0F, 0F, 0F, 21, 3, 3); - BarrelTR.setRotationPoint(-18F, -3.2F, 0.2F); - BarrelTR.setTextureSize(64, 64); - BarrelTR.mirror = true; - setRotation(BarrelTR, 0F, 0F, 0F); - BarrelTL = new ModelRenderer(this, 0, 18); - BarrelTL.addBox(0F, 0F, 0F, 21, 3, 3); - BarrelTL.setRotationPoint(-18F, -3.2F, -3.2F); - BarrelTL.setTextureSize(64, 64); - BarrelTL.mirror = true; - setRotation(BarrelTL, 0F, 0F, 0F); - Body = new ModelRenderer(this, 0, 24); - Body.addBox(0F, 0F, 0F, 15, 7, 4); - Body.setRotationPoint(-9F, -2F, -2F); - Body.setTextureSize(64, 64); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - Back = new ModelRenderer(this, 38, 24); - Back.addBox(0F, 0F, 0F, 3, 5, 3); - Back.setRotationPoint(6F, 0F, -1.5F); - Back.setTextureSize(64, 64); - Back.mirror = true; - setRotation(Back, 0F, 0F, 0F); - Plate = new ModelRenderer(this, 0, 35); - Plate.addBox(0F, 0F, 0F, 4, 2, 3); - Plate.setRotationPoint(6F, -2F, -1.5F); - Plate.setTextureSize(64, 64); - Plate.mirror = true; - setRotation(Plate, 0F, 0F, 0.4363323F); - StockMain = new ModelRenderer(this, 0, 40); - StockMain.addBox(0F, 0F, 0F, 13, 3, 3); - StockMain.setRotationPoint(9F, 2F, -1.5F); - StockMain.setTextureSize(64, 64); - StockMain.mirror = true; - setRotation(StockMain, 0F, 0F, 0F); - StockBottom = new ModelRenderer(this, 0, 46); - StockBottom.addBox(0F, 0F, 0F, 6, 3, 3); - StockBottom.setRotationPoint(16F, 5F, -1.5F); - StockBottom.setTextureSize(64, 64); - StockBottom.mirror = true; - setRotation(StockBottom, 0F, 0F, 0F); - StockPlate = new ModelRenderer(this, 18, 46); - StockPlate.addBox(-8F, -3F, 0F, 8, 3, 3); - StockPlate.setRotationPoint(16F, 8F, -1.5F); - StockPlate.setTextureSize(64, 64); - StockPlate.mirror = true; - setRotation(StockPlate, 0F, 0F, 0.4014257F); - } - - @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); - BarrelBR.render(f5); - BarrelBL.render(f5); - BarrelTR.render(f5); - BarrelTL.render(f5); - Body.render(f5); - Back.render(f5); - Plate.render(f5); - StockMain.render(f5); - StockBottom.render(f5); - StockPlate.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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelLacunae.java b/src/main/java/com/hbm/render/model/ModelLacunae.java deleted file mode 100644 index ba9c0a519..000000000 --- a/src/main/java/com/hbm/render/model/ModelLacunae.java +++ /dev/null @@ -1,598 +0,0 @@ -// Date: 30.12.2018 13:53:06 -// 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 ModelLacunae extends ModelBase { - // fields - ModelRenderer FrontP1; - ModelRenderer FrontP2; - ModelRenderer FrontP3; - ModelRenderer Barrel1; - ModelRenderer Barrel2; - ModelRenderer Barrel3; - ModelRenderer Barrel4; - ModelRenderer Barrel5; - ModelRenderer Barrel6; - ModelRenderer Brace1; - ModelRenderer Brace2; - ModelRenderer Brace3; - ModelRenderer Brace4; - ModelRenderer Brace5; - ModelRenderer Brace6; - ModelRenderer Brace7; - ModelRenderer Brace8; - ModelRenderer Brace9; - ModelRenderer Brace10; - ModelRenderer Brace11; - ModelRenderer Brace12; - ModelRenderer Disc1; - ModelRenderer Disc2; - ModelRenderer Disc3; - ModelRenderer Disc4; - ModelRenderer Disc5; - ModelRenderer Disc6; - ModelRenderer Disc7; - ModelRenderer Disc8; - ModelRenderer BodyF1; - ModelRenderer BodyF2; - ModelRenderer BodyF3; - ModelRenderer BodyR1; - ModelRenderer BodyR2; - ModelRenderer BodyL1; - ModelRenderer BodyL2; - ModelRenderer BackP1; - ModelRenderer BackP2; - ModelRenderer BackP3; - ModelRenderer Block; - ModelRenderer AchsleF; - ModelRenderer Drum1; - ModelRenderer Drum2; - ModelRenderer DrumT; - ModelRenderer StickBase; - ModelRenderer Stick; - ModelRenderer AchsleB; - ModelRenderer Motor1; - ModelRenderer Motor2; - ModelRenderer Pipe1; - ModelRenderer Frame1; - ModelRenderer Frame2; - ModelRenderer Frame3; - ModelRenderer Frame4; - ModelRenderer Grip; - ModelRenderer Pipe2; - ModelRenderer PipeT; - ModelRenderer Pipe3; - ModelRenderer Pipe4; - ModelRenderer AmmoFrame; - ModelRenderer ClampB; - ModelRenderer ClampF; - ModelRenderer AmmoBox; - - public ModelLacunae() { - textureWidth = 128; - textureHeight = 128; - - FrontP1 = new ModelRenderer(this, 0, 52); - FrontP1.addBox(0F, 0F, 0F, 3, 8, 4); - FrontP1.setRotationPoint(-2F, 0F, -2F); - FrontP1.setTextureSize(128, 128); - FrontP1.mirror = true; - setRotation(FrontP1, 0F, 0F, 0F); - FrontP2 = new ModelRenderer(this, 14, 52); - FrontP2.addBox(0F, 0F, 0F, 3, 4, 8); - FrontP2.setRotationPoint(-2F, 2F, -4F); - FrontP2.setTextureSize(128, 128); - FrontP2.mirror = true; - setRotation(FrontP2, 0F, 0F, 0F); - FrontP3 = new ModelRenderer(this, 0, 38); - FrontP3.addBox(0F, 0F, 0F, 3, 7, 7); - FrontP3.setRotationPoint(-2F, 0.5F, -3.5F); - FrontP3.setTextureSize(128, 128); - FrontP3.mirror = true; - setRotation(FrontP3, 0F, 0F, 0F); - Barrel1 = new ModelRenderer(this, 64, 62); - Barrel1.addBox(0F, -2.5F, -0.5F, 31, 1, 1); - Barrel1.setRotationPoint(1F, 4F, 0F); - Barrel1.setTextureSize(128, 128); - Barrel1.mirror = true; - setRotation(Barrel1, 0F, 0F, 0F); - Barrel2 = new ModelRenderer(this, 64, 62); - Barrel2.addBox(0F, -2.5F, -0.5F, 31, 1, 1); - Barrel2.setRotationPoint(1F, 4F, 0F); - Barrel2.setTextureSize(128, 128); - Barrel2.mirror = true; - setRotation(Barrel2, 0.6457718F, 0F, 0F); - Barrel3 = new ModelRenderer(this, 64, 62); - Barrel3.addBox(0F, -2.5F, -0.5F, 31, 1, 1); - Barrel3.setRotationPoint(1F, 4F, 0F); - Barrel3.setTextureSize(128, 128); - Barrel3.mirror = true; - setRotation(Barrel3, 2.268928F, 0F, 0F); - Barrel4 = new ModelRenderer(this, 64, 62); - Barrel4.addBox(0F, -2.5F, -0.5F, 31, 1, 1); - Barrel4.setRotationPoint(1F, 4F, 0F); - Barrel4.setTextureSize(128, 128); - Barrel4.mirror = true; - setRotation(Barrel4, 2.9147F, 0F, 0F); - Barrel5 = new ModelRenderer(this, 64, 62); - Barrel5.addBox(0F, -2.5F, -0.5F, 31, 1, 1); - Barrel5.setRotationPoint(1F, 4F, 0F); - Barrel5.setTextureSize(128, 128); - Barrel5.mirror = true; - setRotation(Barrel5, -1.919862F, 0F, 0F); - Barrel6 = new ModelRenderer(this, 64, 62); - Barrel6.addBox(0F, -2.5F, -0.5F, 31, 1, 1); - Barrel6.setRotationPoint(1F, 4F, 0F); - Barrel6.setTextureSize(128, 128); - Barrel6.mirror = true; - setRotation(Barrel6, -1.27409F, 0F, 0F); - Brace1 = new ModelRenderer(this, 20, 48); - Brace1.addBox(0F, -3F, -1F, 5, 2, 2); - Brace1.setRotationPoint(25F, 4F, 0F); - Brace1.setTextureSize(128, 128); - Brace1.mirror = true; - setRotation(Brace1, 0F, 0F, 0F); - Brace2 = new ModelRenderer(this, 20, 48); - Brace2.addBox(0F, -3F, -1F, 5, 2, 2); - Brace2.setRotationPoint(25F, 4F, 0F); - Brace2.setTextureSize(128, 128); - Brace2.mirror = true; - setRotation(Brace2, 0.6457718F, 0F, 0F); - Brace3 = new ModelRenderer(this, 20, 44); - Brace3.addBox(0F, -3F, -1F, 5, 2, 2); - Brace3.setRotationPoint(4F, 4F, 0F); - Brace3.setTextureSize(128, 128); - Brace3.mirror = true; - setRotation(Brace3, 2.268928F, 0F, 0F); - Brace4 = new ModelRenderer(this, 20, 44); - Brace4.addBox(0F, -3F, -1F, 5, 2, 2); - Brace4.setRotationPoint(4F, 4F, 0F); - Brace4.setTextureSize(128, 128); - Brace4.mirror = true; - setRotation(Brace4, 2.9147F, 0F, 0F); - Brace5 = new ModelRenderer(this, 20, 44); - Brace5.addBox(0F, -3F, -1F, 5, 2, 2); - Brace5.setRotationPoint(4F, 4F, 0F); - Brace5.setTextureSize(128, 128); - Brace5.mirror = true; - setRotation(Brace5, -1.919862F, 0F, 0F); - Brace6 = new ModelRenderer(this, 20, 44); - Brace6.addBox(0F, -3F, -1F, 5, 2, 2); - Brace6.setRotationPoint(4F, 4F, 0F); - Brace6.setTextureSize(128, 128); - Brace6.mirror = true; - setRotation(Brace6, -1.27409F, 0F, 0F); - Brace7 = new ModelRenderer(this, 20, 44); - Brace7.addBox(0F, -3F, -1F, 5, 2, 2); - Brace7.setRotationPoint(4F, 4F, 0F); - Brace7.setTextureSize(128, 128); - Brace7.mirror = true; - setRotation(Brace7, 0F, 0F, 0F); - Brace8 = new ModelRenderer(this, 20, 44); - Brace8.addBox(0F, -3F, -1F, 5, 2, 2); - Brace8.setRotationPoint(4F, 4F, 0F); - Brace8.setTextureSize(128, 128); - Brace8.mirror = true; - setRotation(Brace8, 0.6457718F, 0F, 0F); - Brace9 = new ModelRenderer(this, 20, 48); - Brace9.addBox(0F, -3F, -1F, 5, 2, 2); - Brace9.setRotationPoint(25F, 4F, 0F); - Brace9.setTextureSize(128, 128); - Brace9.mirror = true; - setRotation(Brace9, 2.268928F, 0F, 0F); - Brace10 = new ModelRenderer(this, 20, 48); - Brace10.addBox(0F, -3F, -1F, 5, 2, 2); - Brace10.setRotationPoint(25F, 4F, 0F); - Brace10.setTextureSize(128, 128); - Brace10.mirror = true; - setRotation(Brace10, 2.9147F, 0F, 0F); - Brace11 = new ModelRenderer(this, 20, 48); - Brace11.addBox(0F, -3F, -1F, 5, 2, 2); - Brace11.setRotationPoint(25F, 4F, 0F); - Brace11.setTextureSize(128, 128); - Brace11.mirror = true; - setRotation(Brace11, -1.919862F, 0F, 0F); - Brace12 = new ModelRenderer(this, 20, 48); - Brace12.addBox(0F, -3F, -1F, 5, 2, 2); - Brace12.setRotationPoint(25F, 4F, 0F); - Brace12.setTextureSize(128, 128); - Brace12.mirror = true; - setRotation(Brace12, -1.27409F, 0F, 0F); - Disc1 = new ModelRenderer(this, 36, 54); - Disc1.addBox(0F, -3.5F, -1.5F, 2, 7, 3); - Disc1.setRotationPoint(15F, 4F, 0F); - Disc1.setTextureSize(128, 128); - Disc1.mirror = true; - setRotation(Disc1, 0F, 0F, 0F); - Disc2 = new ModelRenderer(this, 46, 54); - Disc2.addBox(0F, -3.5F, -1.5F, 2, 7, 3); - Disc2.setRotationPoint(15F, 4F, 0F); - Disc2.setTextureSize(128, 128); - Disc2.mirror = true; - setRotation(Disc2, 0.7853982F, 0F, 0F); - Disc3 = new ModelRenderer(this, 36, 44); - Disc3.addBox(0F, -3.5F, -1.5F, 2, 7, 3); - Disc3.setRotationPoint(15F, 4F, 0F); - Disc3.setTextureSize(128, 128); - Disc3.mirror = true; - setRotation(Disc3, 1.570796F, 0F, 0F); - Disc4 = new ModelRenderer(this, 46, 44); - Disc4.addBox(0F, -3.5F, -1.5F, 2, 7, 3); - Disc4.setRotationPoint(15F, 4F, 0F); - Disc4.setTextureSize(128, 128); - Disc4.mirror = true; - setRotation(Disc4, 2.356194F, 0F, 0F); - Disc5 = new ModelRenderer(this, 56, 54); - Disc5.addBox(0F, -3.5F, -1.5F, 1, 7, 3); - Disc5.setRotationPoint(2F, 4F, 0F); - Disc5.setTextureSize(128, 128); - Disc5.mirror = true; - setRotation(Disc5, 0F, 0F, 0F); - Disc6 = new ModelRenderer(this, 56, 44); - Disc6.addBox(0F, -3.5F, -1.5F, 1, 7, 3); - Disc6.setRotationPoint(2F, 4F, 0F); - Disc6.setTextureSize(128, 128); - Disc6.mirror = true; - setRotation(Disc6, 1.570796F, 0F, 0F); - Disc7 = new ModelRenderer(this, 64, 52); - Disc7.addBox(0F, -3.5F, -1.5F, 1, 7, 3); - Disc7.setRotationPoint(2F, 4F, 0F); - Disc7.setTextureSize(128, 128); - Disc7.mirror = true; - setRotation(Disc7, 0.7853982F, 0F, 0F); - Disc8 = new ModelRenderer(this, 72, 52); - Disc8.addBox(0F, -3.5F, -1.5F, 1, 7, 3); - Disc8.setRotationPoint(2F, 4F, 0F); - Disc8.setTextureSize(128, 128); - Disc8.mirror = true; - setRotation(Disc8, 2.356194F, 0F, 0F); - BodyF1 = new ModelRenderer(this, 80, 48); - BodyF1.addBox(0F, 0F, 0F, 7, 10, 4); - BodyF1.setRotationPoint(-9F, -1F, -2F); - BodyF1.setTextureSize(128, 128); - BodyF1.mirror = true; - setRotation(BodyF1, 0F, 0F, 0F); - BodyF2 = new ModelRenderer(this, 64, 34); - BodyF2.addBox(0F, 0F, 0F, 7, 4, 10); - BodyF2.setRotationPoint(-9F, 2F, -5F); - BodyF2.setTextureSize(128, 128); - BodyF2.mirror = true; - setRotation(BodyF2, 0F, 0F, 0F); - BodyF3 = new ModelRenderer(this, 98, 32); - BodyF3.addBox(0F, 0F, 0F, 7, 8, 8); - BodyF3.setRotationPoint(-9F, 0F, -4F); - BodyF3.setTextureSize(128, 128); - BodyF3.mirror = true; - setRotation(BodyF3, 0F, 0F, 0F); - BodyR1 = new ModelRenderer(this, 102, 55); - BodyR1.addBox(0F, 0F, 0F, 8, 4, 3); - BodyR1.setRotationPoint(-9.5F, 4.5F, -6F); - BodyR1.setTextureSize(128, 128); - BodyR1.mirror = true; - setRotation(BodyR1, 0F, 0F, 0F); - BodyR2 = new ModelRenderer(this, 102, 48); - BodyR2.addBox(0F, 0F, 0F, 8, 3, 4); - BodyR2.setRotationPoint(-9.5F, 5F, -6.5F); - BodyR2.setTextureSize(128, 128); - BodyR2.mirror = true; - setRotation(BodyR2, 0F, 0F, 0F); - BodyL1 = new ModelRenderer(this, 106, 17); - BodyL1.addBox(0F, 0F, 0F, 8, 4, 3); - BodyL1.setRotationPoint(-9.5F, 4.5F, 3F); - BodyL1.setTextureSize(128, 128); - BodyL1.mirror = true; - setRotation(BodyL1, 0F, 0F, 0F); - BodyL2 = new ModelRenderer(this, 104, 10); - BodyL2.addBox(0F, 0F, 0F, 8, 3, 4); - BodyL2.setRotationPoint(-9.5F, 5F, 2.5F); - BodyL2.setTextureSize(128, 128); - BodyL2.mirror = true; - setRotation(BodyL2, 0F, 0F, 0F); - BackP1 = new ModelRenderer(this, 54, 32); - BackP1.addBox(0F, 0F, 0F, 1, 8, 4); - BackP1.setRotationPoint(-10F, 0F, -2F); - BackP1.setTextureSize(128, 128); - BackP1.mirror = true; - setRotation(BackP1, 0F, 0F, 0F); - BackP2 = new ModelRenderer(this, 36, 32); - BackP2.addBox(0F, 0F, 0F, 1, 4, 8); - BackP2.setRotationPoint(-10F, 2F, -4F); - BackP2.setTextureSize(128, 128); - BackP2.mirror = true; - setRotation(BackP2, 0F, 0F, 0F); - BackP3 = new ModelRenderer(this, 20, 30); - BackP3.addBox(0F, 0F, 0F, 1, 7, 7); - BackP3.setRotationPoint(-10F, 0.5F, -3.5F); - BackP3.setTextureSize(128, 128); - BackP3.mirror = true; - setRotation(BackP3, 0F, 0F, 0F); - Block = new ModelRenderer(this, 98, 64); - Block.addBox(0F, 0F, 0F, 5, 9, 10); - Block.setRotationPoint(-27F, -1F, -5F); - Block.setTextureSize(128, 128); - Block.mirror = true; - setRotation(Block, 0F, 0F, 0F); - AchsleF = new ModelRenderer(this, 0, 34); - AchsleF.addBox(0F, 0F, 0F, 1, 2, 2); - AchsleF.setRotationPoint(-22F, 3F, -1F); - AchsleF.setTextureSize(128, 128); - AchsleF.mirror = true; - setRotation(AchsleF, 0F, 0F, 0F); - Drum1 = new ModelRenderer(this, 100, 24); - Drum1.addBox(0F, 0F, 0F, 11, 5, 3); - Drum1.setRotationPoint(-21F, 1.5F, -1.5F); - Drum1.setTextureSize(128, 128); - Drum1.mirror = true; - setRotation(Drum1, 0F, 0F, 0F); - Drum2 = new ModelRenderer(this, 96, 2); - Drum2.addBox(0F, 0F, 0F, 11, 3, 5); - Drum2.setRotationPoint(-21F, 2.5F, -2.5F); - Drum2.setTextureSize(128, 128); - Drum2.mirror = true; - setRotation(Drum2, 0F, 0F, 0F); - DrumT = new ModelRenderer(this, 34, 26); - DrumT.addBox(0F, 0F, 0F, 12, 1, 5); - DrumT.setRotationPoint(-22F, 0F, -2.5F); - DrumT.setTextureSize(128, 128); - DrumT.mirror = true; - setRotation(DrumT, 0F, 0F, 0F); - StickBase = new ModelRenderer(this, 6, 33); - StickBase.addBox(0F, 0F, 0F, 3, 2, 3); - StickBase.setRotationPoint(-26F, -3F, -1.5F); - StickBase.setTextureSize(128, 128); - StickBase.mirror = true; - setRotation(StickBase, 0F, 0F, 0F); - Stick = new ModelRenderer(this, 28, 72); - Stick.addBox(0F, -7F, 0F, 2, 7, 2); - Stick.setRotationPoint(-25.5F, -3F, -1F); - Stick.setTextureSize(128, 128); - Stick.mirror = true; - setRotation(Stick, 0F, 0F, 0.5235988F); - AchsleB = new ModelRenderer(this, 56, 66); - AchsleB.addBox(0F, 0F, 0F, 3, 2, 2); - AchsleB.setRotationPoint(-30F, 3F, -1F); - AchsleB.setTextureSize(128, 128); - AchsleB.mirror = true; - setRotation(AchsleB, 0F, 0F, 0F); - Motor1 = new ModelRenderer(this, 80, 66); - Motor1.addBox(0F, 0F, 0F, 5, 6, 4); - Motor1.setRotationPoint(-35F, 1F, -2F); - Motor1.setTextureSize(128, 128); - Motor1.mirror = true; - setRotation(Motor1, 0F, 0F, 0F); - Motor2 = new ModelRenderer(this, 76, 76); - Motor2.addBox(0F, 0F, 0F, 5, 4, 6); - Motor2.setRotationPoint(-35F, 2F, -3F); - Motor2.setTextureSize(128, 128); - Motor2.mirror = true; - setRotation(Motor2, 0F, 0F, 0F); - Pipe1 = new ModelRenderer(this, 62, 64); - Pipe1.addBox(0F, 0F, 0F, 16, 1, 1); - Pipe1.setRotationPoint(-23F, -1F, -6F); - Pipe1.setTextureSize(128, 128); - Pipe1.mirror = true; - setRotation(Pipe1, 0F, 0F, 0.2617994F); - Frame1 = new ModelRenderer(this, 0, 103); - Frame1.addBox(0F, 0F, 0F, 1, 1, 11); - Frame1.setRotationPoint(-1F, -2F, -5.5F); - Frame1.setTextureSize(128, 128); - Frame1.mirror = true; - setRotation(Frame1, 0F, 0F, 0F); - Frame2 = new ModelRenderer(this, 24, 73); - Frame2.addBox(0F, 0F, 0F, 1, 5, 1); - Frame2.setRotationPoint(-1F, -1.5F, -6F); - Frame2.setTextureSize(128, 128); - Frame2.mirror = true; - setRotation(Frame2, 0F, 0F, 0F); - Frame3 = new ModelRenderer(this, 28, 70); - Frame3.addBox(0F, 0F, 0F, 6, 1, 1); - Frame3.setRotationPoint(-6.5F, 3F, -6F); - Frame3.setTextureSize(128, 128); - Frame3.mirror = true; - setRotation(Frame3, 0F, 0F, 0F); - Frame4 = new ModelRenderer(this, 52, 66); - Frame4.addBox(0F, 0F, 0F, 1, 3, 1); - Frame4.setRotationPoint(-1F, -1.5F, 5F); - Frame4.setTextureSize(128, 128); - Frame4.mirror = true; - setRotation(Frame4, 0F, 0F, 0F); - Grip = new ModelRenderer(this, 0, 95); - Grip.addBox(0F, 0F, 0F, 2, 2, 6); - Grip.setRotationPoint(-3F, 0F, 5F); - Grip.setTextureSize(128, 128); - Grip.mirror = true; - setRotation(Grip, 0F, 0F, 0F); - Pipe2 = new ModelRenderer(this, 28, 68); - Pipe2.addBox(-11F, 0F, 0F, 11, 1, 1); - Pipe2.setRotationPoint(-26F, -1F, -6F); - Pipe2.setTextureSize(128, 128); - Pipe2.mirror = true; - setRotation(Pipe2, 0F, 0F, -0.6108652F); - PipeT = new ModelRenderer(this, 0, 84); - PipeT.addBox(0F, 0F, 0F, 1, 1, 10); - PipeT.setRotationPoint(-34.5F, 4.5F, -5F); - PipeT.setTextureSize(128, 128); - PipeT.mirror = true; - setRotation(PipeT, 0F, 0F, 0F); - Pipe3 = new ModelRenderer(this, 28, 66); - Pipe3.addBox(-11F, 0F, 0F, 11, 1, 1); - Pipe3.setRotationPoint(-26F, -1F, 5F); - Pipe3.setTextureSize(128, 128); - Pipe3.mirror = true; - setRotation(Pipe3, 0F, 0F, -0.6108652F); - Pipe4 = new ModelRenderer(this, 28, 64); - Pipe4.addBox(0F, 0F, 0F, 16, 1, 1); - Pipe4.setRotationPoint(-23F, -1F, 5F); - Pipe4.setTextureSize(128, 128); - Pipe4.mirror = true; - setRotation(Pipe4, 0F, 0F, 0.2617994F); - AmmoFrame = new ModelRenderer(this, 0, 0); - AmmoFrame.addBox(0F, 0F, 0F, 10, 12, 12); - AmmoFrame.setRotationPoint(-21F, 9F, -6F); - AmmoFrame.setTextureSize(128, 128); - AmmoFrame.mirror = true; - setRotation(AmmoFrame, 0F, 0F, 0F); - ClampB = new ModelRenderer(this, 0, 73); - ClampB.addBox(0F, 0F, 0F, 4, 3, 8); - ClampB.setRotationPoint(-25F, 8F, -4F); - ClampB.setTextureSize(128, 128); - ClampB.mirror = true; - setRotation(ClampB, 0F, 0F, 0F); - ClampF = new ModelRenderer(this, 0, 64); - ClampF.addBox(0F, 0F, 0F, 8, 3, 6); - ClampF.setRotationPoint(-11F, 9F, -3F); - ClampF.setTextureSize(128, 128); - ClampF.mirror = true; - setRotation(ClampF, 0F, 0F, 0F); - AmmoBox = new ModelRenderer(this, 44, 0); - AmmoBox.addBox(0F, 0F, 0F, 9, 11, 11); - AmmoBox.setRotationPoint(-20.5F, 9.5F, -5.5F); - AmmoBox.setTextureSize(128, 128); - AmmoBox.mirror = true; - setRotation(AmmoBox, 0F, 0F, 0F); - } - - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, float rot) { - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - - rot *= Math.PI / 180F; - - Barrel1.rotateAngleX += rot; - Barrel2.rotateAngleX += rot; - Barrel3.rotateAngleX += rot; - Barrel4.rotateAngleX += rot; - Barrel5.rotateAngleX += rot; - Barrel6.rotateAngleX += rot; - Brace1.rotateAngleX += rot; - Brace2.rotateAngleX += rot; - Brace3.rotateAngleX += rot; - Brace4.rotateAngleX += rot; - Brace5.rotateAngleX += rot; - Brace6.rotateAngleX += rot; - Brace7.rotateAngleX += rot; - Brace8.rotateAngleX += rot; - Brace9.rotateAngleX += rot; - Brace10.rotateAngleX += rot; - Brace11.rotateAngleX += rot; - Brace12.rotateAngleX += rot; - Disc1.rotateAngleX += rot; - Disc2.rotateAngleX += rot; - Disc3.rotateAngleX += rot; - Disc4.rotateAngleX += rot; - Disc5.rotateAngleX += rot; - Disc6.rotateAngleX += rot; - Disc7.rotateAngleX += rot; - Disc8.rotateAngleX += rot; - - FrontP1.render(f5); - FrontP2.render(f5); - FrontP3.render(f5); - Barrel1.render(f5); - Barrel2.render(f5); - Barrel3.render(f5); - Barrel4.render(f5); - Barrel5.render(f5); - Barrel6.render(f5); - Brace1.render(f5); - Brace2.render(f5); - Brace3.render(f5); - Brace4.render(f5); - Brace5.render(f5); - Brace6.render(f5); - Brace7.render(f5); - Brace8.render(f5); - Brace9.render(f5); - Brace10.render(f5); - Brace11.render(f5); - Brace12.render(f5); - Disc1.render(f5); - Disc2.render(f5); - Disc3.render(f5); - Disc4.render(f5); - Disc5.render(f5); - Disc6.render(f5); - Disc7.render(f5); - Disc8.render(f5); - BodyF1.render(f5); - BodyF2.render(f5); - BodyF3.render(f5); - BodyR1.render(f5); - BodyR2.render(f5); - BodyL1.render(f5); - BodyL2.render(f5); - BackP1.render(f5); - BackP2.render(f5); - BackP3.render(f5); - Block.render(f5); - AchsleF.render(f5); - Drum1.render(f5); - Drum2.render(f5); - DrumT.render(f5); - StickBase.render(f5); - Stick.render(f5); - AchsleB.render(f5); - Motor1.render(f5); - Motor2.render(f5); - Pipe1.render(f5); - Frame1.render(f5); - Frame2.render(f5); - Frame3.render(f5); - Frame4.render(f5); - Grip.render(f5); - Pipe2.render(f5); - PipeT.render(f5); - Pipe3.render(f5); - Pipe4.render(f5); - AmmoFrame.render(f5); - ClampB.render(f5); - ClampF.render(f5); - AmmoBox.render(f5); - - Barrel1.rotateAngleX -= rot; - Barrel2.rotateAngleX -= rot; - Barrel3.rotateAngleX -= rot; - Barrel4.rotateAngleX -= rot; - Barrel5.rotateAngleX -= rot; - Barrel6.rotateAngleX -= rot; - Brace1.rotateAngleX -= rot; - Brace2.rotateAngleX -= rot; - Brace3.rotateAngleX -= rot; - Brace4.rotateAngleX -= rot; - Brace5.rotateAngleX -= rot; - Brace6.rotateAngleX -= rot; - Brace7.rotateAngleX -= rot; - Brace8.rotateAngleX -= rot; - Brace9.rotateAngleX -= rot; - Brace10.rotateAngleX -= rot; - Brace11.rotateAngleX -= rot; - Brace12.rotateAngleX -= rot; - Disc1.rotateAngleX -= rot; - Disc2.rotateAngleX -= rot; - Disc3.rotateAngleX -= rot; - Disc4.rotateAngleX -= rot; - Disc5.rotateAngleX -= rot; - Disc6.rotateAngleX -= rot; - Disc7.rotateAngleX -= rot; - Disc8.rotateAngleX -= rot; - } - - 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/src/main/java/com/hbm/render/model/ModelLeverAction.java b/src/main/java/com/hbm/render/model/ModelLeverAction.java deleted file mode 100644 index c45cc2986..000000000 --- a/src/main/java/com/hbm/render/model/ModelLeverAction.java +++ /dev/null @@ -1,233 +0,0 @@ -// Date: 13.01.2018 16:04:59 -// 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 ModelLeverAction extends ModelBase { - // fields - ModelRenderer Barrel1; - ModelRenderer Barrel2; - ModelRenderer Barrel3; - ModelRenderer Barrel4; - ModelRenderer Grip; - ModelRenderer Front1; - ModelRenderer Front2; - ModelRenderer BodyFront; - ModelRenderer BodyTop; - ModelRenderer BodyMain; - ModelRenderer BodyPlate; - ModelRenderer HandleMain; - ModelRenderer HandleBottom; - ModelRenderer HandleBack; - ModelRenderer LeverFront; - ModelRenderer LeverBottom; - ModelRenderer LeverMid; - ModelRenderer LeverFrontPlate; - ModelRenderer LeverBackBottom; - ModelRenderer Trigger; - ModelRenderer LeverBackTop; - ModelRenderer LeverBack; - - public ModelLeverAction() { - textureWidth = 128; - textureHeight = 64; - - Barrel1 = new ModelRenderer(this, 0, 0); - Barrel1.addBox(0F, 0F, 0F, 60, 3, 2); - Barrel1.setRotationPoint(-60F, 1.5F, -1F); - Barrel1.setTextureSize(64, 32); - Barrel1.mirror = true; - setRotation(Barrel1, 0F, 0F, 0F); - Barrel2 = new ModelRenderer(this, 0, 5); - Barrel2.addBox(0F, 0F, 0F, 60, 2, 3); - Barrel2.setRotationPoint(-60F, 2F, -1.5F); - Barrel2.setTextureSize(64, 32); - Barrel2.mirror = true; - setRotation(Barrel2, 0F, 0F, 0F); - Barrel3 = new ModelRenderer(this, 0, 10); - Barrel3.addBox(0F, 0F, 0F, 10, 2, 3); - Barrel3.setRotationPoint(-46F, 6F, -1.5F); - Barrel3.setTextureSize(64, 32); - Barrel3.mirror = true; - setRotation(Barrel3, 0F, 0F, 0F); - Barrel4 = new ModelRenderer(this, 26, 10); - Barrel4.addBox(0F, 0F, 0F, 10, 3, 2); - Barrel4.setRotationPoint(-46F, 5.5F, -1F); - Barrel4.setTextureSize(64, 32); - Barrel4.mirror = true; - setRotation(Barrel4, 0F, 0F, 0F); - Grip = new ModelRenderer(this, 0, 15); - Grip.addBox(0F, 0F, 0F, 36, 6, 4); - Grip.setRotationPoint(-36F, 3F, -2F); - Grip.setTextureSize(64, 32); - Grip.mirror = true; - setRotation(Grip, 0F, 0F, 0F); - Front1 = new ModelRenderer(this, 50, 10); - Front1.addBox(0F, 0F, 0F, 3, 2, 1); - Front1.setRotationPoint(-50F, 4.5F, -0.5F); - Front1.setTextureSize(64, 32); - Front1.mirror = true; - setRotation(Front1, 0F, 0F, 0F); - Front2 = new ModelRenderer(this, 58, 10); - Front2.addBox(0F, 0F, 0F, 3, 1, 2); - Front2.setRotationPoint(-50F, 6.5F, -1F); - Front2.setTextureSize(64, 32); - Front2.mirror = true; - setRotation(Front2, 0F, 0F, 0F); - BodyFront = new ModelRenderer(this, 0, 25); - BodyFront.addBox(0F, 0F, 0F, 3, 8, 4); - BodyFront.setRotationPoint(0F, 1.5F, -2F); - BodyFront.setTextureSize(64, 32); - BodyFront.mirror = true; - setRotation(BodyFront, 0F, 0F, 0F); - BodyTop = new ModelRenderer(this, 14, 25); - BodyTop.addBox(0F, 0F, 0F, 3, 1, 3); - BodyTop.setRotationPoint(0F, 1F, -1.5F); - BodyTop.setTextureSize(64, 32); - BodyTop.mirror = true; - setRotation(BodyTop, 0F, 0F, 0F); - BodyMain = new ModelRenderer(this, 0, 37); - BodyMain.addBox(0F, 0F, 0F, 12, 7, 4); - BodyMain.setRotationPoint(3F, 2.5F, -2F); - BodyMain.setTextureSize(64, 32); - BodyMain.mirror = true; - setRotation(BodyMain, 0F, 0F, 0F); - BodyPlate = new ModelRenderer(this, 26, 25); - BodyPlate.addBox(0F, 0F, 0F, 10, 2, 3); - BodyPlate.setRotationPoint(3F, 1F, -1.5F); - BodyPlate.setTextureSize(64, 32); - BodyPlate.mirror = true; - setRotation(BodyPlate, 0F, 0F, 0.1570796F); - HandleMain = new ModelRenderer(this, 0, 48); - HandleMain.addBox(0F, 0F, 0F, 18, 5, 4); - HandleMain.setRotationPoint(15F, 4F, -2F); - HandleMain.setTextureSize(128, 64); - HandleMain.mirror = true; - setRotation(HandleMain, 0F, 0F, 0.4363323F); - HandleBottom = new ModelRenderer(this, 0, 57); - HandleBottom.addBox(4F, 4.5F, 0F, 13, 1, 4); - HandleBottom.setRotationPoint(15F, 4F, -2F); - HandleBottom.setTextureSize(128, 64); - HandleBottom.mirror = true; - setRotation(HandleBottom, 0F, 0F, 0.4363323F); - HandleBack = new ModelRenderer(this, 34, 57); - HandleBack.addBox(17.5F, 0.5F, 0F, 1, 4, 3); - HandleBack.setRotationPoint(15F, 4F, -1.5F); - HandleBack.setTextureSize(128, 64); - HandleBack.mirror = true; - setRotation(HandleBack, 0F, 0F, 0.4363323F); - LeverFront = new ModelRenderer(this, 62, 30); - LeverFront.addBox(-1F, 0F, 0F, 2, 4, 2); - LeverFront.setRotationPoint(7F, 9F, -1F); - LeverFront.setTextureSize(128, 64); - LeverFront.mirror = true; - setRotation(LeverFront, 0F, 0F, 0F); - LeverBottom = new ModelRenderer(this, 70, 30); - LeverBottom.addBox(0F, 4F, 0F, 6, 1, 2); - LeverBottom.setRotationPoint(7F, 9F, -1F); - LeverBottom.setTextureSize(128, 64); - LeverBottom.mirror = true; - setRotation(LeverBottom, 0F, 0F, 0F); - LeverMid = new ModelRenderer(this, 62, 36); - LeverMid.addBox(6F, 0F, 0F, 1, 5, 2); - LeverMid.setRotationPoint(7F, 9F, -1F); - LeverMid.setTextureSize(128, 64); - LeverMid.mirror = true; - setRotation(LeverMid, 0F, 0F, 0F); - LeverFrontPlate = new ModelRenderer(this, 68, 39); - LeverFrontPlate.addBox(7F, -1.5F, 0F, 9, 1, 2); - LeverFrontPlate.setRotationPoint(7F, 9F, -1F); - LeverFrontPlate.setTextureSize(128, 64); - LeverFrontPlate.mirror = true; - setRotation(LeverFrontPlate, 0F, 0F, 0.7853982F); - LeverBackBottom = new ModelRenderer(this, 70, 33); - LeverBackBottom.addBox(12F, 10F, 0F, 6, 1, 2); - LeverBackBottom.setRotationPoint(7F, 9F, -1F); - LeverBackBottom.setTextureSize(128, 64); - LeverBackBottom.mirror = true; - setRotation(LeverBackBottom, 0F, 0F, 0F); - Trigger = new ModelRenderer(this, 88, 30); - Trigger.addBox(-1F, 0F, 0F, 1, 3, 1); - Trigger.setRotationPoint(12.5F, 9F, -0.5F); - Trigger.setTextureSize(128, 64); - Trigger.mirror = true; - setRotation(Trigger, 0F, 0F, 0.3490659F); - LeverBackTop = new ModelRenderer(this, 68, 36); - LeverBackTop.addBox(8F, -2F, 0F, 11, 1, 2); - LeverBackTop.setRotationPoint(7F, 9F, -1F); - LeverBackTop.setTextureSize(128, 64); - LeverBackTop.mirror = true; - setRotation(LeverBackTop, 0F, 0F, 0.4363323F); - LeverBack = new ModelRenderer(this, 62, 43); - LeverBack.addBox(17F, 6F, 0F, 1, 4, 2); - LeverBack.setRotationPoint(7F, 9F, -1F); - LeverBack.setTextureSize(128, 64); - LeverBack.mirror = true; - setRotation(LeverBack, 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); - Barrel1.render(f5); - Barrel2.render(f5); - Barrel3.render(f5); - Barrel4.render(f5); - Grip.render(f5); - Front1.render(f5); - Front2.render(f5); - BodyFront.render(f5); - BodyTop.render(f5); - BodyMain.render(f5); - BodyPlate.render(f5); - HandleMain.render(f5); - HandleBottom.render(f5); - HandleBack.render(f5); - LeverFront.render(f5); - LeverBottom.render(f5); - LeverMid.render(f5); - LeverFrontPlate.render(f5); - LeverBackBottom.render(f5); - Trigger.render(f5); - LeverBackTop.render(f5); - LeverBack.render(f5); - } - - public void renderAnim(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, float anim) { - LeverFront.rotateAngleZ += anim; - LeverBottom.rotateAngleZ += anim; - LeverMid.rotateAngleZ += anim; - LeverFrontPlate.rotateAngleZ += anim; - LeverBackBottom.rotateAngleZ += anim; - LeverBackTop.rotateAngleZ += anim; - LeverBack.rotateAngleZ += anim; - - render(entity, f, f1, f2, f3, f4, f5); - - setRotation(LeverFront, 0F, 0F, 0F); - setRotation(LeverBottom, 0F, 0F, 0F); - setRotation(LeverMid, 0F, 0F, 0F); - setRotation(LeverFrontPlate, 0F, 0F, 0.7853982F); - setRotation(LeverBackBottom, 0F, 0F, 0F); - setRotation(LeverBackTop, 0F, 0F, 0.4363323F); - setRotation(LeverBack, 0F, 0F, 0F); - } - - 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/src/main/java/com/hbm/render/model/ModelMIRV.java b/src/main/java/com/hbm/render/model/ModelMIRV.java deleted file mode 100644 index 69cbe99e5..000000000 --- a/src/main/java/com/hbm/render/model/ModelMIRV.java +++ /dev/null @@ -1,95 +0,0 @@ -// Date: 13.11.2016 12:38:48 -// 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 org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelMIRV extends ModelBase -{ - //fields - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - - public ModelMIRV() - { - textureWidth = 64; - textureHeight = 32; - - Shape9 = new ModelRenderer(this, 0, 0); - Shape9.addBox(0F, 0F, 0F, 10, 4, 2); - Shape9.setRotationPoint(-3F, -2F, -1F); - Shape9.setTextureSize(64, 32); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - Shape10 = new ModelRenderer(this, 0, 6); - Shape10.addBox(0F, 0F, 0F, 10, 2, 4); - Shape10.setRotationPoint(-3F, -1F, -2F); - Shape10.setTextureSize(64, 32); - Shape10.mirror = true; - setRotation(Shape10, 0F, 0F, 0F); - Shape11 = new ModelRenderer(this, 0, 12); - Shape11.addBox(0F, 0F, 0F, 10, 3, 3); - Shape11.setRotationPoint(-3F, -1.5F, -1.5F); - Shape11.setTextureSize(64, 32); - Shape11.mirror = true; - setRotation(Shape11, 0F, 0F, 0F); - Shape12 = new ModelRenderer(this, 0, 18); - Shape12.addBox(0F, 0F, 0F, 4, 1, 1); - Shape12.setRotationPoint(0F, -3F, -1F); - Shape12.setTextureSize(64, 32); - Shape12.mirror = true; - setRotation(Shape12, 0F, 0F, 0F); - } - - public void renderAll(float f5) - { - Shape9.render(f5); - Shape10.render(f5); - Shape11.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Shape12.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - } - - @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); - Shape9.render(f5); - Shape10.render(f5); - Shape11.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Shape12.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - } - - 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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelMIRVLauncher.java b/src/main/java/com/hbm/render/model/ModelMIRVLauncher.java deleted file mode 100644 index a6dad112d..000000000 --- a/src/main/java/com/hbm/render/model/ModelMIRVLauncher.java +++ /dev/null @@ -1,287 +0,0 @@ -// Date: 13.11.2016 12:34:14 -// 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 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 ModelMIRVLauncher extends ModelBase { - // fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - ModelRenderer Shape13; - ModelRenderer Shape14; - ModelRenderer Shape15; - ModelRenderer Shape16; - ModelRenderer Shape17; - ModelRenderer Shape18; - ModelRenderer Shape27; - ModelRenderer Shape28; - ModelRenderer Shape29; - ModelRenderer Shape30; - ModelRenderer Shape31; - ModelRenderer Shape32; - ModelRenderer Shape33; - ModelRenderer Shape19; - ModelRenderer Shape20; - ModelRenderer Shape21; - ModelRenderer Shape22; - - public ModelMIRVLauncher() { - textureWidth = 128; - textureHeight = 64; - - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 40, 2, 4); - Shape1.setRotationPoint(-20F, 0F, 0F); - Shape1.setTextureSize(128, 64); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 6); - Shape2.addBox(0F, 0F, 0F, 6, 2, 2); - Shape2.setRotationPoint(-19F, 2F, 1F); - Shape2.setTextureSize(128, 64); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 10); - Shape3.addBox(0F, 0F, 0F, 1, 4, 1); - Shape3.setRotationPoint(-12F, 2F, 1.5F); - Shape3.setTextureSize(128, 64); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 16, 6); - Shape4.addBox(0F, 0F, 0F, 6, 1, 4); - Shape4.setRotationPoint(-10F, 2F, 0F); - Shape4.setTextureSize(128, 64); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 0, 15); - Shape5.addBox(0F, 0F, 0F, 2, 3, 1); - Shape5.setRotationPoint(-7F, 3F, 1.5F); - Shape5.setTextureSize(128, 64); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 4, 10); - Shape6.addBox(0F, 0F, 0F, 3, 3, 1); - Shape6.setRotationPoint(-10F, 3F, 1.5F); - Shape6.setTextureSize(128, 64); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 12, 10); - Shape7.addBox(-1F, 0F, 0F, 1, 2, 1); - Shape7.setRotationPoint(-7F, 3F, 1.5F); - Shape7.setTextureSize(128, 64); - Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0.5235988F); - Shape8 = new ModelRenderer(this, 36, 6); - Shape8.addBox(0F, 0F, 0F, 10, 1, 4); - Shape8.setRotationPoint(-3F, 2F, 0F); - Shape8.setTextureSize(128, 64); - Shape8.mirror = true; - setRotation(Shape8, 0F, 0F, 0F); - Shape9 = new ModelRenderer(this, 64, 6); - Shape9.addBox(0F, 0F, 0F, 2, 3, 2); - Shape9.setRotationPoint(7F, 2F, 1F); - Shape9.setTextureSize(128, 64); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - Shape10 = new ModelRenderer(this, 88, 0); - Shape10.addBox(0F, 0F, 0F, 3, 4, 4); - Shape10.setRotationPoint(17F, -4F, 0F); - Shape10.setTextureSize(128, 64); - Shape10.mirror = true; - setRotation(Shape10, 0F, 0F, 0F); - Shape11 = new ModelRenderer(this, 72, 6); - Shape11.addBox(0F, 0F, 0F, 2, 3, 1); - Shape11.setRotationPoint(18F, -7F, 0F); - Shape11.setTextureSize(128, 64); - Shape11.mirror = true; - setRotation(Shape11, 0F, 0F, 0F); - Shape12 = new ModelRenderer(this, 78, 6); - Shape12.addBox(0F, 0F, 0F, 2, 3, 1); - Shape12.setRotationPoint(18F, -7F, 3F); - Shape12.setTextureSize(128, 64); - Shape12.mirror = true; - setRotation(Shape12, 0F, 0F, 0F); - Shape13 = new ModelRenderer(this, 0, 19); - Shape13.addBox(0F, -4F, 0F, 22, 4, 0); - Shape13.setRotationPoint(-17F, 0F, 1F); - Shape13.setTextureSize(128, 64); - Shape13.mirror = true; - setRotation(Shape13, 0.4363323F, 0F, 0F); - Shape14 = new ModelRenderer(this, 16, 11); - Shape14.addBox(0F, 0F, 0F, 33, 1, 1); - Shape14.setRotationPoint(-17F, -4F, -1F); - Shape14.setTextureSize(128, 64); - Shape14.mirror = true; - setRotation(Shape14, 0F, 0F, 0F); - Shape15 = new ModelRenderer(this, 0, 23); - Shape15.addBox(0F, -4F, 0F, 22, 4, 0); - Shape15.setRotationPoint(-17F, 0F, 3F); - Shape15.setTextureSize(128, 64); - Shape15.mirror = true; - setRotation(Shape15, -0.4363323F, 0F, 0F); - Shape16 = new ModelRenderer(this, 16, 13); - Shape16.addBox(0F, 0F, 0F, 33, 1, 1); - Shape16.setRotationPoint(-17F, -4F, 4F); - Shape16.setTextureSize(128, 64); - Shape16.mirror = true; - setRotation(Shape16, 0F, 0F, 0F); - Shape17 = new ModelRenderer(this, 44, 25); - Shape17.addBox(0F, -4F, 0F, 8, 4, 0); - Shape17.setRotationPoint(8F, 0F, 1F); - Shape17.setTextureSize(128, 64); - Shape17.mirror = true; - setRotation(Shape17, 0.4363323F, 0F, 0F); - Shape18 = new ModelRenderer(this, 44, 21); - Shape18.addBox(0F, -4F, 0F, 8, 4, 0); - Shape18.setRotationPoint(8F, 0F, 3F); - Shape18.setTextureSize(128, 64); - Shape18.mirror = true; - setRotation(Shape18, -0.4363323F, 0F, 0F); - Shape27 = new ModelRenderer(this, 18, 27); - Shape27.addBox(0F, 0F, 0F, 2, 5, 1); - Shape27.setRotationPoint(13F, -5F, 1.5F); - Shape27.setTextureSize(128, 64); - Shape27.mirror = true; - setRotation(Shape27, 0F, 0F, 0F); - Shape28 = new ModelRenderer(this, 84, 6); - Shape28.addBox(0F, 0F, 0F, 1, 3, 1); - Shape28.setRotationPoint(16F, -3F, 1.5F); - Shape28.setTextureSize(128, 64); - Shape28.mirror = true; - setRotation(Shape28, 0F, 0F, 0F); - Shape29 = new ModelRenderer(this, 6, 15); - Shape29.addBox(0F, 0F, 0F, 10, 2, 2); - Shape29.setRotationPoint(3F, -2F, 1F); - Shape29.setTextureSize(128, 64); - Shape29.mirror = true; - setRotation(Shape29, 0F, 0F, 0F); - Shape30 = new ModelRenderer(this, 30, 15); - Shape30.addBox(0F, 0F, 0F, 12, 2, 2); - Shape30.setRotationPoint(-7F, -1F, 4F); - Shape30.setTextureSize(128, 64); - Shape30.mirror = true; - setRotation(Shape30, 0F, 0F, 0F); - Shape31 = new ModelRenderer(this, 44, 19); - Shape31.addBox(0F, 0F, 0F, 14, 1, 1); - Shape31.setRotationPoint(5F, -0.5F, 4.5F); - Shape31.setTextureSize(128, 64); - Shape31.mirror = true; - setRotation(Shape31, 0F, 0F, 0F); - Shape32 = new ModelRenderer(this, 12, 27); - Shape32.addBox(0F, 0F, 0F, 1, 1, 1); - Shape32.setRotationPoint(18F, -0.5F, 3.5F); - Shape32.setTextureSize(128, 64); - Shape32.mirror = true; - setRotation(Shape32, 0F, 0F, 0F); - Shape33 = new ModelRenderer(this, 24, 29); - Shape33.addBox(0F, 0F, 0F, 21, 1, 2); - Shape33.setRotationPoint(-18F, -1F, 1F); - Shape33.setTextureSize(128, 64); - Shape33.mirror = true; - setRotation(Shape33, 0F, 0F, 0F); - Shape19 = new ModelRenderer(this, 0, 33); - Shape19.addBox(0F, 0F, 0F, 10, 4, 2); - Shape19.setRotationPoint(-9F, -5F, 1F); - Shape19.setTextureSize(128, 64); - Shape19.mirror = true; - setRotation(Shape19, 0F, 0F, 0F); - Shape20 = new ModelRenderer(this, 0, 39); - Shape20.addBox(0F, 0F, 0F, 10, 2, 4); - Shape20.setRotationPoint(-9F, -4F, 0F); - Shape20.setTextureSize(128, 64); - Shape20.mirror = true; - setRotation(Shape20, 0F, 0F, 0F); - Shape21 = new ModelRenderer(this, 0, 45); - Shape21.addBox(0F, 0F, 0F, 10, 3, 3); - Shape21.setRotationPoint(-9F, -4.5F, 0.5F); - Shape21.setTextureSize(128, 64); - Shape21.mirror = true; - setRotation(Shape21, 0F, 0F, 0F); - Shape22 = new ModelRenderer(this, 0, 51); - Shape22.addBox(0F, 0F, 0F, 4, 1, 1); - Shape22.setRotationPoint(-6F, -6F, 1F); - Shape22.setTextureSize(128, 64); - Shape22.mirror = true; - setRotation(Shape22, 0F, 0F, 0F); - } - - 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); - Shape1.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Shape2.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Shape6.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Shape7.render(f5); - Shape8.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Shape9.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - Shape27.render(f5); - Shape28.render(f5); - Shape29.render(f5); - Shape30.render(f5); - Shape31.render(f5); - Shape32.render(f5); - Shape33.render(f5); - - int ammo = ItemGunBase.getMag(item); - if(ammo > 0) { - Shape19.render(f5); - Shape20.render(f5); - Shape21.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Shape22.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - } - } - - 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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelMP.java b/src/main/java/com/hbm/render/model/ModelMP.java deleted file mode 100644 index b9c8c4ebf..000000000 --- a/src/main/java/com/hbm/render/model/ModelMP.java +++ /dev/null @@ -1,234 +0,0 @@ -// Date: 29.08.2016 12:31:19 -// 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 ModelMP extends ModelBase { - // fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - ModelRenderer Shape13; - ModelRenderer Shape14; - ModelRenderer Shape15; - ModelRenderer Shape16; - ModelRenderer Shape17; - ModelRenderer Shape18; - ModelRenderer Shape19; - ModelRenderer Shape20; - ModelRenderer Shape21; - ModelRenderer Shape22; - ModelRenderer Shape23; - ModelRenderer Shape24; - ModelRenderer Shape25; - - public ModelMP() { - textureWidth = 128; - textureHeight = 64; - - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 3, 6, 1); - Shape1.setRotationPoint(-25F, -3F, -2F); - Shape1.setTextureSize(128, 64); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 8, 0); - Shape2.addBox(0F, 0F, 0F, 3, 6, 1); - Shape2.setRotationPoint(-25F, -3F, 2F); - Shape2.setTextureSize(128, 64); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 8); - Shape3.addBox(0F, 0F, 0F, 2, 3, 3); - Shape3.setRotationPoint(-24F, 0F, -1F); - Shape3.setTextureSize(128, 64); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 0, 14); - Shape4.addBox(0F, 0F, 0F, 20, 3, 1); - Shape4.setRotationPoint(-22F, -3F, -2F); - Shape4.setTextureSize(128, 64); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 0, 18); - Shape5.addBox(0F, 0F, 0F, 20, 3, 1); - Shape5.setRotationPoint(-22F, -3F, 2F); - Shape5.setTextureSize(128, 64); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 0, 22); - Shape6.addBox(0F, 0F, 0F, 24, 1, 3); - Shape6.setRotationPoint(-24F, -1F, -1F); - Shape6.setTextureSize(128, 64); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 0, 26); - Shape7.addBox(0F, 0F, 0F, 26, 4, 5); - Shape7.setRotationPoint(-25F, 3F, -2F); - Shape7.setTextureSize(128, 64); - Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0F); - Shape8 = new ModelRenderer(this, 16, 0); - Shape8.addBox(0F, 0F, 0F, 3, 6, 1); - Shape8.setRotationPoint(-2F, -3F, -2F); - Shape8.setTextureSize(128, 64); - Shape8.mirror = true; - setRotation(Shape8, 0F, 0F, 0F); - Shape9 = new ModelRenderer(this, 24, 0); - Shape9.addBox(0F, 0F, 0F, 3, 6, 1); - Shape9.setRotationPoint(-2F, -3F, 2F); - Shape9.setTextureSize(128, 64); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - Shape10 = new ModelRenderer(this, 90, 22); - Shape10.addBox(0F, 0F, 0F, 11, 3, 3); - Shape10.setRotationPoint(-2F, 0F, -1F); - Shape10.setTextureSize(128, 64); - Shape10.mirror = true; - setRotation(Shape10, 0F, 0F, 0F); - Shape11 = new ModelRenderer(this, 19, 38); - Shape11.addBox(0F, 0F, 0F, 26, 1, 4); - Shape11.setRotationPoint(-25F, 7F, -1.5F); - Shape11.setTextureSize(128, 64); - Shape11.mirror = true; - setRotation(Shape11, 0F, 0F, 0F); - Shape12 = new ModelRenderer(this, 78, 35); - Shape12.addBox(0F, 0F, 0F, 20, 5, 5); - Shape12.setRotationPoint(-25F, 8F, -2F); - Shape12.setTextureSize(128, 64); - Shape12.mirror = true; - setRotation(Shape12, 0F, 0F, 0F); - Shape13 = new ModelRenderer(this, 54, 45); - Shape13.addBox(0F, 0F, 0F, 32, 2, 5); - Shape13.setRotationPoint(-5F, 8F, -2F); - Shape13.setTextureSize(128, 64); - Shape13.mirror = true; - setRotation(Shape13, 0F, 0F, 0F); - Shape14 = new ModelRenderer(this, 108, 28); - Shape14.addBox(0F, -6F, 0F, 8, 6, 1); - Shape14.setRotationPoint(1F, 8F, -2F); - Shape14.setTextureSize(128, 64); - Shape14.mirror = true; - setRotation(Shape14, -0.0872665F, 0F, 0F); - Shape15 = new ModelRenderer(this, 84, 52); - Shape15.addBox(0F, 0F, 0F, 18, 9, 3); - Shape15.setRotationPoint(9F, -1F, -1F); - Shape15.setTextureSize(128, 64); - Shape15.mirror = true; - setRotation(Shape15, 0F, 0F, 0F); - Shape16 = new ModelRenderer(this, 0, 43); - Shape16.addBox(0F, -9F, 0F, 18, 9, 1); - Shape16.setRotationPoint(9F, 8F, -2F); - Shape16.setTextureSize(128, 64); - Shape16.mirror = true; - setRotation(Shape16, -0.0872665F, 0F, 0F); - Shape17 = new ModelRenderer(this, 90, 28); - Shape17.addBox(0F, -6F, -1F, 8, 6, 1); - Shape17.setRotationPoint(1F, 8F, 3F); - Shape17.setTextureSize(128, 64); - Shape17.mirror = true; - setRotation(Shape17, 0.0872665F, 0F, 0F); - Shape18 = new ModelRenderer(this, 46, 54); - Shape18.addBox(0F, -9F, -1F, 18, 9, 1); - Shape18.setRotationPoint(9F, 8F, 3F); - Shape18.setTextureSize(128, 64); - Shape18.mirror = true; - setRotation(Shape18, 0.0872665F, 0F, 0F); - Shape19 = new ModelRenderer(this, 0, 35); - Shape19.addBox(0F, -3F, 0F, 4, 3, 5); - Shape19.setRotationPoint(-5F, 13F, -2F); - Shape19.setTextureSize(128, 64); - Shape19.mirror = true; - setRotation(Shape19, 0F, 0F, -0.8726646F); - Shape20 = new ModelRenderer(this, 0, 53); - Shape20.addBox(0F, 0F, 0F, 18, 6, 5); - Shape20.setRotationPoint(9F, 10F, -2F); - Shape20.setTextureSize(128, 64); - Shape20.mirror = true; - setRotation(Shape20, 0F, 0F, 0F); - Shape21 = new ModelRenderer(this, 42, 16); - Shape21.addBox(0F, 0F, 0F, 3, 5, 1); - Shape21.setRotationPoint(1F, 10F, 0F); - Shape21.setTextureSize(128, 64); - Shape21.mirror = true; - setRotation(Shape21, 0F, 0F, 0F); - Shape22 = new ModelRenderer(this, 62, 27); - Shape22.addBox(0F, 0F, 0F, 11, 1, 3); - Shape22.setRotationPoint(-2F, 15F, -1F); - Shape22.setTextureSize(128, 64); - Shape22.mirror = true; - setRotation(Shape22, 0F, 0F, 0F); - Shape23 = new ModelRenderer(this, 62, 31); - Shape23.addBox(-6F, -1F, 0F, 6, 1, 3); - Shape23.setRotationPoint(-2F, 16F, -1F); - Shape23.setTextureSize(128, 64); - Shape23.mirror = true; - setRotation(Shape23, 0F, 0F, 0.5235988F); - Shape24 = new ModelRenderer(this, 20, 10); - Shape24.addBox(0F, 0F, 0F, 2, 1, 3); - Shape24.setRotationPoint(-21F, -2F, -1F); - Shape24.setTextureSize(128, 64); - Shape24.mirror = true; - setRotation(Shape24, 0F, 0F, 0F); - Shape25 = new ModelRenderer(this, 10, 10); - Shape25.addBox(0F, 0F, 0F, 2, 1, 3); - Shape25.setRotationPoint(-5F, -2F, -1F); - Shape25.setTextureSize(128, 64); - Shape25.mirror = true; - setRotation(Shape25, 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); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - Shape19.render(f5); - Shape20.render(f5); - Shape21.render(f5); - Shape22.render(f5); - Shape23.render(f5); - Shape24.render(f5); - Shape25.render(f5); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelMP40.java b/src/main/java/com/hbm/render/model/ModelMP40.java deleted file mode 100644 index ccd31ff80..000000000 --- a/src/main/java/com/hbm/render/model/ModelMP40.java +++ /dev/null @@ -1,165 +0,0 @@ -// Date: 03.11.2016 19:00:33 -// 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 org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelMP40 extends ModelBase { - // fields - ModelRenderer Body; - ModelRenderer Barrel; - ModelRenderer Scope; - ModelRenderer ClipPivot; - ModelRenderer ClipPivotBack; - ModelRenderer Clip; - ModelRenderer BarrelBottom; - ModelRenderer BodyStock; - ModelRenderer BodyStockBottom; - ModelRenderer BodyBack; - ModelRenderer Handle; - ModelRenderer TriggerFrame; - ModelRenderer Trigger; - ModelRenderer Bar; - ModelRenderer BarFront; - - public ModelMP40() { - textureWidth = 128; - textureHeight = 64; - - Body = new ModelRenderer(this, 0, 0); - Body.addBox(0F, 0F, 0F, 40, 4, 4); - Body.setRotationPoint(-10F, 0F, -2F); - Body.setTextureSize(128, 64); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - Barrel = new ModelRenderer(this, 88, 0); - Barrel.addBox(0F, 0F, 0F, 17, 2, 2); - Barrel.setRotationPoint(-27F, 1F, -1F); - Barrel.setTextureSize(128, 64); - Barrel.mirror = true; - setRotation(Barrel, 0F, 0F, 0F); - Scope = new ModelRenderer(this, 88, 4); - Scope.addBox(0F, 0F, 0F, 2, 3, 2); - Scope.setRotationPoint(-25F, -2F, -1F); - Scope.setTextureSize(128, 64); - Scope.mirror = true; - setRotation(Scope, 0F, 0F, 0F); - ClipPivot = new ModelRenderer(this, 0, 17); - ClipPivot.addBox(0F, 0F, 0F, 4, 5, 3); - ClipPivot.setRotationPoint(-3F, 4F, -1.5F); - ClipPivot.setTextureSize(128, 64); - ClipPivot.mirror = true; - setRotation(ClipPivot, 0F, 0F, 0F); - ClipPivotBack = new ModelRenderer(this, 14, 17); - ClipPivotBack.addBox(0F, 0F, 0F, 3, 3, 3); - ClipPivotBack.setRotationPoint(1F, 4F, -1.5F); - ClipPivotBack.setTextureSize(128, 64); - ClipPivotBack.mirror = true; - setRotation(ClipPivotBack, 0F, 0F, 0F); - Clip = new ModelRenderer(this, 0, 25); - Clip.addBox(0F, 0F, 0F, 3, 18, 2); - Clip.setRotationPoint(-2.5F, 9F, -1F); - Clip.setTextureSize(128, 64); - Clip.mirror = true; - setRotation(Clip, 0F, 0F, 0F); - BarrelBottom = new ModelRenderer(this, 96, 4); - BarrelBottom.addBox(0F, 0F, 0F, 14, 1, 1); - BarrelBottom.setRotationPoint(-24F, 2.5F, -0.5F); - BarrelBottom.setTextureSize(128, 64); - BarrelBottom.mirror = true; - setRotation(BarrelBottom, 0F, 0F, 0F); - BodyStock = new ModelRenderer(this, 0, 8); - BodyStock.addBox(0F, 0F, 0F, 26, 4, 5); - BodyStock.setRotationPoint(4F, 3F, -2.5F); - BodyStock.setTextureSize(128, 64); - BodyStock.mirror = true; - setRotation(BodyStock, 0F, 0F, 0F); - BodyStockBottom = new ModelRenderer(this, 62, 11); - BodyStockBottom.addBox(0F, 0F, 0F, 26, 3, 3); - BodyStockBottom.setRotationPoint(4F, 7F, -1.5F); - BodyStockBottom.setTextureSize(128, 64); - BodyStockBottom.mirror = true; - setRotation(BodyStockBottom, 0F, 0F, 0F); - BodyBack = new ModelRenderer(this, 10, 25); - BodyBack.addBox(0F, 0F, 0F, 7, 7, 3); - BodyBack.setRotationPoint(30F, 0F, -1.5F); - BodyBack.setTextureSize(128, 64); - BodyBack.mirror = true; - setRotation(BodyBack, 0F, 0F, 0.7853982F); - Handle = new ModelRenderer(this, 30, 17); - Handle.addBox(0F, 0F, 0F, 4, 10, 3); - Handle.setRotationPoint(27F, 10F, -1.5F); - Handle.setTextureSize(128, 64); - Handle.mirror = true; - setRotation(Handle, 0F, 0F, -0.4363323F); - TriggerFrame = new ModelRenderer(this, 44, 17); - TriggerFrame.addBox(0F, 0F, 0F, 6, 4, 2); - TriggerFrame.setRotationPoint(23F, 10F, -1F); - TriggerFrame.setTextureSize(128, 64); - TriggerFrame.mirror = true; - setRotation(TriggerFrame, 0F, 0F, 0F); - Trigger = new ModelRenderer(this, 26, 17); - Trigger.addBox(-1F, 0F, 0F, 1, 3, 1); - Trigger.setRotationPoint(27F, 10F, -0.5F); - Trigger.setTextureSize(128, 64); - Trigger.mirror = true; - setRotation(Trigger, 0F, 0F, 0.4363323F); - Bar = new ModelRenderer(this, 60, 17); - Bar.addBox(0F, 0F, 0F, 23, 1, 1); - Bar.setRotationPoint(7F, 7.5F, -3F); - Bar.setTextureSize(128, 64); - Bar.mirror = true; - setRotation(Bar, 0F, 0F, 0F); - BarFront = new ModelRenderer(this, 0, 45); - BarFront.addBox(-2.5F, -0.5F, 0F, 5, 1, 1); - BarFront.setRotationPoint(7F, 8F, -3F); - BarFront.setTextureSize(128, 64); - BarFront.mirror = true; - setRotation(BarFront, 0F, 0F, 0.7853982F); - } - - @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); - Body.render(f5); - Barrel.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Scope.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - ClipPivot.render(f5); - ClipPivotBack.render(f5); - Clip.render(f5); - BarrelBottom.render(f5); - BodyStock.render(f5); - BodyStockBottom.render(f5); - BodyBack.render(f5); - Handle.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - TriggerFrame.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Trigger.render(f5); - Bar.render(f5); - BarFront.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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelMiniNuke.java b/src/main/java/com/hbm/render/model/ModelMiniNuke.java deleted file mode 100644 index 04deee6a8..000000000 --- a/src/main/java/com/hbm/render/model/ModelMiniNuke.java +++ /dev/null @@ -1,125 +0,0 @@ -// Date: 26.01.2016 16:09:23 -// 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 ModelMiniNuke extends ModelBase -{ - //fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - - public ModelMiniNuke() - { - textureWidth = 64; - textureHeight = 32; - - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 5, 4, 2); - Shape1.setRotationPoint(-2F, -2F, -1F); - Shape1.setTextureSize(64, 32); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 6); - Shape2.addBox(0F, 0F, 0F, 5, 2, 4); - Shape2.setRotationPoint(-2F, -1F, -2F); - Shape2.setTextureSize(64, 32); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 58, 0); - Shape3.addBox(0F, 0F, 0F, 1, 2, 2); - Shape3.setRotationPoint(-3F, -1F, -1F); - Shape3.setTextureSize(64, 32); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 52, 0); - Shape4.addBox(0F, 0F, 0F, 1, 2, 2); - Shape4.setRotationPoint(3F, -1F, -1F); - Shape4.setTextureSize(64, 32); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 46, 0); - Shape5.addBox(0F, 0F, 0F, 2, 2, 1); - Shape5.setRotationPoint(4F, -1F, -2F); - Shape5.setTextureSize(64, 32); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 40, 0); - Shape6.addBox(0F, 0F, 0F, 2, 2, 1); - Shape6.setRotationPoint(4F, -1F, 1F); - Shape6.setTextureSize(64, 32); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 24, 0); - Shape7.addBox(0F, 0F, 0F, 2, 1, 2); - Shape7.setRotationPoint(4F, -2F, -1F); - Shape7.setTextureSize(64, 32); - Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0F); - Shape8 = new ModelRenderer(this, 32, 0); - Shape8.addBox(0F, 0F, 0F, 2, 1, 2); - Shape8.setRotationPoint(4F, 1F, -1F); - Shape8.setTextureSize(64, 32); - Shape8.mirror = true; - setRotation(Shape8, 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); - } - - 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); - } - - 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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelOSIPR.java b/src/main/java/com/hbm/render/model/ModelOSIPR.java deleted file mode 100644 index f63c32e50..000000000 --- a/src/main/java/com/hbm/render/model/ModelOSIPR.java +++ /dev/null @@ -1,249 +0,0 @@ -// Date: 29.08.2016 09:41:02 -// 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 ModelOSIPR extends ModelBase { - // fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - ModelRenderer Shape13; - ModelRenderer Shape14; - ModelRenderer Shape15; - ModelRenderer Shape16; - ModelRenderer Shape17; - ModelRenderer Shape18; - ModelRenderer Shape19; - ModelRenderer Shape20; - ModelRenderer Shape21; - ModelRenderer Shape22; - ModelRenderer Shape23; - - public ModelOSIPR() { - textureWidth = 64; - textureHeight = 64; - - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 8, 3, 3); - Shape1.setRotationPoint(0F, 0F, -0.5F); - Shape1.setTextureSize(64, 64); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 6); - Shape2.addBox(0F, 0F, 0F, 11, 2, 2); - Shape2.setRotationPoint(8F, 0F, 0F); - Shape2.setTextureSize(64, 64); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 10); - Shape3.addBox(0F, 0F, 0F, 2, 3, 2); - Shape3.setRotationPoint(17F, 2F, 0F); - Shape3.setTextureSize(64, 64); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 0, 15); - Shape4.addBox(-5F, -3F, 0F, 5, 3, 2); - Shape4.setRotationPoint(17F, 5F, 0F); - Shape4.setTextureSize(64, 64); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0.4363323F); - Shape5 = new ModelRenderer(this, 8, 10); - Shape5.addBox(-8F, -1F, 0F, 3, 1, 2); - Shape5.setRotationPoint(17F, 5F, 0F); - Shape5.setTextureSize(64, 64); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0.4363323F); - Shape6 = new ModelRenderer(this, 30, 0); - Shape6.addBox(0F, 0F, 0F, 10, 2, 2); - Shape6.setRotationPoint(-10F, 0.5F, 0F); - Shape6.setTextureSize(64, 64); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 54, 0); - Shape7.addBox(0F, 0F, 0F, 3, 2, 1); - Shape7.setRotationPoint(-13F, 0.5F, 0.5F); - Shape7.setTextureSize(64, 64); - Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0F); - Shape8 = new ModelRenderer(this, 30, 4); - Shape8.addBox(0F, 0F, 0F, 10, 3, 3); - Shape8.setRotationPoint(-16F, 2F, -0.5F); - Shape8.setTextureSize(64, 64); - Shape8.mirror = true; - setRotation(Shape8, 0F, 0F, 0F); - Shape9 = new ModelRenderer(this, 30, 10); - Shape9.addBox(0F, 0F, 0F, 3, 1, 3); - Shape9.setRotationPoint(-19F, 4F, -0.5F); - Shape9.setTextureSize(64, 64); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - Shape10 = new ModelRenderer(this, 42, 10); - Shape10.addBox(0F, 0F, 0F, 3, 1, 3); - Shape10.setRotationPoint(-19F, 2F, -0.5F); - Shape10.setTextureSize(64, 64); - Shape10.mirror = true; - setRotation(Shape10, 0F, 0F, 0F); - Shape11 = new ModelRenderer(this, 0, 20); - Shape11.addBox(0F, 0F, 0F, 1, 1, 2); - Shape11.setRotationPoint(8F, -1F, 0F); - Shape11.setTextureSize(64, 64); - Shape11.mirror = true; - setRotation(Shape11, 0F, 0F, 0F); - Shape12 = new ModelRenderer(this, 30, 14); - Shape12.addBox(0F, 0F, 0F, 7, 3, 2); - Shape12.setRotationPoint(0F, 3F, 0F); - Shape12.setTextureSize(64, 64); - Shape12.mirror = true; - setRotation(Shape12, 0F, 0F, 0F); - Shape13 = new ModelRenderer(this, 30, 19); - Shape13.addBox(0F, -2F, 0F, 5, 2, 2); - Shape13.setRotationPoint(7F, 6F, 0F); - Shape13.setTextureSize(64, 64); - Shape13.mirror = true; - setRotation(Shape13, 0F, 0F, -0.9599311F); - Shape14 = new ModelRenderer(this, 30, 23); - Shape14.addBox(0F, 0F, 0F, 2, 5, 1); - Shape14.setRotationPoint(5F, 6F, 0.5F); - Shape14.setTextureSize(64, 64); - Shape14.mirror = true; - setRotation(Shape14, 0F, 0F, -0.3490659F); - Shape15 = new ModelRenderer(this, 0, 23); - Shape15.addBox(0F, 0F, 0F, 7, 2, 1); - Shape15.setRotationPoint(-6F, 5F, 0.5F); - Shape15.setTextureSize(64, 64); - Shape15.mirror = true; - setRotation(Shape15, 0F, 0F, 0F); - Shape16 = new ModelRenderer(this, 0, 26); - Shape16.addBox(0F, 0F, 0F, 8, 1, 2); - Shape16.setRotationPoint(-6F, 7F, 0F); - Shape16.setTextureSize(64, 64); - Shape16.mirror = true; - setRotation(Shape16, 0F, 0F, 0F); - Shape17 = new ModelRenderer(this, 0, 29); - Shape17.addBox(0F, 0F, 0F, 3, 6, 6); - Shape17.setRotationPoint(-9F, 9F, -3F); - Shape17.setTextureSize(64, 64); - Shape17.mirror = true; - setRotation(Shape17, 0.6108652F, 0F, 0F); - Shape18 = new ModelRenderer(this, 0, 41); - Shape18.addBox(0F, 0F, 0F, 3, 6, 7); - Shape18.setRotationPoint(-9F, 8F, -4F); - Shape18.setTextureSize(64, 64); - Shape18.mirror = true; - setRotation(Shape18, 0F, 0F, 0F); - Shape19 = new ModelRenderer(this, 30, 29); - Shape19.addBox(0F, 1F, 6F, 2, 4, 3); - Shape19.setRotationPoint(-8.5F, 9F, -3F); - Shape19.setTextureSize(64, 64); - Shape19.mirror = true; - setRotation(Shape19, 0.6108652F, 0F, 0F); - Shape20 = new ModelRenderer(this, 30, 36); - Shape20.addBox(0F, 0F, 0F, 1, 6, 3); - Shape20.setRotationPoint(-8F, 1F, 3F); - Shape20.setTextureSize(64, 64); - Shape20.mirror = true; - setRotation(Shape20, 0F, 0F, 0F); - Shape21 = new ModelRenderer(this, 30, 45); - Shape21.addBox(0F, -3F, 0F, 1, 5, 4); - Shape21.setRotationPoint(-8F, 2F, 3F); - Shape21.setTextureSize(64, 64); - Shape21.mirror = true; - setRotation(Shape21, 0.9599311F, 0F, 0F); - Shape22 = new ModelRenderer(this, 0, 54); - Shape22.addBox(0F, 0F, 0F, 2, 2, 2); - Shape22.setRotationPoint(-11F, 7F, 0F); - Shape22.setTextureSize(64, 64); - Shape22.mirror = true; - setRotation(Shape22, 0F, 0F, 0F); - Shape23 = new ModelRenderer(this, 0, 58); - Shape23.addBox(-7F, -2F, 0F, 7, 2, 2); - Shape23.setRotationPoint(-11F, 9F, 0F); - Shape23.setTextureSize(64, 64); - Shape23.mirror = true; - setRotation(Shape23, 0F, 0F, 0.148353F); - } - - @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); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - Shape19.render(f5); - Shape20.render(f5); - Shape21.render(f5); - Shape22.render(f5); - Shape23.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); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - Shape19.render(f5); - Shape20.render(f5); - Shape21.render(f5); - Shape22.render(f5); - Shape23.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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelPoles.java b/src/main/java/com/hbm/render/model/ModelPoles.java deleted file mode 100644 index 8c18b69ed..000000000 --- a/src/main/java/com/hbm/render/model/ModelPoles.java +++ /dev/null @@ -1,134 +0,0 @@ -// Date: 04.10.2015 20:54:36 -// 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 ModelPoles extends ModelBase -{ - //fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - ModelRenderer Shape9; - - public ModelPoles() - { - textureWidth = 64; - textureHeight = 64; - - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 2, 16, 2); - Shape1.setRotationPoint(-1F, 8F, 4F); - Shape1.setTextureSize(64, 64); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 0); - Shape2.addBox(0F, 0F, 0F, 2, 16, 2); - Shape2.setRotationPoint(4F, 8F, -6F); - Shape2.setTextureSize(64, 64); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 0); - Shape3.addBox(0F, 0F, 0F, 2, 16, 2); - Shape3.setRotationPoint(-6F, 8F, -6F); - Shape3.setTextureSize(64, 64); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 0, 41); - Shape4.addBox(0F, -1F, 0F, 13, 1, 1); - Shape4.setRotationPoint(-4F, 21F, -5.5F); - Shape4.setTextureSize(64, 64); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, -0.7853982F); - Shape5 = new ModelRenderer(this, 0, 41); - Shape5.addBox(0F, 0F, 0F, 13, 1, 1); - Shape5.setRotationPoint(4F, 21F, -5.5F); - Shape5.setTextureSize(64, 64); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, -2.356194F); - Shape6 = new ModelRenderer(this, 0, 18); - Shape6.addBox(0F, -1F, 0F, 1, 1, 15); - Shape6.setRotationPoint(-5.533333F, 21F, -4F); - Shape6.setTextureSize(64, 64); - Shape6.mirror = true; - setRotation(Shape6, 0.7853982F, 0.4886922F, 0F); - Shape7 = new ModelRenderer(this, 0, 18); - Shape7.addBox(0F, 0F, 0F, 1, 1, 15); - Shape7.setRotationPoint(-5.5F, 12F, -4F); - Shape7.setTextureSize(64, 64); - Shape7.mirror = true; - setRotation(Shape7, -0.7853982F, 0.4886922F, 0F); - Shape8 = new ModelRenderer(this, 0, 18); - Shape8.addBox(-1F, 0F, 0F, 1, 1, 15); - Shape8.setRotationPoint(5.5F, 12F, -4F); - Shape8.setTextureSize(64, 64); - Shape8.mirror = true; - setRotation(Shape8, -0.7853982F, -0.4886922F, 0F); - Shape9 = new ModelRenderer(this, 0, 18); - Shape9.addBox(-1F, -1F, 0F, 1, 1, 15); - Shape9.setRotationPoint(5.5F, 21F, -4F); - Shape9.setTextureSize(64, 64); - Shape9.mirror = true; - setRotation(Shape9, 0.7853982F, -0.4886922F, 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); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - public void renderModel(float f) - { - Shape1.render(f); - Shape2.render(f); - Shape3.render(f); - Shape4.render(f); - Shape5.render(f); - Shape6.render(f); - Shape7.render(f); - Shape8.render(f); - Shape9.render(f); - } - - @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/src/main/java/com/hbm/render/model/ModelRainbow.java b/src/main/java/com/hbm/render/model/ModelRainbow.java deleted file mode 100644 index f9d1a6ed0..000000000 --- a/src/main/java/com/hbm/render/model/ModelRainbow.java +++ /dev/null @@ -1,125 +0,0 @@ -// Date: 30.07.2016 17:36:41 -// 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 ModelRainbow extends ModelBase -{ - //fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - - public ModelRainbow() - { - textureWidth = 32; - textureHeight = 32; - - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 8, 2, 2); - Shape1.setRotationPoint(-4F, -1F, 1F); - Shape1.setTextureSize(32, 32); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 16); - Shape2.addBox(0F, 0F, 0F, 8, 1, 1); - Shape2.setRotationPoint(-5F, -4F, -1F); - Shape2.setTextureSize(32, 32); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 4); - Shape3.addBox(0F, 0F, 0F, 6, 1, 1); - Shape3.setRotationPoint(-1F, -1F, -2F); - Shape3.setTextureSize(32, 32); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 0, 6); - Shape4.addBox(0F, 0F, 0F, 8, 1, 1); - Shape4.setRotationPoint(-6F, 2F, -1F); - Shape4.setTextureSize(32, 32); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 0, 14); - Shape5.addBox(0F, 0F, 0F, 6, 1, 1); - Shape5.setRotationPoint(-3F, -3F, 2F); - Shape5.setTextureSize(32, 32); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 0, 12); - Shape6.addBox(0F, 0F, 0F, 8, 1, 1); - Shape6.setRotationPoint(-3F, -4F, 4F); - Shape6.setTextureSize(32, 32); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 0, 10); - Shape7.addBox(0F, 0F, 0F, 7, 1, 1); - Shape7.setRotationPoint(-6F, 0F, 5F); - Shape7.setTextureSize(32, 32); - Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0F); - Shape8 = new ModelRenderer(this, 0, 8); - Shape8.addBox(0F, 0F, 0F, 6, 1, 1); - Shape8.setRotationPoint(-2F, 2F, 3F); - Shape8.setTextureSize(32, 32); - Shape8.mirror = true; - setRotation(Shape8, 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); - } - - 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); - } - - 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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelSRocket.java b/src/main/java/com/hbm/render/model/ModelSRocket.java deleted file mode 100644 index 6185db735..000000000 --- a/src/main/java/com/hbm/render/model/ModelSRocket.java +++ /dev/null @@ -1,94 +0,0 @@ -// Date: 23.02.2018 15:06:23 -// 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 ModelSRocket extends ModelBase { - // fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - - public ModelSRocket() { - textureWidth = 64; - textureHeight = 16; - - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 24, 2, 2); - Shape1.setRotationPoint(-12F, -1F, -1F); - Shape1.setTextureSize(64, 16); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 4); - Shape2.addBox(0F, 0F, 0F, 1, 6, 0); - Shape2.setRotationPoint(7F, -3F, 0F); - Shape2.setTextureSize(64, 16); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 2, 4); - Shape3.addBox(0F, 0F, 0F, 1, 0, 6); - Shape3.setRotationPoint(7F, 0F, -3F); - Shape3.setTextureSize(64, 16); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 16, 4); - Shape4.addBox(0F, 0F, 0F, 1, 4, 0); - Shape4.setRotationPoint(-10F, -2F, 0F); - Shape4.setTextureSize(64, 16); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 0, 10); - Shape5.addBox(0F, 0F, 0F, 1, 0, 4); - Shape5.setRotationPoint(-10F, 0F, -2F); - Shape5.setTextureSize(64, 16); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 18, 4); - Shape6.addBox(0F, 0F, 0F, 2, 3, 3); - Shape6.setRotationPoint(9F, -1.5F, -1.5F); - Shape6.setTextureSize(64, 16); - Shape6.mirror = true; - setRotation(Shape6, 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); - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.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); - } - - public void renderAll(float f5) { - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.render(f5); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelSpark.java b/src/main/java/com/hbm/render/model/ModelSpark.java deleted file mode 100644 index 9125c0944..000000000 --- a/src/main/java/com/hbm/render/model/ModelSpark.java +++ /dev/null @@ -1,189 +0,0 @@ -// Date: 14.02.2017 20:27:10 -// 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 org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelSpark extends ModelBase -{ - //fields - ModelRenderer BarrelMain; - ModelRenderer BarrelSide; - ModelRenderer PlateFront; - ModelRenderer Sight; - ModelRenderer Grip; - ModelRenderer Cell1; - ModelRenderer Cell2; - ModelRenderer Cell3; - ModelRenderer Cell4; - ModelRenderer Cell5; - ModelRenderer Cell8; - ModelRenderer Cell7; - ModelRenderer Cell6; - ModelRenderer PlateBack; - ModelRenderer Body; - ModelRenderer Handle1; - ModelRenderer Handle2; - - public ModelSpark() - { - textureWidth = 64; - textureHeight = 64; - - BarrelMain = new ModelRenderer(this, 0, 0); - BarrelMain.addBox(0F, 0F, 0F, 18, 6, 6); - BarrelMain.setRotationPoint(-18F, 0F, -3F); - BarrelMain.setTextureSize(64, 64); - BarrelMain.mirror = true; - setRotation(BarrelMain, 0F, 0F, 0F); - BarrelSide = new ModelRenderer(this, 0, 12); - BarrelSide.addBox(0F, -3F, -3F, 14, 6, 6); - BarrelSide.setRotationPoint(-14F, 3F, 0F); - BarrelSide.setTextureSize(64, 64); - BarrelSide.mirror = true; - setRotation(BarrelSide, 0.7853982F, 0F, 0F); - PlateFront = new ModelRenderer(this, 40, 12); - PlateFront.addBox(0F, 0F, 0F, 2, 8, 8); - PlateFront.setRotationPoint(0F, -1F, -4F); - PlateFront.setTextureSize(64, 64); - PlateFront.mirror = true; - setRotation(PlateFront, 0F, 0F, 0F); - Sight = new ModelRenderer(this, 48, 0); - Sight.addBox(0F, 0F, 0F, 1, 4, 2); - Sight.setRotationPoint(-16F, -4F, -1F); - Sight.setTextureSize(64, 64); - Sight.mirror = true; - setRotation(Sight, 0F, 0F, 0F); - Grip = new ModelRenderer(this, 0, 24); - Grip.addBox(0F, 0F, 0F, 12, 2, 2); - Grip.setRotationPoint(-10F, 5F, -6F); - Grip.setTextureSize(64, 64); - Grip.mirror = true; - setRotation(Grip, 0F, 0F, 0F); - Cell1 = new ModelRenderer(this, 0, 28); - Cell1.addBox(0F, -3.5F, -1F, 3, 2, 2); - Cell1.setRotationPoint(2F, 3F, 0F); - Cell1.setTextureSize(64, 64); - Cell1.mirror = true; - setRotation(Cell1, 0F, 0F, 0F); - Cell2 = new ModelRenderer(this, 0, 32); - Cell2.addBox(0F, -3.5F, -1F, 3, 2, 2); - Cell2.setRotationPoint(2F, 3F, 0F); - Cell2.setTextureSize(64, 64); - Cell2.mirror = true; - setRotation(Cell2, 0.7853982F, 0F, 0F); - Cell3 = new ModelRenderer(this, 0, 36); - Cell3.addBox(0F, -3.5F, -1F, 3, 2, 2); - Cell3.setRotationPoint(2F, 3F, 0F); - Cell3.setTextureSize(64, 64); - Cell3.mirror = true; - setRotation(Cell3, 1.570796F, 0F, 0F); - Cell4 = new ModelRenderer(this, 0, 40); - Cell4.addBox(0F, -3.5F, -1F, 3, 2, 2); - Cell4.setRotationPoint(2F, 3F, 0F); - Cell4.setTextureSize(64, 64); - Cell4.mirror = true; - setRotation(Cell4, 2.356194F, 0F, 0F); - Cell5 = new ModelRenderer(this, 0, 44); - Cell5.addBox(0F, -3.5F, -1F, 3, 2, 2); - Cell5.setRotationPoint(2F, 3F, 0F); - Cell5.setTextureSize(64, 64); - Cell5.mirror = true; - setRotation(Cell5, 3.141593F, 0F, 0F); - Cell8 = new ModelRenderer(this, 0, 48); - Cell8.addBox(0F, -3.5F, -1F, 3, 2, 2); - Cell8.setRotationPoint(2F, 3F, 0F); - Cell8.setTextureSize(64, 64); - Cell8.mirror = true; - setRotation(Cell8, -0.7853982F, 0F, 0F); - Cell7 = new ModelRenderer(this, 0, 52); - Cell7.addBox(0F, -3.5F, -1F, 3, 2, 2); - Cell7.setRotationPoint(2F, 3F, 0F); - Cell7.setTextureSize(64, 64); - Cell7.mirror = true; - setRotation(Cell7, -1.570796F, 0F, 0F); - Cell6 = new ModelRenderer(this, 0, 56); - Cell6.addBox(0F, -3.5F, -1F, 3, 2, 2); - Cell6.setRotationPoint(2F, 3F, 0F); - Cell6.setTextureSize(64, 64); - Cell6.mirror = true; - setRotation(Cell6, -2.356194F, 0F, 0F); - PlateBack = new ModelRenderer(this, 10, 28); - PlateBack.addBox(0F, 0F, 0F, 2, 8, 8); - PlateBack.setRotationPoint(5F, -1F, -4F); - PlateBack.setTextureSize(64, 64); - PlateBack.mirror = true; - setRotation(PlateBack, 0F, 0F, 0F); - Body = new ModelRenderer(this, 10, 44); - Body.addBox(0F, 0F, 0F, 8, 6, 4); - Body.setRotationPoint(7F, 1F, -2F); - Body.setTextureSize(64, 64); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - Handle1 = new ModelRenderer(this, 10, 54); - Handle1.addBox(0F, 0F, 0F, 2, 2, 2); - Handle1.setRotationPoint(15F, 4F, -1F); - Handle1.setTextureSize(64, 64); - Handle1.mirror = true; - setRotation(Handle1, 0F, 0F, 0F); - Handle2 = new ModelRenderer(this, 18, 54); - Handle2.addBox(0F, 0F, 0F, 1, 4, 1); - Handle2.setRotationPoint(17F, 2F, -0.5F); - Handle2.setTextureSize(64, 64); - Handle2.mirror = true; - setRotation(Handle2, 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); - BarrelMain.render(f5); - BarrelSide.render(f5); - PlateFront.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Sight.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Grip.render(f5); - Cell1.render(f5); - Cell2.render(f5); - Cell3.render(f5); - Cell4.render(f5); - Cell5.render(f5); - Cell8.render(f5); - Cell7.render(f5); - Cell6.render(f5); - PlateBack.render(f5); - Body.render(f5); - Handle1.render(f5); - Handle2.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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelUboinik.java b/src/main/java/com/hbm/render/model/ModelUboinik.java deleted file mode 100644 index 17125c06c..000000000 --- a/src/main/java/com/hbm/render/model/ModelUboinik.java +++ /dev/null @@ -1,320 +0,0 @@ -// Date: 03.12.2016 21:30:48 -// 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 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 - ModelRenderer Barrel; - ModelRenderer ConnectorFront; - ModelRenderer ConnectorBack; - ModelRenderer Grip; - ModelRenderer Coil; - ModelRenderer FrontBase; - ModelRenderer FrontTip; - ModelRenderer DrumCenter; - ModelRenderer DrumBack; - ModelRenderer DrumBottom; - ModelRenderer Shell1; - ModelRenderer Shell2; - ModelRenderer Shell3; - ModelRenderer Shell4; - ModelRenderer Shell5; - ModelRenderer Shell6; - ModelRenderer Clip1; - ModelRenderer Clip2; - ModelRenderer Clip3; - ModelRenderer ChamberBack; - ModelRenderer ChamberBackConnector; - ModelRenderer ChamberTop; - ModelRenderer Chamber; - ModelRenderer Stock; - ModelRenderer TriggerFrame; - ModelRenderer Trigger; - ModelRenderer Handle; - ModelRenderer StockBottom; - - public ModelUboinik() { - textureWidth = 64; - textureHeight = 64; - - Barrel = new ModelRenderer(this, 0, 11); - Barrel.addBox(0F, 0F, 0F, 24, 2, 2); - Barrel.setRotationPoint(-24F, 0F, -1F); - Barrel.setTextureSize(64, 64); - Barrel.mirror = true; - setRotation(Barrel, 0F, 0F, 0F); - ConnectorFront = new ModelRenderer(this, 0, 53); - ConnectorFront.addBox(0F, 0F, 0F, 1, 8, 3); - ConnectorFront.setRotationPoint(-16F, -0.5F, -1.5F); - ConnectorFront.setTextureSize(64, 64); - ConnectorFront.mirror = true; - setRotation(ConnectorFront, 0F, 0F, 0F); - ConnectorBack = new ModelRenderer(this, 8, 53); - ConnectorBack.addBox(0F, 0F, 0F, 1, 8, 3); - ConnectorBack.setRotationPoint(0F, -0.5F, -1.5F); - ConnectorBack.setTextureSize(64, 64); - ConnectorBack.mirror = true; - setRotation(ConnectorBack, 0F, 0F, 0F); - Grip = new ModelRenderer(this, 16, 57); - Grip.addBox(0F, 0F, 0F, 15, 4, 3); - Grip.setRotationPoint(-15F, 3.5F, -1.5F); - Grip.setTextureSize(64, 64); - Grip.mirror = true; - setRotation(Grip, 0F, 0F, 0F); - Coil = new ModelRenderer(this, 16, 51); - Coil.addBox(0F, 0F, 0F, 15, 3, 3); - Coil.setRotationPoint(-15F, -0.5F, -1.5F); - Coil.setTextureSize(64, 64); - Coil.mirror = true; - setRotation(Coil, 0F, 0F, 0F); - FrontBase = new ModelRenderer(this, 0, 49); - FrontBase.addBox(0F, 0F, 0F, 1, 2, 2); - FrontBase.setRotationPoint(-17F, 4.5F, -1F); - FrontBase.setTextureSize(64, 64); - FrontBase.mirror = true; - setRotation(FrontBase, 0F, 0F, 0F); - FrontTip = new ModelRenderer(this, 6, 51); - FrontTip.addBox(0F, 0F, 0F, 4, 1, 1); - FrontTip.setRotationPoint(-21F, 5F, -0.5F); - FrontTip.setTextureSize(64, 64); - FrontTip.mirror = true; - setRotation(FrontTip, 0F, 0F, 0F); - DrumCenter = new ModelRenderer(this, 6, 49); - DrumCenter.addBox(0F, 0F, 0F, 6, 1, 1); - DrumCenter.setRotationPoint(1F, 3F, -0.5F); - DrumCenter.setTextureSize(64, 64); - DrumCenter.mirror = true; - setRotation(DrumCenter, 0F, 0F, 0F); - DrumBack = new ModelRenderer(this, 0, 40); - DrumBack.addBox(0F, 0F, 0F, 1, 7, 2); - DrumBack.setRotationPoint(7F, 1F, -1F); - DrumBack.setTextureSize(64, 64); - DrumBack.mirror = true; - setRotation(DrumBack, 0F, 0F, 0F); - DrumBottom = new ModelRenderer(this, 6, 46); - DrumBottom.addBox(0F, 0F, 0F, 7, 1, 2); - DrumBottom.setRotationPoint(0F, 7.5F, -1F); - DrumBottom.setTextureSize(64, 64); - DrumBottom.mirror = true; - setRotation(DrumBottom, 0F, 0F, 0F); - Shell1 = new ModelRenderer(this, 0, 34); - Shell1.addBox(0F, -3.5F, -1F, 5, 2, 2); - Shell1.setRotationPoint(1.5F, 3.5F, 0F); - Shell1.setTextureSize(64, 64); - Shell1.mirror = true; - setRotation(Shell1, 1.047198F, 0F, 0F); - Shell2 = new ModelRenderer(this, 0, 34); - Shell2.addBox(0F, -3.5F, -1F, 5, 2, 2); - Shell2.setRotationPoint(1.5F, 3.5F, 0F); - Shell2.setTextureSize(64, 64); - Shell2.mirror = true; - setRotation(Shell2, 2.094395F, 0F, 0F); - Shell3 = new ModelRenderer(this, 0, 34); - Shell3.addBox(0F, -3.5F, -1F, 5, 2, 2); - Shell3.setRotationPoint(1.5F, 3.5F, 0F); - Shell3.setTextureSize(64, 64); - Shell3.mirror = true; - setRotation(Shell3, 3.141593F, 0F, 0F); - Shell4 = new ModelRenderer(this, 0, 34); - Shell4.addBox(0F, -3.5F, -1F, 5, 2, 2); - Shell4.setRotationPoint(1.5F, 3.5F, 0F); - Shell4.setTextureSize(64, 64); - Shell4.mirror = true; - setRotation(Shell4, -2.094395F, 0F, 0F); - Shell5 = new ModelRenderer(this, 0, 34); - Shell5.addBox(0F, -3.5F, -1F, 5, 2, 2); - Shell5.setRotationPoint(1.5F, 3.5F, 0F); - Shell5.setTextureSize(64, 64); - Shell5.mirror = true; - setRotation(Shell5, -1.047198F, 0F, 0F); - Shell6 = new ModelRenderer(this, 0, 34); - Shell6.addBox(0F, -3.5F, -1F, 5, 2, 2); - Shell6.setRotationPoint(1.5F, 3.5F, 0F); - Shell6.setTextureSize(64, 64); - Shell6.mirror = true; - setRotation(Shell6, 0F, 0F, 0F); - Clip1 = new ModelRenderer(this, 6, 42); - Clip1.addBox(0F, -1.5F, -0.5F, 2, 3, 1); - Clip1.setRotationPoint(4F, 3.5F, 0F); - Clip1.setTextureSize(64, 64); - Clip1.mirror = true; - setRotation(Clip1, 0F, 0F, 0F); - Clip2 = new ModelRenderer(this, 6, 42); - Clip2.addBox(0F, -1.5F, -0.5F, 2, 3, 1); - Clip2.setRotationPoint(4F, 3.5F, 0F); - Clip2.setTextureSize(64, 64); - Clip2.mirror = true; - setRotation(Clip2, 1.047198F, 0F, 0F); - Clip3 = new ModelRenderer(this, 6, 42); - Clip3.addBox(0F, -1.5F, -0.5F, 2, 3, 1); - Clip3.setRotationPoint(4F, 3.5F, 0F); - Clip3.setTextureSize(64, 64); - Clip3.mirror = true; - setRotation(Clip3, 2.094395F, 0F, 0F); - ChamberBack = new ModelRenderer(this, 0, 28); - ChamberBack.addBox(0F, 0F, 0F, 8, 2, 2); - ChamberBack.setRotationPoint(8F, 1F, -1F); - ChamberBack.setTextureSize(64, 64); - ChamberBack.mirror = true; - setRotation(ChamberBack, 0F, 0F, 0F); - ChamberBackConnector = new ModelRenderer(this, 12, 43); - ChamberBackConnector.addBox(0F, 0F, 0F, 4, 1, 2); - ChamberBackConnector.setRotationPoint(12F, 0F, -1F); - ChamberBackConnector.setTextureSize(64, 64); - ChamberBackConnector.mirror = true; - setRotation(ChamberBackConnector, 0F, 0F, 0F); - ChamberTop = new ModelRenderer(this, 0, 25); - ChamberTop.addBox(0F, 0F, 0F, 9, 1, 2); - ChamberTop.setRotationPoint(7F, -1F, -1F); - ChamberTop.setTextureSize(64, 64); - ChamberTop.mirror = true; - setRotation(ChamberTop, 0F, 0F, 0F); - Chamber = new ModelRenderer(this, 0, 20); - Chamber.addBox(0F, 0F, 0F, 6, 2, 3); - Chamber.setRotationPoint(1F, -1F, -1.5F); - Chamber.setTextureSize(64, 64); - Chamber.mirror = true; - setRotation(Chamber, 0F, 0F, 0F); - Stock = new ModelRenderer(this, 0, 15); - Stock.addBox(0F, 0F, 0F, 23, 3, 2); - Stock.setRotationPoint(13F, 3F, -1F); - Stock.setTextureSize(64, 64); - Stock.mirror = true; - setRotation(Stock, 0F, 0F, 0F); - TriggerFrame = new ModelRenderer(this, 24, 45); - TriggerFrame.addBox(0F, 0F, 0F, 5, 5, 1); - TriggerFrame.setRotationPoint(8F, 3F, -0.5F); - TriggerFrame.setTextureSize(64, 64); - TriggerFrame.mirror = true; - setRotation(TriggerFrame, 0F, 0F, 0F); - Trigger = new ModelRenderer(this, 36, 46); - Trigger.addBox(-1F, 0F, 0F, 1, 4, 1); - Trigger.setRotationPoint(12.5F, 3F, -0.5F); - Trigger.setTextureSize(64, 64); - Trigger.mirror = true; - setRotation(Trigger, 0F, 0F, 0.4363323F); - Handle = new ModelRenderer(this, 40, 43); - Handle.addBox(0F, 0F, 0F, 3, 6, 2); - Handle.setRotationPoint(13F, 6F, -1F); - Handle.setTextureSize(64, 64); - Handle.mirror = true; - setRotation(Handle, 0F, 0F, -0.1745329F); - StockBottom = new ModelRenderer(this, 26, 36); - StockBottom.addBox(0F, 0F, 0F, 10, 5, 2); - StockBottom.setRotationPoint(26F, 6F, -1F); - StockBottom.setTextureSize(64, 64); - StockBottom.mirror = true; - setRotation(StockBottom, 0F, 0F, 0F); - } - - 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); - ConnectorFront.render(f5); - ConnectorBack.render(f5); - Grip.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Coil.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - FrontBase.render(f5); - FrontTip.render(f5); - DrumCenter.render(f5); - DrumBack.render(f5); - DrumBottom.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); - ChamberBack.render(f5); - ChamberBackConnector.render(f5); - ChamberTop.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Chamber.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Stock.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - TriggerFrame.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Trigger.render(f5); - Handle.render(f5); - StockBottom.render(f5); - } - - public void renderDud(float f5) { - Barrel.render(f5); - ConnectorFront.render(f5); - ConnectorBack.render(f5); - Grip.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Coil.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - FrontBase.render(f5); - FrontTip.render(f5); - DrumCenter.render(f5); - DrumBack.render(f5); - DrumBottom.render(f5); - Shell5.render(f5); - Shell4.render(f5); - Shell3.render(f5); - Shell2.render(f5); - Shell1.render(f5); - Shell6.render(f5); - Clip1.render(f5); - Clip2.render(f5); - Clip3.render(f5); - ChamberBack.render(f5); - ChamberBackConnector.render(f5); - ChamberTop.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Chamber.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Stock.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - TriggerFrame.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Trigger.render(f5); - Handle.render(f5); - StockBottom.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); - } - -} diff --git a/src/main/java/com/hbm/render/model/ModelUzi.java b/src/main/java/com/hbm/render/model/ModelUzi.java deleted file mode 100644 index 473dd6fe1..000000000 --- a/src/main/java/com/hbm/render/model/ModelUzi.java +++ /dev/null @@ -1,420 +0,0 @@ -// Date: 22.07.2018 14:18:53 -// 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 org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelUzi extends ModelBase { - // fields - ModelRenderer BodyBack; - ModelRenderer BodyBottom; - ModelRenderer BodySide; - ModelRenderer Ejector; - ModelRenderer BodyFront; - ModelRenderer GripFront; - ModelRenderer StockFront; - ModelRenderer StockPlate; - ModelRenderer HandleBase; - ModelRenderer Handle; - ModelRenderer HandleBack; - ModelRenderer HandleBottom; - ModelRenderer HandlePlate; - ModelRenderer HandleTop; - ModelRenderer Muzzle1; - ModelRenderer Muzzle2; - ModelRenderer StockBack; - ModelRenderer StockPlate1; - ModelRenderer Stock1; - ModelRenderer Stock2; - ModelRenderer Stcok3; - ModelRenderer Stock4; - ModelRenderer Hump1; - ModelRenderer Hump2; - ModelRenderer Hump3; - ModelRenderer Hump4; - ModelRenderer Hump5; - ModelRenderer Hump6; - ModelRenderer SightBack; - ModelRenderer Sight1; - ModelRenderer Sight2; - ModelRenderer Hump7; - ModelRenderer Hump8; - ModelRenderer Hump9; - ModelRenderer Hump10; - ModelRenderer Hump11; - ModelRenderer Hump12; - ModelRenderer Sight3; - ModelRenderer SightFront; - ModelRenderer Knob1; - ModelRenderer Knob2; - ModelRenderer Bolt1; - ModelRenderer Bolt2; - ModelRenderer Mag; - ModelRenderer Trigger; - ModelRenderer Frame1; - ModelRenderer Frame2; - - public ModelUzi() { - textureWidth = 128; - textureHeight = 64; - - BodyBack = new ModelRenderer(this, 0, 0); - BodyBack.addBox(0F, 0F, 0F, 14, 6, 4); - BodyBack.setRotationPoint(0F, 0F, 0F); - BodyBack.setTextureSize(128, 64); - BodyBack.mirror = true; - setRotation(BodyBack, 0F, 0F, 0F); - BodyBottom = new ModelRenderer(this, 82, 0); - BodyBottom.addBox(0F, 0F, 0F, 6, 3, 4); - BodyBottom.setRotationPoint(-6F, 3F, 0F); - BodyBottom.setTextureSize(128, 64); - BodyBottom.mirror = true; - setRotation(BodyBottom, 0F, 0F, 0F); - BodySide = new ModelRenderer(this, 102, 0); - BodySide.addBox(0F, 0F, 0F, 6, 3, 2); - BodySide.setRotationPoint(-6F, 0F, 0F); - BodySide.setTextureSize(128, 64); - BodySide.mirror = true; - setRotation(BodySide, 0F, 0F, 0F); - Ejector = new ModelRenderer(this, 102, 5); - Ejector.addBox(0F, 0F, 0F, 6, 3, 2); - Ejector.setRotationPoint(-6F, 0.5F, 1.5F); - Ejector.setTextureSize(128, 64); - Ejector.mirror = true; - setRotation(Ejector, 0F, 0F, 0F); - BodyFront = new ModelRenderer(this, 36, 0); - BodyFront.addBox(0F, 0F, 0F, 19, 6, 4); - BodyFront.setRotationPoint(-25F, 0F, 0F); - BodyFront.setTextureSize(128, 64); - BodyFront.mirror = true; - setRotation(BodyFront, 0F, 0F, 0F); - GripFront = new ModelRenderer(this, 0, 10); - GripFront.addBox(0F, 0F, 0F, 14, 5, 5); - GripFront.setRotationPoint(-24.5F, 1.5F, -0.5F); - GripFront.setTextureSize(128, 64); - GripFront.mirror = true; - setRotation(GripFront, 0F, 0F, 0F); - StockFront = new ModelRenderer(this, 38, 10); - StockFront.addBox(0F, 0F, 0F, 14, 3, 4); - StockFront.setRotationPoint(3F, 6F, 0F); - StockFront.setTextureSize(128, 64); - StockFront.mirror = true; - setRotation(StockFront, 0F, 0F, 0F); - StockPlate = new ModelRenderer(this, 118, 0); - StockPlate.addBox(0F, -4F, 0F, 1, 4, 4); - StockPlate.setRotationPoint(3F, 9F, 0F); - StockPlate.setTextureSize(128, 64); - StockPlate.mirror = true; - setRotation(StockPlate, 0F, 0F, -0.3490659F); - HandleBase = new ModelRenderer(this, 0, 20); - HandleBase.addBox(0F, 0F, 0F, 12, 3, 5); - HandleBase.setRotationPoint(-10F, 4F, -0.5F); - HandleBase.setTextureSize(128, 64); - HandleBase.mirror = true; - setRotation(HandleBase, 0F, 0F, 0F); - Handle = new ModelRenderer(this, 0, 28); - Handle.addBox(0F, 0F, 0F, 4, 10, 3); - Handle.setRotationPoint(-5F, 7F, 0.5F); - Handle.setTextureSize(128, 64); - Handle.mirror = true; - setRotation(Handle, 0F, 0F, 0F); - HandleBack = new ModelRenderer(this, 14, 28); - HandleBack.addBox(0F, 0F, 0F, 2, 4, 3); - HandleBack.setRotationPoint(-1F, 11F, 0.5F); - HandleBack.setTextureSize(128, 64); - HandleBack.mirror = true; - setRotation(HandleBack, 0F, 0F, 0F); - HandleBottom = new ModelRenderer(this, 14, 35); - HandleBottom.addBox(-2F, 0F, 0F, 2, 3, 3); - HandleBottom.setRotationPoint(1F, 15F, 0.5F); - HandleBottom.setTextureSize(128, 64); - HandleBottom.mirror = true; - setRotation(HandleBottom, 0F, 0F, 0.7853982F); - HandlePlate = new ModelRenderer(this, 24, 28); - HandlePlate.addBox(-2F, -3F, 0F, 2, 3, 3); - HandlePlate.setRotationPoint(1F, 11F, 0.5F); - HandlePlate.setTextureSize(128, 64); - HandlePlate.mirror = true; - setRotation(HandlePlate, 0F, 0F, -0.4886922F); - HandleTop = new ModelRenderer(this, 24, 34); - HandleTop.addBox(-2F, 0F, 0F, 2, 3, 3); - HandleTop.setRotationPoint(1F, 7F, 0.5F); - HandleTop.setTextureSize(128, 64); - HandleTop.mirror = true; - setRotation(HandleTop, 0F, 0F, 0.5235988F); - Muzzle1 = new ModelRenderer(this, 82, 12); - Muzzle1.addBox(0F, 0F, 0F, 3, 3, 2); - Muzzle1.setRotationPoint(-28F, 1.5F, 1F); - Muzzle1.setTextureSize(128, 64); - Muzzle1.mirror = true; - setRotation(Muzzle1, 0F, 0F, 0F); - Muzzle2 = new ModelRenderer(this, 82, 7); - Muzzle2.addBox(0F, 0F, 0F, 3, 2, 3); - Muzzle2.setRotationPoint(-28F, 2F, 0.5F); - Muzzle2.setTextureSize(128, 64); - Muzzle2.mirror = true; - setRotation(Muzzle2, 0F, 0F, 0F); - StockBack = new ModelRenderer(this, 34, 20); - StockBack.addBox(0F, 0F, 0F, 1, 11, 3); - StockBack.setRotationPoint(14F, 7F, 0.5F); - StockBack.setTextureSize(128, 64); - StockBack.mirror = true; - setRotation(StockBack, 0F, 0F, 0F); - StockPlate1 = new ModelRenderer(this, 42, 17); - StockPlate1.addBox(-1F, -11F, 0F, 1, 11, 3); - StockPlate1.setRotationPoint(15F, 18F, 0.5F); - StockPlate1.setTextureSize(128, 64); - StockPlate1.mirror = true; - setRotation(StockPlate1, 0F, 0F, 0.0959931F); - Stock1 = new ModelRenderer(this, 50, 17); - Stock1.addBox(-1F, -3F, 0F, 1, 3, 4); - Stock1.setRotationPoint(17F, 6F, 0F); - Stock1.setTextureSize(128, 64); - Stock1.mirror = true; - setRotation(Stock1, 0F, 0F, -0.3490659F); - Stock2 = new ModelRenderer(this, 60, 17); - Stock2.addBox(0F, -3F, 0F, 1, 3, 4); - Stock2.setRotationPoint(14F, 6F, 0F); - Stock2.setTextureSize(128, 64); - Stock2.mirror = true; - setRotation(Stock2, 0F, 0F, 0.3490659F); - Stcok3 = new ModelRenderer(this, 50, 24); - Stcok3.addBox(0F, 0F, 0F, 1, 3, 4); - Stcok3.setRotationPoint(15F, 3F, 0F); - Stcok3.setTextureSize(128, 64); - Stcok3.mirror = true; - setRotation(Stcok3, 0F, 0F, 0F); - Stock4 = new ModelRenderer(this, 60, 24); - Stock4.addBox(0F, 0F, 0F, 2, 5, 3); - Stock4.setRotationPoint(13.5F, 1.5F, 0.5F); - Stock4.setTextureSize(128, 64); - Stock4.mirror = true; - setRotation(Stock4, 0F, 0F, 0F); - Hump1 = new ModelRenderer(this, 74, 10); - Hump1.addBox(-2F, -3F, 0F, 2, 3, 1); - Hump1.setRotationPoint(14F, 0F, 0F); - Hump1.setTextureSize(128, 64); - Hump1.mirror = true; - setRotation(Hump1, 0F, 0F, -0.2617994F); - Hump2 = new ModelRenderer(this, 74, 14); - Hump2.addBox(0F, -3F, 0F, 2, 3, 1); - Hump2.setRotationPoint(10F, 0F, 0F); - Hump2.setTextureSize(128, 64); - Hump2.mirror = true; - setRotation(Hump2, 0F, 0F, 0.2617994F); - Hump3 = new ModelRenderer(this, 74, 18); - Hump3.addBox(0F, 0F, 0F, 2, 1, 1); - Hump3.setRotationPoint(11F, -3F, 0F); - Hump3.setTextureSize(128, 64); - Hump3.mirror = true; - setRotation(Hump3, 0F, 0F, 0F); - Hump4 = new ModelRenderer(this, 70, 20); - Hump4.addBox(-2F, -3F, 0F, 2, 3, 1); - Hump4.setRotationPoint(14F, 0F, 3F); - Hump4.setTextureSize(128, 64); - Hump4.mirror = true; - setRotation(Hump4, 0F, 0F, -0.2617994F); - Hump5 = new ModelRenderer(this, 70, 24); - Hump5.addBox(0F, -3F, 0F, 2, 3, 1); - Hump5.setRotationPoint(10F, 0F, 3F); - Hump5.setTextureSize(128, 64); - Hump5.mirror = true; - setRotation(Hump5, 0F, 0F, 0.2617994F); - Hump6 = new ModelRenderer(this, 70, 28); - Hump6.addBox(0F, 0F, 0F, 2, 1, 1); - Hump6.setRotationPoint(11F, -3F, 3F); - Hump6.setTextureSize(128, 64); - Hump6.mirror = true; - setRotation(Hump6, 0F, 0F, 0F); - SightBack = new ModelRenderer(this, 80, 17); - SightBack.addBox(0F, 0F, 0F, 1, 1, 1); - SightBack.setRotationPoint(11.5F, -2F, 1.5F); - SightBack.setTextureSize(128, 64); - SightBack.mirror = true; - setRotation(SightBack, 0F, 0F, 0F); - Sight1 = new ModelRenderer(this, 80, 19); - Sight1.addBox(0F, 0F, 0F, 1, 1, 1); - Sight1.setRotationPoint(11.5F, -1F, 1.5F); - Sight1.setTextureSize(128, 64); - Sight1.mirror = true; - setRotation(Sight1, 0F, 0F, 0F); - Sight2 = new ModelRenderer(this, 84, 17); - Sight2.addBox(0F, 0F, 0F, 2, 1, 2); - Sight2.setRotationPoint(11F, -0.5F, 1F); - Sight2.setTextureSize(128, 64); - Sight2.mirror = true; - setRotation(Sight2, 0F, 0F, 0F); - Hump7 = new ModelRenderer(this, 94, 7); - Hump7.addBox(-2F, -3F, 0F, 2, 3, 1); - Hump7.setRotationPoint(-21F, 0F, 0F); - Hump7.setTextureSize(128, 64); - Hump7.mirror = true; - setRotation(Hump7, 0F, 0F, -0.2617994F); - Hump8 = new ModelRenderer(this, 94, 11); - Hump8.addBox(0F, -3F, 0F, 2, 3, 1); - Hump8.setRotationPoint(-25F, 0F, 0F); - Hump8.setTextureSize(128, 64); - Hump8.mirror = true; - setRotation(Hump8, 0F, 0F, 0.2617994F); - Hump9 = new ModelRenderer(this, 94, 15); - Hump9.addBox(0F, 0F, 0F, 2, 1, 1); - Hump9.setRotationPoint(-24F, -3F, 0F); - Hump9.setTextureSize(128, 64); - Hump9.mirror = true; - setRotation(Hump9, 0F, 0F, 0F); - Hump10 = new ModelRenderer(this, 100, 10); - Hump10.addBox(-2F, -3F, 0F, 2, 3, 1); - Hump10.setRotationPoint(-21F, 0F, 3F); - Hump10.setTextureSize(128, 64); - Hump10.mirror = true; - setRotation(Hump10, 0F, 0F, -0.2617994F); - Hump11 = new ModelRenderer(this, 100, 14); - Hump11.addBox(0F, -3F, 0F, 2, 3, 1); - Hump11.setRotationPoint(-25F, 0F, 3F); - Hump11.setTextureSize(128, 64); - Hump11.mirror = true; - setRotation(Hump11, 0F, 0F, 0.2617994F); - Hump12 = new ModelRenderer(this, 100, 18); - Hump12.addBox(0F, 0F, 0F, 2, 1, 1); - Hump12.setRotationPoint(-24F, -3F, 3F); - Hump12.setTextureSize(128, 64); - Hump12.mirror = true; - setRotation(Hump12, 0F, 0F, 0F); - Sight3 = new ModelRenderer(this, 34, 34); - Sight3.addBox(0F, 0F, 0F, 2, 1, 2); - Sight3.setRotationPoint(-24F, -0.5F, 1F); - Sight3.setTextureSize(128, 64); - Sight3.mirror = true; - setRotation(Sight3, 0F, 0F, 0F); - SightFront = new ModelRenderer(this, 34, 37); - SightFront.addBox(0F, 0F, 0F, 1, 2, 0); - SightFront.setRotationPoint(-23.5F, -1.5F, 2F); - SightFront.setTextureSize(128, 64); - SightFront.mirror = true; - setRotation(SightFront, 0F, 0F, 0F); - Knob1 = new ModelRenderer(this, 42, 31); - Knob1.addBox(0F, 0F, 0F, 2, 2, 2); - Knob1.setRotationPoint(-15F, -2F, 1F); - Knob1.setTextureSize(128, 64); - Knob1.mirror = true; - setRotation(Knob1, 0F, 0F, 0F); - Knob2 = new ModelRenderer(this, 50, 31); - Knob2.addBox(-1F, 0F, -1F, 2, 2, 2); - Knob2.setRotationPoint(-14F, -2F, 2F); - Knob2.setTextureSize(128, 64); - Knob2.mirror = true; - setRotation(Knob2, 0F, 0.7853982F, 0F); - Bolt1 = new ModelRenderer(this, 42, 35); - Bolt1.addBox(0F, 0F, 0F, 1, 1, 1); - Bolt1.setRotationPoint(11.5F, -2F, -0.5F); - Bolt1.setTextureSize(128, 64); - Bolt1.mirror = true; - setRotation(Bolt1, 0F, 0F, 0F); - Bolt2 = new ModelRenderer(this, 46, 35); - Bolt2.addBox(0F, 0F, 0F, 1, 1, 1); - Bolt2.setRotationPoint(11.5F, -2F, 3.5F); - Bolt2.setTextureSize(128, 64); - Bolt2.mirror = true; - setRotation(Bolt2, 0F, 0F, 0F); - Mag = new ModelRenderer(this, 118, 8); - Mag.addBox(0F, 0F, 0F, 3, 10, 2); - Mag.setRotationPoint(-4.5F, 17F, 1F); - Mag.setTextureSize(128, 64); - Mag.mirror = true; - setRotation(Mag, 0F, 0F, 0F); - Trigger = new ModelRenderer(this, 0, 41); - Trigger.addBox(-1F, 0F, 0F, 1, 3, 1); - Trigger.setRotationPoint(-6F, 7F, 1.5F); - Trigger.setTextureSize(128, 64); - Trigger.mirror = true; - setRotation(Trigger, 0F, 0F, 0.3490659F); - Frame1 = new ModelRenderer(this, 4, 41); - Frame1.addBox(0F, 0F, 0F, 3, 4, 2); - Frame1.setRotationPoint(-10F, 7F, 1F); - Frame1.setTextureSize(128, 64); - Frame1.mirror = true; - setRotation(Frame1, 0F, 0F, 0F); - Frame2 = new ModelRenderer(this, 14, 41); - Frame2.addBox(0F, -1F, 0F, 3, 1, 2); - Frame2.setRotationPoint(-7F, 11F, 1F); - Frame2.setTextureSize(128, 64); - Frame2.mirror = true; - setRotation(Frame2, 0F, 0F, -0.4363323F); - } - - 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); - GL11.glDisable(GL11.GL_CULL_FACE); - BodyBack.render(f5); - BodyBottom.render(f5); - BodySide.render(f5); - Ejector.render(f5); - BodyFront.render(f5); - GripFront.render(f5); - StockFront.render(f5); - StockPlate.render(f5); - HandleBase.render(f5); - Handle.render(f5); - HandleBack.render(f5); - HandleBottom.render(f5); - HandlePlate.render(f5); - HandleTop.render(f5); - Muzzle1.render(f5); - Muzzle2.render(f5); - StockBack.render(f5); - StockPlate1.render(f5); - Stock1.render(f5); - Stock2.render(f5); - Stcok3.render(f5); - Stock4.render(f5); - Hump1.render(f5); - Hump2.render(f5); - Hump3.render(f5); - Hump4.render(f5); - Hump5.render(f5); - Hump6.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - SightBack.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - Sight1.render(f5); - Sight2.render(f5); - Hump7.render(f5); - Hump8.render(f5); - Hump9.render(f5); - Hump10.render(f5); - Hump11.render(f5); - Hump12.render(f5); - Sight3.render(f5); - SightFront.render(f5); - Knob1.render(f5); - Knob2.render(f5); - Bolt1.render(f5); - Bolt2.render(f5); - Mag.render(f5); - GL11.glDisable(GL11.GL_CULL_FACE); - Trigger.render(f5); - Frame1.render(f5); - Frame2.render(f5); - GL11.glEnable(GL11.GL_CULL_FACE); - } - - 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/src/main/java/com/hbm/render/model/ModelUziBarrel.java b/src/main/java/com/hbm/render/model/ModelUziBarrel.java deleted file mode 100644 index c699eb13d..000000000 --- a/src/main/java/com/hbm/render/model/ModelUziBarrel.java +++ /dev/null @@ -1,45 +0,0 @@ -// Date: 22.07.2018 14:26:58 -// 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 ModelUziBarrel extends ModelBase { - // fields - ModelRenderer Barrel; - - public ModelUziBarrel() { - textureWidth = 32; - textureHeight = 32; - - Barrel = new ModelRenderer(this, 0, 0); - Barrel.addBox(0F, 0F, 0F, 12, 2, 2); - Barrel.setRotationPoint(-40F, 2F, 1F); - Barrel.setTextureSize(32, 32); - Barrel.mirror = true; - setRotation(Barrel, 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); - Barrel.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/src/main/java/com/hbm/render/model/ModelUziSilencer.java b/src/main/java/com/hbm/render/model/ModelUziSilencer.java deleted file mode 100644 index 5066db4c4..000000000 --- a/src/main/java/com/hbm/render/model/ModelUziSilencer.java +++ /dev/null @@ -1,61 +0,0 @@ -// Date: 22.07.2018 14:32:28 -// 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 ModelUziSilencer extends ModelBase { - // fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - - public ModelUziSilencer() { - textureWidth = 128; - textureHeight = 32; - - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 32, 5, 3); - Shape1.setRotationPoint(-60F, 0.5F, 0.5F); - Shape1.setTextureSize(128, 32); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 8); - Shape2.addBox(0F, 0F, 0F, 32, 3, 5); - Shape2.setRotationPoint(-60F, 1.5F, -0.5F); - Shape2.setTextureSize(128, 32); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 16); - Shape3.addBox(0F, 0F, 0F, 32, 4, 4); - Shape3.setRotationPoint(-60F, 1F, 0F); - Shape3.setTextureSize(128, 32); - Shape3.mirror = true; - setRotation(Shape3, 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); - Shape1.render(f5); - Shape2.render(f5); - Shape3.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/src/main/java/com/hbm/render/model/ModelZOMG.java b/src/main/java/com/hbm/render/model/ModelZOMG.java deleted file mode 100644 index 9d338ad96..000000000 --- a/src/main/java/com/hbm/render/model/ModelZOMG.java +++ /dev/null @@ -1,255 +0,0 @@ -// Date: 14.08.2016 18:55:34 -// 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 ModelZOMG extends ModelBase { - // fields - ModelRenderer Body; - ModelRenderer BodyFront; - ModelRenderer BodyFrontPlate; - ModelRenderer PipeLeft; - ModelRenderer PipeRight; - ModelRenderer PipeBottom; - ModelRenderer Head; - ModelRenderer HeadBottom; - ModelRenderer HeadBottomPlate; - ModelRenderer BodyTop; - ModelRenderer BodyCenter; - ModelRenderer BodyBack; - ModelRenderer BodyBackPlate; - ModelRenderer StockTop; - ModelRenderer StockBack; - ModelRenderer StockBackPlate; - ModelRenderer Handle; - ModelRenderer PistonBack; - ModelRenderer PistonFront; - ModelRenderer BarrelVertical; - ModelRenderer BarrelHorizontal; - ModelRenderer BarrelCenter; - ModelRenderer HandleBack; - ModelRenderer BarrelPipe; - ModelRenderer PistonPivot; - ModelRenderer Scope; - ModelRenderer ScopePivot; - - public ModelZOMG() { - textureWidth = 128; - textureHeight = 64; - - Body = new ModelRenderer(this, 0, 0); - Body.addBox(0F, 0F, 0F, 12, 5, 4); - Body.setRotationPoint(-6F, 0F, 0F); - Body.setTextureSize(128, 64); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - BodyFront = new ModelRenderer(this, 32, 14); - BodyFront.addBox(0F, 0F, 0F, 1, 4, 4); - BodyFront.setRotationPoint(-7F, 0F, 0F); - BodyFront.setTextureSize(128, 64); - BodyFront.mirror = true; - setRotation(BodyFront, 0F, 0F, 0F); - BodyFrontPlate = new ModelRenderer(this, 46, 6); - BodyFrontPlate.addBox(-2F, -1F, 0F, 2, 1, 4); - BodyFrontPlate.setRotationPoint(-6F, 5F, 0F); - BodyFrontPlate.setTextureSize(128, 64); - BodyFrontPlate.mirror = true; - setRotation(BodyFrontPlate, 0F, 0F, 0.6981317F); - PipeLeft = new ModelRenderer(this, 0, 29); - PipeLeft.addBox(0F, 0F, 0F, 6, 1, 1); - PipeLeft.setRotationPoint(-13F, 0.5F, 0.5F); - PipeLeft.setTextureSize(128, 64); - PipeLeft.mirror = true; - setRotation(PipeLeft, 0F, 0F, 0F); - PipeRight = new ModelRenderer(this, 14, 29); - PipeRight.addBox(0F, 0F, 0F, 6, 1, 1); - PipeRight.setRotationPoint(-13F, 0.5F, 2.5F); - PipeRight.setTextureSize(128, 64); - PipeRight.mirror = true; - setRotation(PipeRight, 0F, 0F, 0F); - PipeBottom = new ModelRenderer(this, 14, 25); - PipeBottom.addBox(0F, 0F, 0F, 6, 2, 2); - PipeBottom.setRotationPoint(-13F, 2F, 1F); - PipeBottom.setTextureSize(128, 64); - PipeBottom.mirror = true; - setRotation(PipeBottom, 0F, 0F, 0F); - Head = new ModelRenderer(this, 32, 0); - Head.addBox(0F, 0F, 0F, 3, 4, 4); - Head.setRotationPoint(-16F, 0F, 0F); - Head.setTextureSize(128, 64); - Head.mirror = true; - setRotation(Head, 0F, 0F, 0F); - HeadBottom = new ModelRenderer(this, 46, 0); - HeadBottom.addBox(0F, 0F, 0F, 2, 2, 4); - HeadBottom.setRotationPoint(-15F, 4F, 0F); - HeadBottom.setTextureSize(128, 64); - HeadBottom.mirror = true; - setRotation(HeadBottom, 0F, 0F, 0F); - HeadBottomPlate = new ModelRenderer(this, 32, 8); - HeadBottomPlate.addBox(0F, 0F, 0F, 1, 2, 4); - HeadBottomPlate.setRotationPoint(-16F, 4F, 0F); - HeadBottomPlate.setTextureSize(128, 64); - HeadBottomPlate.mirror = true; - setRotation(HeadBottomPlate, 0F, 0F, -0.4363323F); - BodyTop = new ModelRenderer(this, 0, 17); - BodyTop.addBox(0F, 0F, 0F, 10, 1, 3); - BodyTop.setRotationPoint(-5F, -0.5F, 0.5F); - BodyTop.setTextureSize(128, 64); - BodyTop.mirror = true; - setRotation(BodyTop, 0F, 0F, 0F); - BodyCenter = new ModelRenderer(this, 0, 9); - BodyCenter.addBox(0F, 0F, 0F, 11, 3, 5); - BodyCenter.setRotationPoint(-5.5F, 1F, -0.5F); - BodyCenter.setTextureSize(128, 64); - BodyCenter.mirror = true; - setRotation(BodyCenter, 0F, 0F, 0F); - BodyBack = new ModelRenderer(this, 42, 11); - BodyBack.addBox(0F, 0F, 0F, 1, 3, 4); - BodyBack.setRotationPoint(6F, 2F, 0F); - BodyBack.setTextureSize(128, 64); - BodyBack.mirror = true; - setRotation(BodyBack, 0F, 0F, 0F); - BodyBackPlate = new ModelRenderer(this, 58, 0); - BodyBackPlate.addBox(-1F, -3F, 0F, 1, 4, 2); - BodyBackPlate.setRotationPoint(7F, 2F, 1F); - BodyBackPlate.setTextureSize(128, 64); - BodyBackPlate.mirror = true; - setRotation(BodyBackPlate, 0F, 0F, -0.4363323F); - StockTop = new ModelRenderer(this, 0, 21); - StockTop.addBox(0F, 0F, 0F, 8, 2, 2); - StockTop.setRotationPoint(7F, 3F, 1F); - StockTop.setTextureSize(128, 64); - StockTop.mirror = true; - setRotation(StockTop, 0F, 0F, 0F); - StockBack = new ModelRenderer(this, 20, 21); - StockBack.addBox(0F, 0F, 0F, 4, 2, 2); - StockBack.setRotationPoint(11F, 5F, 1F); - StockBack.setTextureSize(128, 64); - StockBack.mirror = true; - setRotation(StockBack, 0F, 0F, 0F); - StockBackPlate = new ModelRenderer(this, 0, 25); - StockBackPlate.addBox(-5F, -2F, 0F, 5, 2, 2); - StockBackPlate.setRotationPoint(11F, 7F, 1F); - StockBackPlate.setTextureSize(128, 64); - StockBackPlate.mirror = true; - setRotation(StockBackPlate, 0F, 0F, 0.418879F); - Handle = new ModelRenderer(this, 64, 8); - Handle.addBox(0F, 0F, 0F, 2, 4, 2); - Handle.setRotationPoint(-4F, 5F, 1F); - Handle.setTextureSize(128, 64); - Handle.mirror = true; - setRotation(Handle, 0F, 0F, 0F); - PistonBack = new ModelRenderer(this, 30, 26); - PistonBack.addBox(0F, -4F, 0F, 2, 4, 2); - PistonBack.setRotationPoint(1F, 4F, -0.5F); - PistonBack.setTextureSize(128, 64); - PistonBack.mirror = true; - setRotation(PistonBack, 0.7853982F, 0F, 0F); - PistonFront = new ModelRenderer(this, 52, 11); - PistonFront.addBox(0F, -4F, 0F, 2, 4, 2); - PistonFront.setRotationPoint(-3F, 4F, -0.5F); - PistonFront.setTextureSize(128, 64); - PistonFront.mirror = true; - setRotation(PistonFront, 0.7853982F, 0F, 0F); - BarrelVertical = new ModelRenderer(this, 38, 22); - BarrelVertical.addBox(0F, 0F, 0F, 8, 3, 2); - BarrelVertical.setRotationPoint(-4F, 1F, 5F); - BarrelVertical.setTextureSize(128, 64); - BarrelVertical.mirror = true; - setRotation(BarrelVertical, 0F, 0F, 0F); - BarrelHorizontal = new ModelRenderer(this, 38, 27); - BarrelHorizontal.addBox(0F, 0F, 0F, 8, 2, 3); - BarrelHorizontal.setRotationPoint(-4F, 1.5F, 4.5F); - BarrelHorizontal.setTextureSize(128, 64); - BarrelHorizontal.mirror = true; - setRotation(BarrelHorizontal, 0F, 0F, 0F); - BarrelCenter = new ModelRenderer(this, 64, 0); - BarrelCenter.addBox(0F, 0F, 0F, 10, 2, 2); - BarrelCenter.setRotationPoint(-5F, 1.5F, 5F); - BarrelCenter.setTextureSize(128, 64); - BarrelCenter.mirror = true; - setRotation(BarrelCenter, 0F, 0F, 0F); - HandleBack = new ModelRenderer(this, 60, 8); - HandleBack.addBox(0F, 0F, 0F, 1, 4, 1); - HandleBack.setRotationPoint(-2.5F, 5F, 1.5F); - HandleBack.setTextureSize(128, 64); - HandleBack.mirror = true; - setRotation(HandleBack, 0F, 0F, 0F); - BarrelPipe = new ModelRenderer(this, 64, 4); - BarrelPipe.addBox(-10F, 0F, -1F, 10, 1, 1); - BarrelPipe.setRotationPoint(-5F, 2F, 6.5F); - BarrelPipe.setTextureSize(128, 64); - BarrelPipe.mirror = true; - setRotation(BarrelPipe, 0F, -0.2602503F, 0F); - PistonPivot = new ModelRenderer(this, 60, 14); - PistonPivot.addBox(0F, -2F, 0.5F, 7, 2, 1); - PistonPivot.setRotationPoint(-3.5F, 4F, -0.5F); - PistonPivot.setTextureSize(128, 64); - PistonPivot.mirror = true; - setRotation(PistonPivot, 0.7853982F, 0F, 0F); - Scope = new ModelRenderer(this, 48, 18); - Scope.addBox(0F, 0F, 0F, 6, 2, 2); - Scope.setRotationPoint(-3F, -3F, 1F); - Scope.setTextureSize(128, 64); - Scope.mirror = true; - setRotation(Scope, 0F, 0F, 0F); - ScopePivot = new ModelRenderer(this, 58, 6); - ScopePivot.addBox(0F, 0F, 0F, 4, 1, 1); - ScopePivot.setRotationPoint(-2F, -1F, 1.5F); - ScopePivot.setTextureSize(128, 64); - ScopePivot.mirror = true; - setRotation(ScopePivot, 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); - Body.render(f5); - BodyFront.render(f5); - BodyFrontPlate.render(f5); - PipeLeft.render(f5); - PipeRight.render(f5); - PipeBottom.render(f5); - Head.render(f5); - HeadBottom.render(f5); - HeadBottomPlate.render(f5); - BodyTop.render(f5); - BodyCenter.render(f5); - BodyBack.render(f5); - BodyBackPlate.render(f5); - StockTop.render(f5); - StockBack.render(f5); - StockBackPlate.render(f5); - Handle.render(f5); - PistonBack.render(f5); - PistonFront.render(f5); - BarrelVertical.render(f5); - BarrelHorizontal.render(f5); - BarrelCenter.render(f5); - HandleBack.render(f5); - BarrelPipe.render(f5); - PistonPivot.render(f5); - Scope.render(f5); - ScopePivot.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); - } - -} diff --git a/src/main/java/com/hbm/render/tileentity/RenderBobble.java b/src/main/java/com/hbm/render/tileentity/RenderBobble.java index fc5332997..d5039e39b 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderBobble.java +++ b/src/main/java/com/hbm/render/tileentity/RenderBobble.java @@ -8,7 +8,6 @@ import com.hbm.blocks.generic.BlockBobble.TileEntityBobble; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.render.model.ModelUboinik; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -380,7 +379,6 @@ public class RenderBobble extends TileEntitySpecialRenderer { bobble.renderPart("Drillgon"); } - private ModelUboinik shotgun = new ModelUboinik(); private ResourceLocation shot_tex = new ResourceLocation(RefStrings.MODID +":textures/models/ModelUboinik.png"); /* @@ -451,7 +449,7 @@ public class RenderBobble extends TileEntitySpecialRenderer { GL11.glRotated(-60, 0, 1, 0); GL11.glTranslated(-0.2, 0, 0); GL11.glScaled(0.5, 0.5, 0.5); - shotgun.renderDud(0.0625F); + //shotgun.renderDud(0.0625F); break; case MELLOW: GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/com/hbm/render/tileentity/RenderLoot.java b/src/main/java/com/hbm/render/tileentity/RenderLoot.java index ec6c89bc5..2a325e92e 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderLoot.java +++ b/src/main/java/com/hbm/render/tileentity/RenderLoot.java @@ -7,7 +7,6 @@ import com.hbm.blocks.generic.BlockLoot.TileEntityLoot; import com.hbm.items.ModItems; import com.hbm.items.armor.ArmorTrenchmaster; import com.hbm.main.ResourceManager; -import com.hbm.render.model.ModelLeverAction; import com.hbm.util.Tuple.Quartet; import net.minecraft.client.Minecraft; @@ -42,7 +41,7 @@ public class RenderLoot extends TileEntitySpecialRenderer { if(stack.getItem() == ModItems.ammo_nuke) { renderNuke(); - } else if(stack.getItem() == ModItems.gun_lever_action) { + } else if(stack.getItem() == ModItems.gun_maresleg) { renderShotgun(); } else if(stack.getItem() instanceof ArmorTrenchmaster) { @@ -117,21 +116,17 @@ public class RenderLoot extends TileEntitySpecialRenderer { GL11.glShadeModel(GL11.GL_FLAT); } - protected ModelLeverAction shotgun; private void renderShotgun() { - GL11.glScaled(0.5, 0.5, 0.5); - GL11.glTranslated(1, 0, 0); + GL11.glScaled(0.125, 0.125, 0.125); + GL11.glTranslated(3, 0, 0); GL11.glRotated(25, 0, 1, 0); GL11.glRotated(90, 1, 0, 0); GL11.glRotated(90, 0, 1, 0); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - bindTexture(ResourceManager.ff_wood); - ResourceManager.ff_maresleg.renderPart("Grip"); - bindTexture(ResourceManager.ff_gun_bright); - ResourceManager.ff_maresleg.renderPart("Gun"); - ResourceManager.ff_maresleg.renderPart("Lever"); + bindTexture(ResourceManager.maresleg_tex); + ResourceManager.maresleg.renderAll(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); } diff --git a/src/main/java/com/hbm/render/tileentity/RenderSteelPoles.java b/src/main/java/com/hbm/render/tileentity/RenderSteelPoles.java deleted file mode 100644 index 475bdcf9c..000000000 --- a/src/main/java/com/hbm/render/tileentity/RenderSteelPoles.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hbm.render.tileentity; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelPoles; - -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -public class RenderSteelPoles extends TileEntitySpecialRenderer { - - private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":" + "textures/models/Poles.png"); - - private ModelPoles model; - - public RenderSteelPoles() { - this.model = new ModelPoles(); - } - - @Override - public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { - GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); - GL11.glRotatef(180, 0F, 0F, 1F); - - switch(tileentity.getBlockMetadata()) - { - case 4: - GL11.glRotatef(90, 0F, 1F, 0F); break; - case 2: - GL11.glRotatef(180, 0F, 1F, 0F); break; - case 5: - GL11.glRotatef(270, 0F, 1F, 0F); break; - case 3: - GL11.glRotatef(0, 0F, 1F, 0F); break; - } - - this.bindTexture(texture); - - GL11.glPushMatrix(); - this.model.renderModel(0.0625F); - GL11.glPopMatrix(); - GL11.glPopMatrix(); - } - -} diff --git a/src/main/java/com/hbm/util/AchievementHandler.java b/src/main/java/com/hbm/util/AchievementHandler.java index 2a40d4526..900509bfe 100644 --- a/src/main/java/com/hbm/util/AchievementHandler.java +++ b/src/main/java/com/hbm/util/AchievementHandler.java @@ -15,11 +15,9 @@ public class AchievementHandler { public static HashMap craftingAchievements = new HashMap(); public static void register() { - craftingAchievements.put(new ComparableStack(ModItems.gun_mp40), MainRegistry.achFreytag); craftingAchievements.put(new ComparableStack(ModItems.piston_selenium), MainRegistry.achSelenium); craftingAchievements.put(new ComparableStack(ModItems.gun_b92), MainRegistry.achSelenium); craftingAchievements.put(new ComparableStack(ModItems.battery_potatos), MainRegistry.achPotato); - craftingAchievements.put(new ComparableStack(ModItems.gun_revolver_pip), MainRegistry.achC44); craftingAchievements.put(new ComparableStack(ModBlocks.machine_press), MainRegistry.achBurnerPress); craftingAchievements.put(new ComparableStack(ModItems.rbmk_fuel_empty), MainRegistry.achRBMK); craftingAchievements.put(new ComparableStack(ModBlocks.machine_chemplant), MainRegistry.achChemplant); diff --git a/src/main/java/com/hbm/util/DamageResistanceHandler.java b/src/main/java/com/hbm/util/DamageResistanceHandler.java index 2e58a5b1c..d9b169377 100644 --- a/src/main/java/com/hbm/util/DamageResistanceHandler.java +++ b/src/main/java/com/hbm/util/DamageResistanceHandler.java @@ -84,6 +84,7 @@ public class DamageResistanceHandler { registerSet(ModItems.steamsuit_helmet, ModItems.steamsuit_plate, ModItems.steamsuit_legs, ModItems.steamsuit_boots, new ResistanceStats() .addCategory(CATEGORY_PROJECTILE, 2F, 0.15F) .addCategory(CATEGORY_FIRE, 0.5F, 0.25F) + .addExact(DamageSource.fall.damageType, 5F, 0.25F) .setOther(0F, 0.1F)); registerSet(ModItems.dieselsuit_helmet, ModItems.dieselsuit_plate, ModItems.dieselsuit_legs, ModItems.dieselsuit_boots, new ResistanceStats() .addCategory(CATEGORY_PROJECTILE, 1F, 0.15F) @@ -94,48 +95,57 @@ public class DamageResistanceHandler { .addCategory(CATEGORY_PROJECTILE, 2F, 0.15F) .addCategory(CATEGORY_FIRE, 0.5F, 0.35F) .addCategory(CATEGORY_EXPLOSION, 5F, 0.25F) + .addExact(DamageSource.fall.damageType, 0F, 1F) .setOther(0F, 0.1F)); registerSet(ModItems.ajr_helmet, ModItems.ajr_plate, ModItems.ajr_legs, ModItems.ajr_boots, new ResistanceStats() .addCategory(CATEGORY_PROJECTILE, 4F, 0.15F) .addCategory(CATEGORY_FIRE, 0.5F, 0.35F) .addCategory(CATEGORY_EXPLOSION, 7.5F, 0.25F) + .addExact(DamageSource.fall.damageType, 0F, 1F) .setOther(0F, 0.15F)); registerSet(ModItems.ajro_helmet, ModItems.ajro_plate, ModItems.ajro_legs, ModItems.ajro_boots, new ResistanceStats() .addCategory(CATEGORY_PROJECTILE, 4F, 0.15F) .addCategory(CATEGORY_FIRE, 0.5F, 0.35F) .addCategory(CATEGORY_EXPLOSION, 7.5F, 0.25F) + .addExact(DamageSource.fall.damageType, 0F, 1F) .setOther(0F, 0.15F)); registerSet(ModItems.rpa_helmet, ModItems.rpa_plate, ModItems.rpa_legs, ModItems.rpa_boots, new ResistanceStats() .addCategory(CATEGORY_PROJECTILE, 20F, 0.65F) .addCategory(CATEGORY_FIRE, 10F, 0.75F) .addCategory(CATEGORY_EXPLOSION, 15F, 0.25F) .addExact(DamageClass.LASER.name(), 10F, 0.75F) + .addExact(DamageSource.fall.damageType, 0F, 1F) .setOther(10F, 0.15F)); ResistanceStats bj = new ResistanceStats() .addCategory(CATEGORY_PROJECTILE, 5F, 0.5F) .addCategory(CATEGORY_FIRE, 2.5F, 0.5F) .addCategory(CATEGORY_EXPLOSION, 10F, 0.25F) + .addExact(DamageSource.fall.damageType, 0F, 1F) .setOther(2F, 0.15F); registerSet(ModItems.bj_helmet, ModItems.bj_plate, ModItems.bj_legs, ModItems.bj_boots, bj); registerSet(ModItems.bj_helmet, ModItems.bj_plate_jetpack, ModItems.bj_legs, ModItems.bj_boots, bj); registerSet(ModItems.envsuit_helmet, ModItems.envsuit_plate, ModItems.envsuit_legs, ModItems.envsuit_boots, new ResistanceStats() .addCategory(CATEGORY_FIRE, 2F, 0.75F) .addExact(DamageSource.drown.damageType, 0F, 1F) + .addExact(DamageSource.fall.damageType, 5F, 0.75F) .setOther(0F, 0.1F)); registerSet(ModItems.hev_helmet, ModItems.hev_plate, ModItems.hev_legs, ModItems.hev_boots, new ResistanceStats() .addCategory(CATEGORY_PROJECTILE, 2F, 0.25F) .addCategory(CATEGORY_FIRE, 0.5F, 0.5F) .addCategory(CATEGORY_EXPLOSION, 5F, 0.25F) .addExact(DamageSource.onFire.damageType, 0F, 1F) + .addExact(DamageSource.fall.damageType, 10F, 0F) .setOther(2F, 0.25F)); registerSet(ModItems.bismuth_helmet, ModItems.bismuth_plate, ModItems.bismuth_legs, ModItems.bismuth_boots, new ResistanceStats() .addCategory(CATEGORY_PROJECTILE, 2F, 0.15F) .addCategory(CATEGORY_FIRE, 5F, 0.5F) .addCategory(CATEGORY_EXPLOSION, 5F, 0.25F) + .addExact(DamageSource.fall.damageType, 0F, 1F) .setOther(2F, 0.25F)); registerSet(ModItems.fau_helmet, ModItems.fau_plate, ModItems.fau_legs, ModItems.fau_boots, new ResistanceStats() .addCategory(CATEGORY_EXPLOSION, 50F, 0.95F) .addExact(DamageClass.LASER.name(), 25F, 0.95F) + .addExact(DamageSource.fall.damageType, 0F, 1F) .setOther(100F, 0.99F)); registerSet(ModItems.dns_helmet, ModItems.dns_plate, ModItems.dns_legs, ModItems.dns_boots, new ResistanceStats() .addCategory(CATEGORY_EXPLOSION, 100F, 0.99F) @@ -145,6 +155,7 @@ public class DamageResistanceHandler { .addCategory(CATEGORY_FIRE, 5F, 0.5F) .addCategory(CATEGORY_EXPLOSION, 5F, 0.25F) .addExact(DamageClass.LASER.name(), 15F, 0.9F) + .addExact(DamageSource.fall.damageType, 10F, 0.5F) .setOther(5F, 0.25F)); registerSet(ModItems.hazmat_helmet, ModItems.hazmat_plate, ModItems.hazmat_legs, ModItems.hazmat_boots, new ResistanceStats()); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 1426e3ab0..f86673b35 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -482,6 +482,7 @@ damage.category.EXPL=Explosion damage.category.FIRE=Feuer damage.category.PROJ=Projektil damage.exact.drown=Ertrinken +damage.exact.fall=Fallschaden damage.exact.LASER=Laser damage.exact.onFire=Nachbrennen damage.other=Andere @@ -543,6 +544,23 @@ death.attack.tau=%1$s wurde von %2$s mit negativ geladenen Tauonen durchsiebt. death.attack.tauBlast=%1$s lud die XVL1456 zu lange auf und wurde in Stücke gerissen. death.attack.teleporter=%1$s wurde ins Nichts teleportiert. +death.sedna.electric=%1$s wurde frittiert. +death.sedna.electric.attacker=%1$s wurde von %2$s frittiert. +death.sedna.explosive=%1$s wurde gesprengt. +death.sedna.explosive.attacker=%1$s wurde von %2$s gesprengt. +death.sedna.fire=%1$s wurde eingeäschert. +death.sedna.fire.attacker=%1$s wurde von %2$s eingeäschert. +death.sedna.laser=%1$s wurde pulverisiert. +death.sedna.laser.attacker=%1$s wurde von %2$s pulverisiert. +death.sedna.microwave=%1$s wurde gekocht. +death.sedna.microwave.attacker=%1$s wurde von %2$s gekocht. +death.sedna.subatomic=%1$s wurde atomisiert. +death.sedna.subatomic.attacker=%1$s wurde von %2$s atomisiert. +death.sedna.other=%1$s wurde getötet. +death.sedna.other.attacker=%1$s wurde von %2$s getötet. +death.sedna.physical=%1$s wurde erschossen. +death.sedna.physical.attacker=%1$s wurde von %2$s erschossen. + desc.item.rtgHeat=Hitzelevel: %s desc.gui.rtgBFurnace.desc=Benötigt mindestens 15 Hitze um zu starten$Je mehr Hitze, desto schneller der Vorgang$Hitze über dem maximalen Level hat keinen Effekt$Gold-198 kann zu Quecksilber zerfallen desc.gui.rtgBFurnace.heat=§eHitzelevel: %s diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 295d181a2..588c144e2 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -898,6 +898,7 @@ damage.category.EXPL=Explosion damage.category.FIRE=Fire damage.category.PROJ=Projectile damage.exact.drown=Drowning +damage.exact.fall=Fall damage damage.exact.LASER=Laser damage.exact.onFire=Afterburn damage.other=Other @@ -960,6 +961,23 @@ death.attack.tau=%1$s was riddeled by %2$s using negatively charged tauons. death.attack.tauBlast=%1$s charged the XVL1456 for too long and was blown into pieces. death.attack.teleporter=%1$s was teleported into nothingness. +death.sedna.electric=%1$s was fried. +death.sedna.electric.attacker=%1$s was fried by %2$s. +death.sedna.explosive=%1$s was blown up. +death.sedna.explosive.attacker=%1$s was blown up by %2$s. +death.sedna.fire=%1$s was incinerated. +death.sedna.fire.attacker=%1$s was incinerated by %2$s. +death.sedna.laser=%1$s was pulverized. +death.sedna.laser.attacker=%1$s was pulverized by %2$s. +death.sedna.microwave=%1$s was microwaved. +death.sedna.microwave.attacker=%1$s was microwaved by %2$s. +death.sedna.subatomic=%1$s was atomized. +death.sedna.subatomic.attacker=%1$s was atomized by %2$s. +death.sedna.other=%1$s was killed. +death.sedna.other.attacker=%1$s was killed by %2$s. +death.sedna.physical=%1$s was shot. +death.sedna.physical.attacker=%1$s was shot by %2$s. + desc.gui.assembler.warning=§cError:§r This machine requires an assembly template! desc.gui.chemplant.warning=§cError:§r This machine requires an chemistry template! desc.gui.gasCent.enrichment=§2Enrichment§r$Uranium enrichment requires cascades.$Two-centrifuge cascades will give$uranium fuel, four-centrifuge cascades$will give total separation.