diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockSpikesRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/BlockSpikesRenderer.java index 3bcbe4ff..2f0a5681 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/BlockSpikesRenderer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/BlockSpikesRenderer.java @@ -69,7 +69,7 @@ public class BlockSpikesRenderer implements ISimpleBlockRenderingHandler renderer.renderStandardBlock(block, x, y, z); Tessellator tessellator = Tessellator.instance; - IIcon icon = ModBlocks.spikeTrap.iconSpike; + //IIcon icon = ModBlocks.spikeTrap.iconSpike; double d = 1.5 / 16; double r = d / 2; @@ -91,7 +91,7 @@ public class BlockSpikesRenderer implements ISimpleBlockRenderingHandler tessellator.addTranslation(sx, 0, sz); - drawSpike(icon, r, 0.5 + rand.nextDouble() * 0.35, x, y, z, rand.nextDouble() * skew - skew / 2, rand.nextDouble() * skew - skew / 2); + //drawSpike(icon, r, 0.5 + rand.nextDouble() * 0.35, x, y, z, rand.nextDouble() * skew - skew / 2, rand.nextDouble() * skew - skew / 2); tessellator.addTranslation(-sx, 0, -sz); } } diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index e2a1d65a..bfeca9fd 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1462,7 +1462,7 @@ public class ModBlocks { } if(Configurations.featureEnabled("cloudbrick")){ cloudbrick = (BlockCarvable) new BlockCarvable(Material.air).setHardness(0.1F).setResistance(0.5F); - cloudbrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloudbrick.0.desc"), 0, "cloudbrick/larged"); + cloudbrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloudbrick.0.desc"), 0, "cloudbrick/large"); cloudbrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloudbrick.1.desc"), 1, "cloudbrick/small"); cloudbrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloudbrick.2.desc"), 2, "cloudbrick/vertical"); cloudbrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloudbrick.3.desc"), 3, "cloudbrick/grid"); diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/chaotic-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/chaotic-spaced.png new file mode 100644 index 00000000..e982bcd2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/chaotic-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/chaotic.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/chaotic.png new file mode 100644 index 00000000..d1fb8713 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/chaotic.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/large-spaced-top.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/large-spaced-top.png new file mode 100644 index 00000000..55023920 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/large-spaced-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/large-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/large-spaced.png new file mode 100644 index 00000000..d65b510f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/large-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/large.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/large.png new file mode 100644 index 00000000..a0c84a4f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/large.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/normal-spaced-top.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/normal-spaced-top.png new file mode 100644 index 00000000..edf1f448 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/normal-spaced-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/normal-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/normal-spaced.png new file mode 100644 index 00000000..b3d0935f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/normal-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/normal-top.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/normal-top.png new file mode 100644 index 00000000..e6af112d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/normal-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/normal.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/normal.png new file mode 100644 index 00000000..a8bceef0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-acacia/normal.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/chaotic-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/chaotic-spaced.png new file mode 100644 index 00000000..a8d1217b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/chaotic-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/chaotic.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/chaotic.png new file mode 100644 index 00000000..5a47bae4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/chaotic.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/large-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/large-spaced.png new file mode 100644 index 00000000..06e756e1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/large-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/large.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/large.png new file mode 100644 index 00000000..20184f11 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/large.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/normal-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/normal-spaced.png new file mode 100644 index 00000000..0f1fe916 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/normal-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/normal.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/normal.png new file mode 100644 index 00000000..f1b02c3b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-birch/normal.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/chaotic-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/chaotic-spaced.png new file mode 100644 index 00000000..1230f477 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/chaotic-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/chaotic.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/chaotic.png new file mode 100644 index 00000000..e9950637 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/chaotic.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/large-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/large-spaced.png new file mode 100644 index 00000000..97bd44c7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/large-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/large.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/large.png new file mode 100644 index 00000000..54cc2b5c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/large.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/normal-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/normal-spaced.png new file mode 100644 index 00000000..c1d2d868 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/normal-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/normal.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/normal.png new file mode 100644 index 00000000..3df87b57 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-dark/normal.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/chaotic-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/chaotic-spaced.png new file mode 100644 index 00000000..b35d7f36 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/chaotic-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/chaotic.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/chaotic.png new file mode 100644 index 00000000..d370f711 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/chaotic.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/large-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/large-spaced.png new file mode 100644 index 00000000..2689ec62 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/large-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/large.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/large.png new file mode 100644 index 00000000..740acf7d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/large.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/normal-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/normal-spaced.png new file mode 100644 index 00000000..0e1e1cd4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/normal-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/normal.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/normal.png new file mode 100644 index 00000000..d3eb47e2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-jungle/normal.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/chaotic-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/chaotic-spaced.png new file mode 100644 index 00000000..6d0c7e64 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/chaotic-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/chaotic.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/chaotic.png new file mode 100644 index 00000000..bcb09880 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/chaotic.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/large-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/large-spaced.png new file mode 100644 index 00000000..bd87e8ff Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/large-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/large.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/large.png new file mode 100644 index 00000000..62b6cd72 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/large.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/normal-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/normal-spaced.png new file mode 100644 index 00000000..40f3982f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/normal-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/normal.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/normal.png new file mode 100644 index 00000000..ab934723 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-oak/normal.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/chaotic-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/chaotic-spaced.png new file mode 100644 index 00000000..fb856bee Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/chaotic-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/chaotic.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/chaotic.png new file mode 100644 index 00000000..e426952a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/chaotic.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/large-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/large-spaced.png new file mode 100644 index 00000000..d50f6082 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/large-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/large.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/large.png new file mode 100644 index 00000000..3cb8facf Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/large.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/normal-spaced.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/normal-spaced.png new file mode 100644 index 00000000..5202c466 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/normal-spaced.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/normal.png b/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/normal.png new file mode 100644 index 00000000..a7598cac Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/thinWood-spruce/normal.png differ