diff --git a/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouch.java b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouch.java new file mode 100644 index 000000000..a6988ab05 --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouch.java @@ -0,0 +1,43 @@ +package noppes.npcs.client.model.blocks.couch; + +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 ModelCouch extends ModelBase { + public final ModelRenderer CouchBack; + public final ModelRenderer Cussion; + + public ModelCouch() { + textureWidth = 64; + textureHeight = 64; + + CouchBack = new ModelRenderer(this); + CouchBack.setRotationPoint(0.0F, 24.0F, 0.0F); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 18, -8.0F, -2.0F, -8.0F, 16, 1, 15, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 46, -8.0F, -10.0F, 7.0F, 16, 9, 1, 0.0F)); + + Cussion = new ModelRenderer(this); + Cussion.setRotationPoint(0.0F, 24.0F, 0.0F); + Cussion.cubeList.add(new ModelBox(Cussion, 0, 0, -8.0F, -5.0F, -8.0F, 16, 3, 15, 0.0F)); + Cussion.cubeList.add(new ModelBox(Cussion, 0, 34, -8.0F, -14.0F, 4.0F, 16, 9, 3, 0.0F)); + Cussion.cubeList.add(new ModelBox(Cussion, 0, 56, -8.0F, -14.0F, 7.0F, 16, 4, 1, 0.0F)); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + CouchBack.render(f5); + Cussion.render(f5); + } + + 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/model/blocks/couch/ModelCouchCorner.java b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchCorner.java new file mode 100644 index 000000000..cd38b2005 --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchCorner.java @@ -0,0 +1,64 @@ +package noppes.npcs.client.model.blocks.couch; + +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 ModelCouchCorner extends ModelBase { + private final ModelRenderer CouchBack; + private final ModelRenderer cube_r1; + private final ModelRenderer Cussion; + private final ModelRenderer cube_r2; + private final ModelRenderer cube_r3; + + public ModelCouchCorner() { + textureWidth = 16; + textureHeight = 16; + + CouchBack = new ModelRenderer(this); + CouchBack.setRotationPoint(0.0F, 24.0F, 0.0F); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, -20, -13, -8.0F, -2.0F, -8.0F, 16, 1, 15, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, -6, 1, -8.0F, -10.0F, 7.0F, 16, 9, 1, 0.0F)); + + cube_r1 = new ModelRenderer(this); + cube_r1.setRotationPoint(-7.5F, -6.5F, -1.0F); + CouchBack.addChild(cube_r1); + setRotationAngle(cube_r1, 0.0F, -1.5708F, 0.0F); + cube_r1.cubeList.add(new ModelBox(cube_r1, -6, 1, -7.0F, -3.5F, -0.5F, 15, 8, 1, 0.0F)); + + Cussion = new ModelRenderer(this); + Cussion.setRotationPoint(0.0F, 24.0F, 0.0F); + Cussion.cubeList.add(new ModelBox(Cussion, -20, -13, -7.0F, -5.0F, -8.0F, 15, 3, 15, 0.0F)); + Cussion.cubeList.add(new ModelBox(Cussion, -8, -1, -7.0F, -14.0F, 4.0F, 15, 9, 3, 0.0F)); + Cussion.cubeList.add(new ModelBox(Cussion, -6, 1, -8.0F, -14.0F, 7.0F, 16, 4, 1, 0.0F)); + + cube_r2 = new ModelRenderer(this); + cube_r2.setRotationPoint(-7.5F, -12.0F, -1.0F); + Cussion.addChild(cube_r2); + setRotationAngle(cube_r2, 0.0F, -1.5708F, 0.0F); + cube_r2.cubeList.add(new ModelBox(cube_r2, -6, 1, -7.0F, -2.0F, -0.5F, 15, 4, 1, 0.0F)); + + cube_r3 = new ModelRenderer(this); + cube_r3.setRotationPoint(-5.5F, -9.5F, -3.5F); + Cussion.addChild(cube_r3); + setRotationAngle(cube_r3, 0.0F, -1.5708F, 0.0F); + cube_r3.cubeList.add(new ModelBox(cube_r3, -8, -1, -4.5F, -4.5F, -1.5F, 12, 9, 3, 0.0F)); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + CouchBack.render(f5); + Cussion.render(f5); + } + + 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/model/blocks/couch/ModelCouchLeft.java b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchLeft.java new file mode 100644 index 000000000..b20289eee --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchLeft.java @@ -0,0 +1,48 @@ +package noppes.npcs.client.model.blocks.couch; + +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 ModelCouchLeft extends ModelBase { + private final ModelRenderer CouchBack; + private final ModelRenderer Cussion; + + public ModelCouchLeft() { + textureWidth = 64; + textureHeight = 64; + + CouchBack = new ModelRenderer(this); + CouchBack.setRotationPoint(0.0F, 24.0F, 0.0F); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 18, -6.0F, -2.0F, -8.0F, 14, 1, 15, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 4, 46, -6.0F, -10.0F, 7.0F, 14, 9, 1, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 13, 14, -8.0F, -5.0F, -8.0F, 2, 4, 16, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 1, 47, -8.0F, -10.0F, 4.0F, 2, 5, 4, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 15, 19, -8.0F, -10.0F, -8.0F, 2, 2, 12, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 44, 51, -7.0F, -8.0F, -6.0F, 0, 3, 10, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 15, 18, -8.0F, -8.0F, -8.0F, 2, 3, 2, 0.0F)); + + Cussion = new ModelRenderer(this); + Cussion.setRotationPoint(0.0F, 24.0F, 0.0F); + Cussion.cubeList.add(new ModelBox(Cussion, 1, 0, -6.0F, -5.0F, -8.0F, 14, 3, 15, 0.0F)); + Cussion.cubeList.add(new ModelBox(Cussion, 1, 34, -6.0F, -14.0F, 4.0F, 14, 9, 3, 0.0F)); + Cussion.cubeList.add(new ModelBox(Cussion, 3, 56, -6.0F, -14.0F, 7.0F, 14, 4, 1, 0.0F)); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + CouchBack.render(f5); + Cussion.render(f5); + } + + 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/model/blocks/couch/ModelCouchRight.java b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchRight.java new file mode 100644 index 000000000..d9f6423a5 --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchRight.java @@ -0,0 +1,48 @@ +package noppes.npcs.client.model.blocks.couch; + +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 ModelCouchRight extends ModelBase { + private final ModelRenderer CouchBack; + private final ModelRenderer Cussion; + + public ModelCouchRight() { + textureWidth = 64; + textureHeight = 64; + + CouchBack = new ModelRenderer(this); + CouchBack.setRotationPoint(0.0F, 24.0F, 0.0F); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 35, -8.0F, -2.0F, -8.0F, 14, 1, 15, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 51, -8.0F, -10.0F, 7.0F, 14, 9, 1, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 36, 50, 6.0F, -5.0F, -6.0F, 2, 4, 10, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 52, 35, 6.0F, -10.0F, 4.0F, 2, 9, 4, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 36, 50, 6.0F, -10.0F, -8.0F, 2, 2, 12, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 44, 51, 7.0F, -8.0F, -6.0F, 0, 3, 10, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 15, 18, 6.0F, -8.0F, -8.0F, 2, 7, 2, 0.0F)); + + Cussion = new ModelRenderer(this); + Cussion.setRotationPoint(0.0F, 24.0F, 0.0F); + Cussion.cubeList.add(new ModelBox(Cussion, 1, 0, -8.0F, -5.0F, -8.0F, 14, 3, 15, 0.0F)); + Cussion.cubeList.add(new ModelBox(Cussion, 1, 18, -8.0F, -14.0F, 4.0F, 14, 9, 3, 0.0F)); + Cussion.cubeList.add(new ModelBox(Cussion, 4, 30, -8.0F, -14.0F, 7.0F, 14, 4, 1, 0.0F)); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + CouchBack.render(f5); + Cussion.render(f5); + } + + 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/model/blocks/couch/ModelCouchSingle.java b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchSingle.java new file mode 100644 index 000000000..0a78455a7 --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/couch/ModelCouchSingle.java @@ -0,0 +1,45 @@ +package noppes.npcs.client.model.blocks.couch; + +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 ModelCouchSingle extends ModelBase { + private final ModelRenderer CouchBack; + private final ModelRenderer Cussion; + + public ModelCouchSingle() { + textureWidth = 16; + textureHeight = 16; + + CouchBack = new ModelRenderer(this); + CouchBack.setRotationPoint(0.0F, 24.0F, 0.0F); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, -8.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, -8.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, 0, 0, 6.0F, -1.0F, 6.0F, 2, 1, 2, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, -18, -13, -6.0F, -2.0F, -8.0F, 12, 1, 15, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, -4, 1, -6.0F, -10.0F, 7.0F, 12, 9, 1, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, -14, -14, 6.0F, -10.0F, -8.0F, 2, 9, 16, 0.0F)); + CouchBack.cubeList.add(new ModelBox(CouchBack, -14, -14, -8.0F, -10.0F, -8.0F, 2, 9, 16, 0.0F)); + + Cussion = new ModelRenderer(this); + Cussion.setRotationPoint(0.0F, 24.0F, 0.0F); + Cussion.cubeList.add(new ModelBox(Cussion, -18, -13, -6.0F, -5.0F, -8.0F, 12, 3, 15, 0.0F)); + Cussion.cubeList.add(new ModelBox(Cussion, -6, -1, -6.0F, -14.0F, 4.0F, 12, 9, 3, 0.0F)); + Cussion.cubeList.add(new ModelBox(Cussion, -4, 1, -6.0F, -14.0F, 7.0F, 12, 4, 1, 0.0F)); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + CouchBack.render(f5); + Cussion.render(f5); + } + + 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/model/blocks/legacy/couch/ModelCouchCorner.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchCorner.java similarity index 95% rename from src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCorner.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchCorner.java index 180c0b15e..990c7c56c 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCorner.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchCorner.java @@ -4,7 +4,7 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelCouchCorner extends ModelBase { +public class ModelLegacyCouchCorner extends ModelBase { ModelRenderer Leg1; ModelRenderer Leg2; ModelRenderer Leg3; @@ -15,7 +15,7 @@ public class ModelCouchCorner extends ModelBase { ModelRenderer Bottom; ModelRenderer Bottom2; - public ModelCouchCorner() { + public ModelLegacyCouchCorner() { Leg1 = new ModelRenderer(this, 0, 0); Leg1.addBox(0F, 0F, 0F, 1, 1, 2); Leg1.setRotationPoint(7F, 23F, 6F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCornerWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchCornerWool.java similarity index 92% rename from src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCornerWool.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchCornerWool.java index a35306c59..ec6f9e12d 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCornerWool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchCornerWool.java @@ -4,13 +4,13 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelCouchCornerWool extends ModelBase { +public class ModelLegacyCouchCornerWool extends ModelBase { ModelRenderer Wool1; ModelRenderer Wool2; ModelRenderer Wool3; ModelRenderer Wool4; - public ModelCouchCornerWool() { + public ModelLegacyCouchCornerWool() { Wool1 = new ModelRenderer(this, 11, 3); Wool1.addBox(0F, 0F, 0F, 13, 5, 2); Wool1.setRotationPoint(-7F, 16F, -8F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeft.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchLeft.java similarity index 94% rename from src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeft.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchLeft.java index 3deb6a847..b51488dd8 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeft.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchLeft.java @@ -4,7 +4,7 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelCouchLeft extends ModelBase { +public class ModelLegacyCouchLeft extends ModelBase { ModelRenderer Leg1; ModelRenderer Leg2; ModelRenderer Leg3; @@ -13,7 +13,7 @@ public class ModelCouchLeft extends ModelBase { ModelRenderer Side; ModelRenderer Bottom; - public ModelCouchLeft() { + public ModelLegacyCouchLeft() { Leg1 = new ModelRenderer(this, 0, 0); Leg1.addBox(0F, 0F, 0F, 2, 1, 2); Leg1.setRotationPoint(-8F, 23F, 6F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeftWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchLeftWool.java similarity index 89% rename from src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeftWool.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchLeftWool.java index 6957a129b..3e3ab99bf 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeftWool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchLeftWool.java @@ -4,11 +4,11 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelCouchLeftWool extends ModelBase { +public class ModelLegacyCouchLeftWool extends ModelBase { ModelRenderer Wool1; ModelRenderer Wool2; - public ModelCouchLeftWool() { + public ModelLegacyCouchLeftWool() { Wool1 = new ModelRenderer(this, 3, 0); Wool1.addBox(0F, 0F, 0F, 14, 5, 13); Wool1.setRotationPoint(-6F, 16F, -6F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddle.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchMiddle.java similarity index 94% rename from src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddle.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchMiddle.java index 15648b0d6..61d9554e8 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddle.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchMiddle.java @@ -4,7 +4,7 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelCouchMiddle extends ModelBase +public class ModelLegacyCouchMiddle extends ModelBase { //fields ModelRenderer Leg1; @@ -14,7 +14,7 @@ public class ModelCouchMiddle extends ModelBase ModelRenderer Bottom; ModelRenderer Back; - public ModelCouchMiddle(){ + public ModelLegacyCouchMiddle(){ Leg1 = new ModelRenderer(this, 0, 0); Leg1.addBox(0F, 0F, 0F, 1, 1, 2); Leg1.setRotationPoint(7F, 23F, 6F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddleWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchMiddleWool.java similarity index 90% rename from src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddleWool.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchMiddleWool.java index 6729a8915..654298906 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddleWool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchMiddleWool.java @@ -4,12 +4,12 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelCouchMiddleWool extends ModelBase +public class ModelLegacyCouchMiddleWool extends ModelBase { ModelRenderer Wool1; ModelRenderer Wool2; - public ModelCouchMiddleWool(){ + public ModelLegacyCouchMiddleWool(){ Wool1 = new ModelRenderer(this, 3, 0); Wool1.addBox(0F, 0F, 0F, 16, 5, 13); Wool1.setRotationPoint(-8F, 16F, -6F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRight.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchRight.java similarity index 94% rename from src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRight.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchRight.java index 517ebc831..e3867a270 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRight.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchRight.java @@ -4,7 +4,7 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelCouchRight extends ModelBase { +public class ModelLegacyCouchRight extends ModelBase { // fields ModelRenderer Leg1; ModelRenderer Leg2; @@ -14,7 +14,7 @@ public class ModelCouchRight extends ModelBase { ModelRenderer Bottom; ModelRenderer Side; - public ModelCouchRight() { + public ModelLegacyCouchRight() { Leg1 = new ModelRenderer(this, 0, 0); Leg1.addBox(0F, 0F, 0F, 2, 1, 2); Leg1.setRotationPoint(6F, 23F, 6F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRightWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchRightWool.java similarity index 90% rename from src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRightWool.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchRightWool.java index 62ecdb8da..6a92b3855 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRightWool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelLegacyCouchRightWool.java @@ -4,11 +4,11 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelCouchRightWool extends ModelBase { +public class ModelLegacyCouchRightWool extends ModelBase { ModelRenderer Wool1; ModelRenderer Wool2; - public ModelCouchRightWool() { + public ModelLegacyCouchRightWool() { Wool1 = new ModelRenderer(this, 3, 0); Wool1.mirror = true; Wool1.addBox(0F, 0F, 0F, 14, 5, 13); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java index c4c8fb970..15974b322 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java @@ -18,11 +18,8 @@ import org.lwjgl.opengl.GL12; public class BlockCouchWoodRenderer extends BlockRendererInterface{ private final ModelBase model = new ModelCouchWoodMiddle(); - private final ModelBase modelLeft = new ModelCouchWoodLeft(); - private final ModelBase modelRight = new ModelCouchWoodRight(); - private final ModelBase modelCorner = new ModelCouchWoodSingle(); public BlockCouchWoodRenderer(){ diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java index 49fc72d05..bfe226f7d 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java @@ -8,23 +8,31 @@ import net.minecraft.tileentity.TileEntity; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockCouchWool; import noppes.npcs.blocks.tiles.TileCouchWool; +import noppes.npcs.client.model.blocks.couch.*; import noppes.npcs.client.model.blocks.legacy.couch.*; +import noppes.npcs.config.ConfigClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; public class BlockCouchWoolRenderer extends BlockRendererInterface{ - private final ModelBase model = new ModelCouchMiddle(); - private final ModelBase model2 = new ModelCouchMiddleWool(); + private final ModelBase modelCouchLeft = new ModelCouchLeft(); + private final ModelBase modelCouchRight = new ModelCouchRight(); + private final ModelBase modelCouchCorner = new ModelCouchCorner(); + private final ModelBase modelCouch = new ModelCouch(); + private final ModelBase modelCouchSingle = new ModelCouchSingle(); - private final ModelBase modelLeft = new ModelCouchLeft(); - private final ModelBase modelLeft2 = new ModelCouchLeftWool(); + private final ModelBase modelLegacyCouchMiddle = new ModelLegacyCouchMiddle(); + private final ModelBase modelLegacyCouchMiddleWool = new ModelLegacyCouchMiddleWool(); - private final ModelBase modelRight = new ModelCouchRight(); - private final ModelBase modelRight2 = new ModelCouchRightWool(); + private final ModelBase modelLegacyCouchLeft = new ModelLegacyCouchLeft(); + private final ModelBase modelLegacyCouchLeftWool = new ModelLegacyCouchLeftWool(); - private final ModelBase modelCorner = new ModelCouchCorner(); - private final ModelBase modelCorner2 = new ModelCouchCornerWool(); + private final ModelBase modelLegacyCouchRight = new ModelLegacyCouchRight(); + private final ModelBase modelLegacyCouchRightWool = new ModelLegacyCouchRightWool(); + + private final ModelBase modelLegacyCouchCorner = new ModelLegacyCouchCorner(); + private final ModelBase modelLegacyCouchCornerWool = new ModelLegacyCouchCornerWool(); public BlockCouchWoolRenderer(){ ((BlockCouchWool)CustomItems.couchWool).renderId = RenderingRegistry.getNextAvailableRenderId(); @@ -37,41 +45,59 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface{ GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPushMatrix(); GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.5f, (float)var6 + 0.5f); - //GL11.glScalef(0.95f, 0.95f, 0.95f); + //GL11.glS calef(0.95f, 0.95f, 0.95f); GL11.glRotatef(180, 0, 0, 1); GL11.glRotatef(90 * tile.rotation, 0, 1, 0); GL11.glColor3f(1, 1, 1); - setWoodTexture(var1.getBlockMetadata()); - if(tile.hasCornerLeft) - modelCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - else if(tile.hasCornerRight){ - GL11.glRotatef(90, 0, 1, 0); - modelCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + if(false){ + setWoodTexture(var1.getBlockMetadata()); + if(tile.hasCornerLeft) + modelLegacyCouchCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else if(tile.hasCornerRight){ + GL11.glRotatef(90, 0, 1, 0); + modelLegacyCouchCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } + else if(tile.hasLeft && tile.hasRight) + modelLegacyCouchMiddle.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else if(tile.hasLeft) + modelLegacyCouchLeft.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else if(tile.hasRight) + modelLegacyCouchRight.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else + modelLegacyCouchMiddle.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + + this.bindTexture(BlockTallLampRenderer.resourceTop); + float[] color = BlockBannerRenderer.colorTable[tile.color]; + GL11.glColor3f(color[0], color[1], color[2]); + + if(tile.hasCornerLeft || tile.hasCornerRight) + modelLegacyCouchCornerWool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else if(tile.hasLeft && tile.hasRight) + modelLegacyCouchMiddleWool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else if(tile.hasLeft) + modelLegacyCouchLeftWool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else if(tile.hasRight) + modelLegacyCouchRightWool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else + modelLegacyCouchMiddleWool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } else { + setWoodTexture(var1.getBlockMetadata()); + if(tile.hasCornerLeft) + modelCouchCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else if(tile.hasCornerRight){ + GL11.glRotatef(90, 0, 1, 0); + modelCouchCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } + else if(tile.hasLeft && tile.hasRight) + modelCouch.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else if(tile.hasLeft) + modelCouchLeft.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else if(tile.hasRight) + modelCouchRight.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else + modelCouchSingle.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } - else if(tile.hasLeft && tile.hasRight) - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - else if(tile.hasLeft) - modelLeft.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - else if(tile.hasRight) - modelRight.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - else - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - - this.bindTexture(BlockTallLampRenderer.resourceTop); - float[] color = BlockBannerRenderer.colorTable[tile.color]; - GL11.glColor3f(color[0], color[1], color[2]); - - if(tile.hasCornerLeft || tile.hasCornerRight) - modelCorner2.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - else if(tile.hasLeft && tile.hasRight) - model2.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - else if(tile.hasLeft) - modelLeft2.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - else if(tile.hasRight) - modelRight2.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - else - model2.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); GL11.glPopMatrix(); } @@ -87,12 +113,12 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface{ setWoodTexture(metadata); GL11.glColor3f(1, 1, 1); - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + modelLegacyCouchMiddle.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); this.bindTexture(BlockTallLampRenderer.resourceTop); float[] color = BlockBannerRenderer.colorTable[15 - metadata]; GL11.glColor3f(color[0], color[1], color[2]); - model2.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + modelLegacyCouchMiddleWool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); GL11.glPopMatrix(); } diff --git a/src/main/java/noppes/npcs/config/ConfigClient.java b/src/main/java/noppes/npcs/config/ConfigClient.java index 1d522cd84..3916c0d19 100644 --- a/src/main/java/noppes/npcs/config/ConfigClient.java +++ b/src/main/java/noppes/npcs/config/ConfigClient.java @@ -86,6 +86,7 @@ public class ConfigClient public static boolean LegacyBanner = false; public static boolean LegacyChair = false; public static boolean LegacyStool = false; + public static boolean LegacyCouch = false; public static boolean LegacyTable = false; public static boolean LegacyBarrel = false; public static boolean LegacyCarpentryBench = false; @@ -153,6 +154,7 @@ public class ConfigClient LegacyBarrel = config.get(MODEL, "Legacy Barrel Model", false).getBoolean(false); LegacyChair = config.get(MODEL, "Legacy Chair Model", false).getBoolean(false); LegacyStool = config.get(MODEL, "Legacy Stool Model", false).getBoolean(false); + LegacyCouch = config.get(MODEL, "Legacy Couch Model", false).getBoolean(false); LegacyTable = config.get(MODEL, "Legacy Table Model", false).getBoolean(false); LegacyCarpentryBench = config.get(MODEL, "Legacy Carpentry Bench Model", false).getBoolean(false);