diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelTable.java b/src/main/java/noppes/npcs/client/model/blocks/ModelTable.java index e44916856..f29345807 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelTable.java +++ b/src/main/java/noppes/npcs/client/model/blocks/ModelTable.java @@ -6,77 +6,77 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelTable extends ModelBase { - public final ModelRenderer Shape1; - private final ModelRenderer cube_r1; - private final ModelRenderer cube_r2; public final ModelRenderer Shape3; public final ModelRenderer Shape4; - private final ModelRenderer cube_r3; - public final ModelRenderer Shape2; - private final ModelRenderer cube_r4; + private final ModelRenderer cube_r1; + public final ModelRenderer Shape1; + private final ModelRenderer cube_r2; + private final ModelRenderer cube_r3; + public final ModelRenderer Shape5; + private final ModelRenderer cube_r4; public final ModelRenderer Table; - public ModelTable() { - textureWidth = 64; - textureHeight = 64; + public ModelTable() { + textureWidth = 64; + textureHeight = 32; - Shape1 = new ModelRenderer(this); - Shape1.setRotationPoint(-4.8333F, 14.8333F, 4.8333F); - Shape1.cubeList.add(new ModelBox(Shape1, 0, 19, -2.1667F, -3.8333F, 0.1667F, 2, 13, 2, 0.0F)); + Shape3 = new ModelRenderer(this); + Shape3.setRotationPoint(-6.0F, 24.0F, 6.0F); + Shape3.cubeList.add(new ModelBox(Shape3, 8, 19, 6.0F, -13.0F, -12.0F, 5, 5, 0, 0.0F)); + Shape3.cubeList.add(new ModelBox(Shape3, 0, 0, 11.0F, -13.0F, -13.0F, 2, 13, 2, 0.0F)); + Shape3.cubeList.add(new ModelBox(Shape3, 8, 14, 12.0F, -13.0F, -11.0F, 0, 5, 5, 0.0F)); - cube_r1 = new ModelRenderer(this); - cube_r1.setRotationPoint(-1.1667F, -1.3333F, -2.3333F); - Shape1.addChild(cube_r1); - setRotationAngle(cube_r1, 0.0F, 3.1416F, 0.0F); - cube_r1.cubeList.add(new ModelBox(cube_r1, 8, 14, 0.0F, -2.5F, -2.5F, 0, 5, 5, 0.0F)); + Shape4 = new ModelRenderer(this); + Shape4.setRotationPoint(-6.0F, 24.0F, 6.0F); + Shape4.cubeList.add(new ModelBox(Shape4, 8, 19, 6.0F, -13.0F, 0.0F, 5, 5, 0, 0.0F)); + Shape4.cubeList.add(new ModelBox(Shape4, 0, 0, 11.0F, -13.0F, -1.0F, 2, 13, 2, 0.0F)); - cube_r2 = new ModelRenderer(this); - cube_r2.setRotationPoint(2.3333F, -1.3333F, 1.1667F); - Shape1.addChild(cube_r2); - setRotationAngle(cube_r2, 0.0F, 3.1416F, 0.0F); - cube_r2.cubeList.add(new ModelBox(cube_r2, 8, 19, -2.5F, -2.5F, 0.0F, 5, 5, 0, 0.0F)); + cube_r1 = new ModelRenderer(this); + cube_r1.setRotationPoint(12.0F, -10.5F, -3.5F); + Shape4.addChild(cube_r1); + setRotationAngle(cube_r1, 0.0F, 3.1416F, 0.0F); + cube_r1.cubeList.add(new ModelBox(cube_r1, 8, 14, 0.0F, -2.5F, -2.5F, 0, 5, 5, 0.0F)); - Shape3 = new ModelRenderer(this); - Shape3.setRotationPoint(-6.0F, 24.0F, 6.0F); - Shape3.cubeList.add(new ModelBox(Shape3, 8, 19, 6.0F, -13.0F, -12.0F, 5, 5, 0, 0.0F)); - Shape3.cubeList.add(new ModelBox(Shape3, 0, 19, 11.0F, -13.0F, -13.0F, 2, 13, 2, 0.0F)); - Shape3.cubeList.add(new ModelBox(Shape3, 8, 14, 12.0F, -13.0F, -11.0F, 0, 5, 5, 0.0F)); + Shape1 = new ModelRenderer(this); + Shape1.setRotationPoint(-6.0F, 24.0F, 6.0F); + Shape1.cubeList.add(new ModelBox(Shape1, 0, 0, -1.0F, -13.0F, -1.0F, 2, 13, 2, 0.0F)); - Shape4 = new ModelRenderer(this); - Shape4.setRotationPoint(-6.0F, 24.0F, 6.0F); - Shape4.cubeList.add(new ModelBox(Shape4, 8, 19, 6.0F, -13.0F, 0.0F, 5, 5, 0, 0.0F)); - Shape4.cubeList.add(new ModelBox(Shape4, 0, 19, 11.0F, -13.0F, -1.0F, 2, 13, 2, 0.0F)); + cube_r2 = new ModelRenderer(this); + cube_r2.setRotationPoint(0.0F, -10.5F, -3.5F); + Shape1.addChild(cube_r2); + setRotationAngle(cube_r2, 0.0F, 3.1416F, 0.0F); + cube_r2.cubeList.add(new ModelBox(cube_r2, 8, 14, 0.0F, -2.5F, -2.5F, 0, 5, 5, 0.0F)); - cube_r3 = new ModelRenderer(this); - cube_r3.setRotationPoint(12.0F, -10.5F, -3.5F); - Shape4.addChild(cube_r3); - setRotationAngle(cube_r3, 0.0F, 3.1416F, 0.0F); - cube_r3.cubeList.add(new ModelBox(cube_r3, 8, 14, 0.0F, -2.5F, -2.5F, 0, 5, 5, 0.0F)); + cube_r3 = new ModelRenderer(this); + cube_r3.setRotationPoint(3.5F, -10.5F, 0.0F); + Shape1.addChild(cube_r3); + setRotationAngle(cube_r3, 0.0F, 3.1416F, 0.0F); + cube_r3.cubeList.add(new ModelBox(cube_r3, 8, 19, -2.5F, -2.5F, 0.0F, 5, 5, 0, 0.0F)); - Shape2 = new ModelRenderer(this); - Shape2.setRotationPoint(0.0F, 24.0F, 6.0F); - Shape2.cubeList.add(new ModelBox(Shape2, 0, 19, -7.0F, -13.0F, -13.0F, 2, 13, 2, 0.0F)); - Shape2.cubeList.add(new ModelBox(Shape2, 8, 14, -6.0F, -13.0F, -11.0F, 0, 5, 5, 0.0F)); + Shape5 = new ModelRenderer(this); + Shape5.setRotationPoint(-6.0F, 24.0F, 6.0F); + Shape5.cubeList.add(new ModelBox(Shape5, 0, 0, -1.0F, -13.0F, -13.0F, 2, 13, 2, 0.0F)); + Shape5.cubeList.add(new ModelBox(Shape5, 8, 14, 0.0F, -13.0F, -11.0F, 0, 5, 5, 0.0F)); - cube_r4 = new ModelRenderer(this); - cube_r4.setRotationPoint(-2.5F, -10.5F, -12.0F); - Shape2.addChild(cube_r4); - setRotationAngle(cube_r4, 0.0F, 3.1416F, 0.0F); - cube_r4.cubeList.add(new ModelBox(cube_r4, 8, 19, -2.5F, -2.5F, 0.0F, 5, 5, 0, 0.0F)); + cube_r4 = new ModelRenderer(this); + cube_r4.setRotationPoint(3.5F, -10.5F, -12.0F); + Shape5.addChild(cube_r4); + setRotationAngle(cube_r4, 0.0F, 3.1416F, 0.0F); + cube_r4.cubeList.add(new ModelBox(cube_r4, 8, 19, -2.5F, -2.5F, 0.0F, 5, 5, 0, 0.0F)); - Table = new ModelRenderer(this); - Table.setRotationPoint(0.0F, 24.0F, 6.0F); - Table.cubeList.add(new ModelBox(Table, 0, 0, -8.0F, -16.0F, -14.0F, 16, 3, 16, 0.0F)); - } + Table = new ModelRenderer(this); + Table.setRotationPoint(-6.0F, 24.0F, 6.0F); + Table.cubeList.add(new ModelBox(Table, 0, 0, -2.0F, -16.0F, -14.0F, 16, 3, 16, 0.0F)); + } - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + @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); + Shape3.render(f5); + Shape4.render(f5); Shape1.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape2.render(f5); - } + Shape5.render(f5); + } public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { modelRenderer.rotateAngleX = x; diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java index 9cc53b0da..1d958196f 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java @@ -45,15 +45,10 @@ public class BlockTableRenderer extends BlockRendererInterface{ boolean east = var1.getWorldObj().getBlock(var1.xCoord, var1.yCoord, var1.zCoord + 1) == CustomItems.table; boolean west = var1.getWorldObj().getBlock(var1.xCoord, var1.yCoord, var1.zCoord - 1) == CustomItems.table; - legacyTable.Shape1.showModel = !south && !east; - legacyTable.Shape3.showModel = !north && !west; - legacyTable.Shape4.showModel = !north && !east; - legacyTable.Shape5.showModel = !south && !west; - - table.Shape1.showModel = !south && !east; - table.Shape2.showModel = !south && !west; - table.Shape3.showModel = !north && !west; - table.Shape4.showModel = !north && !east; + legacyTable.Shape1.showModel = table.Shape1.showModel = !south && !east; + legacyTable.Shape3.showModel = table.Shape3.showModel = !north && !west; + legacyTable.Shape4.showModel = table.Shape4.showModel = !north && !east; + legacyTable.Shape5.showModel = table.Shape5.showModel = !south && !west; if(ConfigClient.LegacyTable){ setWoodTexture(var1.getBlockMetadata()); @@ -94,9 +89,9 @@ public class BlockTableRenderer extends BlockRendererInterface{ GL11.glColor3f(1, 1, 1); table.Table.render(0.0625f); table.Shape1.showModel = true; - table.Shape2.showModel = true; table.Shape3.showModel = true; table.Shape4.showModel = true; + table.Shape5.showModel = true; table.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } diff --git a/src/main/resources/assets/customnpcs/textures/models/table/acacia.png b/src/main/resources/assets/customnpcs/textures/models/table/acacia.png index ae87e7dbc..98067a527 100644 Binary files a/src/main/resources/assets/customnpcs/textures/models/table/acacia.png and b/src/main/resources/assets/customnpcs/textures/models/table/acacia.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/table/birch.png b/src/main/resources/assets/customnpcs/textures/models/table/birch.png index dea734bcb..28deda1e1 100644 Binary files a/src/main/resources/assets/customnpcs/textures/models/table/birch.png and b/src/main/resources/assets/customnpcs/textures/models/table/birch.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/table/dark_oak.png b/src/main/resources/assets/customnpcs/textures/models/table/dark_oak.png index 2ffc8f5f6..9a659284f 100644 Binary files a/src/main/resources/assets/customnpcs/textures/models/table/dark_oak.png and b/src/main/resources/assets/customnpcs/textures/models/table/dark_oak.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/table/jungle.png b/src/main/resources/assets/customnpcs/textures/models/table/jungle.png index c1a2c1420..73b7d05ff 100644 Binary files a/src/main/resources/assets/customnpcs/textures/models/table/jungle.png and b/src/main/resources/assets/customnpcs/textures/models/table/jungle.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/table/oak.png b/src/main/resources/assets/customnpcs/textures/models/table/oak.png index d087fc65c..5eb5728d5 100644 Binary files a/src/main/resources/assets/customnpcs/textures/models/table/oak.png and b/src/main/resources/assets/customnpcs/textures/models/table/oak.png differ diff --git a/src/main/resources/assets/customnpcs/textures/models/table/spruce.png b/src/main/resources/assets/customnpcs/textures/models/table/spruce.png index 40607b4d1..70e52c958 100644 Binary files a/src/main/resources/assets/customnpcs/textures/models/table/spruce.png and b/src/main/resources/assets/customnpcs/textures/models/table/spruce.png differ