From 76f541bc3fb3b75923cf9ad8f410238ca0932c97 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Wed, 13 Mar 2013 19:53:39 -0700 Subject: [PATCH] Exdending length of come bee effects Adding hunger-inducing to grafter Adding Greatwood & Silverwood log planks Fixing more Version Info shit. --- thaumicbees_res/build.xml | 2 +- thaumicbees_res/changelog.txt | 5 +++++ thaumicbees_res/mcmod.info | 2 +- thaumicbees_src/thaumicbees/bees/Allele.java | 4 ++-- thaumicbees_src/thaumicbees/item/ItemThaumiumGrafter.java | 8 +++++++- thaumicbees_src/thaumicbees/main/ThaumicBees.java | 1 + .../thaumicbees/main/utils/CompatabilityManager.java | 7 +++++++ thaumicbees_src/thaumicbees/main/utils/VersionInfo.java | 4 ++-- 8 files changed, 26 insertions(+), 7 deletions(-) diff --git a/thaumicbees_res/build.xml b/thaumicbees_res/build.xml index b4be508..d30d63a 100644 --- a/thaumicbees_res/build.xml +++ b/thaumicbees_res/build.xml @@ -17,7 +17,7 @@ - + diff --git a/thaumicbees_res/changelog.txt b/thaumicbees_res/changelog.txt index 43f416b..6ef8ae2 100644 --- a/thaumicbees_res/changelog.txt +++ b/thaumicbees_res/changelog.txt @@ -1,3 +1,8 @@ +1.4.3b +Greatwood & Silverwood planks support BuildCraft facades. +Tweaking Aura cost for Repair on Thaumium Grafters and other balance. +Turns out I can't get the version crap to work properly. More fixes. + 1.4.3a Changed Version info embedded in mod to match format supported by Version checking. Will need to make this more robust in the future. Fixed bug with Thaumium Grafter not being enchantable. diff --git a/thaumicbees_res/mcmod.info b/thaumicbees_res/mcmod.info index a9ea1bf..e3d6385 100644 --- a/thaumicbees_res/mcmod.info +++ b/thaumicbees_res/mcmod.info @@ -1,7 +1,7 @@ [ { "modid": "ThaumicBees", - "version": "@VERSION@ - @BUILD_NUMBER", + "version": "@MODVERSION@", "name": "ThaumicBees", "url": "http://bit.ly/XFDvLY", "description": "Crossover mod for Forestry and Thaumcraft. Magic bees & more.", diff --git a/thaumicbees_src/thaumicbees/bees/Allele.java b/thaumicbees_src/thaumicbees/bees/Allele.java index 61fb3f5..54a972a 100644 --- a/thaumicbees_src/thaumicbees/bees/Allele.java +++ b/thaumicbees_src/thaumicbees/bees/Allele.java @@ -37,8 +37,8 @@ public class Allele implements IAllele Allele.flowerNodeFluxify = new AlleleFlower("flowerAuraNodeFlux", new FlowerProviderAuraNodeFlux(), false); Allele.cleansingEffect = new AlleleEffectCure("effectCurative", false); - Allele.digSpeed = new AlleleEffectPotion("effectDigSpeed", Potion.digSpeed, 7, false); - Allele.moveSpeed = new AlleleEffectPotion("effectMoveSpeed", Potion.moveSpeed, 5, false); + Allele.digSpeed = new AlleleEffectPotion("effectDigSpeed", Potion.digSpeed, 15, false); + Allele.moveSpeed = new AlleleEffectPotion("effectMoveSpeed", Potion.moveSpeed, 10, false); Allele.slowSpeed = new AlleleEffectPotion("effectSlowSpeed", Potion.moveSlowdown, 3, false); Allele.nodeGen = new AlleleEffectAuraNodeGrow("effectNodeGeneration", false, 400); diff --git a/thaumicbees_src/thaumicbees/item/ItemThaumiumGrafter.java b/thaumicbees_src/thaumicbees/item/ItemThaumiumGrafter.java index ae16fb7..d44b8f7 100644 --- a/thaumicbees_src/thaumicbees/item/ItemThaumiumGrafter.java +++ b/thaumicbees_src/thaumicbees/item/ItemThaumiumGrafter.java @@ -9,6 +9,7 @@ import forestry.api.arboriculture.IToolGrafter; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -80,8 +81,13 @@ public class ItemThaumiumGrafter extends Item implements IVisRepairable, IToolGr { if (stack.getItemDamage() > 0) { - if (ThaumcraftApi.decreaseClosestAura(e.worldObj, e.posX, e.posY, e.posZ, 1, true)) + if (ThaumcraftApi.decreaseClosestAura(e.worldObj, e.posX, e.posY, e.posZ, 2, true)) { + if (e instanceof EntityPlayer) + { + EntityPlayer p = (EntityPlayer)e; + p.addExhaustion(0.12f); + } stack.damageItem(-1, (EntityLiving)e); } } diff --git a/thaumicbees_src/thaumicbees/main/ThaumicBees.java b/thaumicbees_src/thaumicbees/main/ThaumicBees.java index c56b5cd..3775a67 100644 --- a/thaumicbees_src/thaumicbees/main/ThaumicBees.java +++ b/thaumicbees_src/thaumicbees/main/ThaumicBees.java @@ -73,6 +73,7 @@ public class ThaumicBees this.modConfig.registerTileEntities(); this.modConfig.setupItems(); + CompatabilityManager.setupBuildCraftFacades(); CompatabilityManager.setupBackpacks(); } diff --git a/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java b/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java index 0100583..9a09c60 100644 --- a/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java +++ b/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java @@ -17,6 +17,7 @@ import thaumicbees.item.ItemMiscResources; import thaumicbees.item.types.CombType; import thaumicbees.item.types.DropType; import thaumicbees.item.types.LiquidType; +import thaumicbees.item.types.PlankType; import thaumicbees.item.types.PollenType; import thaumicbees.item.types.PropolisType; import thaumicbees.item.types.ResourceType; @@ -440,6 +441,12 @@ public class CompatabilityManager } + public static void setupBuildCraftFacades() + { + FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", ThaumicBees.getConfig().planksWood.blockID + "@" + PlankType.GREATWOOD.ordinal()); + FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", ThaumicBees.getConfig().planksWood.blockID + "@" + PlankType.SILVERWOOD.ordinal()); + } + public static void setupResearch() { ObjectTags tags; diff --git a/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java b/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java index 8d4040d..dd79843 100644 --- a/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java +++ b/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java @@ -81,7 +81,7 @@ public class VersionInfo int[] versionTokens = parseVersion(version); int[] targetTokens = parseVersion(target); - for (int i = 0; i < versionTokens.length; ++i) + for (int i = 0; i < versionTokens.length && i < targetTokens.length; ++i) { if (versionTokens[i] < targetTokens[i]) { @@ -111,7 +111,7 @@ public class VersionInfo int[] versionTokens = parseVersion(version); int[] targetTokens = parseVersion(target); - for (int i = 0; i < versionTokens.length; ++i) + for (int i = 0; i < versionTokens.length && i < targetTokens.length; ++i) { if (versionTokens[i] > targetTokens[i]) {