From c309c202688613d4c8f4cc5c8f0a7d3acfd3c36a Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Tue, 10 Sep 2013 15:24:52 -0700 Subject: [PATCH] Seriously Thaumcraft? WTF. Fixing logic error in Railcraft transmutation effect logic. --- magicbees_res/assets/magicbees/lang/en_US.xml | 2 +- magicbees_res/build.xml | 2 +- magicbees_src/magicbees/bees/TransmutationEffectRailcraft.java | 2 +- .../magicbees/main/utils/compat/ThaumcraftHelper.java | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/magicbees_res/assets/magicbees/lang/en_US.xml b/magicbees_res/assets/magicbees/lang/en_US.xml index b9e5f1f..37945b5 100644 --- a/magicbees_res/assets/magicbees/lang/en_US.xml +++ b/magicbees_res/assets/magicbees/lang/en_US.xml @@ -416,6 +416,6 @@ Apimancy Apimancy Adding some sparkle to your buzz. - Don't get too excited.\This is just a test. + Don't get too excited. This is just a test. diff --git a/magicbees_res/build.xml b/magicbees_res/build.xml index 3ef1c1f..4929da9 100644 --- a/magicbees_res/build.xml +++ b/magicbees_res/build.xml @@ -14,7 +14,7 @@ - + diff --git a/magicbees_src/magicbees/bees/TransmutationEffectRailcraft.java b/magicbees_src/magicbees/bees/TransmutationEffectRailcraft.java index 47e5fb0..f88b18c 100644 --- a/magicbees_src/magicbees/bees/TransmutationEffectRailcraft.java +++ b/magicbees_src/magicbees/bees/TransmutationEffectRailcraft.java @@ -46,7 +46,7 @@ public class TransmutationEffectRailcraft implements ITransmutationEffectLogic { boolean flag = false; if (BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.WATER) && - biome.biomeName.toLowerCase(Locale.ENGLISH).contains("river")) + !biome.biomeName.toLowerCase(Locale.ENGLISH).contains("river")) { ItemStack item = GameRegistry.findItemStack("Railcraft", "cube.stone.abyssal", 1); if (item != null) diff --git a/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java b/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java index 0f58a4e..68eebab 100644 --- a/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -134,7 +134,7 @@ public class ThaumcraftHelper getBlocks(); getItems(); - addItemsToBackpack(); + //addItemsToBackpack(); } } @@ -167,6 +167,7 @@ public class ThaumcraftHelper Config.tcGolem = GameRegistry.findItem(Name, "ItemGolemPlacer"); //Config.tcWispEssence = ItemApi.getItem("itemWispEssence", 0).getItem(); Config.tcNuggets = GameRegistry.findItem(Name, "ItemNugget"); + Config.tcShard = GameRegistry.findItem(Name, "ItemShard"); Config.tcNuggetChicken = GameRegistry.findItem(Name, "ItemNuggetChicken"); Config.tcNuggetBeef = GameRegistry.findItem(Name, "itemNuggetBeef"); Config.tcNuggetPork = GameRegistry.findItem(Name, "itemNuggetPork");