Fixes #14 & #16
This commit is contained in:
Arkandos committed 2014-09-23 00:30:12 +02:00
1 parent a6c439c078
commit 0c5f27e192
10 files changed
+32 -18

No files matched your search

+1 -1
View File
@@ -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")
}
@@ -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");
}
}
@@ -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");
}
}
+4 -4
View File
@@ -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) { }
}
}
@@ -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;
@@ -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();
@@ -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
@@ -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
Binary file not shown.
@@ -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=翡翠色月相盘