diff --git a/build.gradle b/build.gradle index c5033a3..db63b49 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ repositories { apply plugin: 'forge' -version = "1.7.10-2.1.20" +version = "1.7.10-2.1.22" group= "magicbees" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "magicbees" @@ -35,7 +35,7 @@ minecraft { dependencies { compile files("/libs/Thaumcraft-1.7.10-4.2.0.0.jar") - compile 'net.sengir.forestry:forestry_1.7.10:3.0.0.174:dev' + compile 'net.sengir.forestry:forestry_1.7.10:3.1.1.4:dev' compile files("/libs/Blood Magic-v1.1.0(1.7.10).jar") } diff --git a/src/main/java/magicbees/item/ItemThaumiumGrafter.java b/src/main/java/magicbees/item/ItemThaumiumGrafter.java index ee4f413..cad6c0b 100644 --- a/src/main/java/magicbees/item/ItemThaumiumGrafter.java +++ b/src/main/java/magicbees/item/ItemThaumiumGrafter.java @@ -76,7 +76,10 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT int meta = world.getBlockMetadata(x, y, z) & 1; if (meta == 0 || meta == 1) { - this.dropItem(world, x, y, z, new ItemStack(Config.tcPlant, 1, meta)); + double chance = Math.random(); + if (chance <= Config.ThaumcraftSaplingDroprate) { + this.dropItem(world, x, y, z, new ItemStack(Config.tcPlant, 1, meta)); + } } } itemstack.damageItem(damage, entityLiving); diff --git a/src/main/java/magicbees/item/ItemThaumiumScoop.java b/src/main/java/magicbees/item/ItemThaumiumScoop.java index eb488d0..8bd86fb 100644 --- a/src/main/java/magicbees/item/ItemThaumiumScoop.java +++ b/src/main/java/magicbees/item/ItemThaumiumScoop.java @@ -93,6 +93,6 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + "thaumiumScoop"); + this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":thaumiumScoop"); } } diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index dadfcba..519512c 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -50,7 +50,7 @@ public class Config { public boolean DrawParticleEffects; public boolean BeeInfusionsAdded; - public boolean ThaumaturgeBackpackActive; + public static boolean ThaumaturgeBackpackActive; public boolean AddThaumcraftItemsToBackpacks; public boolean DisableUpdateNotification; public boolean AreMagicPlanksFlammable; @@ -62,6 +62,7 @@ public class Config public boolean DoHiveRetrogen; public boolean ForceHiveRegen; public static boolean LogHiveSpawns; + public static double ThaumcraftSaplingDroprate; public static boolean ArsMagicaActive; public static boolean BloodMagicActive; @@ -462,6 +463,9 @@ public class Config p = configuration.get("general", "useImpregnatedStickInTools", false); p.comment = "Set to true to make Thaumium Grafter & Scoop require impregnated sticks in the recipe."; this.UseImpregnatedStickInTools = p.getBoolean(false); + + p = configuration.get("general", "thaumCraftSaplingDroprate", 0.1, "The chance for thaumcraft saplings using the thaumium grafter", 0.0, 1.0); + this.ThaumcraftSaplingDroprate = p.getDouble(0.1); p = configuration.get("general", "moonDialShowText", false); p.comment = "set to true to show the current moon phase in mouse-over text."; diff --git a/src/main/java/magicbees/main/utils/CraftingManager.java b/src/main/java/magicbees/main/utils/CraftingManager.java index 8f16f51..de520c7 100644 --- a/src/main/java/magicbees/main/utils/CraftingManager.java +++ b/src/main/java/magicbees/main/utils/CraftingManager.java @@ -383,14 +383,16 @@ public class CraftingManager input, input, input, input }); - // T1 Thaumaturge's backpack - GameRegistry.addRecipe(new ItemStack(Config.thaumaturgeBackpackT1), new Object[] { - "SWS", "NCN", "SWS", - 'S', Items.string, - 'W', Blocks.wool, - 'N', new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.AMBER.ordinal()), - 'C', Blocks.chest - }); + if(Config.ThaumaturgeBackpackActive) { + // T1 Thaumaturge's backpack + GameRegistry.addRecipe(new ItemStack(Config.thaumaturgeBackpackT1), new Object[]{ + "SWS", "NCN", "SWS", + 'S', Items.string, + 'W', Blocks.wool, + 'N', new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.AMBER.ordinal()), + 'C', Blocks.chest + }); + } // "bottling" Crystal aspects. /*for (EnumTag tag : EnumTag.values()) diff --git a/src/main/java/magicbees/main/utils/VersionInfo.java b/src/main/java/magicbees/main/utils/VersionInfo.java index 0ad0c32..4405559 100644 --- a/src/main/java/magicbees/main/utils/VersionInfo.java +++ b/src/main/java/magicbees/main/utils/VersionInfo.java @@ -25,7 +25,7 @@ public class VersionInfo public static final String Logo = "/gfx/magicbees/logo.png"; - public static final String Depends = "required-after:Forestry;after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:AWWayofTime"; + public static final String Depends = "required-after:Forestry@[3.1.1.4,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:AWWayofTime"; boolean criticalUpdate; boolean newVersion; diff --git a/src/main/java/magicbees/storage/BackpackDefinition.java b/src/main/java/magicbees/storage/BackpackDefinition.java index 9fc3c74..0773792 100644 --- a/src/main/java/magicbees/storage/BackpackDefinition.java +++ b/src/main/java/magicbees/storage/BackpackDefinition.java @@ -35,7 +35,7 @@ public class BackpackDefinition implements IBackpackDefinition @Override public String getName(ItemStack backpack) { - return backpack.getDisplayName(); + return name; } @Override