diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java b/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java index 69e8754..d1375b4 100644 --- a/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java +++ b/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java @@ -21,31 +21,46 @@ public class RenderShield extends Render { GL11.glTranslated(x, y, z); Tessellator tessellator = Tessellator.instance; GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glPushAttrib(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + float sin1; + float cos1; + + float sin2; + float cos2; + + float hsin1 = 0; + float hcos1 = 1; + + float hsin2; + float hcos2; + for (float h = 0; h < 360; h += 15) { + sin1 = 0; + cos1 = 1; + + hsin2 = MathHelper.sin((float) Math.toRadians(h + 15)); + hcos2 = MathHelper.cos((float) Math.toRadians(h + 15)); + for (float angle = 0; angle < 360; angle += 15) { - float sin1 = (float) Math.sin(Math.toRadians(angle)); - float sin2 = (float) Math.sin(Math.toRadians(angle + 15)); - - float cos1 = (float) Math.cos(Math.toRadians(angle)); - float cos2 = (float) Math.cos(Math.toRadians(angle + 15)); - - float hsin1 = (float) Math.sin(Math.toRadians(h)); - float hsin2 = (float) Math.sin(Math.toRadians(h + 15)); - - float hcos1 = (float) Math.cos(Math.toRadians(h)); - float hcos2 = (float) Math.cos(Math.toRadians(h + 15)); + sin2 = MathHelper.sin((float) Math.toRadians(angle + 15)); + cos2 = MathHelper.cos((float) Math.toRadians(angle + 15)); tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(sin1 * 2 * hcos1, 2 * hsin1, cos1 * 2 * hcos1, 1, 1); - tessellator.addVertexWithUV(sin1 * 2 * hcos2, 2 * hsin2, cos1 * 2 * hcos2, 1, 0); - tessellator.addVertexWithUV(sin2 * 2 * hcos2, 2 * hsin2, cos2 * 2 * hcos2, 0, 0); - tessellator.addVertexWithUV(sin2 * 2 * hcos1, 2 * hsin1, cos2 * 2 * hcos1, 0, 1); + tessellator.addVertexWithUV(sin1 * hcos1, hsin1, cos1 * hcos1, 1, 1); + tessellator.addVertexWithUV(sin1 * hcos2, hsin2, cos1 * hcos2, 1, 0); + tessellator.addVertexWithUV(sin2 * hcos2, hsin2, cos2 * hcos2, 0, 0); + tessellator.addVertexWithUV(sin2 * hcos1, hsin1, cos2 * hcos1, 0, 1); tessellator.draw(); + + sin1 = sin2; + cos1 = cos2; } + + hsin1 = hsin2; + hcos1 = hcos2; } GL11.glPopAttrib(); diff --git a/src/main/java/tombenpotter/emt/common/entities/EntityShield.java b/src/main/java/tombenpotter/emt/common/entities/EntityShield.java index d42e830..408d00e 100644 --- a/src/main/java/tombenpotter/emt/common/entities/EntityShield.java +++ b/src/main/java/tombenpotter/emt/common/entities/EntityShield.java @@ -83,6 +83,11 @@ public class EntityShield extends Entity implements IProjectile { } } } + + @SideOnly(Side.CLIENT) + public int getBrightnessForRender(float p_70070_1_){ + return 240; + } public void applyEntityCollision(Entity entity) { if (entity.riddenByEntity != this && entity.ridingEntity != this) { diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airbottom.png deleted file mode 100644 index 9ddf27c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airbottom.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png deleted file mode 100644 index c8995c7..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/doublesolartop.png deleted file mode 100644 index 797aa00..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/doublesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/solartop.png deleted file mode 100644 index ddf4eb3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/solartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/triplesolartop.png deleted file mode 100644 index efe16f0..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/triplesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkbottom.png deleted file mode 100644 index 9ddf27c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkbottom.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png deleted file mode 100644 index 454852c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/doublesolartop.png deleted file mode 100644 index 797aa00..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/doublesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/solartop.png deleted file mode 100644 index ddf4eb3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/solartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/triplesolartop.png deleted file mode 100644 index efe16f0..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/triplesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/doublesolartop.png deleted file mode 100644 index 797aa00..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/doublesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthbottom.png deleted file mode 100644 index 9ddf27c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthbottom.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png deleted file mode 100644 index a6d05e5..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/solartop.png deleted file mode 100644 index ddf4eb3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/solartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/triplesolartop.png deleted file mode 100644 index efe16f0..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/triplesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/doublesolartop.png deleted file mode 100644 index 797aa00..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/doublesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/firebottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/firebottom.png deleted file mode 100644 index 9ddf27c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/firebottom.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png deleted file mode 100644 index d902d48..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/solartop.png deleted file mode 100644 index ddf4eb3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/solartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/triplesolartop.png deleted file mode 100644 index efe16f0..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/triplesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/doublesolartop.png deleted file mode 100644 index 797aa00..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/doublesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderbottom.png deleted file mode 100644 index 9ddf27c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderbottom.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png deleted file mode 100644 index b3e6582..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/solartop.png deleted file mode 100644 index ddf4eb3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/solartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/triplesolartop.png deleted file mode 100644 index efe16f0..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/triplesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/doublesolartop.png deleted file mode 100644 index 797aa00..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/doublesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/solartop.png deleted file mode 100644 index ddf4eb3..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/solartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/triplesolartop.png deleted file mode 100644 index efe16f0..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/triplesolartop.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterbottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterbottom.png deleted file mode 100644 index 9ddf27c..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterbottom.png and /dev/null differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png deleted file mode 100644 index 77fd802..0000000 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png and /dev/null differ