diff --git a/build.gradle b/build.gradle index 47ec089..c5033a3 100644 --- a/build.gradle +++ b/build.gradle @@ -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.90:dev' + compile 'net.sengir.forestry:forestry_1.7.10:3.0.0.174: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 e55ac97..ee4f413 100644 --- a/src/main/java/magicbees/item/ItemThaumiumGrafter.java +++ b/src/main/java/magicbees/item/ItemThaumiumGrafter.java @@ -1,10 +1,13 @@ package magicbees.item; import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import magicbees.main.CommonProxy; import magicbees.main.Config; import magicbees.main.utils.compat.ThaumcraftHelper; import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -134,4 +137,11 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT } return flag; } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) + { + this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":thaumiumGrafter"); + } } diff --git a/src/main/java/magicbees/item/ItemThaumiumScoop.java b/src/main/java/magicbees/item/ItemThaumiumScoop.java index 539b925..eb488d0 100644 --- a/src/main/java/magicbees/item/ItemThaumiumScoop.java +++ b/src/main/java/magicbees/item/ItemThaumiumScoop.java @@ -1,8 +1,11 @@ package magicbees.item; import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import magicbees.main.CommonProxy; import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -85,4 +88,11 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop return ThaumcraftApi.toolMatThaumium.customCraftingMaterial == par2ItemStack.getItem() ? true : super .getIsRepairable(par1ItemStack, par2ItemStack); } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) + { + 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 2b0688c..dadfcba 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -356,12 +356,12 @@ public class Config try { // Reflecting avoids the need to directly include the Thaumcraft API in the jar. BAM! Constructor ctor1 = Class.forName("magicbees.item.ItemThaumiumScoop").getConstructor(); - thaumiumScoop = (Item)ctor1.newInstance(); - GameRegistry.registerItem(thaumiumScoop, thaumiumScoop.getUnlocalizedName()); + thaumiumScoop = new ItemThaumiumScoop(); + GameRegistry.registerItem(thaumiumScoop, thaumiumScoop.getUnlocalizedName(), CommonProxy.DOMAIN); Constructor ctor2 = Class.forName("magicbees.item.ItemThaumiumGrafter").getConstructor(); - thaumiumGrafter = (Item)ctor2.newInstance(); - GameRegistry.registerItem(thaumiumGrafter, thaumiumGrafter.getUnlocalizedName()); + thaumiumGrafter = new ItemThaumiumGrafter(); + GameRegistry.registerItem(thaumiumGrafter, thaumiumGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); } catch (Exception e) { } } } diff --git a/src/main/java/magicbees/main/utils/CraftingManager.java b/src/main/java/magicbees/main/utils/CraftingManager.java index ee9eebe..8f16f51 100644 --- a/src/main/java/magicbees/main/utils/CraftingManager.java +++ b/src/main/java/magicbees/main/utils/CraftingManager.java @@ -642,7 +642,7 @@ public class CraftingManager FluidContainerRegistry.registerFluidContainer(liquid, filled, empty); // Register with Squeezer/Bottler - RecipeManagers.bottlerManager.addRecipe(5, liquid, empty, filled); + //RecipeManagers.bottlerManager.addRecipe(5, liquid, empty, filled); Outdated? RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[] {filled} , liquid, Config.wax.getStackForType(WaxType.MAGIC), 20); fluidType.available = true; diff --git a/src/main/java/magicbees/storage/BackpackDefinition.java b/src/main/java/magicbees/storage/BackpackDefinition.java index 998a079..9fc3c74 100644 --- a/src/main/java/magicbees/storage/BackpackDefinition.java +++ b/src/main/java/magicbees/storage/BackpackDefinition.java @@ -33,12 +33,6 @@ public class BackpackDefinition implements IBackpackDefinition return this.key; } - @Override - public String getName() - { - return this.name; - } - @Override public String getName(ItemStack backpack) { return backpack.getDisplayName(); diff --git a/src/main/resources/assets/magicbees/lang/de_DE.lang b/src/main/resources/assets/magicbees/lang/de_DE.lang index d92f727..423e0af 100644 --- a/src/main/resources/assets/magicbees/lang/de_DE.lang +++ b/src/main/resources/assets/magicbees/lang/de_DE.lang @@ -4,8 +4,8 @@ language.code=de_DE #Items item.magicbees:jellyBabies.name=Handvoll Gummibärchen -item.magicbees:thaumiumScoop.name=Thaumiumkescher -item.magicbees:thaumiumGrafter.name=Thaumiumgartenschere +item.thaumiumScoop.name=Thaumiumkescher +item.thaumiumGrafter.name=Thaumiumgartenschere item.magicbees:mysteriousMagnet.name=Mysteriöser Magnet item.moonDial.name=Jade-Mondskala diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index 0300334..d80903f 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -4,8 +4,8 @@ language.code=en_US #Items item.magicbees:jellyBabies.name=Handful of Jelly Babies -item.magicbees:thaumiumScoop.name=Thaumium Scoop -item.magicbees:thaumiumGrafter.name=Thaumium Grafter +item.thaumiumScoop.name=Thaumium Scoop +item.thaumiumGrafter.name=Thaumium Grafter item.magicbees:mysteriousMagnet.name=Mysterious Magnet item.moonDial.name=Jade Moon Dial diff --git a/src/main/resources/assets/magicbees/lang/ru_RU.lang b/src/main/resources/assets/magicbees/lang/ru_RU.lang index 97c8abd..f819297 100644 Binary files a/src/main/resources/assets/magicbees/lang/ru_RU.lang and b/src/main/resources/assets/magicbees/lang/ru_RU.lang differ diff --git a/src/main/resources/assets/magicbees/lang/zh_CN.lang b/src/main/resources/assets/magicbees/lang/zh_CN.lang index 8588879..f5e9f96 100644 --- a/src/main/resources/assets/magicbees/lang/zh_CN.lang +++ b/src/main/resources/assets/magicbees/lang/zh_CN.lang @@ -1,7 +1,7 @@ #Items item.magicbees:jellyBabies.name=胶糖娃娃 - item.magicbees:thaumiumScoop.name=奥法捕蜂网 - item.magicbees:thaumiumGrafter.name=奥法剪枝器 + item.thaumiumScoop.name=奥法捕蜂网 + item.thaumiumGrafter.name=奥法剪枝器 item.moonDial.name=翡翠色月相盘