upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-14 01:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up misplaced modname references.

Browse Source 
Incrementing build number.
This commit is contained in:
MysteriousAges committed 2015-04-12 15:42:47 -07:00
1 parent a332d3f2e5
commit 3b8dec5425
4 files changed
+14 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/magicbees/item/ItemThaumiumGrafter.java
+8 -7
View File
@@ -3,11 +3,9 @@ package magicbees.item;
import java.util.HashSet;
import java.util.Set;
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;
@@ -19,11 +17,14 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import thaumcraft.api.IRepairableExtended;
import thaumcraft.api.ThaumcraftApi;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.arboriculture.IToolGrafter;
@Optional.InterfaceList(
{
@Optional.Interface(iface = "thaumcraft.api.IRepairableExtended", modid = CommonProxy.ThaumcraftID, striprefs = true)
@Optional.Interface(iface = "thaumcraft.api.IRepairableExtended", modid = ThaumcraftHelper.Name, striprefs = true)
}
)
public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IToolGrafter
@@ -107,7 +108,7 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT
/**
* Return the enchantability factor of the item, most of the time is based on material.
*/
@Optional.Method(modid = CommonProxy.ThaumcraftID)
@Optional.Method(modid = ThaumcraftHelper.Name)
public int getItemEnchantability()
{
return ThaumcraftApi.toolMatThaumium.getEnchantability();
@@ -116,7 +117,7 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT
/**
* Return the name for this tool's material.
*/
@Optional.Method(modid = CommonProxy.ThaumcraftID)
@Optional.Method(modid = ThaumcraftHelper.Name)
public String getToolMaterialName()
{
return ThaumcraftApi.toolMatThaumium.toString();
@@ -125,7 +126,7 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT
/**
* Return whether this item is repairable in an anvil.
*/
@Optional.Method(modid = CommonProxy.ThaumcraftID)
@Optional.Method(modid = ThaumcraftHelper.Name)
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
{
return ThaumcraftApi.toolMatThaumium.customCraftingMaterial == par2ItemStack.getItem() || super.getIsRepairable(par1ItemStack, par2ItemStack);
src/main/java/magicbees/item/ItemThaumiumScoop.java
+5 -4
View File
@@ -7,6 +7,7 @@ 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.utils.compat.ThaumcraftHelper;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
@@ -20,7 +21,7 @@ import forestry.api.core.IToolScoop;
@Optional.InterfaceList(
{
@Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = CommonProxy.ThaumcraftID, striprefs = true)
@Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = ThaumcraftHelper.Name, striprefs = true)
}
)
public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
@@ -71,7 +72,7 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
/**
* Return the enchantability factor of the item, most of the time is based on material.
*/
@Optional.Method(modid = CommonProxy.ThaumcraftID)
@Optional.Method(modid = ThaumcraftHelper.Name)
public int getItemEnchantability()
{
return ThaumcraftApi.toolMatThaumium.getEnchantability();
@@ -80,7 +81,7 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
/**
* Return the name for this tool's material.
*/
@Optional.Method(modid = CommonProxy.ThaumcraftID)
@Optional.Method(modid = ThaumcraftHelper.Name)
public String getToolMaterialName()
{
return ThaumcraftApi.toolMatThaumium.toString();
@@ -89,7 +90,7 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
/**
* Return whether this item is repairable in an anvil.
*/
@Optional.Method(modid = CommonProxy.ThaumcraftID)
@Optional.Method(modid = ThaumcraftHelper.Name)
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
{
return ThaumcraftApi.toolMatThaumium.customCraftingMaterial == par2ItemStack.getItem() || super.getIsRepairable(par1ItemStack, par2ItemStack);
src/main/java/magicbees/main/CommonProxy.java
-3
View File
@@ -8,9 +8,6 @@ public class CommonProxy
public static final String ITEM_TEXTURE = TEXTURE + "items/";
public static final String MODEL = "model/";
public static final String LANGS = "lang/";
public static final String ForestryID = "forestry";
public static final String ThaumcraftID = "Thaumcraft";
@Deprecated
public static final String RESOURCE_PATH = "/assets/magicbees/";