diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3c7abdf1..c97a8bdb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 244a668f..9369f7bc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Mar 26 13:33:58 CDT 2014 +#Thu Jan 08 23:20:41 CST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockNoCTMRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/renderStandardBlock_noSunlight.java similarity index 82% rename from src/main/java/com/cricketcraft/chisel/client/render/BlockNoCTMRenderer.java rename to src/main/java/com/cricketcraft/chisel/client/render/renderStandardBlock_noSunlight.java index 44f45dd1..ba13eb6e 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/BlockNoCTMRenderer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/renderStandardBlock_noSunlight.java @@ -1,6 +1,7 @@ package com.cricketcraft.chisel.client.render; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; @@ -11,11 +12,11 @@ import com.cricketcraft.chisel.utils.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; -public class BlockNoCTMRenderer implements ISimpleBlockRenderingHandler { +public class renderStandardBlock_noSunlight implements ISimpleBlockRenderingHandler { static int id; - public BlockNoCTMRenderer() { + public renderStandardBlock_noSunlight() { id = RenderingRegistry.getNextAvailableRenderId(); } @@ -32,7 +33,7 @@ public class BlockNoCTMRenderer implements ISimpleBlockRenderingHandler { if (meta != 0) renderer.overrideBlockTexture = block.getIcon(0, meta); renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); + renderer.renderStandardBlockWithColorMultiplier(block, x, y, z, 1.0F, 1.0F, 1.0F); renderer.overrideBlockTexture = null; return false; diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index da7ea968..246ecc08 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -5,6 +5,7 @@ import net.minecraft.block.Block; import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.block.BlockCarvable; import com.cricketcraft.chisel.block.BlockCarvableGlass; +import com.cricketcraft.chisel.block.BlockCarvableGlow; import com.cricketcraft.chisel.block.BlockCarvablePane; import com.cricketcraft.chisel.block.BlockCarvablePowered; import com.cricketcraft.chisel.block.BlockCarvablePumpkin; @@ -103,7 +104,7 @@ public final class ChiselBlocks { public static final BlockCarvable hexPlating = null; public static final BlockCarvable technical = null; public static final BlockCarvableGlass technical2 = null; - public static final BlockCarvable futura = null; + public static final BlockCarvableGlow futura = null; public static final BlockCarvable bone = null; public static final BlockCarvable scorching = null; public static final BlockCarvable brickCustom = null; diff --git a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java index fd9e7fbf..15d30e63 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java @@ -7,7 +7,6 @@ import net.minecraft.item.Item; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; -import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; import com.cricketcraft.chisel.client.render.BlockAdvancedMarbleRenderer; @@ -17,7 +16,7 @@ import com.cricketcraft.chisel.client.render.BlockGlowRenderer; import com.cricketcraft.chisel.client.render.BlockMarblePaneRenderer; import com.cricketcraft.chisel.client.render.BlockMarblePillarRenderer; import com.cricketcraft.chisel.client.render.BlockMarbleStairsRenderer; -import com.cricketcraft.chisel.client.render.BlockNoCTMRenderer; +import com.cricketcraft.chisel.client.render.renderStandardBlock_noSunlight; import com.cricketcraft.chisel.client.render.BlockRoadLineRenderer; import com.cricketcraft.chisel.client.render.BlockSnakeStoneRenderer; import com.cricketcraft.chisel.client.render.BlockTexturedOreRenderer; @@ -48,7 +47,7 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerBlockHandler(new BlockMarblePaneRenderer()); RenderingRegistry.registerBlockHandler(new BlockRoadLineRenderer()); RenderingRegistry.registerBlockHandler(new BlockSnakeStoneRenderer()); - RenderingRegistry.registerBlockHandler(new BlockNoCTMRenderer()); + RenderingRegistry.registerBlockHandler(new renderStandardBlock_noSunlight()); RenderingRegistry.registerBlockHandler(new BlockMarblePillarRenderer()); RenderingRegistry.registerBlockHandler(new BlockEldritchRenderer()); RenderingRegistry.registerBlockHandler(new BlockAdvancedMarbleRenderer()); diff --git a/src/main/resources/assets/chisel/textures/blocks/autoChisel/autoChisel16.png b/src/main/resources/assets/chisel/textures/blocks/autoChisel/autoChisel16.png new file mode 100644 index 00000000..f158c5ad Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/autoChisel/autoChisel16.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexOverlay.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexOverlay.png index 96b4e9bd..1ee20e62 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexOverlay.png and b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexOverlay.png differ