diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index ee2524bf..4c6810b1 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2645,6 +2645,16 @@ public enum Features { voidstone2.carverHelper.registerAll(voidstone2, "voidstone2"); Carving.chisel.registerOre("voidstone2", "voidstone2"); + + BlockCarvable voidstoneRunic = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F); + voidstoneRunic.carverHelper.setChiselBlockName("Voidstone Runic"); + + for (int i = 1; i < 16; i++) + voidstoneRunic.carverHelper.addVariation("tile.voidstoneRunic." + i + ".desc", i, "voidstone/runes/rune" + sGNames[i].replaceAll(" ", "")); + voidstoneRunic.carverHelper.registerAll(voidstoneRunic, "voidstoneRunic"); + voidstoneRunic.carverHelper.registerVariations("voidstone", voidstoneRunic); + + Carving.chisel.registerOre("voidstoneRunic", "voidstoneRunic"); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java index 885fa8f0..25ff99e9 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java @@ -1,6 +1,8 @@ package com.cricketcraft.chisel.block; import net.minecraft.block.material.Material; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.world.IBlockAccess; import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; @@ -26,4 +28,8 @@ public class BlockCarvableAntiBlock extends BlockCarvableColor implements ICarva return false; } */ + @Override + public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { + return false; + } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePillar.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePillar.java index f2736c4a..4231ed0b 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePillar.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePillar.java @@ -31,7 +31,12 @@ public class BlockCarvablePillar extends BlockCarvable { } public IIcon getCtmIcon(int index, int metadata) { - CarvableVariation var = carverHelper.variations.get(metadata); + //Workaround to prevent crash with invalid meta + CarvableVariation var = null; + if(metadata <= carverHelper.variations.size()) + var = carverHelper.variations.get(metadata); + else + var = carverHelper.variations.get(0); if (index >= 4) return var.iconTop; diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 515c1687..4f2d66b3 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -130,6 +130,22 @@ tile.voidstone.4.desc=Runic Voidstone tile.voidstone.5.desc=Metal-Bordered Voidstone tile.voidstone.6.desc=Eye Voidstone tile.voidstone.7.desc=Beveled Voidstone +tile.chisel.voidstoneRunic.name=Runic Voidstone +tile.voidstoneRunic.0.desc=Voidstone - Orange Rune +tile.voidstoneRunic.1.desc=Voidstone - Magenta Rune +tile.voidstoneRunic.2.desc=Voidstone - Light Blue Rune +tile.voidstoneRunic.3.desc=Voidstone - Yellow Rune +tile.voidstoneRunic.4.desc=Voidstone - Lime Rune +tile.voidstoneRunic.5.desc=Voidstone - Pink Rune +tile.voidstoneRunic.6.desc=Voidstone - Gray Rune +tile.voidstoneRunic.7.desc=Voidstone - Light Gray Rune +tile.voidstoneRunic.8.desc=Voidstone - Cyan Rune +tile.voidstoneRunic.9.desc=Voidstone - Purple Rune +tile.voidstoneRunic.10.desc=Voidstone - Blue Rune +tile.voidstoneRunic.11.desc=Voidstone - Brown Rune +tile.voidstoneRunic.12.desc=Voidstone - Green Rune +tile.voidstoneRunic.13.desc=Voidstone - Red Rune +tile.voidstoneRunic.14.desc=Voidstone - Black Rune #Void Stone Pillars tile.chisel.voidstonePillar.name=Voidstone Pillar diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeBlack.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeBlack.png new file mode 100644 index 00000000..92b24348 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeBlack.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeBlue.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeBlue.png new file mode 100644 index 00000000..84022b54 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeBlue.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeBrown.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeBrown.png new file mode 100644 index 00000000..0a21e37f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeBrown.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeCyan.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeCyan.png new file mode 100644 index 00000000..0c1ea76f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeCyan.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeGray.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeGray.png new file mode 100644 index 00000000..abb2dcd2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeGray.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeGreen.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeGreen.png new file mode 100644 index 00000000..0b76c9d8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeGreen.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeLightBlue.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeLightBlue.png new file mode 100644 index 00000000..1f7b3b43 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeLightBlue.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeLightGray.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeLightGray.png new file mode 100644 index 00000000..4cb75b60 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeLightGray.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeLime.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeLime.png new file mode 100644 index 00000000..4bcacf7a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeLime.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeMagenta.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeMagenta.png new file mode 100644 index 00000000..8dd2a4e4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeMagenta.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeOrange.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeOrange.png new file mode 100644 index 00000000..22f55ba9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeOrange.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runePink.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runePink.png new file mode 100644 index 00000000..f6c7c531 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runePink.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runePurple.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runePurple.png new file mode 100644 index 00000000..0354e696 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runePurple.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeRed.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeRed.png new file mode 100644 index 00000000..ee401194 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeRed.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeYellow.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeYellow.png new file mode 100644 index 00000000..f4691ee0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/runes/runeYellow.png differ