diff --git a/assets/hbm/textures/gui/potions.png b/assets/hbm/textures/gui/potions.png index bde3d40aa..46c14d1c6 100644 Binary files a/assets/hbm/textures/gui/potions.png and b/assets/hbm/textures/gui/potions.png differ diff --git a/assets/hbm/textures/models/ModelGustav.png b/assets/hbm/textures/models/ModelGustav.png new file mode 100644 index 000000000..7644f473f Binary files /dev/null and b/assets/hbm/textures/models/ModelGustav.png differ diff --git a/com/hbm/entity/projectile/EntityBulletBase.java b/com/hbm/entity/projectile/EntityBulletBase.java index 58abf562f..1ca20c09c 100644 --- a/com/hbm/entity/projectile/EntityBulletBase.java +++ b/com/hbm/entity/projectile/EntityBulletBase.java @@ -280,6 +280,10 @@ public class EntityBulletBase extends Entity implements IProjectile { this.posX += (movement.hitVec.xCoord - this.posX) * 0.6; this.posY += (movement.hitVec.yCoord - this.posY) * 0.6; this.posZ += (movement.hitVec.zCoord - this.posZ) * 0.6; + + this.motionX *= 0.8; + this.motionY *= 0.8; + this.motionZ *= 0.8; didBounce = true; } diff --git a/com/hbm/render/item/ItemRenderRpg.java b/com/hbm/render/item/ItemRenderRpg.java index 322a05664..dd7a96c50 100644 --- a/com/hbm/render/item/ItemRenderRpg.java +++ b/com/hbm/render/item/ItemRenderRpg.java @@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelAt4; +import com.hbm.render.model.ModelGustav; import com.hbm.render.model.ModelStinger; import net.minecraft.client.Minecraft; @@ -14,10 +15,10 @@ import net.minecraftforge.client.IItemRenderer; public class ItemRenderRpg implements IItemRenderer { - protected ModelAt4 swordModel; + protected ModelGustav swordModel; public ItemRenderRpg() { - swordModel = new ModelAt4(); + swordModel = new ModelGustav(); } @Override @@ -41,10 +42,9 @@ public class ItemRenderRpg implements IItemRenderer { switch(type) { case EQUIPPED_FIRST_PERSON: GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/At4New.png")); + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelGustav.png")); GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-0.5F, 0.0F, -0.2F); - GL11.glScalef(2.0F, 2.0F, 2.0F); + GL11.glTranslatef(0.1F, 0.1F, -0.1F); GL11.glScalef(0.5F, 0.5F, 0.5F); swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); @@ -52,14 +52,13 @@ public class ItemRenderRpg implements IItemRenderer { case EQUIPPED: case ENTITY: GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/At4New.png")); + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelGustav.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.2F, -0.2F, 0.0F); - GL11.glScalef(1.5F, 1.5F, 1.5F); + GL11.glTranslatef(0.9F, 0.0F, 0.1F); swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); default: break; diff --git a/com/hbm/render/model/ModelGustav.java b/com/hbm/render/model/ModelGustav.java new file mode 100644 index 000000000..956b794dc --- /dev/null +++ b/com/hbm/render/model/ModelGustav.java @@ -0,0 +1,309 @@ +// 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 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); + 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); + } + + 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); + } + +}