diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api/items')
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTGenericItem.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java) | 24 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java) | 53 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java) | 118 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java) | 46 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaTool.java (renamed from src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java) | 76 |
5 files changed, 150 insertions, 167 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTGenericItem.java index 3ad04ab014..d734328327 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTGenericItem.java @@ -25,31 +25,31 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.SubTag; import gregtech.api.interfaces.IProjectileItem; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.Utils; /** * Extended by most Items, also used as a fallback Item, to prevent the accidental deletion when Errors occur. */ -public class Gregtech_Generic_Item extends Item implements IProjectileItem { +public class GTGenericItem extends Item implements IProjectileItem { private final String mName, mTooltip; protected IIcon mIcon; - public Gregtech_Generic_Item(final String aUnlocalized, final String aEnglish, final String aEnglishTooltip) { + public GTGenericItem(final String aUnlocalized, final String aEnglish, final String aEnglishTooltip) { this(aUnlocalized, aEnglish, aEnglishTooltip, true); } - public Gregtech_Generic_Item(final String aUnlocalized, final String aEnglish, final String aEnglishTooltip, + public GTGenericItem(final String aUnlocalized, final String aEnglish, final String aEnglishTooltip, final boolean aWriteToolTipIntoLangFile) { super(); this.mName = aUnlocalized; - GT_LanguageManager.addStringLocalization(this.mName + ".name", aEnglish); - if (GT_Utility.isStringValid(aEnglishTooltip)) { - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization(this.mName + ".name", aEnglish); + if (GTUtility.isStringValid(aEnglishTooltip)) { + GTLanguageManager.addStringLocalization( this.mTooltip = this.mName + ".tooltip_main", aEnglishTooltip, aWriteToolTipIntoLangFile); @@ -104,9 +104,9 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem { aList.add((aStack.getMaxDamage() - this.getDamage(aStack)) + " / " + aStack.getMaxDamage()); } if (this.mTooltip != null) { - aList.add(GT_LanguageManager.getTranslation(this.mTooltip)); + aList.add(GTLanguageManager.getTranslation(this.mTooltip)); } - if (GT_ModHandler.isElectricItem(aStack)) { + if (GTModHandler.isElectricItem(aStack)) { aList.add("Tier: " + this.getTier(aStack)); } this.addAdditionalToolTips(aList, aStack); @@ -164,7 +164,7 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem { @Override public ItemStack dispenseStack(final IBlockSource aSource, final ItemStack aStack) { - return ((Gregtech_Generic_Item) aStack.getItem()).onDispense(aSource, aStack); + return ((GTGenericItem) aStack.getItem()).onDispense(aSource, aStack); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java index 015ba9d716..c98023bad7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.api.items; -import static gregtech.api.enums.GT_Values.D1; +import static gregtech.api.enums.GTValues.D1; import static gregtech.api.enums.Mods.GTPlusPlus; import java.util.ArrayList; @@ -20,21 +20,21 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.SubTag; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; +import gregtech.api.enums.TCAspects.TC_AspectStack; import gregtech.api.interfaces.IFoodStat; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.IItemContainer; import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour; +import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IItemBehaviour; -public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { +public abstract class GTMetaItem extends GTMetaItemBase { /** * All instances of this Item Class are listed here. This gets used to register the Renderer to all Items of this @@ -42,7 +42,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { * <p/> * You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item. */ - public static final HashMap<String, Gregtech_MetaItem> sInstances = new HashMap<>(); + public static final HashMap<String, GTMetaItem> sInstances = new HashMap<>(); /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ @@ -61,7 +61,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { * * @param aUnlocalized The Unlocalized Name of this Item. */ - public Gregtech_MetaItem(final String aUnlocalized, final short aOffset, final short aItemAmount) { + public GTMetaItem(final String aUnlocalized, final short aOffset, final short aItemAmount) { super(aUnlocalized); this.setCreativeTab(AddToCreativeTab.tabMachines); this.setHasSubtypes(true); @@ -94,8 +94,8 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { final ItemStack rStack = new ItemStack(this, 1, this.mOffset + aID); this.mEnabledItems.set(aID); this.mVisibleItems.set(aID); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".name", aEnglish); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".tooltip", aToolTip); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".name", aEnglish); + GTLanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".tooltip", aToolTip); final List<TC_AspectStack> tAspects = new ArrayList<>(); // Important Stuff to do first for (final Object tRandomData : aRandomData) { @@ -105,7 +105,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { continue; } if (tRandomData == SubTag.NO_UNIFICATION) { - GT_OreDictUnificator.addToBlacklist(rStack); + GTOreDictUnificator.addToBlacklist(rStack); continue; } } @@ -115,10 +115,8 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { if (tRandomData != null) { boolean tUseOreDict = true; - if (tRandomData instanceof Interface_ItemBehaviour) { - this.addItemBehavior( - this.mOffset + aID, - (Interface_ItemBehaviour<Gregtech_MetaItem_Base>) tRandomData); + if (tRandomData instanceof IItemBehaviour) { + this.addItemBehavior(this.mOffset + aID, (IItemBehaviour<GTMetaItemBase>) tRandomData); tUseOreDict = false; } if (tRandomData instanceof IItemContainer) { @@ -133,21 +131,21 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { continue; } if (tRandomData instanceof ItemData) { - if (GT_Utility.isStringValid(tRandomData)) { - GT_OreDictUnificator.registerOre(tRandomData, rStack); + if (GTUtility.isStringValid(tRandomData)) { + GTOreDictUnificator.registerOre(tRandomData, rStack); } else { - GT_OreDictUnificator.addItemData(rStack, (ItemData) tRandomData); + GTOreDictUnificator.addItemData(rStack, (ItemData) tRandomData); } continue; } if (tUseOreDict) { - GT_OreDictUnificator.registerOre(tRandomData, rStack); + GTOreDictUnificator.registerOre(tRandomData, rStack); continue; } } } - if (GregTech_API.sThaumcraftCompat != null) { - GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false); + if (GregTechAPI.sThaumcraftCompat != null) { + GregTechAPI.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false); } return rStack; } @@ -161,7 +159,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { * @param aValue 200 = 1 Burn Process = 500 EU, max = 32767 (that is 81917.5 EU) * @return the Item itself for convenience in constructing. */ - public final Gregtech_MetaItem setBurnValue(final int aMetaValue, final int aValue) { + public final GTMetaItem setBurnValue(final int aMetaValue, final int aValue) { if ((aMetaValue < 0) || (aMetaValue >= (this.mOffset + this.mEnabledItems.length())) || (aValue < 0)) { return this; } @@ -184,8 +182,8 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { * this Battery charge/discharge-able. * @return the Item itself for convenience in constructing. */ - public final Gregtech_MetaItem setElectricStats(final int aMetaValue, final long aMaxCharge, - final long aTransferLimit, final long aTier, final long aSpecialData, final boolean aUseAnimations) { + public final GTMetaItem setElectricStats(final int aMetaValue, final long aMaxCharge, final long aTransferLimit, + final long aTier, final long aSpecialData, final boolean aUseAnimations) { if ((aMetaValue < 0) || (aMetaValue >= (this.mOffset + this.mEnabledItems.length()))) { return this; } @@ -215,8 +213,7 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { * this Battery charge/discharge-able. * @return the Item itself for convenience in constructing. */ - public final Gregtech_MetaItem setFluidContainerStats(final int aMetaValue, final long aCapacity, - final long aStacksize) { + public final GTMetaItem setFluidContainerStats(final int aMetaValue, final long aCapacity, final long aStacksize) { if ((aMetaValue < 0) || (aMetaValue >= (this.mOffset + this.mEnabledItems.length()))) { return this; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java index 3c4418c2bf..3e7fcf1486 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.api.items; -import static gregtech.api.enums.GT_Values.D1; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.D1; +import static gregtech.api.enums.GTValues.V; import java.util.ArrayList; import java.util.HashMap; @@ -22,22 +22,22 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; import gregtech.api.enums.SubTag; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour; +import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IItemBehaviour; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; -public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item +public abstract class GTMetaItemBase extends GTGenericItem implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem { /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ - private final HashMap<Short, ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>>> mItemBehaviors = new HashMap<>(); + private final HashMap<Short, ArrayList<IItemBehaviour<GTMetaItemBase>>> mItemBehaviors = new HashMap<>(); /** * Creates the Item using these Parameters. @@ -45,7 +45,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item * @param aUnlocalized The Unlocalized Name of this Item. * @param aGeneratedPrefixList The OreDict Prefixes you want to have generated. */ - public Gregtech_MetaItem_Base(final String aUnlocalized) { + public GTMetaItemBase(final String aUnlocalized) { super(aUnlocalized, "Generated Item", null, false); this.setHasSubtypes(true); this.setMaxDamage(0); @@ -60,12 +60,11 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item * @param aBehavior the Click Behavior you want to add. * @return the Item itself for convenience in constructing. */ - public final Gregtech_MetaItem_Base addItemBehavior(final int aMetaValue, - final Interface_ItemBehaviour<Gregtech_MetaItem_Base> aBehavior) { + public final GTMetaItemBase addItemBehavior(final int aMetaValue, final IItemBehaviour<GTMetaItemBase> aBehavior) { if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) { return this; } - ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors.get((short) aMetaValue); + ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) aMetaValue); if (tList == null) { tList = new ArrayList<>(1); this.mItemBehaviors.put((short) aMetaValue, tList); @@ -80,10 +79,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item @Override public boolean hasProjectile(final SubTag aProjectileType, final ItemStack aStack) { - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { if (tBehavior.hasProjectile(this, aProjectileType, aStack)) { return true; } @@ -95,10 +93,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item @Override public EntityArrow getProjectile(final SubTag aProjectileType, final ItemStack aStack, final World aWorld, final double aX, final double aY, final double aZ) { - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { final EntityArrow rArrow = tBehavior.getProjectile(this, aProjectileType, aStack, aWorld, aX, aY, aZ); if (rArrow != null) { return rArrow; @@ -111,10 +108,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item @Override public EntityArrow getProjectile(final SubTag aProjectileType, final ItemStack aStack, final World aWorld, final EntityLivingBase aEntity, final float aSpeed) { - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { final EntityArrow rArrow = tBehavior .getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed); if (rArrow != null) { @@ -127,10 +123,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item @Override public ItemStack onDispense(final IBlockSource aSource, final ItemStack aStack) { - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { if (tBehavior.canDispense(this, aSource, aStack)) { return tBehavior.onDispense(this, aSource, aStack); } @@ -141,10 +136,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item @Override public boolean isItemStackUsable(final ItemStack aStack) { - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { if (!tBehavior.isItemStackUsable(this, aStack)) { return false; } @@ -157,10 +151,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item public boolean onLeftClickEntity(final ItemStack aStack, final EntityPlayer aPlayer, final Entity aEntity) { this.use(aStack, 0, aPlayer); this.isItemStackUsable(aStack); - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { try { if (tBehavior.onLeftClickEntity(this, aStack, aPlayer, aEntity)) { if (aStack.stackSize <= 0) { @@ -174,7 +167,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item } } catch (final Throwable e) { if (D1) { - e.printStackTrace(GT_Log.err); + e.printStackTrace(GTLog.err); } } } @@ -187,10 +180,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item final int aY, final int aZ, final int ordinalSide, final float hitX, final float hitY, final float hitZ) { this.use(aStack, 0, aPlayer); this.isItemStackUsable(aStack); - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { try { if (tBehavior.onItemUse(this, aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ)) { if (aStack.stackSize <= 0) { @@ -204,7 +196,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item } } catch (final Throwable e) { if (D1) { - e.printStackTrace(GT_Log.err); + e.printStackTrace(GTLog.err); } } } @@ -217,10 +209,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item final int aY, final int aZ, final int ordinalSide, final float hitX, final float hitY, final float hitZ) { this.use(aStack, 0, aPlayer); this.isItemStackUsable(aStack); - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { try { if (tBehavior .onItemUseFirst(this, aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ)) { @@ -235,7 +226,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item } } catch (final Throwable e) { if (D1) { - e.printStackTrace(GT_Log.err); + e.printStackTrace(GTLog.err); } } } @@ -247,15 +238,14 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item public ItemStack onItemRightClick(ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) { this.use(aStack, 0, aPlayer); this.isItemStackUsable(aStack); - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { try { aStack = tBehavior.onItemRightClick(this, aStack, aWorld, aPlayer); } catch (final Throwable e) { if (D1) { - e.printStackTrace(GT_Log.err); + e.printStackTrace(GTLog.err); } } } @@ -267,8 +257,8 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item public final void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, List aList, final boolean aF3_H) { final String tKey = this.getUnlocalizedName(aStack) + ".tooltip", - tString = GT_LanguageManager.getTranslation(tKey); - if (GT_Utility.isStringValid(tString) && !tKey.equals(tString)) { + tString = GTLanguageManager.getTranslation(tKey); + if (GTUtility.isStringValid(tString) && !tKey.equals(tString)) { aList.add(tString); } @@ -277,7 +267,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item if (tStats[3] > 0) { aList.add( EnumChatFormatting.AQUA + "Contains " - + GT_Utility.formatNumbers(tStats[3]) + + GTUtility.formatNumbers(tStats[3]) + " EU Tier: " + (tStats[2] >= 0 ? tStats[2] : 0) + EnumChatFormatting.GRAY); @@ -289,11 +279,11 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item } else { aList.add( EnumChatFormatting.AQUA + "" - + GT_Utility.formatNumbers(tCharge) + + GTUtility.formatNumbers(tCharge) + " / " - + GT_Utility.formatNumbers(Math.abs(tStats[0])) + + GTUtility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: " - + GT_Utility.formatNumbers( + + GTUtility.formatNumbers( V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)]) + EnumChatFormatting.GRAY); } @@ -305,20 +295,19 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item final FluidStack tFluid = this.getFluidContent(aStack); aList.add( EnumChatFormatting.BLUE - + ((tFluid == null ? "No Fluids Contained" : GT_Utility.getFluidName(tFluid, true))) + + ((tFluid == null ? "No Fluids Contained" : GTUtility.getFluidName(tFluid, true))) + EnumChatFormatting.GRAY); aList.add( EnumChatFormatting.BLUE - + (GT_Utility.formatNumbers(tFluid == null ? 0 : tFluid.amount) + "L / " - + GT_Utility.formatNumbers(tStats[0]) + + (GTUtility.formatNumbers(tFluid == null ? 0 : tFluid.amount) + "L / " + + GTUtility.formatNumbers(tStats[0]) + "L") + EnumChatFormatting.GRAY); } - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { aList = tBehavior.getAdditionalToolTips(this, aList, aStack); } } @@ -329,10 +318,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item @Override public void onUpdate(final ItemStack aStack, final World aWorld, final Entity aPlayer, final int aTimer, final boolean aIsInHand) { - final ArrayList<Interface_ItemBehaviour<Gregtech_MetaItem_Base>> tList = this.mItemBehaviors - .get((short) this.getDamage(aStack)); + final ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); if (tList != null) { - for (final Interface_ItemBehaviour<Gregtech_MetaItem_Base> tBehavior : tList) { + for (final IItemBehaviour<GTMetaItemBase> tBehavior : tList) { tBehavior.onUpdate(this, aStack, aWorld, aPlayer, aTimer, aIsInHand); } } @@ -446,7 +434,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item } for (int i = 1; i < 5; i++) { final ItemStack tArmor = aPlayer.getEquipmentInSlot(i); - if (GT_ModHandler.isElectricItem(tArmor)) { + if (GTModHandler.isElectricItem(tArmor)) { final IElectricItem tArmorItem = (IElectricItem) tArmor.getItem(); if (tArmorItem.canProvideEnergy(tArmor) && (tArmorItem.getTier(tArmor) >= this.getTier(aStack))) { final double tCharge = ElectricItem.manager.discharge( @@ -533,11 +521,11 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item return 0; } - final ItemStack tStack = GT_Utility.fillFluidContainer(aFluid, aStack, false, false); + final ItemStack tStack = GTUtility.fillFluidContainer(aFluid, aStack, false, false); if (tStack != null) { aStack.setItemDamage(tStack.getItemDamage()); aStack.func_150996_a(tStack.getItem()); - return GT_Utility.getFluidForFilledItem(tStack, false).amount; + return GTUtility.getFluidForFilledItem(tStack, false).amount; } final Long[] tStats = this.getFluidContainerStats(aStack); @@ -592,9 +580,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item return null; } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aStack, false); + FluidStack tFluid = GTUtility.getFluidForFilledItem(aStack, false); if ((tFluid != null) && (maxDrain >= tFluid.amount)) { - final ItemStack tStack = GT_Utility.getContainerItem(aStack, false); + final ItemStack tStack = GTUtility.getContainerItem(aStack, false); if (tStack == null) { aStack.stackSize = 0; return tFluid; @@ -631,7 +619,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item public FluidStack getFluidContent(final ItemStack aStack) { final Long[] tStats = this.getFluidContainerStats(aStack); if ((tStats == null) || (tStats[0] <= 0)) { - return GT_Utility.getFluidForFilledItem(aStack, false); + return GTUtility.getFluidForFilledItem(aStack, false); } final NBTTagCompound tNBT = aStack.getTagCompound(); return tNBT == null ? null : FluidStack.loadFluidStackFromNBT(tNBT.getCompoundTag("GT.FluidContent")); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java index c04acb9537..31cdac4770 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java @@ -10,14 +10,14 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IIconContainer; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; @@ -36,7 +36,7 @@ import gtPlusPlus.core.util.math.MathUtils; * These Items can also have special RightClick abilities, electric Charge or even be set to become a Food alike * Item. */ -public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { +public abstract class GTMetaItemX32 extends GTMetaItem { protected final OrePrefixes[] mGeneratedPrefixList; @@ -46,7 +46,7 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { * @param aUnlocalized The Unlocalized Name of this Item. * @param aGeneratedPrefixList The OreDict Prefixes you want to have generated. */ - public Gregtech_MetaItem_X32(final String aUnlocalized, final OrePrefixes... aGeneratedPrefixList) { + public GTMetaItemX32(final String aUnlocalized, final OrePrefixes... aGeneratedPrefixList) { super(aUnlocalized, (short) 32000, (short) 766); this.mGeneratedPrefixList = Arrays.copyOf(aGeneratedPrefixList, 32); @@ -55,27 +55,27 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { if (tPrefix == null) { continue; } - final Materials tMaterial = GregTech_API.sGeneratedMaterials[i % 1000]; + final Materials tMaterial = GregTechAPI.sGeneratedMaterials[i % 1000]; if (tMaterial == null) { continue; } if (this.doesMaterialAllowGeneration(tPrefix, tMaterial)) { final ItemStack tStack = new ItemStack(this, 1, i); - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( this.getUnlocalizedName(tStack) + ".name", this.getDefaultLocalization(tPrefix, tMaterial, i)); - GT_LanguageManager.addStringLocalization( + GTLanguageManager.addStringLocalization( this.getUnlocalizedName(tStack) + ".tooltip", - tMaterial.getToolTip(tPrefix.mMaterialAmount / GT_Values.M)); + tMaterial.getToolTip(tPrefix.mMaterialAmount / GTValues.M)); if (tPrefix.mIsUnificatable) { - GT_OreDictUnificator.set(tPrefix, tMaterial, tStack); + GTOreDictUnificator.set(tPrefix, tMaterial, tStack); } else { - GT_OreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack); + GTOreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack); } if (((tPrefix == OrePrefixes.stick) || (tPrefix == OrePrefixes.wireFine)) && ((tMaterial == Materials.Lead) || (tMaterial == Materials.Tin) || (tMaterial == Materials.SolderingAlloy))) { - GregTech_API.sSolderingMetalList.add(tStack); + GregTechAPI.sSolderingMetalList.add(tStack); } } } @@ -88,7 +88,7 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { */ @Override public short[] getRGBa(final ItemStack aStack) { - final Materials tMaterial = GregTech_API.sGeneratedMaterials[this.getDamage(aStack) % 1000]; + final Materials tMaterial = GregTechAPI.sGeneratedMaterials[this.getDamage(aStack) % 1000]; return tMaterial == null ? Materials._NULL.mRGBa : tMaterial.mRGBa; } @@ -146,11 +146,11 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { public ItemStack getContainerItem(final ItemStack aStack) { final int aDamage = aStack.getItemDamage(); if ((aDamage < 32000) && (aDamage >= 0)) { - final Materials aMaterial = GregTech_API.sGeneratedMaterials[aDamage % 1000]; + final Materials aMaterial = GregTechAPI.sGeneratedMaterials[aDamage % 1000]; if ((aMaterial != null) && (aMaterial != Materials.Empty) && (aMaterial != Materials._NULL)) { final OrePrefixes aPrefix = this.mGeneratedPrefixList[aDamage / 1000]; if (aPrefix != null) { - return GT_Utility.copyAmount(1, aPrefix.mContainerItem); + return GTUtility.copyAmount(1, aPrefix.mContainerItem); } } } @@ -159,8 +159,8 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { @Override public final IIconContainer getIconContainer(final int aMetaData) { - return GregTech_API.sGeneratedMaterials[aMetaData % 1000] == null ? null - : this.getIconContainer(aMetaData, GregTech_API.sGeneratedMaterials[aMetaData % 1000]); + return GregTechAPI.sGeneratedMaterials[aMetaData % 1000] == null ? null + : this.getIconContainer(aMetaData, GregTechAPI.sGeneratedMaterials[aMetaData % 1000]); } @Override @@ -169,11 +169,11 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { for (int i = 0; i < 32000; i++) { if (this.doesMaterialAllowGeneration( this.mGeneratedPrefixList[i / 1000], - GregTech_API.sGeneratedMaterials[i % 1000]) + GregTechAPI.sGeneratedMaterials[i % 1000]) && this.doesShowInCreative( this.mGeneratedPrefixList[i / 1000], - GregTech_API.sGeneratedMaterials[i % 1000], - GregTech_API.sDoShowAllItemsInCreative)) { + GregTechAPI.sGeneratedMaterials[i % 1000], + GregTechAPI.sDoShowAllItemsInCreative)) { final ItemStack tStack = new ItemStack(this, 1, i); this.isItemStackUsable(tStack); aList.add(tStack); @@ -188,7 +188,7 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { return null; } if (aMetaData < 32000) { - final Materials tMaterial = GregTech_API.sGeneratedMaterials[aMetaData % 1000]; + final Materials tMaterial = GregTechAPI.sGeneratedMaterials[aMetaData % 1000]; if (tMaterial == null) { return null; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaTool.java index fcfa5fae50..f47ef56e9a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaTool.java @@ -25,16 +25,15 @@ import net.minecraftforge.event.world.BlockEvent; import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.Optional; -import gregtech.api.enchants.Enchantment_Radioactivity; +import gregtech.api.enchants.EnchantmentRadioactivity; import gregtech.api.enums.Materials; import gregtech.api.enums.Mods; import gregtech.api.interfaces.IDamagableItem; -import gregtech.api.interfaces.IToolStats; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats; +import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IToolStats; import mods.railcraft.api.core.items.IToolCrowbar; /** @@ -47,8 +46,7 @@ import mods.railcraft.api.core.items.IToolCrowbar; @Optional.Interface(iface = "mods.railcraft.api.core.items.IToolCrowbar", modid = Mods.Names.RAILCRAFT), @Optional.Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft"), @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = Mods.Names.ENDER_I_O) }) -public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool - implements IDamagableItem, IToolCrowbar, IToolWrench { +public abstract class GTMetaTool extends MetaGeneratedTool implements IDamagableItem, IToolCrowbar, IToolWrench { /** * All instances of this Item Class are listed here. This gets used to register the Renderer to all Items of this @@ -56,33 +54,33 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool * <p/> * You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item. */ - public static final HashMap<String, Gregtech_MetaTool> sInstances = new HashMap<>(); + public static final HashMap<String, GTMetaTool> sInstances = new HashMap<>(); /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ - public final HashMap<Short, IToolStats> mToolStats = new HashMap<>(); + public final HashMap<Short, gregtech.api.interfaces.IToolStats> mToolStats = new HashMap<>(); /** * Creates the Item using these Parameters. * * @param aUnlocalized The Unlocalized Name of this Item. */ - public Gregtech_MetaTool(final String aUnlocalized) { + public GTMetaTool(final String aUnlocalized) { super(aUnlocalized); - GT_ModHandler.registerBoxableItemToToolBox(new ItemStack(this)); + GTModHandler.registerBoxableItemToToolBox(new ItemStack(this)); this.setCreativeTab(AddToCreativeTab.tabMachines); this.setMaxStackSize(1); sInstances.put(this.getUnlocalizedName(), this); } /** - * Called by the Block Harvesting Event within the GT_Proxy + * Called by the Block Harvesting Event within the GTProxy */ @Override public void onHarvestBlockEvent(final ArrayList<ItemStack> aDrops, final ItemStack aStack, final EntityPlayer aPlayer, final Block aBlock, final int aX, final int aY, final int aZ, final byte aMetaData, final int aFortune, final boolean aSilkTouch, final BlockEvent.HarvestDropsEvent aEvent) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (this.isItemStackUsable(aStack) && (this.getDigSpeed(aStack, aBlock, aMetaData) > 0.0F)) { this.doDamage( aStack, @@ -103,11 +101,11 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool @Override public boolean onLeftClickEntity(final ItemStack aStack, final EntityPlayer aPlayer, final Entity aEntity) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if ((tStats == null) || !this.isItemStackUsable(aStack)) { return true; } - GT_Utility.doSoundAtClient(tStats.getEntityHitSound(), 1, 1.0F); + GTUtility.doSoundAtClient(tStats.getEntityHitSound(), 1, 1.0F); if (super.onLeftClickEntity(aStack, aPlayer, aEntity)) { return true; } @@ -184,7 +182,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool @Override public ItemStack onItemRightClick(final ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if ((tStats != null) && tStats.canBlock()) { aPlayer.setItemInUse(aStack, 72000); } @@ -195,7 +193,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool public void addAdditionalToolTips(final List aList, final ItemStack aStack) { final long tMaxDamage = getToolMaxDamage(aStack); final Materials tMaterial = getPrimaryMaterial(aStack); - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); final int tOffset = this.getElectricStats(aStack) != null ? 2 : 1; if (tStats != null) { final String name = aStack.getUnlocalizedName(); @@ -289,7 +287,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool public void addAdditionalToolTips(final List aList, final ItemStack aStack, final EntityPlayer aPlayer) { final long tMaxDamage = getToolMaxDamage(aStack); final Materials tMaterial = getPrimaryMaterial(aStack); - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); final int tOffset = this.getElectricStats(aStack) != null ? 2 : 1; if (tStats != null) { final String name = aStack.getUnlocalizedName(); @@ -427,7 +425,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool @Override public float getToolCombatDamage(final ItemStack aStack) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (tStats == null) { return 0; } @@ -439,7 +437,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(aStack)) { return 0.0F; } - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if ((tStats == null) || (Math.max(0, this.getHarvestLevel(aStack, "")) < aBlock.getHarvestLevel(aMetaData))) { return 0.0F; } @@ -454,11 +452,11 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(aStack)) { return false; } - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (tStats == null) { return false; } - GT_Utility.doSoundAtClient(tStats.getMiningSound(), 1, 1.0F); + GTUtility.doSoundAtClient(tStats.getMiningSound(), 1, 1.0F); this.doDamage( aStack, (int) Math.max(1, aBlock.getBlockHardness(aWorld, aX, aY, aZ) * tStats.getToolDamagePerBlockBreak())); @@ -469,8 +467,8 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(aStack)) { return null; } - aStack = GT_Utility.copyAmount(1, aStack); - final IToolStats tStats = this.getToolStats(aStack); + aStack = GTUtility.copyAmount(1, aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (tStats == null) { return null; } @@ -481,13 +479,13 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool } @Override - public Interface_ToolStats getToolStats(final ItemStack aStack) { + public IToolStats getToolStats(final ItemStack aStack) { this.isItemStackUsable(aStack); return this.getToolStatsInternal(aStack); } - private Interface_ToolStats getToolStatsInternal(final ItemStack aStack) { - return (Interface_ToolStats) (aStack == null ? null : this.mToolStats.get((short) aStack.getItemDamage())); + private IToolStats getToolStatsInternal(final ItemStack aStack) { + return (IToolStats) (aStack == null ? null : this.mToolStats.get((short) aStack.getItemDamage())); } @Override @@ -496,13 +494,13 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(aStack)) { return false; } - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); return (tStats != null) && tStats.isCrowbar(); } @Override public void onWhack(final EntityPlayer aPlayer, final ItemStack aStack, final int aX, final int aY, final int aZ) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (tStats != null) { this.doDamage(aStack, tStats.getToolDamagePerEntityAttack()); } @@ -520,7 +518,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(player.getCurrentEquippedItem())) { return false; } - final Interface_ToolStats tStats = this.getToolStats(player.getCurrentEquippedItem()); + final IToolStats tStats = this.getToolStats(player.getCurrentEquippedItem()); return (tStats != null) && tStats.isWrench(); } @@ -532,7 +530,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (player.getCurrentEquippedItem() == null) { return; } - final IToolStats tStats = this.getToolStats(player.getCurrentEquippedItem()); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(player.getCurrentEquippedItem()); if (tStats != null) { this.doDamage(player.getCurrentEquippedItem(), tStats.getToolDamagePerEntityAttack()); } @@ -543,13 +541,13 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(aStack)) { return false; } - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); return (tStats != null) && tStats.isCrowbar(); } @Override public void onLink(final EntityPlayer aPlayer, final ItemStack aStack, final EntityMinecart cart) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (tStats != null) { this.doDamage(aStack, tStats.getToolDamagePerEntityAttack()); } @@ -560,13 +558,13 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool if (!this.isItemStackUsable(aStack)) { return false; } - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); return (tStats != null) && tStats.isCrowbar(); } @Override public void onBoost(final EntityPlayer aPlayer, final ItemStack aStack, final EntityMinecart cart) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if (tStats != null) { this.doDamage(aStack, tStats.getToolDamagePerEntityAttack()); } @@ -574,7 +572,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool @Override public void onCreated(final ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) { - final IToolStats tStats = this.getToolStats(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStats(aStack); if ((tStats != null) && (aPlayer != null)) { tStats.onToolCrafted(aStack, aPlayer); } @@ -588,7 +586,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool @Override public boolean isItemStackUsable(final ItemStack aStack) { - final IToolStats tStats = this.getToolStatsInternal(aStack); + final gregtech.api.interfaces.IToolStats tStats = this.getToolStatsInternal(aStack); if (((aStack.getItemDamage() % 2) == 1) || (tStats == null)) { final NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { @@ -622,7 +620,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool } for (final Entry<Integer, Integer> tEntry : tMap.entrySet()) { if ((tEntry.getKey() == 33) || ((tEntry.getKey() == 20) && (tEntry.getValue() > 2)) - || (tEntry.getKey() == Enchantment_Radioactivity.INSTANCE.effectId)) { + || (tEntry.getKey() == EnchantmentRadioactivity.INSTANCE.effectId)) { tResult.put(tEntry.getKey(), tEntry.getValue()); } else { switch (Enchantment.enchantmentsList[tEntry.getKey()].type) { |