From d5dbfe5f6d7e56777fa6d531afb572bbadc7b254 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Mon, 1 Jan 2024 19:07:05 +0000 Subject: [PATCH] fix mining levels with iguana --- src/main/java/team/chisel/Chisel.java | 4 +++ src/main/java/team/chisel/Features.java | 36 ++++++++++++++++++++----- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/src/main/java/team/chisel/Chisel.java b/src/main/java/team/chisel/Chisel.java index dc64772b..07f64a92 100644 --- a/src/main/java/team/chisel/Chisel.java +++ b/src/main/java/team/chisel/Chisel.java @@ -75,6 +75,7 @@ public class Chisel { public static final BlockCarvable.SoundType soundMetalFootstep = new BlockCarvable.SoundType("metal", 1.0f, 1.0f); public static boolean multipartLoaded = false; public static boolean gtnhLoaded = false; + public static boolean iguanaTweaksLoaded = false; public static int renderEldritchId; public static int renderAutoChiselId; public static int renderGlowId; @@ -148,6 +149,9 @@ public class Chisel { if (Loader.isModLoaded("dreamcraft")) { gtnhLoaded = true; } + if (Loader.isModLoaded("IguanaTweaksTConstruct")) { + iguanaTweaksLoaded = true; + } TabsInit.preInit(); Features.preInit(); Statistics.init(); diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 06ea837c..6280f177 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -940,7 +940,11 @@ public enum Features { .setResistance(10F) .setStepSound(Block.soundTypeMetal); - diamond_block.setHarvestLevel("pickaxe", 2); + if (Chisel.iguanaTweaksLoaded) { + diamond_block.setHarvestLevel("pickaxe", 4); + } else { + diamond_block.setHarvestLevel("pickaxe", 2); + } Carving.chisel.addVariation("diamond_block", Blocks.diamond_block, 0, 0); diamond_block.carverHelper.addVariation("tile.diamond.1.desc", 1, "diamond/terrain-diamond-embossed"); @@ -1035,7 +1039,11 @@ public enum Features { .setResistance(10.0F) .setStepSound(Block.soundTypeMetal); - emerald_block.setHarvestLevel("pickaxe", 2); + if (Chisel.iguanaTweaksLoaded) { + emerald_block.setHarvestLevel("pickaxe", 4); + } else { + emerald_block.setHarvestLevel("pickaxe", 2); + } Carving.chisel.addVariation("emerald_block", Blocks.emerald_block, 0, 0); emerald_block.carverHelper.addVariation("tile.emerald.1.desc", 1, "emerald/panel"); @@ -1519,7 +1527,11 @@ public enum Features { .setResistance(10F) .setStepSound(Block.soundTypeMetal); - gold_block.setHarvestLevel("pickaxe", 2); + if (Chisel.iguanaTweaksLoaded) { + gold_block.setHarvestLevel("pickaxe", 3); + } else { + gold_block.setHarvestLevel("pickaxe", 2); + } Carving.chisel.addVariation("gold_block", Blocks.gold_block, 0, 0); gold_block.carverHelper.addVariation("tile.gold.1.desc", 1, "gold/terrain-gold-largeingot"); @@ -1930,7 +1942,11 @@ public enum Features { .setResistance(10F) .setStepSound(Block.soundTypeMetal); - iron_block.setHarvestLevel("pickaxe", 1); + if (Chisel.iguanaTweaksLoaded) { + iron_block.setHarvestLevel("pickaxe", 2); + } else { + iron_block.setHarvestLevel("pickaxe", 1); + } Carving.chisel.addVariation("iron_block", Blocks.iron_block, 0, 0); iron_block.carverHelper.addVariation("tile.iron.1.desc", 1, "iron/terrain-iron-largeingot"); @@ -2044,7 +2060,11 @@ public enum Features { .setResistance(5F) .setStepSound(Block.soundTypeStone); - lapis_block.setHarvestLevel("pickaxe", 1); + if (Chisel.iguanaTweaksLoaded) { + lapis_block.setHarvestLevel("pickaxe", 2); + } else { + lapis_block.setHarvestLevel("pickaxe", 1); + } Carving.chisel.addVariation("lapis_block", Blocks.lapis_block, 0, 0); lapis_block.carverHelper.addVariation("tile.lapis.1.desc", 1, "lapis/terrain-lapisblock-chunky"); @@ -2804,7 +2824,11 @@ public enum Features { .setResistance(2000.0F) .setStepSound(Block.soundTypeStone); - obsidian.setHarvestLevel("pickaxe", 3); + if (Chisel.iguanaTweaksLoaded) { + obsidian.setHarvestLevel("pickaxe", 5); + } else { + obsidian.setHarvestLevel("pickaxe", 3); + } Carving.chisel.addVariation("obsidian", Blocks.obsidian, 0, 0); obsidian.carverHelper.addVariation("tile.obsidian.1.desc", 1, "obsidian/pillar");