diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index b5c39a30..60f6de2d 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -20,14 +20,9 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import team.chisel.block.*; +import team.chisel.block.BlockCarvableNeonite; import team.chisel.carving.Carving; -import team.chisel.client.render.SubmapManagerAntiblock; -import team.chisel.client.render.SubmapManagerCarpetFloor; -import team.chisel.client.render.SubmapManagerCombinedCTM; -import team.chisel.client.render.SubmapManagerFakeController; -import team.chisel.client.render.SubmapManagerLeaves; -import team.chisel.client.render.SubmapManagerSlab; -import team.chisel.client.render.SubmapManagerVoidstone; +import team.chisel.client.render.*; import team.chisel.compat.fmp.ItemBlockChiselTorchPart; import team.chisel.config.Configurations; import team.chisel.entity.EntityBallOMoss; @@ -837,6 +832,46 @@ public enum Features { } }, + CUBITS { + + @Override + void addBlocks() { + BlockCarvable cubit = (BlockCarvable) new BlockCarvable(Material.rock) + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.8F).setResistance(10.0F) + .setStepSound(Block.soundTypeStone); + + cubit.carverHelper.addVariation("tile.cubit.0.desc", 0, "cubit/0"); + cubit.carverHelper.addVariation("tile.cubit.1.desc", 1, "cubit/1"); + cubit.carverHelper.addVariation("tile.cubit.2.desc", 2, "cubit/2"); + cubit.carverHelper.addVariation("tile.cubit.3.desc", 3, "cubit/3"); + cubit.carverHelper.addVariation("tile.cubit.4.desc", 4, "cubit/4"); + cubit.carverHelper.addVariation("tile.cubit.5.desc", 5, "cubit/5"); + cubit.carverHelper.addVariation("tile.cubit.6.desc", 6, "cubit/6"); + cubit.carverHelper.addVariation("tile.cubit.7.desc", 7, "cubit/7"); + cubit.carverHelper.addVariation("tile.cubit.8.desc", 8, "cubit/8"); + cubit.carverHelper.addVariation("tile.cubit.9.desc", 9, "cubit/9"); + cubit.carverHelper.addVariation("tile.cubit.10.desc", 10, "cubit/10"); + cubit.carverHelper.addVariation("tile.cubit.11.desc", 11, "cubit/11"); + cubit.carverHelper.addVariation("tile.cubit.12.desc", 12, "cubit/12"); + cubit.carverHelper.addVariation("tile.cubit.13.desc", 13, "cubit/13"); + cubit.carverHelper.addVariation("tile.cubit.14.desc", 14, "cubit/14"); + cubit.carverHelper.addVariation("tile.cubit.15.desc", 15, "cubit/15"); + cubit.carverHelper.registerAll(cubit, "cubit"); + } + @Override + void addRecipes() { + GameRegistry.addRecipe( + new ItemStack(cubit, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.stone, 1), + 'X', + new ItemStack(Blocks.wool, 1, 15)); + } + }, + DIAMOND_BLOCK { @Override @@ -1308,6 +1343,38 @@ public enum Features { } }, + GLOTEK { + + @Override + void addBlocks() { + BlockCarvable glotek = (BlockCarvable) new BlockCarvableGlotek() + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); + + if (!Configurations.allowChiselCrossColors) { + glotek.carverHelper.forbidChiseling = true; + } + + for (int i = 0; i < 16; i++) { + glotek.carverHelper + .addVariation("tile.glotek." + i + ".desc", i, new SubmapManagerGlotek(String.valueOf(i))); + } + + glotek.carverHelper.registerAll(glotek, "glotek"); + OreDictionary.registerOre("glotek", glotek); + } + @Override + void addRecipes() { + GameRegistry.addRecipe( + new ItemStack(ChiselBlocks.glotek, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(neonite, 1), + 'X', + new ItemStack(Items.glowstone_dust, 1)); + } + }, GLOWSTONE { @Override @@ -1530,6 +1597,83 @@ public enum Features { } }, + Hempcrete { + + @Override + void addBlocks() { + BlockCarvable hempcrete = (BlockCarvable) new BlockCarvable(Material.rock) + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.8F).setResistance(10.0F) + .setStepSound(Block.soundTypeStone); + + hempcrete.carverHelper.addVariation("tile.hempcrete.0.desc", 0, "hempCrete/concrete/black"); + hempcrete.carverHelper.addVariation("tile.hempcrete.1.desc", 1, "hempCrete/concrete/gray"); + hempcrete.carverHelper.addVariation("tile.hempcrete.2.desc", 2, "hempCrete/concrete/silver"); + hempcrete.carverHelper.addVariation("tile.hempcrete.3.desc", 3, "hempCrete/concrete/white"); + hempcrete.carverHelper.addVariation("tile.hempcrete.4.desc", 4, "hempCrete/concrete/lightblue"); + hempcrete.carverHelper.addVariation("tile.hempcrete.5.desc", 5, "hempCrete/concrete/cyan"); + hempcrete.carverHelper.addVariation("tile.hempcrete.6.desc", 6, "hempCrete/concrete/blue"); + hempcrete.carverHelper.addVariation("tile.hempcrete.7.desc", 7, "hempCrete/concrete/purple"); + hempcrete.carverHelper.addVariation("tile.hempcrete.8.desc", 8, "hempCrete/concrete/magenta"); + hempcrete.carverHelper.addVariation("tile.hempcrete.9.desc", 9, "hempCrete/concrete/pink"); + hempcrete.carverHelper.addVariation("tile.hempcrete.10.desc", 10, "hempCrete/concrete/red"); + hempcrete.carverHelper.addVariation("tile.hempcrete.11.desc", 11, "hempCrete/concrete/orange"); + hempcrete.carverHelper.addVariation("tile.hempcrete.12.desc", 12, "hempCrete/concrete/yellow"); + hempcrete.carverHelper.addVariation("tile.hempcrete.13.desc", 13, "hempCrete/concrete/lime"); + hempcrete.carverHelper.addVariation("tile.hempcrete.14.desc", 14, "hempCrete/concrete/green"); + hempcrete.carverHelper.addVariation("tile.hempcrete.15.desc", 15, "hempCrete/concrete/brown"); + hempcrete.carverHelper.registerAll(hempcrete, "hempcrete"); + + } + @Override + void addRecipes() { + for (int i = 0; i < 16; i++) { + GameRegistry.addSmelting(new ItemStack(ChiselBlocks.hempcretesand, 1, i), new ItemStack(ChiselBlocks.hempcrete, 1, i), 0.1F); + } + } + }, + + hempcreteSand { + + @Override + void addBlocks() { + BlockHempcreteSand hempcretesand = (BlockHempcreteSand) new BlockHempcreteSand() + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.5F).setResistance(0.5F) + .setStepSound(Block.soundTypeSand); + + hempcretesand.carverHelper.addVariation("tile.hempcretesand.0.desc", 0, "hempCrete/sand/black"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.1.desc", 1, "hempCrete/sand/gray"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.2.desc", 2, "hempCrete/sand/silver"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.3.desc", 3, "hempCrete/sand/white"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.4.desc", 4, "hempCrete/sand/lightblue"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.5.desc", 5, "hempCrete/sand/cyan"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.6.desc", 6, "hempCrete/sand/blue"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.7.desc", 7, "hempCrete/sand/purple"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.8.desc", 8, "hempCrete/sand/magenta"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.9.desc", 9, "hempCrete/sand/pink"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.10.desc", 10, "hempCrete/sand/red"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.11.desc", 11, "hempCrete/sand/orange"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.12.desc", 12, "hempCrete/sand/yellow"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.13.desc", 13, "hempCrete/sand/lime"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.14.desc", 14, "hempCrete/sand/green"); + hempcretesand.carverHelper.addVariation("tile.hempcretesand.15.desc", 15, "hempCrete/sand/brown"); + hempcretesand.carverHelper.registerAll(hempcretesand, "hempcretesand"); + OreDictionary.registerOre("hempcretesand", hempcretesand); + + } + @Override + void addRecipes() { + GameRegistry.addRecipe( + new ItemStack(ChiselBlocks.hempcretesand, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.sand, 1), + 'X', + new ItemStack(Blocks.tallgrass, 1,2)); + } + }, + ICE { @Override @@ -2334,6 +2478,39 @@ public enum Features { } }, + NEONITE { + + @Override + void addBlocks() { + BlockCarvable neonite = (BlockCarvable) new BlockCarvableNeonite() + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); + + if (!Configurations.allowChiselCrossColors) { + neonite.carverHelper.forbidChiseling = true; + } + + for (int i = 0; i < 16; i++) { + neonite.carverHelper + .addVariation("tile.neonite." + i + ".desc", i, new SubmapManagerNeonite(String.valueOf(i))); + } + + neonite.carverHelper.registerAll(neonite, "neonite"); + OreDictionary.registerOre("neonite", neonite); + } + @Override + void addRecipes() { + GameRegistry.addRecipe( + new ItemStack(neonite, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Items.emerald, 1), + 'X', + new ItemStack(Items.glowstone_dust, 1)); + } + }, + NETHER_BRICK { @Override @@ -2408,6 +2585,49 @@ public enum Features { } }, + NUCRETE { + + @Override + void addBlocks() { + BlockCarvable nucrete = (BlockCarvable) new BlockCarvable(Material.rock) + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F) + .setStepSound(Block.soundTypeStone); + + nucrete.carverHelper.addVariation("tile.nucrete.0.desc", 0, "nucrete/darkbreezeblock"); + nucrete.carverHelper.addVariation("tile.nucrete.1.desc", 1, "nucrete/darkpanel"); + nucrete.carverHelper.addVariation("tile.nucrete.2.desc", 2, "nucrete/darkpanel2"); + nucrete.carverHelper.addVariation("tile.nucrete.3.desc", 3, "nucrete/darksmooth"); + nucrete.carverHelper.addVariation("tile.nucrete.4.desc", 4, "nucrete/darkstamped"); + nucrete.carverHelper.addVariation("tile.nucrete.5.desc", 5, "nucrete/darkstrip"); + nucrete.carverHelper.addVariation("tile.nucrete.6.desc", 6, "nucrete/darkstripes"); + nucrete.carverHelper.addVariation("tile.nucrete.7.desc", 7, "nucrete/darktiles"); + nucrete.carverHelper.addVariation("tile.nucrete.8.desc", 8, "nucrete/lightbreezeblocks"); + nucrete.carverHelper.addVariation("tile.nucrete.9.desc", 9, "nucrete/lightpanel"); + nucrete.carverHelper.addVariation("tile.nucrete.10.desc", 10, "nucrete/lightpanel2"); + nucrete.carverHelper.addVariation("tile.nucrete.11.desc", 11, "nucrete/lightsmooth"); + nucrete.carverHelper.addVariation("tile.nucrete.12.desc", 12, "nucrete/lightstamped"); + nucrete.carverHelper.addVariation("tile.nucrete.13.desc", 13, "nucrete/lightstrip"); + nucrete.carverHelper.addVariation("tile.nucrete.14.desc", 14, "nucrete/lightstripe"); + nucrete.carverHelper.addVariation("tile.nucrete.15.desc", 15, "nucrete/lighttiles"); + nucrete.carverHelper.registerAll(nucrete, "nucrete"); + + } + @Override + void addRecipes() { + GameRegistry.addRecipe( + new ItemStack(nucrete, 8, 0), + "XYX", + "*X*", + "XYX", + '*', + new ItemStack(Blocks.sand, 1), + 'X', + new ItemStack(Blocks.gravel, 1), + 'Y', + new ItemStack(Items.clay_ball, 1)); + } + }, + OBSIDIAN { @Override @@ -2436,6 +2656,7 @@ public enum Features { obsidian.carverHelper.registerAll(obsidian, "obsidian"); Carving.chisel.registerOre("obsidian", "obsidian"); } + }, PACKEDICE { @@ -2873,6 +3094,7 @@ public enum Features { road_line.carverHelper.addVariation("tile.roadLine.1.desc", 1, "line-marking/double-white-center"); road_line.carverHelper.addVariation("tile.roadLine.2.desc", 2, "line-marking/yellow-center"); road_line.carverHelper.addVariation("tile.roadLine.3.desc", 3, "line-marking/double-yellow-center"); + road_line.carverHelper.addVariation("tile.roadLine.4.desc", 4, "line-marking/warning-center"); road_line.carverHelper.registerAll(road_line, "road_line"); Carving.chisel.registerOre("road_line", "roadLine"); } @@ -3148,6 +3370,46 @@ public enum Features { // 0, 0); } }, + SVELSTONE { + + @Override + void addBlocks() { + BlockCarvable svelstone = (BlockCarvable) new BlockCarvable(Material.rock) + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F) + .setStepSound(Block.soundTypeStone); + + svelstone.carverHelper.addVariation("tile.sveltstone.0.desc", 0, "sveltstone/0"); + svelstone.carverHelper.addVariation("tile.sveltstone.1.desc", 1, "sveltstone/1"); + svelstone.carverHelper.addVariation("tile.sveltstone.2.desc", 2, "sveltstone/2"); + svelstone.carverHelper.addVariation("tile.sveltstone.3.desc", 3, "sveltstone/3"); + svelstone.carverHelper.addVariation("tile.sveltstone.4.desc", 4, "sveltstone/4"); + svelstone.carverHelper.addVariation("tile.sveltstone.5.desc", 5, "sveltstone/5"); + svelstone.carverHelper.addVariation("tile.sveltstone.6.desc", 6, "sveltstone/6"); + svelstone.carverHelper.addVariation("tile.sveltstone.7.desc", 7, "sveltstone/7"); + svelstone.carverHelper.addVariation("tile.sveltstone.8.desc", 8, "sveltstone/8"); + svelstone.carverHelper.addVariation("tile.sveltstone.9.desc", 9, "sveltstone/9"); + svelstone.carverHelper.addVariation("tile.sveltstone.10.desc", 10, "sveltstone/10"); + svelstone.carverHelper.addVariation("tile.sveltstone.11.desc", 11, "sveltstone/11"); + svelstone.carverHelper.addVariation("tile.sveltstone.12.desc", 12, "sveltstone/12"); + svelstone.carverHelper.addVariation("tile.sveltstone.13.desc", 13, "sveltstone/13"); + svelstone.carverHelper.addVariation("tile.sveltstone.14.desc", 14, "sveltstone/14"); + svelstone.carverHelper.addVariation("tile.sveltstone.15.desc", 15, "sveltstone/15"); + svelstone.carverHelper.registerAll(svelstone, "sveltstone"); + + } + @Override + void addRecipes() { + GameRegistry.addRecipe( + new ItemStack(sveltstone, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.stone, 1), + 'X', + new ItemStack(ChiselBlocks.andesite, 1)); + } + }, TALLOW("Thaumcraft") { diff --git a/src/main/java/team/chisel/block/BlockCarvableGlotek.java b/src/main/java/team/chisel/block/BlockCarvableGlotek.java new file mode 100644 index 00000000..3e9f8046 --- /dev/null +++ b/src/main/java/team/chisel/block/BlockCarvableGlotek.java @@ -0,0 +1,19 @@ +package team.chisel.block; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.world.IBlockAccess; + +import com.cricketcraft.chisel.api.ICarvable; + +public class BlockCarvableGlotek extends BlockCarvable implements ICarvable { + + public BlockCarvableGlotek() { + super(Material.rock); + } + + @Override + public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { + return false; + } +} diff --git a/src/main/java/team/chisel/block/BlockCarvableNeonite.java b/src/main/java/team/chisel/block/BlockCarvableNeonite.java new file mode 100644 index 00000000..d826cc65 --- /dev/null +++ b/src/main/java/team/chisel/block/BlockCarvableNeonite.java @@ -0,0 +1,19 @@ +package team.chisel.block; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.world.IBlockAccess; + +import com.cricketcraft.chisel.api.ICarvable; + +public class BlockCarvableNeonite extends BlockCarvable implements ICarvable { + + public BlockCarvableNeonite() { + super(Material.rock); + } + + @Override + public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { + return false; + } +} diff --git a/src/main/java/team/chisel/block/BlockHempcreteSand.java b/src/main/java/team/chisel/block/BlockHempcreteSand.java new file mode 100644 index 00000000..f0b3317f --- /dev/null +++ b/src/main/java/team/chisel/block/BlockHempcreteSand.java @@ -0,0 +1,18 @@ +package team.chisel.block; + +import net.minecraft.block.Block; + +import com.cricketcraft.chisel.api.ChiselTabs; + +public class BlockHempcreteSand extends BlockCarvableSand { + + public BlockHempcreteSand() { + super(); + setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + setHardness(0.5F); + setResistance(0.5F); + setStepSound(Block.soundTypeSand); + + } + +} diff --git a/src/main/java/team/chisel/block/BlockRoadLine.java b/src/main/java/team/chisel/block/BlockRoadLine.java index eebf99f1..68fd1987 100644 --- a/src/main/java/team/chisel/block/BlockRoadLine.java +++ b/src/main/java/team/chisel/block/BlockRoadLine.java @@ -16,9 +16,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockRoadLine extends BlockCarvable { - public IIcon aloneIcon[] = new IIcon[4]; - public IIcon halfLineIcon[] = new IIcon[4]; - public IIcon fullLineIcon[] = new IIcon[4]; + public IIcon aloneIcon[] = new IIcon[5]; + public IIcon halfLineIcon[] = new IIcon[5]; + public IIcon fullLineIcon[] = new IIcon[5]; public BlockRoadLine() { super(Material.circuits); @@ -71,8 +71,8 @@ public class BlockRoadLine extends BlockCarvable { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister reg) { - for (int i = 0; i < 4; i++) { - String[] texNames = { "white", "yellow", "double-white", "double-yellow" }; + for (int i = 0; i < 5; i++) { + String[] texNames = { "white", "yellow", "double-white", "double-yellow", "warning" }; aloneIcon[i] = reg.registerIcon("Chisel:line-marking/" + texNames[i] + "-center"); halfLineIcon[i] = reg.registerIcon("Chisel:line-marking/" + texNames[i] + "-side"); fullLineIcon[i] = reg.registerIcon("Chisel:line-marking/" + texNames[i] + "-long"); diff --git a/src/main/java/team/chisel/client/render/SubmapManagerGlotek.java b/src/main/java/team/chisel/client/render/SubmapManagerGlotek.java new file mode 100644 index 00000000..2501f200 --- /dev/null +++ b/src/main/java/team/chisel/client/render/SubmapManagerGlotek.java @@ -0,0 +1,86 @@ +package team.chisel.client.render; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +import team.chisel.ctmlib.Drawing; +import team.chisel.ctmlib.RenderBlocksCTM; +import team.chisel.ctmlib.TextureSubmap; +import team.chisel.init.ChiselBlocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class SubmapManagerGlotek extends SubmapManagerBase { + + @SideOnly(Side.CLIENT) + private static class RenderBlocksCTMFullbright extends RenderBlocksCTM { + + @Override + protected void fillLightmap(int bottomLeft, int bottomRight, int topRight, int topLeft) { + ao(); + int maxLight = 0xF000F0; + super.fillLightmap(maxLight, maxLight, maxLight, maxLight); + } + + @Override + protected void fillColormap(float bottomLeft, float bottomRight, float topRight, float topLeft, float[][] map) { + ao(); + int color = 0xFFFFFF; + super.fillColormap(color, color, color, color, map); + } + + @Override + public boolean renderStandardBlock(Block block, int x, int y, int z) { + boolean ret = super.renderStandardBlock(block, x, y, z); + this.enableAO = false; + return ret; + } + + private void ao() { + if (this.inWorld) { + this.enableAO = true; + } + } + }; + + @SideOnly(Side.CLIENT) + private static RenderBlocksCTMFullbright rb; + + private String color; + private TextureSubmap submap, submapSmall; + + public SubmapManagerGlotek(String color) { + this.color = color; + } + + @Override + public IIcon getIcon(int side, int meta) { + return submapSmall.getBaseIcon(); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(String modName, Block block, IIconRegister register) { + submap = new TextureSubmap(register.registerIcon(modName + ":Glotek/" + color + "-ctm"), 4, 4); + submapSmall = new TextureSubmap(register.registerIcon(modName + ":Glotek/" + color), 2, 2); + } + + @Override + @SideOnly(Side.CLIENT) + public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) { + if (rb == null) { + rb = new RenderBlocksCTMFullbright(); + } + rb.setRenderBoundsFromBlock(block); + rb.submap = submap; + rb.submapSmall = submapSmall; + return rb; + } +} diff --git a/src/main/java/team/chisel/client/render/SubmapManagerNeonite.java b/src/main/java/team/chisel/client/render/SubmapManagerNeonite.java new file mode 100644 index 00000000..4b33e24a --- /dev/null +++ b/src/main/java/team/chisel/client/render/SubmapManagerNeonite.java @@ -0,0 +1,86 @@ +package team.chisel.client.render; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +import team.chisel.ctmlib.Drawing; +import team.chisel.ctmlib.RenderBlocksCTM; +import team.chisel.ctmlib.TextureSubmap; +import team.chisel.init.ChiselBlocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class SubmapManagerNeonite extends SubmapManagerBase { + + @SideOnly(Side.CLIENT) + private static class RenderBlocksCTMFullbright extends RenderBlocksCTM { + + @Override + protected void fillLightmap(int bottomLeft, int bottomRight, int topRight, int topLeft) { + ao(); + int maxLight = 0xF000F0; + super.fillLightmap(maxLight, maxLight, maxLight, maxLight); + } + + @Override + protected void fillColormap(float bottomLeft, float bottomRight, float topRight, float topLeft, float[][] map) { + ao(); + int color = 0xFFFFFF; + super.fillColormap(color, color, color, color, map); + } + + @Override + public boolean renderStandardBlock(Block block, int x, int y, int z) { + boolean ret = super.renderStandardBlock(block, x, y, z); + this.enableAO = false; + return ret; + } + + private void ao() { + if (this.inWorld) { + this.enableAO = true; + } + } + }; + + @SideOnly(Side.CLIENT) + private static RenderBlocksCTMFullbright rb; + + private String color; + private TextureSubmap submap, submapSmall; + + public SubmapManagerNeonite(String color) { + this.color = color; + } + + @Override + public IIcon getIcon(int side, int meta) { + return submapSmall.getBaseIcon(); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(String modName, Block block, IIconRegister register) { + submap = new TextureSubmap(register.registerIcon(modName + ":Neonite/" + color + "-ctm"), 4, 4); + submapSmall = new TextureSubmap(register.registerIcon(modName + ":Neonite/" + color), 2, 2); + } + + @Override + @SideOnly(Side.CLIENT) + public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) { + if (rb == null) { + rb = new RenderBlocksCTMFullbright(); + } + rb.setRenderBoundsFromBlock(block); + rb.submap = submap; + rb.submapSmall = submapSmall; + return rb; + } +} diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index b9a21deb..1184630c 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -105,6 +105,15 @@ public final class ChiselBlocks { public static final BlockCarvable valentines = null; public static final BlockPresent present = null; + public static final BlockCarvable nucrete = null; + public static final BlockCarvable neonite = null; + public static final BlockCarvable glotek = null; + public static final BlockCarvable hempcrete = null; + public static final BlockHempcreteSand hempcretesand = null; + + public static final BlockCarvable sveltstone = null; + public static final BlockCarvable cubit = null; + // Arrays can't be final because of how @ObjectHolder works public static BlockCarvableStairs[] marbleStairs = new BlockCarvableStairs[8]; public static BlockCarvableStairs[] limestoneStairs = new BlockCarvableStairs[8]; diff --git a/src/main/resources/assets/chisel/lang/en_GB.lang b/src/main/resources/assets/chisel/lang/en_GB.lang index 27928d3e..6fcc8314 100644 --- a/src/main/resources/assets/chisel/lang/en_GB.lang +++ b/src/main/resources/assets/chisel/lang/en_GB.lang @@ -780,6 +780,7 @@ tile.roadLine.0.desc=White tile.roadLine.1.desc=Yellow tile.roadLine.2.desc=Double White tile.roadLine.3.desc=Double Yellow +tile.roadLine.4.desc=Hazard Tape # Iron Blocks tile.chisel.iron_block.name=Iron Block diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index c84126d5..e23ebfbe 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -776,12 +776,13 @@ tile.concrete.8.desc=Partly Weathered Concrete tile.concrete.9.desc=Partly Weathered Concrete Block tile.concrete.10.desc=Asphalt -#Road Line +# Road Line tile.chisel.road_line.name=Road Lines tile.roadLine.0.desc=White tile.roadLine.1.desc=Yellow tile.roadLine.2.desc=Double White tile.roadLine.3.desc=Double Yellow +tile.roadLine.4.desc=Hazard Tape #Iron Blocks tile.chisel.iron_block.name=Iron Block @@ -1744,3 +1745,136 @@ container.chisel.mode.single=Single container.chisel.mode.panel=Panel container.chisel.mode.column=Column container.chisel.mode.row=Row + +#cubits +tile.chisel.cubit.name=Cubits +tile.cubit.0.desc=Cubit(0) +tile.cubit.1.desc=Cubit(1) +tile.cubit.2.desc=Cubit(2) +tile.cubit.3.desc=Cubit(3) +tile.cubit.4.desc=Cubit(4) +tile.cubit.5.desc=Cubit(5) +tile.cubit.6.desc=Cubit(6) +tile.cubit.7.desc=Cubit(7) +tile.cubit.8.desc=Cubit(8) +tile.cubit.9.desc=Cubit(9) +tile.cubit.10.desc=Cubit(10) +tile.cubit.11.desc=Cubit(11) +tile.cubit.12.desc=Cubit(12) +tile.cubit.13.desc=Cubit(13) +tile.cubit.14.desc=Cubit(14) +tile.cubit.15.desc=Cubit(15) + +#Hempcrete +tile.chisel.hempcrete.name=Hempcrete +tile.hempcrete.0.desc=Black +tile.hempcrete.1.desc=Gray +tile.hempcrete.2.desc=Silver +tile.hempcrete.3.desc=White +tile.hempcrete.4.desc=Light Blue +tile.hempcrete.5.desc=Cyan +tile.hempcrete.6.desc=Blue +tile.hempcrete.7.desc=Purple +tile.hempcrete.8.desc=Magenta +tile.hempcrete.9.desc=Pink +tile.hempcrete.10.desc=Red +tile.hempcrete.11.desc=Orange +tile.hempcrete.12.desc=Yellow +tile.hempcrete.13.desc=Lime +tile.hempcrete.14.desc=Green +tile.hempcrete.15.desc=Brown + +#hempcreteSand +tile.chisel.hempcretesand.name=Hempcrete powder +tile.hempcretesand.0.desc=Black +tile.hempcretesand.1.desc=Gray +tile.hempcretesand.2.desc=Silver +tile.hempcretesand.3.desc=White +tile.hempcretesand.4.desc=Light Blue +tile.hempcretesand.5.desc=Cyan +tile.hempcretesand.6.desc=Blue +tile.hempcretesand.7.desc=Purple +tile.hempcretesand.8.desc=Magenta +tile.hempcretesand.9.desc=Pink +tile.hempcretesand.10.desc=Red +tile.hempcretesand.11.desc=Orange +tile.hempcretesand.12.desc=Yellow +tile.hempcretesand.13.desc=Lime +tile.hempcretesand.14.desc=Green +tile.hempcretesand.15.desc=Brown + +#Sveltsone +tile.chisel.sveltstone.name=Svelstone block +tile.sveltstone.0.desc=Silver Sand +tile.sveltstone.1.desc=Sand Dune +tile.sveltstone.2.desc=Fuscous Grey +tile.sveltstone.3.desc=Flint +tile.sveltstone.4.desc=Taupe +tile.sveltstone.5.desc=Tobacco Brown +tile.sveltstone.6.desc=Boulder +tile.sveltstone.7.desc=Olive Haze +tile.sveltstone.8.desc=Pale Oister +tile.sveltstone.9.desc=Hemlock +tile.sveltstone.10.desc=Rifle Green +tile.sveltstone.11.desc=Everglade +tile.sveltstone.12.desc=Baltic Sea +tile.sveltstone.13.desc=Outer Space +tile.sveltstone.14.desc=Gunmetal +tile.sveltstone.15.desc=Matterhorn + +#NUCRETE +tile.chisel.nucrete.name=Structural Concrete +tile.nucrete.0.desc=Dark Concrete Breezeblocks +tile.nucrete.1.desc=Dark Concrete Panel +tile.nucrete.2.desc=Dark Concrete Panel 2 +tile.nucrete.3.desc=Dark Smooth Concrete +tile.nucrete.4.desc=Dark Concrete Tiles +tile.nucrete.5.desc=Dark Concrete Strip +tile.nucrete.6.desc=Dark Concrete Caution Tape +tile.nucrete.7.desc=Dark Concrete Tiles +tile.nucrete.8.desc=Light Concrete Breezeblocks +tile.nucrete.9.desc=Light Concrete Panel +tile.nucrete.10.desc=Light Concrete Panel 2 +tile.nucrete.11.desc=Light Smooth Concrete +tile.nucrete.12.desc=Light Concrete Tiles +tile.nucrete.13.desc=Light Concrete Strip +tile.nucrete.14.desc=Light Concrete Caution Tape +tile.nucrete.15.desc=Light Concrete Tiles + +#Neonite +tile.chisel.neonite.name=Neonite +tile.neonite.0.desc=Atomic Tangerine +tile.neonite.1.desc=Saffron Mango +tile.neonite.2.desc=Golden Glow +tile.neonite.3.desc=Oasis +tile.neonite.4.desc=Pixie Green +tile.neonite.5.desc=Fresh Green +tile.neonite.6.desc=Jungle Green +tile.neonite.7.desc=Mariner +tile.neonite.8.desc=Congress Blue +tile.neonite.9.desc=Deep Saphire +tile.neonite.10.desc=Deep Cove +tile.neonite.11.desc=Meteorite +tile.neonite.12.desc=Eminence +tile.neonite.13.desc=Warm Purple +tile.neonite.14.desc=Raspberry Pink +tile.neonite.15.desc=Watermelon Pink + +#Glotek +tile.chisel.glotek.name=GloTek +tile.glotek.0.desc=Ceramic +tile.glotek.1.desc=Sandwisp +tile.glotek.2.desc=Easter Green +tile.glotek.3.desc=Dragon Green +tile.glotek.4.desc=Tealish Green +tile.glotek.5.desc=Green Haze +tile.glotek.6.desc=Petrol +tile.glotek.7.desc=Catalina Blue +tile.glotek.8.desc=Blue Gem +tile.glotek.9.desc=Royal Purple +tile.glotek.10.desc=Dark Magenta +tile.glotek.11.desc=Dogwood Rose +tile.glotek.12.desc=Cranberry +tile.glotek.13.desc=Brink Pink +tile.glotek.14.desc=Dark Salmon +tile.glotek.15.desc=Harvest Gold diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/0-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/0-ctm.png new file mode 100644 index 00000000..f9c1e1f1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/0-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/0.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/0.png new file mode 100644 index 00000000..54afc7e5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/0.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/1-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/1-ctm.png new file mode 100644 index 00000000..8e34d502 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/1-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/1.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/1.png new file mode 100644 index 00000000..751fb66b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/10-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/10-ctm.png new file mode 100644 index 00000000..c968e3d3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/10-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/10.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/10.png new file mode 100644 index 00000000..274faa8b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/10.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/11-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/11-ctm.png new file mode 100644 index 00000000..c194e5cc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/11-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/11.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/11.png new file mode 100644 index 00000000..38af7fe8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/11.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/12-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/12-ctm.png new file mode 100644 index 00000000..dce9434d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/12-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/12.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/12.png new file mode 100644 index 00000000..b2538718 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/12.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/13-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/13-ctm.png new file mode 100644 index 00000000..dfd2ad07 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/13-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/13.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/13.png new file mode 100644 index 00000000..15a8c470 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/13.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/14-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/14-ctm.png new file mode 100644 index 00000000..7ef113a4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/14-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/14.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/14.png new file mode 100644 index 00000000..91c589d4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/14.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/15-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/15-ctm.png new file mode 100644 index 00000000..1ff39dff Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/15-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/15.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/15.png new file mode 100644 index 00000000..235eb6c4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/15.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/2-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/2-ctm.png new file mode 100644 index 00000000..7cbbcf6e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/2-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/2.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/2.png new file mode 100644 index 00000000..ae154fa8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/3-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/3-ctm.png new file mode 100644 index 00000000..ca4a37ef Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/3-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/3.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/3.png new file mode 100644 index 00000000..99718ebf Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/4-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/4-ctm.png new file mode 100644 index 00000000..c81418ba Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/4-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/4.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/4.png new file mode 100644 index 00000000..0baa348a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/5-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/5-ctm.png new file mode 100644 index 00000000..c911de3b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/5-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/5.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/5.png new file mode 100644 index 00000000..4ffbd7b7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/5.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/6-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/6-ctm.png new file mode 100644 index 00000000..17af4668 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/6-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/6.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/6.png new file mode 100644 index 00000000..3ce93b7e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/6.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/7-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/7-ctm.png new file mode 100644 index 00000000..de36281e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/7-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/7.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/7.png new file mode 100644 index 00000000..64dc0af8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/7.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/8-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/8-ctm.png new file mode 100644 index 00000000..fdea2850 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/8-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/8.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/8.png new file mode 100644 index 00000000..d16ecc2f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/8.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/9-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/9-ctm.png new file mode 100644 index 00000000..ff451337 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/9-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Glotek/9.png b/src/main/resources/assets/chisel/textures/blocks/Glotek/9.png new file mode 100644 index 00000000..7bef3811 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Glotek/9.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/0-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/0-ctm.png new file mode 100644 index 00000000..c4c88482 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/0-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/0.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/0.png new file mode 100644 index 00000000..56001d12 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/0.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/1-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/1-ctm.png new file mode 100644 index 00000000..6b9649cc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/1-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/1.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/1.png new file mode 100644 index 00000000..65042ed8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/10-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/10-ctm.png new file mode 100644 index 00000000..41250e25 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/10-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/10.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/10.png new file mode 100644 index 00000000..40b2900b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/10.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/11-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/11-ctm.png new file mode 100644 index 00000000..0ec7a4d5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/11-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/11.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/11.png new file mode 100644 index 00000000..f71b3533 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/11.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/12-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/12-ctm.png new file mode 100644 index 00000000..081de92d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/12-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/12.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/12.png new file mode 100644 index 00000000..84f5863c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/12.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/13-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/13-ctm.png new file mode 100644 index 00000000..f28fe054 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/13-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/13.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/13.png new file mode 100644 index 00000000..d11245a8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/13.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/14-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/14-ctm.png new file mode 100644 index 00000000..13b41dc8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/14-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/14.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/14.png new file mode 100644 index 00000000..b46575fb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/14.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/15-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/15-ctm.png new file mode 100644 index 00000000..a3410605 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/15-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/15.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/15.png new file mode 100644 index 00000000..88b6910c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/15.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/2-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/2-ctm.png new file mode 100644 index 00000000..7ebc2017 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/2-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/2.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/2.png new file mode 100644 index 00000000..1555ba32 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/3-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/3-ctm.png new file mode 100644 index 00000000..4ae5a963 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/3-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/3.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/3.png new file mode 100644 index 00000000..303fcb7b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/4-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/4-ctm.png new file mode 100644 index 00000000..4384605b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/4-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/4.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/4.png new file mode 100644 index 00000000..889c7f9b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/5-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/5-ctm.png new file mode 100644 index 00000000..779eefaa Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/5-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/5.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/5.png new file mode 100644 index 00000000..f0010478 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/5.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/6-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/6-ctm.png new file mode 100644 index 00000000..4f05d59d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/6-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/6.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/6.png new file mode 100644 index 00000000..7926ee78 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/6.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/7-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/7-ctm.png new file mode 100644 index 00000000..cf4b90bc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/7-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/7.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/7.png new file mode 100644 index 00000000..5605e939 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/7.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/8-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/8-ctm.png new file mode 100644 index 00000000..3994920b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/8-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/8.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/8.png new file mode 100644 index 00000000..eac3f0ce Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/8.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/9-ctm.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/9-ctm.png new file mode 100644 index 00000000..d3e1ca29 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/9-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/Neonite/9.png b/src/main/resources/assets/chisel/textures/blocks/Neonite/9.png new file mode 100644 index 00000000..31601046 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/Neonite/9.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/large.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/large.png index f157e0b2..11bcf0c7 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/brickCustom/large.png and b/src/main/resources/assets/chisel/textures/blocks/brickCustom/large.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/concrete/asphalt.png b/src/main/resources/assets/chisel/textures/blocks/concrete/asphalt.png index c7b9aa2d..73917077 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/concrete/asphalt.png and b/src/main/resources/assets/chisel/textures/blocks/concrete/asphalt.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/0.png b/src/main/resources/assets/chisel/textures/blocks/cubit/0.png new file mode 100644 index 00000000..592f6393 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/0.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/1.png b/src/main/resources/assets/chisel/textures/blocks/cubit/1.png new file mode 100644 index 00000000..a0fbbe21 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/10.png b/src/main/resources/assets/chisel/textures/blocks/cubit/10.png new file mode 100644 index 00000000..e89c2dd6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/10.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/11.png b/src/main/resources/assets/chisel/textures/blocks/cubit/11.png new file mode 100644 index 00000000..cc728f21 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/11.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/12.png b/src/main/resources/assets/chisel/textures/blocks/cubit/12.png new file mode 100644 index 00000000..4f5ccb2d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/12.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/13.png b/src/main/resources/assets/chisel/textures/blocks/cubit/13.png new file mode 100644 index 00000000..4d93723f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/13.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/14.png b/src/main/resources/assets/chisel/textures/blocks/cubit/14.png new file mode 100644 index 00000000..a28b35cd Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/14.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/15.png b/src/main/resources/assets/chisel/textures/blocks/cubit/15.png new file mode 100644 index 00000000..06d90483 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/15.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/2.png b/src/main/resources/assets/chisel/textures/blocks/cubit/2.png new file mode 100644 index 00000000..2914c61e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/3.png b/src/main/resources/assets/chisel/textures/blocks/cubit/3.png new file mode 100644 index 00000000..b518d538 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/4.png b/src/main/resources/assets/chisel/textures/blocks/cubit/4.png new file mode 100644 index 00000000..85b1fd49 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/5.png b/src/main/resources/assets/chisel/textures/blocks/cubit/5.png new file mode 100644 index 00000000..312c1cb2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/5.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/6.png b/src/main/resources/assets/chisel/textures/blocks/cubit/6.png new file mode 100644 index 00000000..d08b6b27 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/6.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/7.png b/src/main/resources/assets/chisel/textures/blocks/cubit/7.png new file mode 100644 index 00000000..b012c229 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/7.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/8.png b/src/main/resources/assets/chisel/textures/blocks/cubit/8.png new file mode 100644 index 00000000..164fd3d3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/8.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/cubit/9.png b/src/main/resources/assets/chisel/textures/blocks/cubit/9.png new file mode 100644 index 00000000..0a774404 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/cubit/9.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/black.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/black.png new file mode 100644 index 00000000..ed74603f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/black.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/blue.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/blue.png new file mode 100644 index 00000000..6d6635f6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/blue.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/brown.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/brown.png new file mode 100644 index 00000000..265698bc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/brown.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/cyan.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/cyan.png new file mode 100644 index 00000000..6483ca88 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/cyan.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/gray.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/gray.png new file mode 100644 index 00000000..f6b2ddf3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/gray.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/green.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/green.png new file mode 100644 index 00000000..3c11ad68 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/green.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/lightblue.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/lightblue.png new file mode 100644 index 00000000..d6b370e3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/lightblue.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/lime.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/lime.png new file mode 100644 index 00000000..95286cbd Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/lime.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/magenta.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/magenta.png new file mode 100644 index 00000000..7ad56938 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/magenta.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/orange.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/orange.png new file mode 100644 index 00000000..37712e75 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/orange.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/pink.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/pink.png new file mode 100644 index 00000000..88a56268 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/pink.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/purple.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/purple.png new file mode 100644 index 00000000..02f1167a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/purple.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/red.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/red.png new file mode 100644 index 00000000..21eef82f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/red.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/silver.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/silver.png new file mode 100644 index 00000000..55e34091 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/silver.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/white.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/white.png new file mode 100644 index 00000000..7341a3bc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/white.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/yellow.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/yellow.png new file mode 100644 index 00000000..3713d400 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/concrete/yellow.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/black.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/black.png new file mode 100644 index 00000000..84941266 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/black.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/blue.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/blue.png new file mode 100644 index 00000000..4c01def4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/blue.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/brown.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/brown.png new file mode 100644 index 00000000..df85ad01 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/brown.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/cyan.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/cyan.png new file mode 100644 index 00000000..f53ed54d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/cyan.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/gray.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/gray.png new file mode 100644 index 00000000..a2ce1416 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/gray.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/green.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/green.png new file mode 100644 index 00000000..422e364e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/green.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/lightblue.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/lightblue.png new file mode 100644 index 00000000..962f5934 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/lightblue.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/lime.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/lime.png new file mode 100644 index 00000000..17f00482 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/lime.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/magenta.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/magenta.png new file mode 100644 index 00000000..949d0bff Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/magenta.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/orange.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/orange.png new file mode 100644 index 00000000..4a95df1f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/orange.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/pink.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/pink.png new file mode 100644 index 00000000..5f24b693 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/pink.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/purple.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/purple.png new file mode 100644 index 00000000..f952971e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/purple.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/red.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/red.png new file mode 100644 index 00000000..9a1cb875 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/red.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/silver.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/silver.png new file mode 100644 index 00000000..373bd40e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/silver.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/white.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/white.png new file mode 100644 index 00000000..836b9a5a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/white.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/yellow.png b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/yellow.png new file mode 100644 index 00000000..c945a13c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/hempCrete/sand/yellow.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-white-center.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-white-center.png index 86e32a81..47fd6305 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-white-center.png and b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-white-center.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-white-long.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-white-long.png index 8dec8b89..8e1dfc13 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-white-long.png and b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-white-long.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-white-side.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-white-side.png index d47bea62..d6cfcc0c 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-white-side.png and b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-white-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-center.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-center.png index 3cf03cde..78b81aa6 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-center.png and b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-center.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-long.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-long.png index 65a9b252..aeb997d6 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-long.png and b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-long.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-side.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-side.png index 0c844f8e..00983f1e 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-side.png and b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/warning-center.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/warning-center.png new file mode 100644 index 00000000..78400797 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/line-marking/warning-center.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/warning-long.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/warning-long.png new file mode 100644 index 00000000..abb4b511 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/line-marking/warning-long.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/warning-side.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/warning-side.png new file mode 100644 index 00000000..bfd4c90a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/line-marking/warning-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/white-center.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/white-center.png index 1773bd7a..17951ee6 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/line-marking/white-center.png and b/src/main/resources/assets/chisel/textures/blocks/line-marking/white-center.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/white-long.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/white-long.png index 69f1fd3f..23332a96 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/line-marking/white-long.png and b/src/main/resources/assets/chisel/textures/blocks/line-marking/white-long.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/white-side.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/white-side.png index 1fc70ae9..11b997ef 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/line-marking/white-side.png and b/src/main/resources/assets/chisel/textures/blocks/line-marking/white-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/yellow-center.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/yellow-center.png index f4249e53..c40706ea 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/line-marking/yellow-center.png and b/src/main/resources/assets/chisel/textures/blocks/line-marking/yellow-center.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/yellow-long.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/yellow-long.png index 1790e5e8..5fbbed1d 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/line-marking/yellow-long.png and b/src/main/resources/assets/chisel/textures/blocks/line-marking/yellow-long.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/yellow-side.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/yellow-side.png index 5bffd088..5693c400 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/line-marking/yellow-side.png and b/src/main/resources/assets/chisel/textures/blocks/line-marking/yellow-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/darkbreezeblock.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkbreezeblock.png new file mode 100644 index 00000000..1698ad22 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkbreezeblock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/darkpanel-ctm.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkpanel-ctm.png new file mode 100644 index 00000000..abc2d482 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkpanel-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/darkpanel.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkpanel.png new file mode 100644 index 00000000..2d75e8e2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkpanel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/darkpanel2-ctm.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkpanel2-ctm.png new file mode 100644 index 00000000..abc2d482 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkpanel2-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/darkpanel2.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkpanel2.png new file mode 100644 index 00000000..2d75e8e2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkpanel2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/darksmooth.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/darksmooth.png new file mode 100644 index 00000000..a00d616c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/darksmooth.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/darkstamped.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkstamped.png new file mode 100644 index 00000000..6bd431c7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkstamped.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/darkstrip.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkstrip.png new file mode 100644 index 00000000..680a0ed5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkstrip.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/darkstripes-ctm.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkstripes-ctm.png new file mode 100644 index 00000000..d78ab65e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkstripes-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/darkstripes.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkstripes.png new file mode 100644 index 00000000..94e117e0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/darkstripes.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/darktiles-v9.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/darktiles-v9.png new file mode 100644 index 00000000..7a6e93ba Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/darktiles-v9.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/darktiles.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/darktiles.png new file mode 100644 index 00000000..6fcecfaf Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/darktiles.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/lightbreezeblocks.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightbreezeblocks.png new file mode 100644 index 00000000..8b239809 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightbreezeblocks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/lightpanel-ctm.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightpanel-ctm.png new file mode 100644 index 00000000..200aa03f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightpanel-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/lightpanel.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightpanel.png new file mode 100644 index 00000000..90233301 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightpanel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/lightpanel2-ctm.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightpanel2-ctm.png new file mode 100644 index 00000000..200aa03f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightpanel2-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/lightpanel2.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightpanel2.png new file mode 100644 index 00000000..90233301 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightpanel2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/lightsmooth.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightsmooth.png new file mode 100644 index 00000000..83fad137 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightsmooth.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/lightstamped.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightstamped.png new file mode 100644 index 00000000..91cd8cc5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightstamped.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/lightstrip.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightstrip.png new file mode 100644 index 00000000..842c5203 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightstrip.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/lightstripe-ctm.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightstripe-ctm.png new file mode 100644 index 00000000..d600ffc1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightstripe-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/lightstripe.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightstripe.png new file mode 100644 index 00000000..22bead2c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/lightstripe.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/lighttiles-v9.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/lighttiles-v9.png new file mode 100644 index 00000000..81aa23b3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/lighttiles-v9.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nucrete/lighttiles.png b/src/main/resources/assets/chisel/textures/blocks/nucrete/lighttiles.png new file mode 100644 index 00000000..7cf598e4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/nucrete/lighttiles.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/0.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/0.png new file mode 100644 index 00000000..029a4ec8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/0.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/1.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/1.png new file mode 100644 index 00000000..a4c96e90 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/10.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/10.png new file mode 100644 index 00000000..79385af1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/10.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/11.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/11.png new file mode 100644 index 00000000..5d1b95fc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/11.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/12.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/12.png new file mode 100644 index 00000000..f80cf32e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/12.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/13.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/13.png new file mode 100644 index 00000000..6f04c81c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/13.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/14.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/14.png new file mode 100644 index 00000000..b80b391c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/14.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/15.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/15.png new file mode 100644 index 00000000..d37054f0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/15.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/2.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/2.png new file mode 100644 index 00000000..2982c246 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/3.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/3.png new file mode 100644 index 00000000..d9f96d0c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/4.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/4.png new file mode 100644 index 00000000..83aecb1d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/5.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/5.png new file mode 100644 index 00000000..8cc65ee0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/5.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/6.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/6.png new file mode 100644 index 00000000..f0aa6a19 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/6.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/7.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/7.png new file mode 100644 index 00000000..475b4d40 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/7.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/8.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/8.png new file mode 100644 index 00000000..2aaa1d2b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/8.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sveltstone/9.png b/src/main/resources/assets/chisel/textures/blocks/sveltstone/9.png new file mode 100644 index 00000000..155aeec7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sveltstone/9.png differ