diff --git a/gradle.properties b/gradle.properties index fbdd0b4..3ceb5e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ version_major=2 version_minor=4 -version_rev=3 +version_rev=4 version_forestry=4.2.+ version_botania=r1.8-248 diff --git a/src/main/java/magicbees/block/BlockEffectJar.java b/src/main/java/magicbees/block/BlockEffectJar.java index ecedcd0..bec7226 100644 --- a/src/main/java/magicbees/block/BlockEffectJar.java +++ b/src/main/java/magicbees/block/BlockEffectJar.java @@ -71,8 +71,8 @@ public class BlockEffectJar extends BlockContainer @Override public void breakBlock(World world, int x, int y, int z, Block block, int meta) { - super.breakBlock(world, x, y, z, block, meta); this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, meta); } private void dropInventory(World world, int x, int y, int z) diff --git a/src/main/java/magicbees/item/ItemMysteriousMagnet.java b/src/main/java/magicbees/item/ItemMysteriousMagnet.java index 700fa65..b2ff39b 100644 --- a/src/main/java/magicbees/item/ItemMysteriousMagnet.java +++ b/src/main/java/magicbees/item/ItemMysteriousMagnet.java @@ -204,7 +204,8 @@ public class ItemMysteriousMagnet extends Item implements IBauble { if (world.rand.nextFloat() < 0.2f) { float pitch = 0.85f - world.rand.nextFloat() * 3f / 10f; - world.playSoundEffect(e.posX, e.posY, e.posZ, "mob.endermen.portal", 0.6f, pitch); + if(!Config.disableMagnetSound) + world.playSoundEffect(e.posX, e.posY, e.posZ, "mob.endermen.portal", 0.6f, pitch); } } } diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index e9caa65..868ef43 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -66,6 +66,7 @@ import forestry.api.storage.EnumBackpackType; public class Config { public static final String CATEGORY_GENERAL = "general"; + public static final String CATEGORY_CLIENT = "client"; public static final String CATEGORY_DEBUG = "debug"; public static final String CATEGORY_MODULES = "modules"; public static final String CATEGORY_BOTANIA = "botaniaPlugin"; @@ -123,6 +124,8 @@ public class Config public static ItemMoonDial moonDial; public static ItemMysteriousMagnet magnet; + public static boolean disableMagnetSound; + //----- Liquid Capsules -------------------- public static ItemCapsule magicCapsule; public static ItemCapsule voidCapsule; @@ -331,6 +334,10 @@ public class Config p = configuration.get(CATEGORY_GENERAL, "aromaticLumpSwarmerRate", 95); p.comment = "Aromatic lump swarmer rate. Final value is X/1000. 0 will disable, values outside of [0,1000] will be clamped to range. Default: 95"; aromaticLumpSwarmerRate = p.getInt(); + + p = configuration.get(CATEGORY_CLIENT, "disableMagnetSound", false); + p.comment = "set to true to disable the magnet from making noise on item pickup"; + disableMagnetSound = p.getBoolean(); } private void setupEffectJar() {