diff --git a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java index 78ae79685..a41c5c6af 100644 --- a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java @@ -24,7 +24,17 @@ public class BasicRenderingHandler implements ISimpleBlockRenderingHandler if(block == Mekanism.BasicBlock || block == Mekanism.BasicBlock2) { + if(block == Mekanism.BasicBlock && metadata == 10) + { + MekanismRenderer.blendOn(); + } + MekanismRenderer.renderItem(renderer, metadata, block); + + if(block == Mekanism.BasicBlock && metadata == 10) + { + MekanismRenderer.blendOff(); + } } GL11.glPopMatrix(); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java index fab5006ee..de2980387 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java @@ -1,6 +1,7 @@ package mekanism.client.render.tileentity; import mekanism.client.model.ModelSeismicVibrator; +import mekanism.common.Mekanism; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -28,7 +29,7 @@ public class RenderSeismicVibrator extends TileEntitySpecialRenderer GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator" + (tileEntity.isActive ? "On" : "") + ".png")); switch(tileEntity.facing) { @@ -38,20 +39,23 @@ public class RenderSeismicVibrator extends TileEntitySpecialRenderer case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; } - float rate = 0.01F; - - if(!tileEntity.getActive() && tileEntity.clientPiston > 0) + if(!Mekanism.proxy.isPaused()) { - if(tileEntity.clientPiston < 1) - { - tileEntity.clientPiston = 1 + (1-tileEntity.clientPiston); - } + float rate = 0.01F; - tileEntity.clientPiston = Math.min(2, tileEntity.clientPiston+rate)%2; - } - else if(tileEntity.getActive()) - { - tileEntity.clientPiston = Math.min(2, tileEntity.clientPiston+rate)%2; + if(!tileEntity.getActive() && tileEntity.clientPiston > 0) + { + if(tileEntity.clientPiston < 1) + { + tileEntity.clientPiston = 1 + (1-tileEntity.clientPiston); + } + + tileEntity.clientPiston = Math.min(2, tileEntity.clientPiston+rate)%2; + } + else if(tileEntity.getActive()) + { + tileEntity.clientPiston = Math.min(2, tileEntity.clientPiston+rate)%2; + } } float actualRate = tileEntity.clientPiston < 1 ? tileEntity.clientPiston : 2-tileEntity.clientPiston; diff --git a/src/main/java/mekanism/common/ConnectedTextureRenderer.java b/src/main/java/mekanism/common/ConnectedTextureRenderer.java index d8e930feb..251471ae8 100644 --- a/src/main/java/mekanism/common/ConnectedTextureRenderer.java +++ b/src/main/java/mekanism/common/ConnectedTextureRenderer.java @@ -23,10 +23,10 @@ public class ConnectedTextureRenderer public Map glassMap = new HashMap(); - public ConnectedTextureRenderer(String title, Block block, int meta) + public ConnectedTextureRenderer(String title, Block b, int meta) { iconTitle = title; - this.block = block; + block = b; metadata = meta; } @@ -111,10 +111,10 @@ public class ConnectedTextureRenderer private boolean canConnect(IBlockAccess access, Coord4D obj, int side, int face) { - Coord4D block = obj.getFromSide(ForgeDirection.getOrientation(side)); - Coord4D blockabove = obj.getFromSide(ForgeDirection.getOrientation(face)); + Coord4D coord = obj.getFromSide(ForgeDirection.getOrientation(side)); + Coord4D coordAbove = obj.getFromSide(ForgeDirection.getOrientation(face)); - return (block.getBlock(access) == this.block && block.getMetadata(access) == metadata) && (blockabove.getBlock(access) != this.block || blockabove.getMetadata(access) != metadata); + return (coord.getBlock(access) == block && coord.getMetadata(access) == metadata) && (coordAbove.getBlock(access) != block || coordAbove.getMetadata(access) != metadata); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 933760b3a..3ec490204 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -150,7 +150,7 @@ import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; /** - * Mekanism - the mod that doesn't have a category. + * Mekanism - a Minecraft mod * @author AidanBrady * */ @@ -339,7 +339,7 @@ public class Mekanism public static double fluidicPlenisherUsage; /** - * Adds all in-game crafting and smelting recipes. + * Adds all in-game crafting, smelting and machine recipes. */ public void addRecipes() { diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index d5154c2f3..0ccd506dc 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -159,12 +159,14 @@ public final class MekanismUtils return "null"; } + /** + * Updates the donator list by retrieving the most recent information from a foreign document. + */ public static void updateDonators() { Mekanism.donators.clear(); - List text = getHTML("http://dl.dropbox.com/u/90411166/Donators/Mekanism.txt"); - for(String s : text) + for(String s : getHTML("http://dl.dropbox.com/u/90411166/Donators/Mekanism.txt")) { Mekanism.donators.add(s); } diff --git a/src/main/resources/assets/mekanism/render/SeismicVibratorOn.png b/src/main/resources/assets/mekanism/render/SeismicVibratorOn.png new file mode 100755 index 000000000..cb0bfe640 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/SeismicVibratorOn.png differ