diff --git a/models/SlantedBelt.png b/models/SlantedBelt.png deleted file mode 100644 index 39bc394af..000000000 Binary files a/models/SlantedBelt.png and /dev/null differ diff --git a/models/Thumbs.db b/models/Thumbs.db new file mode 100644 index 000000000..381b29451 Binary files /dev/null and b/models/Thumbs.db differ diff --git a/resources/assemblyline/textures/Thumbs.db b/resources/assemblyline/textures/Thumbs.db new file mode 100644 index 000000000..3aff9ca51 Binary files /dev/null and b/resources/assemblyline/textures/Thumbs.db differ diff --git a/resources/assemblyline/textures/slantedbelt/Upframe0.png b/resources/assemblyline/textures/slantedbelt/Upframe0.png new file mode 100644 index 000000000..e1e95bf1d Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/Upframe0.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame0.png b/resources/assemblyline/textures/slantedbelt/frame0.png new file mode 100644 index 000000000..4e2551bec Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame0.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame1.png b/resources/assemblyline/textures/slantedbelt/frame1.png new file mode 100644 index 000000000..7cd49121d Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame1.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame10.png b/resources/assemblyline/textures/slantedbelt/frame10.png new file mode 100644 index 000000000..5d86d398d Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame10.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame11.png b/resources/assemblyline/textures/slantedbelt/frame11.png new file mode 100644 index 000000000..15d2474c0 Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame11.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame12.png b/resources/assemblyline/textures/slantedbelt/frame12.png new file mode 100644 index 000000000..c50a1d187 Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame12.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame13.png b/resources/assemblyline/textures/slantedbelt/frame13.png new file mode 100644 index 000000000..3823f4535 Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame13.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame14.png b/resources/assemblyline/textures/slantedbelt/frame14.png new file mode 100644 index 000000000..b95e4289a Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame14.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame15.png b/resources/assemblyline/textures/slantedbelt/frame15.png new file mode 100644 index 000000000..b5319b469 Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame15.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame16.png b/resources/assemblyline/textures/slantedbelt/frame16.png new file mode 100644 index 000000000..afd75372a Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame16.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame17.png b/resources/assemblyline/textures/slantedbelt/frame17.png new file mode 100644 index 000000000..8bd8a32b4 Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame17.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame18.png b/resources/assemblyline/textures/slantedbelt/frame18.png new file mode 100644 index 000000000..0803cab7e Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame18.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame19.png b/resources/assemblyline/textures/slantedbelt/frame19.png new file mode 100644 index 000000000..ef94c7bd5 Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame19.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame2.png b/resources/assemblyline/textures/slantedbelt/frame2.png new file mode 100644 index 000000000..bc8076887 Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame2.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame20.png b/resources/assemblyline/textures/slantedbelt/frame20.png new file mode 100644 index 000000000..300b6d82a Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame20.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame21.png b/resources/assemblyline/textures/slantedbelt/frame21.png new file mode 100644 index 000000000..b8191855e Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame21.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame22.png b/resources/assemblyline/textures/slantedbelt/frame22.png new file mode 100644 index 000000000..c89d9ce32 Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame22.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame23.png b/resources/assemblyline/textures/slantedbelt/frame23.png new file mode 100644 index 000000000..254a9735e Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame23.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame3.png b/resources/assemblyline/textures/slantedbelt/frame3.png new file mode 100644 index 000000000..5ef222837 Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame3.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame4.png b/resources/assemblyline/textures/slantedbelt/frame4.png new file mode 100644 index 000000000..5e25ae677 Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame4.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame5.png b/resources/assemblyline/textures/slantedbelt/frame5.png new file mode 100644 index 000000000..bc6bc6d9e Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame5.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame6.png b/resources/assemblyline/textures/slantedbelt/frame6.png new file mode 100644 index 000000000..9081ae054 Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame6.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame7.png b/resources/assemblyline/textures/slantedbelt/frame7.png new file mode 100644 index 000000000..9072dddc3 Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame7.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame8.png b/resources/assemblyline/textures/slantedbelt/frame8.png new file mode 100644 index 000000000..92c018c35 Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame8.png differ diff --git a/resources/assemblyline/textures/slantedbelt/frame9.png b/resources/assemblyline/textures/slantedbelt/frame9.png new file mode 100644 index 000000000..541e193fe Binary files /dev/null and b/resources/assemblyline/textures/slantedbelt/frame9.png differ diff --git a/src/minecraft/assemblyline/client/render/RenderConveyorBelt.java b/src/minecraft/assemblyline/client/render/RenderConveyorBelt.java index cb28e6e7e..06af259d2 100644 --- a/src/minecraft/assemblyline/client/render/RenderConveyorBelt.java +++ b/src/minecraft/assemblyline/client/render/RenderConveyorBelt.java @@ -31,40 +31,56 @@ public class RenderConveyorBelt extends TileEntitySpecialRenderer int frame = tileEntity.getAnimationFrame(); - switch (face) - { - case 2: - GL11.glRotatef(0f, 0f, 1f, 0f); - break; - case 3: - GL11.glRotatef(180f, 0f, 1f, 0f); - break; - case 4: - GL11.glRotatef(-90f, 0f, 1f, 0f); - break; - case 5: - GL11.glRotatef(90f, 0f, 1f, 0f); - break; - } - if (slantType != null && slantType != SlantType.NONE) { - this.bindTextureByName(AssemblyLine.TEXTURE_PATH + "Grey64.png"); - if (slantType == SlantType.UP) + + switch (face) { - GL11.glRotatef(180f, 0f, 1f, 0f); + case 2: + GL11.glRotatef(180f, 0f, 1f, 0f); + break; + case 3: + GL11.glRotatef(0f, 0f, 1f, 0f); + break; + case 4: + GL11.glRotatef(90f, 0f, 1f, 0f); + break; + case 5: + GL11.glRotatef(-90f, 0f, 1f, 0f); + break; + } + + if (slantType == SlantType.UP) + { + this.bindTextureByName(AssemblyLine.TEXTURE_PATH + "slantedbelt/Upframe0.png"); + //GL11.glRotatef(-90f, 1f, 0f, 0f); model2.render(0.0625F); } else if (slantType == SlantType.DOWN) { - - + this.bindTextureByName(AssemblyLine.TEXTURE_PATH + "slantedbelt/frame"+frame+".png"); + GL11.glRotatef(180f, 0f, 1f, 0f); model2.render(0.0625F); } } else { + switch (face) + { + case 2: + GL11.glRotatef(0f, 0f, 1f, 0f); + break; + case 3: + GL11.glRotatef(180f, 0f, 1f, 0f); + break; + case 4: + GL11.glRotatef(-90f, 0f, 1f, 0f); + break; + case 5: + GL11.glRotatef(90f, 0f, 1f, 0f); + break; + } this.bindTextureByName(AssemblyLine.TEXTURE_PATH + "belt/frame" + frame + ".png"); model.render(0.0625F, (float) Math.toRadians(tileEntity.wheelRotation), tileEntity.getIsLastBelt(), tileEntity.getIsFirstBelt(), false);