diff --git a/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChair.java b/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChair.java new file mode 100644 index 000000000..84bff4eac --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChair.java @@ -0,0 +1,41 @@ +package noppes.npcs.client.model.blocks.chair; + +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 ModelChair extends ModelBase { + private final ModelRenderer bb_main; + + public ModelChair(){ + textureWidth = 64; + textureHeight = 32; + + bb_main = new ModelRenderer(this); + bb_main.setRotationPoint(0.0F, 24.0F, 0.0F); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, 4.0F, -6.0F, 4.0F, 2, 6, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, -6.0F, -6.0F, 4.0F, 2, 6, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, -6.0F, -6.0F, -6.0F, 2, 6, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, 4.0F, -6.0F, -6.0F, 2, 6, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -6.0F, -8.0F, -6.0F, 12, 2, 12, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 8, 17, 4.0F, -20.0F, 4.0F, 2, 12, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 8, 17, -6.0F, -20.0F, 4.0F, 2, 12, 2, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 16, 18, -4.0F, -19.0F, 5.0F, 8, 11, 0, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 16, 8, 5.0F, -4.0F, -4.0F, 0, 2, 8, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 16, 16, -4.0F, -4.0F, -5.0F, 8, 2, 0, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 16, 8, -5.0F, -4.0F, -4.0F, 0, 2, 8, 0.0F)); + bb_main.cubeList.add(new ModelBox(bb_main, 16, 16, -4.0F, -4.0F, 5.0F, 8, 2, 0, 0.0F)); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + bb_main.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/ModelChair.java b/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChairSpoof.java similarity index 93% rename from src/main/java/noppes/npcs/client/model/blocks/ModelChair.java rename to src/main/java/noppes/npcs/client/model/blocks/chair/ModelChairSpoof.java index 6f7f94e46..eccad5767 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelChair.java +++ b/src/main/java/noppes/npcs/client/model/blocks/chair/ModelChairSpoof.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.chair; import net.minecraft.client.model.ModelBase; @@ -6,11 +6,11 @@ import net.minecraft.client.model.ModelBox; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelChair extends ModelBase { +public class ModelChairSpoof extends ModelBase { private final ModelRenderer chairBase; - public ModelChair() { + public ModelChairSpoof() { textureWidth = 64; textureHeight = 32; diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchCorner.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCorner.java similarity index 96% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchCorner.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCorner.java index 36f02c5a5..180c0b15e 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchCorner.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCorner.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -19,35 +19,35 @@ public class ModelCouchCorner extends ModelBase { Leg1 = new ModelRenderer(this, 0, 0); Leg1.addBox(0F, 0F, 0F, 1, 1, 2); Leg1.setRotationPoint(7F, 23F, 6F); - + Leg2 = new ModelRenderer(this, 0, 0); Leg2.addBox(0F, 0F, 0F, 2, 1, 1); Leg2.setRotationPoint(4F, 23F, -8F); - + Leg3 = new ModelRenderer(this, 0, 0); Leg3.addBox(0F, 0F, 0F, 2, 1, 1); Leg3.setRotationPoint(-8F, 23F, -8F); - + Leg4 = new ModelRenderer(this, 0, 0); Leg4.addBox(0F, 0F, 0F, 2, 1, 2); Leg4.setRotationPoint(-8F, 23F, 6F); - + Leg5 = new ModelRenderer(this, 0, 0); Leg5.addBox(0F, 0F, 0F, 1, 1, 2); Leg5.setRotationPoint(7F, 23F, -6F); - + Back = new ModelRenderer(this, 1, 1); Back.addBox(0F, 0F, 0F, 1, 15, 15); Back.setRotationPoint(-8F, 6F, -8F); - + Back2 = new ModelRenderer(this, 14, 15); Back2.addBox(0F, 0F, 0F, 16, 15, 1); Back2.setRotationPoint(-8F, 6F, 7F); - + Bottom = new ModelRenderer(this, 4, 0); Bottom.addBox(0F, 0F, 0F, 16, 2, 14); Bottom.setRotationPoint(-8F, 21F, -6F); - + Bottom2 = new ModelRenderer(this, 0, 0); Bottom2.addBox(0F, 0F, 0F, 14, 2, 2); Bottom2.setRotationPoint(-8F, 21F, -8F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchCornerWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCornerWool.java similarity index 92% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchCornerWool.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCornerWool.java index 69bfaa4d6..a35306c59 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchCornerWool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchCornerWool.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -10,19 +10,19 @@ public class ModelCouchCornerWool extends ModelBase { ModelRenderer Wool3; ModelRenderer Wool4; - public ModelCouchCornerWool() { + public ModelCouchCornerWool() { Wool1 = new ModelRenderer(this, 11, 3); Wool1.addBox(0F, 0F, 0F, 13, 5, 2); Wool1.setRotationPoint(-7F, 16F, -8F); - + Wool2 = new ModelRenderer(this, 2, 4); Wool2.addBox(0F, 0F, 0F, 2, 10, 13); Wool2.setRotationPoint(-7F, 6F, -8F); - + Wool3 = new ModelRenderer(this, 14, 15); Wool3.addBox(0F, 0F, 0F, 15, 10, 2); Wool3.setRotationPoint(-7F, 6F, 5F); - + Wool4 = new ModelRenderer(this, 0, 45); Wool4.addBox(0F, 0F, 0F, 15, 5, 13); Wool4.setRotationPoint(-7F, 16F, -6F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeft.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeft.java similarity index 96% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeft.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeft.java index c07f32051..3deb6a847 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeft.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeft.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -17,27 +17,27 @@ public class ModelCouchLeft extends ModelBase { Leg1 = new ModelRenderer(this, 0, 0); Leg1.addBox(0F, 0F, 0F, 2, 1, 2); Leg1.setRotationPoint(-8F, 23F, 6F); - + Leg2 = new ModelRenderer(this, 0, 0); Leg2.addBox(0F, 0F, 0F, 1, 1, 2); Leg2.setRotationPoint(7F, 23F, -6F); - + Leg3 = new ModelRenderer(this, 0, 0); Leg3.addBox(0F, 0F, 0F, 2, 1, 2); Leg3.setRotationPoint(-8F, 23F, -6F); - + Leg4 = new ModelRenderer(this, 0, 0); Leg4.addBox(0F, 0F, 0F, 1, 1, 2); Leg4.setRotationPoint(7F, 23F, 6F); - + Back = new ModelRenderer(this, 1, 15); Back.addBox(0F, 0F, 0F, 14, 15, 1); Back.setRotationPoint(-6F, 6F, 7F); - + Side = new ModelRenderer(this, 1, 28); Side.addBox(0F, 0F, 0F, 2, 11, 14); Side.setRotationPoint(-8F, 12F, -6F); - + Bottom = new ModelRenderer(this, 3, 1); Bottom.addBox(0F, 0F, 0F, 14, 2, 14); Bottom.setRotationPoint(-6F, 21F, -6F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeftWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeftWool.java similarity index 93% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeftWool.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeftWool.java index 039d843ba..6957a129b 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchLeftWool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchLeftWool.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -12,7 +12,7 @@ public class ModelCouchLeftWool extends ModelBase { Wool1 = new ModelRenderer(this, 3, 0); Wool1.addBox(0F, 0F, 0F, 14, 5, 13); Wool1.setRotationPoint(-6F, 16F, -6F); - + Wool2 = new ModelRenderer(this, 14, 0); Wool2.addBox(0F, 0F, 0F, 14, 10, 2); Wool2.setRotationPoint(-6F, 6F, 5F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddle.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddle.java similarity index 94% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddle.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddle.java index 563b9ff20..15648b0d6 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddle.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddle.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -13,33 +13,33 @@ public class ModelCouchMiddle extends ModelBase ModelRenderer Leg4; ModelRenderer Bottom; ModelRenderer Back; - + public ModelCouchMiddle(){ Leg1 = new ModelRenderer(this, 0, 0); Leg1.addBox(0F, 0F, 0F, 1, 1, 2); Leg1.setRotationPoint(7F, 23F, 6F); - + Leg2 = new ModelRenderer(this, 0, 0); Leg2.addBox(0F, 0F, 0F, 1, 1, 2); Leg2.setRotationPoint(7F, 23F, -6F); - + Leg3 = new ModelRenderer(this, 0, 0); Leg3.addBox(0F, 0F, 0F, 1, 1, 2); Leg3.setRotationPoint(-8F, 23F, -6F); - + Leg4 = new ModelRenderer(this, 0, 0); Leg4.addBox(0F, 0F, 0F, 1, 1, 2); Leg4.setRotationPoint(-8F, 23F, 6F); - + Bottom = new ModelRenderer(this, 2, 0); Bottom.addBox(0F, 0F, 0F, 16, 2, 14); Bottom.setRotationPoint(-8F, 21F, -6F); - + Back = new ModelRenderer(this, 14, 15); Back.addBox(0F, 0F, 0F, 16, 15, 1); Back.setRotationPoint(-8F, 6F, 7F); } - + 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); @@ -50,7 +50,7 @@ public class ModelCouchMiddle extends ModelBase Bottom.render(f5); Back.render(f5); } - + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddleWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddleWool.java similarity index 90% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddleWool.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddleWool.java index 8746975b6..6729a8915 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchMiddleWool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchMiddleWool.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -8,24 +8,24 @@ public class ModelCouchMiddleWool extends ModelBase { ModelRenderer Wool1; ModelRenderer Wool2; - - public ModelCouchMiddleWool(){ + + public ModelCouchMiddleWool(){ Wool1 = new ModelRenderer(this, 3, 0); Wool1.addBox(0F, 0F, 0F, 16, 5, 13); Wool1.setRotationPoint(-8F, 16F, -6F); - + Wool2 = new ModelRenderer(this, 14, 0); Wool2.addBox(0F, 0F, 0F, 16, 10, 2); Wool2.setRotationPoint(-8F, 6F, 5F); } - + 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); Wool1.render(f5); Wool2.render(f5); } - + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchRight.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRight.java similarity index 96% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchRight.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRight.java index 33f96e40c..517ebc831 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchRight.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRight.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -18,29 +18,29 @@ public class ModelCouchRight extends ModelBase { Leg1 = new ModelRenderer(this, 0, 0); Leg1.addBox(0F, 0F, 0F, 2, 1, 2); Leg1.setRotationPoint(6F, 23F, 6F); - + Leg2 = new ModelRenderer(this, 0, 0); Leg2.addBox(0F, 0F, 0F, 1, 1, 2); Leg2.setRotationPoint(-8F, 23F, -6F); - + Leg3 = new ModelRenderer(this, 0, 0); Leg3.addBox(0F, 0F, 0F, 2, 1, 2); Leg3.setRotationPoint(6F, 23F, -6F); - + Leg4 = new ModelRenderer(this, 0, 0); Leg4.addBox(0F, 0F, 0F, 1, 1, 2); Leg4.setRotationPoint(-8F, 23F, 6F); - + Back = new ModelRenderer(this, 1, 15); Back.mirror = true; Back.addBox(0F, 0F, 0F, 14, 15, 1); Back.setRotationPoint(-8F, 6F, 7F); - + Bottom = new ModelRenderer(this, 3, 1); Bottom.mirror = true; Bottom.addBox(0F, 0F, 0F, 14, 2, 14); Bottom.setRotationPoint(-8F, 21F, -6F); - + Side = new ModelRenderer(this, 1, 28); Side.mirror = true; Side.addBox(0F, 0F, 0F, 2, 11, 14); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchRightWool.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRightWool.java similarity index 94% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchRightWool.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRightWool.java index ae9617417..62ecdb8da 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchRightWool.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchRightWool.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -13,7 +13,7 @@ public class ModelCouchRightWool extends ModelBase { Wool1.mirror = true; Wool1.addBox(0F, 0F, 0F, 14, 5, 13); Wool1.setRotationPoint(-8F, 16F, -6F); - + Wool2 = new ModelRenderer(this, 14, 0); Wool2.mirror = true; Wool2.addBox(0F, 0F, 0F, 14, 10, 2); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodLeft.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodLeft.java similarity index 97% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodLeft.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodLeft.java index 227e40c22..5d889b3b3 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodLeft.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodLeft.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -29,77 +29,77 @@ public class ModelCouchWoodLeft extends ModelBase { Shape1.mirror = true; Shape1.addBox(0F, 0F, 0F, 2, 3, 10); Shape1.setRotationPoint(-8F, 18F, -4F); - + Shape2 = new ModelRenderer(this, 0, 0); Shape2.addBox(0F, 0F, 0F, 1, 3, 2); Shape2.setRotationPoint(7F, 21F, -6F); - + Shape3 = new ModelRenderer(this, 0, 0); Shape3.mirror = true; Shape3.addBox(0F, 0F, 0F, 2, 4, 1); Shape3.setRotationPoint(-8F, 14F, 0.5F); - + Shape4 = new ModelRenderer(this, 0, 0); Shape4.mirror = true; Shape4.addBox(0F, 0F, 0F, 14, 2, 1); Shape4.setRotationPoint(-6F, 7F, 7F); - + Shape5 = new ModelRenderer(this, 0, 0); Shape5.mirror = true; Shape5.addBox(0F, 0F, 0F, 14, 2, 2); Shape5.setRotationPoint(-6F, 19F, 6F); - + Shape6 = new ModelRenderer(this, 0, 0); Shape6.mirror = true; Shape6.addBox(0F, 0F, 0F, 2, 1, 13); Shape6.setRotationPoint(-8F, 13F, -7F); - + Shape7 = new ModelRenderer(this, 0, 0); Shape7.addBox(0F, 0F, 0F, 1, 1, 10); Shape7.setRotationPoint(-6F, 19F, -4F); - + Shape8 = new ModelRenderer(this, 0, 0); Shape8.addBox(0F, 0F, 0F, 1, 3, 2); Shape8.setRotationPoint(7F, 21F, 6F); - + Shape9 = new ModelRenderer(this, 0, 0); Shape9.addBox(0F, 0F, 0F, 2, 1, 10); Shape9.setRotationPoint(5F, 19F, -4F); - + Shape10 = new ModelRenderer(this, 0, 0); Shape10.addBox(0F, 0F, 0F, 1, 10, 1); Shape10.setRotationPoint(-6F, 9F, 7F); - + Shape11 = new ModelRenderer(this, 0, 0); Shape11.mirror = true; Shape11.addBox(0F, 0F, 0F, 14, 2, 2); Shape11.setRotationPoint(-6F, 19F, -6F); - + Shape12 = new ModelRenderer(this, 0, 0); Shape12.addBox(0F, 0F, 0F, 2, 1, 10); Shape12.setRotationPoint(-3F, 19F, -4F); - + Shape13 = new ModelRenderer(this, 0, 0); Shape13.addBox(0F, 0F, 0F, 2, 1, 10); Shape13.setRotationPoint(1F, 19F, -4F); - + Shape14 = new ModelRenderer(this, 0, 0); Shape14.addBox(0F, 0F, 0F, 2, 10, 1); Shape14.setRotationPoint(-3F, 9F, 7F); - + Shape15 = new ModelRenderer(this, 0, 0); Shape15.addBox(0F, 0F, 0F, 2, 10, 1); Shape15.setRotationPoint(1F, 9F, 7F); - + Shape16 = new ModelRenderer(this, 0, 0); Shape16.addBox(0F, 0F, 0F, 2, 10, 1); Shape16.setRotationPoint(5F, 9F, 7F); - + Shape17 = new ModelRenderer(this, 0, 0); Shape17.mirror = true; Shape17.addBox(0F, 0F, 0F, 2, 10, 2); Shape17.setRotationPoint(-8F, 14F, -6F); - + Shape18 = new ModelRenderer(this, 0, 0); Shape18.mirror = true; Shape18.addBox(0F, 0F, 0F, 2, 18, 2); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodMiddle.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodMiddle.java similarity index 98% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodMiddle.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodMiddle.java index 5248f938a..f59932b83 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodMiddle.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodMiddle.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -26,7 +26,7 @@ public class ModelCouchWoodMiddle extends ModelBase { Shape2 = new ModelRenderer(this, 0, 0); Shape2.addBox(0F, 0F, 0F, 1, 3, 2); Shape2.setRotationPoint(-8F, 21F, -6F); - + Shape4 = new ModelRenderer(this, 0, 0); Shape4.addBox(0F, 0F, 0F, 16, 2, 1); Shape4.setRotationPoint(-8F, 7F, 7F); diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodRight.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodRight.java similarity index 98% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodRight.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodRight.java index 5819b2ada..951af09c2 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodRight.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodRight.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodSingle.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodSingle.java similarity index 98% rename from src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodSingle.java rename to src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodSingle.java index 7023ba6b1..f43549102 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelCouchWoodSingle.java +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/couch/ModelCouchWoodSingle.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.model.blocks; +package noppes.npcs.client.model.blocks.legacy.couch; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -33,30 +33,30 @@ public class ModelCouchWoodSingle extends ModelBase { Shape1.mirror = true; Shape1.addBox(0F, 0F, 0F, 2, 3, 10); Shape1.setRotationPoint(-8F, 18F, -4F); - + Shape2 = new ModelRenderer(this, 0, 0); Shape2.mirror = true; Shape2.addBox(0F, 0F, 0F, 2, 10, 2); Shape2.setRotationPoint(-8F, 14F, -6F); - + Shape3 = new ModelRenderer(this, 0, 0); Shape3.mirror = true; Shape3.addBox(0F, 0F, 0F, 2, 4, 1); Shape3.setRotationPoint(-8F, 14F, 0.5F); - + Shape4 = new ModelRenderer(this, 0, 0); Shape4.addBox(0F, 0F, 0F, 12, 2, 1); Shape4.setRotationPoint(-6F, 7F, 7F); - + Shape5 = new ModelRenderer(this, 0, 0); Shape5.addBox(0F, 0F, 0F, 12, 2, 2); Shape5.setRotationPoint(-6F, 19F, 6F); - + Shape6 = new ModelRenderer(this, 0, 0); Shape6.mirror = true; Shape6.addBox(0F, 0F, 0F, 2, 1, 13); Shape6.setRotationPoint(-8F, 13F, -7F); - + Shape7 = new ModelRenderer(this, 0, 0); Shape7.addBox(0F, 0F, 0F, 1, 1, 10); Shape7.setRotationPoint(-6F, 19F, -4F); @@ -109,11 +109,11 @@ public class ModelCouchWoodSingle extends ModelBase { Shape19 = new ModelRenderer(this, 0, 0); Shape19.addBox(0F, 0F, 0F, 2, 10, 2); Shape19.setRotationPoint(6F, 14F, -6F); - + Shape20 = new ModelRenderer(this, 0, 0); Shape20.addBox(0F, 0F, 0F, 2, 3, 10); Shape20.setRotationPoint(6F, 18F, -4F); - + Shape21 = new ModelRenderer(this, 0, 0); Shape21.addBox(0F, 0F, 0F, 2, 4, 1); Shape21.setRotationPoint(6F, 14F, 0.5F); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java index 86ff10676..b394ba01b 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockChairRenderer.java @@ -2,12 +2,16 @@ package noppes.npcs.client.renderer.blocks; import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockChair; import noppes.npcs.blocks.tiles.TileColorable; -import noppes.npcs.client.model.blocks.ModelChair; +import noppes.npcs.client.model.blocks.chair.ModelChair; +import noppes.npcs.client.model.blocks.chair.ModelChairSpoof; import noppes.npcs.client.model.blocks.legacy.ModelLegacyChair; import noppes.npcs.config.ConfigClient; import org.lwjgl.opengl.GL11; @@ -16,7 +20,16 @@ import org.lwjgl.opengl.GL12; public class BlockChairRenderer extends BlockRendererInterface{ private final ModelLegacyChair legacyModel = new ModelLegacyChair(); - private final ModelChair model = new ModelChair(); + + private final ModelChairSpoof chairSpoof = new ModelChairSpoof(); + private final ModelChair chair = new ModelChair(); + + private static final ResourceLocation oak = new ResourceLocation("customnpcs","textures/models/chair/oak.png"); + private static final ResourceLocation spruce = new ResourceLocation("customnpcs","textures/models/chair/spruce.png"); + private static final ResourceLocation birch = new ResourceLocation("customnpcs","textures/models/chair/birch.png"); + private static final ResourceLocation jungle = new ResourceLocation("customnpcs","textures/models/chair/jungle.png"); + private static final ResourceLocation dark_oak = new ResourceLocation("customnpcs","textures/models/chair/dark_oak.png"); + private static final ResourceLocation acacia = new ResourceLocation("customnpcs","textures/models/chair/acacia.png"); public BlockChairRenderer(){ ((BlockChair)CustomItems.chair).renderId = RenderingRegistry.getNextAvailableRenderId(); @@ -28,7 +41,7 @@ public class BlockChairRenderer extends BlockRendererInterface{ TileColorable tile = (TileColorable) var1; GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPushMatrix(); - GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.68f, (float)var6 + 0.5f); + GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.65f, (float)var6 + 0.5f); GL11.glScalef(1.2f, 1.1f, 1.2f); GL11.glRotatef(180, 0, 0, 1); GL11.glRotatef(90 * tile.rotation, 0, 1, 0); @@ -38,8 +51,14 @@ public class BlockChairRenderer extends BlockRendererInterface{ setWoodTexture(var1.getBlockMetadata()); if(ConfigClient.LegacyChair) legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - else - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else { + if(ConfigClient.WoodTextures) + chairSpoof.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else { + setChairTexture(var1.getBlockMetadata()); + chair.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } + } GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glPopMatrix(); @@ -58,11 +77,32 @@ public class BlockChairRenderer extends BlockRendererInterface{ GL11.glColor3f(1, 1, 1); if(ConfigClient.LegacyChair) legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - else - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else { + if(ConfigClient.WoodTextures) + chairSpoof.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + else { + setChairTexture(metadata); + chair.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } + } GL11.glPopMatrix(); } + public void setChairTexture(int meta){ + TextureManager manager = Minecraft.getMinecraft().getTextureManager(); + if(meta == 1) + manager.bindTexture(spruce); + else if(meta == 2) + manager.bindTexture(birch); + else if(meta == 3) + manager.bindTexture(jungle); + else if(meta == 4) + manager.bindTexture(acacia); + else if(meta == 5) + manager.bindTexture(dark_oak); + else + manager.bindTexture(oak); + } @Override 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 f2cd94a0c..c4c8fb970 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoodRenderer.java @@ -8,10 +8,10 @@ import net.minecraft.tileentity.TileEntity; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockCouchWood; import noppes.npcs.blocks.tiles.TileCouchWood; -import noppes.npcs.client.model.blocks.ModelCouchWoodLeft; -import noppes.npcs.client.model.blocks.ModelCouchWoodMiddle; -import noppes.npcs.client.model.blocks.ModelCouchWoodRight; -import noppes.npcs.client.model.blocks.ModelCouchWoodSingle; +import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodLeft; +import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodMiddle; +import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodRight; +import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodSingle; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -24,7 +24,7 @@ public class BlockCouchWoodRenderer extends BlockRendererInterface{ private final ModelBase modelRight = new ModelCouchWoodRight(); private final ModelBase modelCorner = new ModelCouchWoodSingle(); - + public BlockCouchWoodRenderer(){ ((BlockCouchWood)CustomItems.couchWood).renderId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(this); @@ -40,7 +40,7 @@ public class BlockCouchWoodRenderer extends BlockRendererInterface{ GL11.glRotatef(180, 0, 0, 1); GL11.glRotatef(90 * tile.rotation, 0, 1, 0); GL11.glColor3f(1, 1, 1); - + setWoodTexture(var1.getBlockMetadata()); if(tile.hasLeft && tile.hasRight) model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); @@ -66,7 +66,7 @@ public class BlockCouchWoodRenderer extends BlockRendererInterface{ setWoodTexture(metadata); GL11.glColor3f(1, 1, 1); modelCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); - + GL11.glPopMatrix(); } 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 6c75e9d38..49fc72d05 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java @@ -8,7 +8,7 @@ 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.*; +import noppes.npcs.client.model.blocks.legacy.couch.*; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -25,7 +25,7 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface{ private final ModelBase modelCorner = new ModelCouchCorner(); private final ModelBase modelCorner2 = new ModelCouchCornerWool(); - + public BlockCouchWoolRenderer(){ ((BlockCouchWool)CustomItems.couchWool).renderId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(this); @@ -41,7 +41,7 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface{ 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); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java index 2f203ea3f..97cc97b64 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockRendererInterface.java @@ -108,22 +108,6 @@ public abstract class BlockRendererInterface extends TileEntitySpecialRenderer i manager.bindTexture(PlanksOak); } - public void setDefaultWoodTexture(int meta){ - TextureManager manager = Minecraft.getMinecraft().getTextureManager(); - if(meta == 1) - manager.bindTexture(PlanksSpruce); - else if(meta == 2) - manager.bindTexture(PlanksBirch); - else if(meta == 3) - manager.bindTexture(PlanksJungle); - else if(meta == 4) - manager.bindTexture(PlanksAcacia); - else if(meta == 5) - manager.bindTexture(PlanksBigOak); - else - manager.bindTexture(PlanksOak); - } - public static void setMaterialTexture(int meta){ TextureManager manager = Minecraft.getMinecraft().getTextureManager(); if(meta == 1) diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java index 32ea1655c..3775a35d3 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockStoolRenderer.java @@ -21,7 +21,12 @@ public class BlockStoolRenderer extends BlockRendererInterface{ private final ModelLegacyStool legacyStool = new ModelLegacyStool(); private final ModelStool stool = new ModelStool(); - protected static final ResourceLocation oak = new ResourceLocation("customnpcs","textures/models/stool/oak.png"); + private static final ResourceLocation oak = new ResourceLocation("customnpcs","textures/models/stool/oak.png"); + private static final ResourceLocation spruce = new ResourceLocation("customnpcs","textures/models/stool/spruce.png"); + private static final ResourceLocation birch = new ResourceLocation("customnpcs","textures/models/stool/birch.png"); + private static final ResourceLocation jungle = new ResourceLocation("customnpcs","textures/models/stool/jungle.png"); + private static final ResourceLocation dark_oak = new ResourceLocation("customnpcs","textures/models/stool/dark_oak.png"); + private static final ResourceLocation acacia = new ResourceLocation("customnpcs","textures/models/stool/acacia.png"); public BlockStoolRenderer(){ ((BlockStool)CustomItems.stool).renderId = RenderingRegistry.getNextAvailableRenderId(); @@ -33,7 +38,7 @@ public class BlockStoolRenderer extends BlockRendererInterface{ TileColorable tile = (TileColorable) var1; GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPushMatrix(); - GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.68f, (float)var6 + 0.5f); + GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.65f, (float)var6 + 0.5f); GL11.glScalef(1.2f, 1.1f, 1.2f); GL11.glRotatef(180, 0, 0, 1); GL11.glColor3f(1, 1, 1); @@ -83,15 +88,15 @@ public class BlockStoolRenderer extends BlockRendererInterface{ public void setStoolTexture(int meta){ TextureManager manager = Minecraft.getMinecraft().getTextureManager(); if(meta == 1) - manager.bindTexture(oak); + manager.bindTexture(spruce); else if(meta == 2) - manager.bindTexture(oak); + manager.bindTexture(birch); else if(meta == 3) - manager.bindTexture(oak); + manager.bindTexture(jungle); else if(meta == 4) - manager.bindTexture(oak); + manager.bindTexture(acacia); else if(meta == 5) - manager.bindTexture(oak); + manager.bindTexture(dark_oak); else manager.bindTexture(oak); } diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/acacia.png b/src/main/resources/assets/customnpcs/textures/models/chair/acacia.png new file mode 100644 index 000000000..65e9fa940 Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/chair/acacia.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/birch.png b/src/main/resources/assets/customnpcs/textures/models/chair/birch.png new file mode 100644 index 000000000..cc108d174 Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/chair/birch.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/dark_oak.png b/src/main/resources/assets/customnpcs/textures/models/chair/dark_oak.png new file mode 100644 index 000000000..cf6c641d2 Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/chair/dark_oak.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/jungle.png b/src/main/resources/assets/customnpcs/textures/models/chair/jungle.png new file mode 100644 index 000000000..40dda68db Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/chair/jungle.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/oak.png b/src/main/resources/assets/customnpcs/textures/models/chair/oak.png new file mode 100644 index 000000000..97099c7dc Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/chair/oak.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/chair/spruce.png b/src/main/resources/assets/customnpcs/textures/models/chair/spruce.png new file mode 100644 index 000000000..ae8753c7f Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/chair/spruce.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/acacia.png b/src/main/resources/assets/customnpcs/textures/models/stool/acacia.png new file mode 100644 index 000000000..7aa0dcbe2 Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/stool/acacia.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/birch.png b/src/main/resources/assets/customnpcs/textures/models/stool/birch.png new file mode 100644 index 000000000..bb79c657d Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/stool/birch.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/dark_oak.png b/src/main/resources/assets/customnpcs/textures/models/stool/dark_oak.png new file mode 100644 index 000000000..8546647c0 Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/stool/dark_oak.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/jungle.png b/src/main/resources/assets/customnpcs/textures/models/stool/jungle.png new file mode 100644 index 000000000..4ba3ed52d Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/stool/jungle.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/oak.png b/src/main/resources/assets/customnpcs/textures/models/stool/oak.png index a26851f00..f14d9cd0d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/models/stool/oak.png and b/src/main/resources/assets/customnpcs/textures/models/stool/oak.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/stool/spruce.png b/src/main/resources/assets/customnpcs/textures/models/stool/spruce.png new file mode 100644 index 000000000..620ebddea Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/models/stool/spruce.png differ