diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCarpentryBench.java b/src/main/java/noppes/npcs/client/model/blocks/ModelCarpentryBench.java index c5d2489f6..6315018e2 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCarpentryBench.java +++ b/src/main/java/noppes/npcs/client/model/blocks/ModelCarpentryBench.java @@ -1,119 +1,98 @@ -// Date: 11-10-2012 19:29:20 -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - package noppes.npcs.client.model.blocks; import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelBox; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelCarpentryBench extends ModelBase { - // fields - ModelRenderer Leg1; - ModelRenderer Leg2; - ModelRenderer Leg3; - ModelRenderer Leg4; - ModelRenderer Bottom_plate; - ModelRenderer Desktop; - ModelRenderer Backboard; - ModelRenderer Vice_Jaw1; - ModelRenderer Vice_Jaw2; - ModelRenderer Vice_Base1; - ModelRenderer Vice_Base2; - ModelRenderer Vice_Crank; - ModelRenderer Vice_Screw; - ModelRenderer Blueprint; + + private final ModelRenderer blueprint; + private final ModelRenderer chissle; + private final ModelRenderer saw; + private final ModelRenderer bb_main; public ModelCarpentryBench() { - this.textureWidth = 128; - this.textureHeight = 64; + textureWidth = 64; + textureHeight = 64; - Leg1 = new ModelRenderer(this, 0, 0); - Leg1.addBox(0F, 0F, 0F, 2, 14, 2); - Leg1.setRotationPoint(6F, 10F, 5F); - - Leg2 = new ModelRenderer(this, 0, 0); - Leg2.addBox(0F, 0F, 0F, 2, 14, 2); - Leg2.setRotationPoint(6F, 10F, -5F); - - Leg3 = new ModelRenderer(this, 0, 0); - Leg3.addBox(0F, 0F, 0F, 2, 14, 2); - Leg3.setRotationPoint(-8F, 10F, 5F); - - Leg4 = new ModelRenderer(this, 0, 0); - Leg4.addBox(0F, 0F, 0F, 2, 14, 2); - Leg4.setRotationPoint(-8F, 10F, -5F); - - Bottom_plate = new ModelRenderer(this, 0, 24); - Bottom_plate.addBox(0F, 0F, 0F, 14, 1, 10); - Bottom_plate.setRotationPoint(-7F, 21F, -4F); - Bottom_plate.setTextureSize(130, 64); - - Desktop = new ModelRenderer(this, 0, 3); - Desktop.addBox(0F, 0F, 0F, 18, 2, 13); - Desktop.setRotationPoint(-9F, 9F, -6F); - - Backboard = new ModelRenderer(this, 0, 18); - Backboard.addBox(-1F, 0F, 0F, 18, 5, 1); - Backboard.setRotationPoint(-8F, 7F, 7F); - - Vice_Jaw1 = new ModelRenderer(this, 54, 18); - Vice_Jaw1.addBox(0F, 0F, 0F, 3, 2, 1); - Vice_Jaw1.setRotationPoint(3F, 6F, -8F); - - Vice_Jaw2 = new ModelRenderer(this, 54, 21); - Vice_Jaw2.addBox(0F, 0F, 0F, 3, 2, 1); - Vice_Jaw2.setRotationPoint(3F, 6F, -6F); - - Vice_Base1 = new ModelRenderer(this, 38, 30); - Vice_Base1.addBox(0F, 0F, 0F, 3, 1, 3); - Vice_Base1.setRotationPoint(3F, 8F, -5F); - - Vice_Base2 = new ModelRenderer(this, 38, 25); - Vice_Base2.addBox(0F, 0F, 0F, 1, 2, 2); - Vice_Base2.setRotationPoint(4F, 7F, -5F); - - Vice_Crank = new ModelRenderer(this, 54, 24); - Vice_Crank.addBox(0F, 0F, 0F, 1, 5, 1); - Vice_Crank.setRotationPoint(6F, 6F, -9F); - - Vice_Screw = new ModelRenderer(this, 44, 25); - Vice_Screw.addBox(0F, 0F, 0F, 1, 1, 4); - Vice_Screw.setRotationPoint(4F, 8F, -8F); - - Blueprint = new ModelRenderer(this, 31, 18); - Blueprint.addBox(0F, 0F, 0F, 8, 0, 7); - Blueprint.setRotationPoint(0F, 9F, 1F); - setRotation(Blueprint, 0.3271718F, 0.1487144F, 0F); + blueprint = new ModelRenderer(this); + blueprint.setRotationPoint(-6.4564F, 9.3925F, -0.75F); + setRotationAngle(blueprint, 0.0F, -0.3054F, 0.0F); + blueprint.cubeList.add(new ModelBox(blueprint, 47, 27, -0.5436F, 0.5075F, -3.5F, 7, 0, 7, 0.0F)); + + ModelRenderer blueprint_r1 = new ModelRenderer(this); + blueprint_r1.setRotationPoint(-0.5436F, 0.5075F, 0.0F); + blueprint.addChild(blueprint_r1); + setRotationAngle(blueprint_r1, 0.0F, 0.0F, 0.7854F); + blueprint_r1.cubeList.add(new ModelBox(blueprint_r1, 45, 27, -1.0F, 0.0F, -3.5F, 1, 0, 7, 0.0F)); + + ModelRenderer blueprint_r2 = new ModelRenderer(this); + blueprint_r2.setRotationPoint(-1.2507F, -0.1996F, 0.0F); + blueprint.addChild(blueprint_r2); + setRotationAngle(blueprint_r2, 0.0F, 0.0F, 1.9635F); + blueprint_r2.cubeList.add(new ModelBox(blueprint_r2, 43, 27, -1.0F, 0.0F, -3.5F, 1, 0, 7, 0.0F)); + + chissle = new ModelRenderer(this); + chissle.setRotationPoint(1.356F, 18.6543F, -2.5F); + setRotationAngle(chissle, 0.0F, -0.7854F, 0.0F); + chissle.cubeList.add(new ModelBox(chissle, 17, 53, -0.356F, -0.6543F, -0.5F, 3, 1, 1, 0.0F)); + + ModelRenderer cube_r1 = new ModelRenderer(this); + cube_r1.setRotationPoint(-1.606F, 0.3457F, 0.0F); + chissle.addChild(cube_r1); + setRotationAngle(cube_r1, 0.0F, 0.0F, -0.3927F); + cube_r1.cubeList.add(new ModelBox(cube_r1, 18, 52, -0.5F, 0.0F, -0.5F, 2, 0, 1, 0.0F)); + + saw = new ModelRenderer(this); + saw.setRotationPoint(-2.65F, 18.5F, -2.7F); + setRotationAngle(saw, -3.096F, -0.3051F, 3.1241F); + saw.cubeList.add(new ModelBox(saw, 16, 46, -1.6F, -0.5F, 0.7F, 1, 1, 1, 0.0F)); + saw.cubeList.add(new ModelBox(saw, 16, 48, 0.4F, -0.5F, 0.7F, 1, 1, 1, 0.0F)); + saw.cubeList.add(new ModelBox(saw, 8, 36, -1.6F, 0.0F, -9.3F, 4, 0, 9, 0.0F)); + saw.cubeList.add(new ModelBox(saw, 20, 46, -1.6F, -0.5F, -0.3F, 3, 1, 1, 0.0F)); + saw.cubeList.add(new ModelBox(saw, 20, 48, -1.6F, -0.5F, 1.7F, 3, 1, 1, 0.0F)); + + bb_main = new ModelRenderer(this); + bb_main.setRotationPoint(0.0F, 24.0F, 0.0F); + bb_main.cubeList.add(new ModelBox(bb_main, 8, 50, 3.0F, -12.0F, -6.0F, 2, 12, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 50, -7.0F, -12.0F, -6.0F, 2, 12, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 36, -7.0F, -12.0F, 4.0F, 2, 12, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 8, 36, 3.0F, -12.0F, 4.0F, 2, 12, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -9.0F, -14.0F, -7.0F, 16, 2, 14, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 16, -9.0F, -17.0F, 5.0F, 16, 3, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 24, -6.0F, -5.0F, -5.0F, 10, 1, 10, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 46, 17, 8.0F, -14.0F, -4.0F, 2, 3, 7, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 29, 16, 6.0F, -12.0F, -4.0F, 2, 1, 7, 0.0F)); + + ModelRenderer cube_r2 = new ModelRenderer(this); + cube_r2.setRotationPoint(10.5F, -12.5F, -0.5F); + bb_main.addChild(cube_r2); + setRotationAngle(cube_r2, 0.7854F, 0.0F, 0.0F); + cube_r2.cubeList.add(new ModelBox(cube_r2, 47, 17, -1.0F, -0.5F, -0.5F, 1, 1, 1, 0.0F)); + cube_r2.cubeList.add(new ModelBox(cube_r2, 41, 17, 0.0F, -0.5F, -1.5F, 1, 1, 3, 0.0F)); + + ModelRenderer hammer_r1 = new ModelRenderer(this); + hammer_r1.setRotationPoint(4.75F, -14.9F, 1.0F); + bb_main.addChild(hammer_r1); + setRotationAngle(hammer_r1, 2.9697F, -0.7703F, -2.8972F); + hammer_r1.cubeList.add(new ModelBox(hammer_r1, 44, 39, -2.75F, -0.5F, -0.5F, 3, 1, 1, 0.0F)); + hammer_r1.cubeList.add(new ModelBox(hammer_r1, 52, 35, 0.25F, -1.0F, -2.0F, 2, 2, 4, 0.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); - Leg1.render(f5); - Leg2.render(f5); - Leg3.render(f5); - Leg4.render(f5); - Bottom_plate.render(f5); - Desktop.render(f5); - Backboard.render(f5); - Vice_Jaw1.render(f5); - Vice_Jaw2.render(f5); - Vice_Base1.render(f5); - Vice_Base2.render(f5); - Vice_Crank.render(f5); - Vice_Screw.render(f5); - Blueprint.render(f5); + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5,entity); + blueprint.render(f5); + chissle.render(f5); + saw.render(f5); + bb_main.render(f5); } - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; + public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; } - - } diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java index 7df7b2a19..57c8c5f43 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java @@ -18,8 +18,9 @@ public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer imple private final ModelCarpentryBench model = new ModelCarpentryBench(); private final ModelAnvil anvil = new ModelAnvil(); - private static final ResourceLocation resource3 = new ResourceLocation("customnpcs","textures/models/Steel.png"); - private static final ResourceLocation field_110631_g = new ResourceLocation("customnpcs","textures/models/CarpentryBench.png"); + private static final ResourceLocation anvilTexture = new ResourceLocation("customnpcs","textures/models/Steel.png"); + private static final ResourceLocation carpentryBench = new ResourceLocation("customnpcs","textures/models/CarpentryBench.png"); + public BlockCarpentryBenchRenderer(){ ((BlockCarpentryBench)CustomItems.carpentyBench).renderId = RenderingRegistry.getNextAvailableRenderId(); @@ -36,11 +37,11 @@ public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer imple GL11.glRotatef(180, 0, 0, 1); GL11.glRotatef(90 * (meta % 4), 0, 1, 0); if(meta >= 4){ - this.bindTexture(resource3); + this.bindTexture(anvilTexture); anvil.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } else{ - this.bindTexture(field_110631_g); + this.bindTexture(carpentryBench); model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } GL11.glPopMatrix(); @@ -57,14 +58,14 @@ public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer imple GL11.glColor3f(1, 1, 1); if(metadata == 0){ - this.bindTexture(field_110631_g); + this.bindTexture(carpentryBench); model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } else{ - this.bindTexture(resource3); + this.bindTexture(anvilTexture); anvil.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } - + GL11.glPopMatrix(); } diff --git a/src/main/resources/assets/customnpcs/textures/models/CarpentryBench.png b/src/main/resources/assets/customnpcs/textures/models/CarpentryBench.png index c9fa3a0ef..b367d14aa 100644 Binary files a/src/main/resources/assets/customnpcs/textures/models/CarpentryBench.png and b/src/main/resources/assets/customnpcs/textures/models/CarpentryBench.png differ