From afccf0a7cc1bd3c3b0661f55ba6583a36506b05a Mon Sep 17 00:00:00 2001 From: Michael Lawrence Date: Sat, 4 Oct 2014 06:20:31 -0700 Subject: [PATCH 1/5] add chisel compatibility for Geologica marble and limestone --- .../chisel/ChiselModCompatibility.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java index 4908ebdd..fb43c206 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java @@ -149,6 +149,25 @@ public class ChiselModCompatibility blocks[0].setHarvestLevel("chisel", 0, 3); } }; + + new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "STRONG_STONE") + { + @Override + void action() + { + Carving.chisel.addVariation("marble", block, 5, 99); + block.setHarvestLevel("chisel", 0, 5); + } + }; + new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "MEDIUM_STONE") + { + @Override + void action() + { + Carving.chisel.addVariation("limestone", block, 0, 99); + block.setHarvestLevel("chisel", 0, 0); + } + }; } } From 5cec7699efb0a71b3e90b91762eae17392761464 Mon Sep 17 00:00:00 2001 From: Michael Lawrence Date: Sat, 4 Oct 2014 07:18:58 -0700 Subject: [PATCH 2/5] also support limestone/marble slabs and stairs (although it seems I do not have the correct group for the stairs, any help?), and Geologica granite stone brick and cobblestone is treated as the vanilla stone counterparts --- .../chisel/ChiselModCompatibility.java | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java index fb43c206..bebad330 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java @@ -159,6 +159,24 @@ public class ChiselModCompatibility block.setHarvestLevel("chisel", 0, 5); } }; + new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "STRONG_STONE_SLAB") + { + @Override + void action() + { + Carving.chisel.addVariation("marbleSlab", block, 5, 99); + block.setHarvestLevel("chisel", 0, 5); + } + }; + new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "STRONG_STONE_BRICK_STAIRS__MARBLE") + { + @Override + void action() + { + Carving.chisel.addVariation("marbleStairs", block, 0, 99); + block.setHarvestLevel("chisel", 0, 0); + } + }; new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "MEDIUM_STONE") { @Override @@ -168,6 +186,42 @@ public class ChiselModCompatibility block.setHarvestLevel("chisel", 0, 0); } }; + new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "MEDIUM_STONE_SLAB") + { + @Override + void action() + { + Carving.chisel.addVariation("limestoneSlab", block, 0, 99); + block.setHarvestLevel("chisel", 0, 0); + } + }; + new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "MEDIUM_STONE_BRICK_STAIRS__LIMESTONE") + { + @Override + void action() + { + Carving.chisel.addVariation("limestoneStairs", block, 0, 99); + block.setHarvestLevel("chisel", 0, 0); + } + }; + new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "STRONG_STONE_BRICK") + { + @Override + void action() + { + Carving.chisel.addVariation("stoneBrick", block, 3, 99); + block.setHarvestLevel("chisel", 0, 3); + } + }; + new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "STRONG_COBBLE") + { + @Override + void action() + { + Carving.chisel.addVariation("cobblestone", block, 3, 99); + block.setHarvestLevel("chisel", 0, 3); + } + }; } } From 4c2a296074844f49cd1548b0856e2d61ad2c9522 Mon Sep 17 00:00:00 2001 From: Michael Lawrence Date: Sat, 4 Oct 2014 19:38:34 -0700 Subject: [PATCH 3/5] Revert "also support limestone/marble slabs and stairs (although it seems I do" This reverts commit ae476e322082ca1114be159b3159519c06029795. --- .../chisel/ChiselModCompatibility.java | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java index bebad330..fb43c206 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java @@ -159,24 +159,6 @@ public class ChiselModCompatibility block.setHarvestLevel("chisel", 0, 5); } }; - new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "STRONG_STONE_SLAB") - { - @Override - void action() - { - Carving.chisel.addVariation("marbleSlab", block, 5, 99); - block.setHarvestLevel("chisel", 0, 5); - } - }; - new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "STRONG_STONE_BRICK_STAIRS__MARBLE") - { - @Override - void action() - { - Carving.chisel.addVariation("marbleStairs", block, 0, 99); - block.setHarvestLevel("chisel", 0, 0); - } - }; new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "MEDIUM_STONE") { @Override @@ -186,42 +168,6 @@ public class ChiselModCompatibility block.setHarvestLevel("chisel", 0, 0); } }; - new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "MEDIUM_STONE_SLAB") - { - @Override - void action() - { - Carving.chisel.addVariation("limestoneSlab", block, 0, 99); - block.setHarvestLevel("chisel", 0, 0); - } - }; - new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "MEDIUM_STONE_BRICK_STAIRS__LIMESTONE") - { - @Override - void action() - { - Carving.chisel.addVariation("limestoneStairs", block, 0, 99); - block.setHarvestLevel("chisel", 0, 0); - } - }; - new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "STRONG_STONE_BRICK") - { - @Override - void action() - { - Carving.chisel.addVariation("stoneBrick", block, 3, 99); - block.setHarvestLevel("chisel", 0, 3); - } - }; - new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "STRONG_COBBLE") - { - @Override - void action() - { - Carving.chisel.addVariation("cobblestone", block, 3, 99); - block.setHarvestLevel("chisel", 0, 3); - } - }; } } From 36705cc6515c9356e5462aa8377d425698cc4f57 Mon Sep 17 00:00:00 2001 From: Michael Lawrence Date: Sat, 4 Oct 2014 19:38:49 -0700 Subject: [PATCH 4/5] Revert "add chisel compatibility for Geologica marble and limestone" This reverts commit 845ea7a6cc54e5180b1da51cf4c61edf76dbca6d. --- .../chisel/ChiselModCompatibility.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java index fb43c206..4908ebdd 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java @@ -149,25 +149,6 @@ public class ChiselModCompatibility blocks[0].setHarvestLevel("chisel", 0, 3); } }; - - new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "STRONG_STONE") - { - @Override - void action() - { - Carving.chisel.addVariation("marble", block, 5, 99); - block.setHarvestLevel("chisel", 0, 5); - } - }; - new ClassBlockCompat("org.pfaa.geologica.GeologicaBlocks", "MEDIUM_STONE") - { - @Override - void action() - { - Carving.chisel.addVariation("limestone", block, 0, 99); - block.setHarvestLevel("chisel", 0, 0); - } - }; } } From f1d2a9779b1447ff295e1d2c960812d666663755 Mon Sep 17 00:00:00 2001 From: Michael Lawrence Date: Sat, 4 Oct 2014 19:57:28 -0700 Subject: [PATCH 5/5] add Geologica stone compatibility via addSupport() --- .../java/info/jbcs/minecraft/chisel/Compatibility.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/info/jbcs/minecraft/chisel/Compatibility.java b/src/main/java/info/jbcs/minecraft/chisel/Compatibility.java index 3cd8d7eb..bcf48364 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Compatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Compatibility.java @@ -18,6 +18,15 @@ public class Compatibility addSupport("ProjRed|Exploration", "projectred.exploration.stone", "marble", 0, 99); addSupport("bluepower", "marble", "marble", 0, 99); + + addSupport("PFAAGeologica", "strongStone", "marble", 5, 99); + addSupport("PFAAGeologica", "strongStoneSlab", "marbleSlab", 5, 99); + addSupport("PFAAGeologica", "strongStoneBrickStairs.marble", "marbleStairs", 0, 99); + addSupport("PFAAGeologica", "mediumStone", "limestone", 0, 99); + addSupport("PFAAGeologica", "mediumStoneSlab", "limestoneSlab", 0, 99); + addSupport("PFAAGeologica", "mediumStoneBrickStairs.limestone", "limestoneStairs", 0, 99); + addSupport("PFAAGeologica", "strongStoneBrick", "stoneBrick", 3, 99); + addSupport("PFAAGeologica", "strongCobble", "cobblestone", 3, 99); } public static void addSupport(String modname, String blockname, String name, int metadata, int order)