diff options
Diffstat (limited to 'src/main/java/gregtech/common/items/behaviors')
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourCoverTool.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java) | 60 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourCrowbar.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java) | 22 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourDataOrb.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_DataOrb.java) | 12 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourDataStick.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java) | 26 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourHoe.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java) | 26 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourLighter.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java) | 51 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourNone.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_None.java) | 30 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourPlungerEssentia.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java) | 24 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourPlungerFluid.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java) | 28 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourPlungerItem.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java) | 24 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourPrintedPages.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_PrintedPages.java) | 12 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourProspecting.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java) | 95 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourScanner.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java) | 22 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourScoop.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java) | 19 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourScrewdriver.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Screwdriver.java) | 20 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourSense.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java) | 18 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourSensorKit.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_SensorKit.java) | 16 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourSoftHammer.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java) | 56 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourSonictron.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java) | 22 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourSprayColor.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java) | 34 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorRemover.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color_Remover.java) | 8 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMetadata.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Metadata.java) | 32 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMode.java | 53 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourWrench.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java) | 34 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/BehaviourWrittenBook.java (renamed from src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java) | 20 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Mode.java | 53 |
26 files changed, 403 insertions, 414 deletions
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java b/src/main/java/gregtech/common/items/behaviors/BehaviourCoverTool.java index 4241e07e4b..b39135fed2 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourCoverTool.java @@ -13,28 +13,28 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.IItemBehaviour; import gregtech.api.interfaces.tileentity.ICoverable; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_CoverBehaviorBase; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.CoverBehaviorBase; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; import gregtech.api.util.ISerializableObject; -public class Behaviour_Cover_Tool extends Behaviour_None { +public class BehaviourCoverTool extends BehaviourNone { - public static final IItemBehaviour<GT_MetaBase_Item> INSTANCE = new Behaviour_Cover_Tool(); - private final String mTooltip = GT_LanguageManager + public static final IItemBehaviour<MetaBaseItem> INSTANCE = new BehaviourCoverTool(); + private final String mTooltip = GTLanguageManager .addStringLocalization("gt.behaviour.cover_copy_paste", "Can copy/paste cover data."); - private ISerializableObject mStoredData = GregTech_API.sNoBehavior.createDataObject(); + private ISerializableObject mStoredData = GregTechAPI.sNoBehavior.createDataObject(); private int mCoverType; private int mTickRateAddition = 0; @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { if (aWorld.isRemote) { return false; @@ -55,24 +55,24 @@ public class Behaviour_Cover_Tool extends Behaviour_None { aItem.discharge(aStack, 25.0D, Integer.MAX_VALUE, true, false, false); } } - GT_Utility.doSoundAtClient(SoundResource.IC2_TOOLS_OD_SCANNER, 1, 1.0F, aX, aY, aZ); + GTUtility.doSoundAtClient(SoundResource.IC2_TOOLS_OD_SCANNER, 1, 1.0F, aX, aY, aZ); return aPlayer instanceof EntityPlayerMP; } private void initDataFromNBT(NBTTagCompound aNBT) { if (aNBT != null) { mCoverType = aNBT.getInteger("mCoverType"); - GT_CoverBehaviorBase<?> tBehavior = GregTech_API.getCoverBehaviorNew(mCoverType); + CoverBehaviorBase<?> tBehavior = GregTechAPI.getCoverBehaviorNew(mCoverType); NBTBase tData = aNBT.getTag("mCoverData"); if (tData != null) mStoredData = tBehavior.createDataObject(tData); - else mStoredData = GregTech_API.sNoBehavior.createDataObject(); + else mStoredData = GregTechAPI.sNoBehavior.createDataObject(); mTickRateAddition = aNBT.hasKey("mTickRateAddition") ? aNBT.getInteger("mTickRateAddition") : 0; } } private void saveDataToNBT(NBTTagCompound aNBT) { aNBT.setInteger("mCoverType", mCoverType); - if (mStoredData == null) mStoredData = GregTech_API.sNoBehavior.createDataObject(); + if (mStoredData == null) mStoredData = GregTechAPI.sNoBehavior.createDataObject(); aNBT.setTag("mCoverData", mStoredData.saveDataToNBT()); aNBT.setInteger("mTickRateAddition", mTickRateAddition); } @@ -84,7 +84,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None { aNBT.setInteger("dataLinesCount", tSize); for (int i = 0; i < tSize; i++) { aNBT.setString("dataLines" + i, (String) aList.get(i)); - GT_Utility.sendChatToPlayer(aPlayer, (String) aList.get(i)); + GTUtility.sendChatToPlayer(aPlayer, (String) aList.get(i)); } } } @@ -94,15 +94,15 @@ public class Behaviour_Cover_Tool extends Behaviour_None { float hitY, float hitZ, List aList) { aList.add( "----- X: " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(aX) + + GTUtility.formatNumbers(aX) + EnumChatFormatting.RESET + " Y: " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(aY) + + GTUtility.formatNumbers(aY) + EnumChatFormatting.RESET + " Z: " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(aZ) + + GTUtility.formatNumbers(aZ) + EnumChatFormatting.RESET + " D: " + EnumChatFormatting.AQUA @@ -111,8 +111,8 @@ public class Behaviour_Cover_Tool extends Behaviour_None { + " -----"); if (aTileEntity instanceof ICoverable tCoverable) { final ForgeDirection tSide = tCoverable.getCoverItemAtSide(side) != null ? side - : tCoverable.getCoverItemAtSide(GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ)) != null - ? GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ) + : tCoverable.getCoverItemAtSide(GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ)) != null + ? GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ) : ForgeDirection.UNKNOWN; if (tSide != ForgeDirection.UNKNOWN) { if (tCoverable.getCoverBehaviorAtSideNew(tSide) @@ -129,19 +129,19 @@ public class Behaviour_Cover_Tool extends Behaviour_None { .getDisplayName() + EnumChatFormatting.RESET); } else { - mStoredData = GregTech_API.sNoBehavior.createDataObject(); + mStoredData = GregTechAPI.sNoBehavior.createDataObject(); mCoverType = 0; mTickRateAddition = 0; aList.add("Copy unavailable for this cover type"); } } else { - mStoredData = GregTech_API.sNoBehavior.createDataObject(); + mStoredData = GregTechAPI.sNoBehavior.createDataObject(); mCoverType = 0; mTickRateAddition = 0; aList.add("No Cover Found"); } } else { - mStoredData = GregTech_API.sNoBehavior.createDataObject(); + mStoredData = GregTechAPI.sNoBehavior.createDataObject(); mCoverType = 0; mTickRateAddition = 0; aList.add("No Cover Found"); @@ -152,12 +152,12 @@ public class Behaviour_Cover_Tool extends Behaviour_None { EntityPlayer aPlayer) { if (aTileEntity instanceof ICoverable tCoverable) { if (mCoverType == 0 || mStoredData == null) { - GT_Utility.sendChatToPlayer(aPlayer, "Please Copy a Valid Cover First."); + GTUtility.sendChatToPlayer(aPlayer, "Please Copy a Valid Cover First."); return; } final ForgeDirection tSide = tCoverable.getCoverItemAtSide(side) != null ? side - : tCoverable.getCoverItemAtSide(GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ)) != null - ? GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ) + : tCoverable.getCoverItemAtSide(GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ)) != null + ? GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ) : ForgeDirection.UNKNOWN; if (tSide != ForgeDirection.UNKNOWN) { int tCoverID = tCoverable.getCoverIDAtSide(tSide); @@ -165,18 +165,18 @@ public class Behaviour_Cover_Tool extends Behaviour_None { tCoverable.setCoverDataAtSide(tSide, mStoredData); tCoverable.getCoverInfoAtSide(tSide) .setTickRateAddition(mTickRateAddition); - GT_Utility.sendChatToPlayer(aPlayer, "Cover Data Pasted."); + GTUtility.sendChatToPlayer(aPlayer, "Cover Data Pasted."); } else { - GT_Utility.sendChatToPlayer(aPlayer, "Not Matched Cover."); + GTUtility.sendChatToPlayer(aPlayer, "Not Matched Cover."); } } else { - GT_Utility.sendChatToPlayer(aPlayer, "No Cover Found."); + GTUtility.sendChatToPlayer(aPlayer, "No Cover Found."); } } } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { try { final NBTTagCompound tNBT = aStack.getTagCompound(); final int tSize = tNBT.getInteger("dataLinesCount"); diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java b/src/main/java/gregtech/common/items/behaviors/BehaviourCrowbar.java index 97d3da4ca3..76c215bfd0 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourCrowbar.java @@ -10,27 +10,27 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.SoundResource; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; -public class Behaviour_Crowbar extends Behaviour_None { +public class BehaviourCrowbar extends BehaviourNone { private final int mVanillaCosts; private final int mEUCosts; - public Behaviour_Crowbar(int aVanillaCosts, int aEUCosts) { + public BehaviourCrowbar(int aVanillaCosts, int aEUCosts) { this.mVanillaCosts = aVanillaCosts; this.mEUCosts = aEUCosts; } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { if (aWorld.isRemote) { return false; } - if (GT_ModHandler.getModItem(Railcraft.ID, "fluid.creosote.bucket", 1L) != null) { + if (GTModHandler.getModItem(Railcraft.ID, "fluid.creosote.bucket", 1L) != null) { return false; } Block aBlock = aWorld.getBlock(aX, aY, aZ); @@ -39,20 +39,20 @@ public class Behaviour_Crowbar extends Behaviour_None { } byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ); if (aBlock == Blocks.rail) { - if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { + if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 1) % 10, 0); aWorld.isRemote = false; - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_BREAK, 1.0F, -1.0F, aX, aY, aZ); + GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_BREAK, 1.0F, -1.0F, aX, aY, aZ); } return true; } if ((aBlock == Blocks.detector_rail) || (aBlock == Blocks.activator_rail) || (aBlock == Blocks.golden_rail)) { - if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { + if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, aBlock, aMeta / 8 * 8 + (aMeta % 8 + 1) % 6, 0); aWorld.isRemote = false; - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_BREAK, 1.0F, -1.0F, aX, aY, aZ); + GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_BREAK, 1.0F, -1.0F, aX, aY, aZ); } return true; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataOrb.java b/src/main/java/gregtech/common/items/behaviors/BehaviourDataOrb.java index ae0627446c..c5d045ecd0 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataOrb.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourDataOrb.java @@ -6,17 +6,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTUtility; -public class Behaviour_DataOrb extends Behaviour_None { +public class BehaviourDataOrb extends BehaviourNone { public static void copyInventory(ItemStack[] aInventory, ItemStack[] aNewContent, int aIndexlength) { for (int i = 0; i < aIndexlength; i++) { if (aNewContent[i] == null) { aInventory[i] = null; } else { - aInventory[i] = GT_Utility.copyOrNull(aNewContent[i]); + aInventory[i] = GTUtility.copyOrNull(aNewContent[i]); } } } @@ -68,7 +68,7 @@ public class Behaviour_DataOrb extends Behaviour_None { NBTTagCompound tag = tNBT_ItemList.getCompoundTagAt(i); byte slot = tag.getByte("Slot"); if (slot >= 0) { - tInventory[slot] = GT_Utility.loadItem(tag); + tInventory[slot] = GTUtility.loadItem(tag); } } return tInventory; @@ -95,7 +95,7 @@ public class Behaviour_DataOrb extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { if (!(getDataTitle(aStack).length() == 0)) { aList.add(getDataTitle(aStack)); aList.add(getDataName(aStack)); diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java b/src/main/java/gregtech/common/items/behaviors/BehaviourDataStick.java index e9db3195c2..63462b8d9b 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourDataStick.java @@ -4,27 +4,27 @@ import java.util.List; import net.minecraft.item.ItemStack; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTUtility; -public class Behaviour_DataStick extends Behaviour_None { +public class BehaviourDataStick extends BehaviourNone { @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { - String tString = GT_Utility.ItemNBT.getBookTitle(aStack); - if (GT_Utility.isStringValid(tString)) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { + String tString = GTUtility.ItemNBT.getBookTitle(aStack); + if (GTUtility.isStringValid(tString)) { aList.add(tString); } - tString = GT_Utility.ItemNBT.getBookAuthor(aStack); - if (GT_Utility.isStringValid(tString)) { + tString = GTUtility.ItemNBT.getBookAuthor(aStack); + if (GTUtility.isStringValid(tString)) { aList.add("by " + tString); } - short tMapID = GT_Utility.ItemNBT.getMapID(aStack); + short tMapID = GTUtility.ItemNBT.getMapID(aStack); if (tMapID >= 0) { aList.add("Map ID: " + tMapID); } - tString = GT_Utility.ItemNBT.getPunchCardData(aStack); - if (GT_Utility.isStringValid(tString)) { + tString = GTUtility.ItemNBT.getPunchCardData(aStack); + if (GTUtility.isStringValid(tString)) { aList.add("Punch Card Data"); int i = 0; int j = tString.length(); @@ -32,7 +32,7 @@ public class Behaviour_DataStick extends Behaviour_None { aList.add(tString.substring(i, Math.min(i + 64, j))); } } - short sTier = GT_Utility.ItemNBT.getNBT(aStack) + short sTier = GTUtility.ItemNBT.getNBT(aStack) .getShort("rocket_tier"); if (sTier > 0 && sTier < 100) { aList.add("Rocket Schematic Tier: " + sTier); @@ -43,7 +43,7 @@ public class Behaviour_DataStick extends Behaviour_None { case 102 -> aList.add("Astro-Miner Schematic"); } } - long lastUpdate = GT_Utility.ItemNBT.getNBT(aStack) + long lastUpdate = GTUtility.ItemNBT.getNBT(aStack) .getLong("lastUpdate"); if (lastUpdate != 0) aList.add(String.format("Last update at: %tc", lastUpdate)); diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java b/src/main/java/gregtech/common/items/behaviors/BehaviourHoe.java index 167eccdf49..ca9166b581 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourHoe.java @@ -11,24 +11,24 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; import cpw.mods.fml.common.eventhandler.Event; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; import gregtech.api.util.WorldSpawnedEventBuilder; -public class Behaviour_Hoe extends Behaviour_None { +public class BehaviourHoe extends BehaviourNone { private final int mCosts; - private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.hoe", "Can till Dirt"); + private final String mTooltip = GTLanguageManager.addStringLocalization("gt.behaviour.hoe", "Can till Dirt"); - public Behaviour_Hoe(int aCosts) { + public BehaviourHoe(int aCosts) { this.mCosts = aCosts; } @Override - public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, - int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) { + public boolean onItemUse(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, + int aZ, int ordinalSide, float hitX, float hitY, float hitZ) { if (!aPlayer.canPlayerEdit(aX, aY, aZ, ordinalSide, aStack)) { return false; } @@ -38,12 +38,12 @@ public class Behaviour_Hoe extends Behaviour_None { } if (event.getResult() == Event.Result.ALLOW) { if (!aPlayer.capabilities.isCreativeMode) { - ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts); + ((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts); } return true; } Block aBlock = aWorld.getBlock(aX, aY, aZ); - if ((ordinalSide != 0) && (GT_Utility.isBlockAir(aWorld, aX, aY + 1, aZ)) + if ((ordinalSide != 0) && (GTUtility.isBlockAir(aWorld, aX, aY + 1, aZ)) && ((aBlock == Blocks.grass) || (aBlock == Blocks.dirt))) { new WorldSpawnedEventBuilder.SoundEventBuilder() .setVolume((Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F) @@ -57,7 +57,7 @@ public class Behaviour_Hoe extends Behaviour_None { } aWorld.setBlock(aX, aY, aZ, Blocks.farmland); if (!aPlayer.capabilities.isCreativeMode) { - ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts); + ((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts); } return true; } @@ -65,7 +65,7 @@ public class Behaviour_Hoe extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { aList.add(this.mTooltip); return aList; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java b/src/main/java/gregtech/common/items/behaviors/BehaviourLighter.java index a4c26e2254..9c9c8ab9f0 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourLighter.java @@ -14,25 +14,24 @@ import net.minecraftforge.common.util.ForgeDirection; import codechicken.lib.math.MathHelper; import gregtech.api.enums.SoundResource; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; -public class Behaviour_Lighter extends Behaviour_None { +public class BehaviourLighter extends BehaviourNone { private final ItemStack mEmptyLighter; private final ItemStack mUsedLighter; private final ItemStack mFullLighter; private final long mFuelAmount; - private final String mTooltip = GT_LanguageManager + private final String mTooltip = GTLanguageManager .addStringLocalization("gt.behaviour.lighter.tooltip", "Can light things on Fire"); - private final String mTooltipUses = GT_LanguageManager + private final String mTooltipUses = GTLanguageManager .addStringLocalization("gt.behaviour.lighter.uses", "Remaining Uses:"); - private final String mTooltipUnstackable = GT_LanguageManager + private final String mTooltipUnstackable = GTLanguageManager .addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!"); - public Behaviour_Lighter(ItemStack aEmptyLighter, ItemStack aUsedLighter, ItemStack aFullLighter, - long aFuelAmount) { + public BehaviourLighter(ItemStack aEmptyLighter, ItemStack aUsedLighter, ItemStack aFullLighter, long aFuelAmount) { this.mFullLighter = aFullLighter; this.mUsedLighter = aUsedLighter; this.mEmptyLighter = aEmptyLighter; @@ -40,16 +39,16 @@ public class Behaviour_Lighter extends Behaviour_None { } @Override - public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { + public boolean onLeftClickEntity(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { if ((aPlayer.worldObj.isRemote) || (aStack.stackSize != 1)) { return false; } boolean rOutput = false; if ((aEntity instanceof EntityCreeper)) { prepare(aStack); - long tFuelAmount = GT_Utility.ItemNBT.getLighterFuel(aStack); - if (GT_Utility.areStacksEqual(aStack, this.mUsedLighter, true)) { - GT_Utility.sendSoundToPlayers( + long tFuelAmount = GTUtility.ItemNBT.getLighterFuel(aStack); + if (GTUtility.areStacksEqual(aStack, this.mUsedLighter, true)) { + GTUtility.sendSoundToPlayers( aPlayer.worldObj, SoundResource.FIRE_IGNITE, 1.0F, @@ -63,7 +62,7 @@ public class Behaviour_Lighter extends Behaviour_None { } rOutput = true; } - GT_Utility.ItemNBT.setLighterFuel(aStack, tFuelAmount); + GTUtility.ItemNBT.setLighterFuel(aStack, tFuelAmount); if (tFuelAmount <= 0L) { useUp(aStack); } @@ -72,13 +71,13 @@ public class Behaviour_Lighter extends Behaviour_None { } @Override - public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, - int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) { + public boolean onItemUse(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, + int aZ, int ordinalSide, float hitX, float hitY, float hitZ) { return false; } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { if ((aWorld.isRemote) || (aStack.stackSize != 1)) { return false; @@ -88,21 +87,21 @@ public class Behaviour_Lighter extends Behaviour_None { aX += side.offsetX; aY += side.offsetY; aZ += side.offsetZ; - if ((!GT_Utility.isBlockAir(aWorld, aX, aY, aZ)) + if ((!GTUtility.isBlockAir(aWorld, aX, aY, aZ)) || (!aPlayer.canPlayerEdit(aX, aY, aZ, side.ordinal(), aStack))) { return false; } prepare(aStack); - long tFuelAmount = GT_Utility.ItemNBT.getLighterFuel(aStack); - if (GT_Utility.areStacksEqual(aStack, this.mUsedLighter, true)) { - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ); + long tFuelAmount = GTUtility.ItemNBT.getLighterFuel(aStack); + if (GTUtility.areStacksEqual(aStack, this.mUsedLighter, true)) { + GTUtility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ); aWorld.setBlock(aX, aY, aZ, Blocks.fire); if (!aPlayer.capabilities.isCreativeMode) { tFuelAmount -= 1L; } rOutput = true; } - GT_Utility.ItemNBT.setLighterFuel(aStack, tFuelAmount); + GTUtility.ItemNBT.setLighterFuel(aStack, tFuelAmount); if (tFuelAmount <= 0L) { useUp(aStack); } @@ -110,10 +109,10 @@ public class Behaviour_Lighter extends Behaviour_None { } private void prepare(ItemStack aStack) { - if (GT_Utility.areStacksEqual(aStack, this.mFullLighter, true)) { + if (GTUtility.areStacksEqual(aStack, this.mFullLighter, true)) { aStack.func_150996_a(this.mUsedLighter.getItem()); Items.feather.setDamage(aStack, Items.feather.getDamage(this.mUsedLighter)); - GT_Utility.ItemNBT.setLighterFuel(aStack, this.mFuelAmount); + GTUtility.ItemNBT.setLighterFuel(aStack, this.mFuelAmount); } } @@ -127,11 +126,11 @@ public class Behaviour_Lighter extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { aList.add(this.mTooltip); NBTTagCompound tNBT = aStack.getTagCompound(); long tFuelAmount = tNBT == null ? this.mFuelAmount - : GT_Utility.areStacksEqual(aStack, this.mFullLighter, true) ? this.mFuelAmount + : GTUtility.areStacksEqual(aStack, this.mFullLighter, true) ? this.mFuelAmount : tNBT.getLong("GT.LighterFuel"); aList.add(this.mTooltipUses + " " + tFuelAmount); aList.add(this.mTooltipUnstackable); diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_None.java b/src/main/java/gregtech/common/items/behaviors/BehaviourNone.java index c31ddc723d..f8b5f74b72 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_None.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourNone.java @@ -17,53 +17,53 @@ import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.SubTag; import gregtech.api.interfaces.IItemBehaviour; -import gregtech.api.items.GT_MetaBase_Item; +import gregtech.api.items.MetaBaseItem; -public class Behaviour_None implements IItemBehaviour<GT_MetaBase_Item> { +public class BehaviourNone implements IItemBehaviour<MetaBaseItem> { @Override - public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { + public boolean onLeftClickEntity(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { return false; } @Override - public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, - int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) { + public boolean onItemUse(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, + int aZ, int ordinalSide, float hitX, float hitY, float hitZ) { return false; } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { return false; } @Override - public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { + public ItemStack onItemRightClick(MetaBaseItem aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { return aStack; } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { return aList; } @Override - public void onUpdate(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, + public void onUpdate(MetaBaseItem aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand) {} @Override - public boolean isItemStackUsable(GT_MetaBase_Item aItem, ItemStack aStack) { + public boolean isItemStackUsable(MetaBaseItem aItem, ItemStack aStack) { return true; } @Override - public boolean canDispense(GT_MetaBase_Item aItem, IBlockSource aSource, ItemStack aStack) { + public boolean canDispense(MetaBaseItem aItem, IBlockSource aSource, ItemStack aStack) { return false; } @Override - public ItemStack onDispense(GT_MetaBase_Item aItem, IBlockSource aSource, ItemStack aStack) { + public ItemStack onDispense(MetaBaseItem aItem, IBlockSource aSource, ItemStack aStack) { EnumFacing enumfacing = BlockDispenser.func_149937_b(aSource.getBlockMetadata()); IPosition iposition = BlockDispenser.func_149939_a(aSource); ItemStack itemstack1 = aStack.splitStack(1); @@ -72,18 +72,18 @@ public class Behaviour_None implements IItemBehaviour<GT_MetaBase_Item> { } @Override - public boolean hasProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack) { + public boolean hasProjectile(MetaBaseItem aItem, SubTag aProjectileType, ItemStack aStack) { return false; } @Override - public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, + public EntityArrow getProjectile(MetaBaseItem aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ) { return null; } @Override - public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, + public EntityArrow getProjectile(MetaBaseItem aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed) { return null; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java b/src/main/java/gregtech/common/items/behaviors/BehaviourPlungerEssentia.java index 867eb25103..910ea2d2d4 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourPlungerEssentia.java @@ -9,32 +9,32 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.SoundResource; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; import thaumcraft.api.aspects.IEssentiaTransport; -public class Behaviour_Plunger_Essentia extends Behaviour_None { +public class BehaviourPlungerEssentia extends BehaviourNone { private final int mCosts; - private final String mTooltip = GT_LanguageManager + private final String mTooltip = GTLanguageManager .addStringLocalization("gt.behaviour.plunger.essentia", "Clears Essentia from Containers and Tubes"); - public Behaviour_Plunger_Essentia(int aCosts) { + public BehaviourPlungerEssentia(int aCosts) { this.mCosts = aCosts; } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { if (aWorld.isRemote) { return false; } TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if (((aTileEntity instanceof IEssentiaTransport)) && ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) { - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + if (((aTileEntity instanceof IEssentiaTransport)) + && ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts)))) { + GTUtility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); for (ForgeDirection tDirection : ForgeDirection.VALID_DIRECTIONS) { ((IEssentiaTransport) aTileEntity).takeEssentia( ((IEssentiaTransport) aTileEntity).getEssentiaType(tDirection), @@ -47,7 +47,7 @@ public class Behaviour_Plunger_Essentia extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { aList.add(this.mTooltip); return aList; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java b/src/main/java/gregtech/common/items/behaviors/BehaviourPlungerFluid.java index c62cb5c4e5..b406b27b15 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourPlungerFluid.java @@ -12,24 +12,24 @@ import net.minecraftforge.fluids.IFluidHandler; import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.metatileentity.implementations.MTEBasicTank; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; -public class Behaviour_Plunger_Fluid extends Behaviour_None { +public class BehaviourPlungerFluid extends BehaviourNone { private final int mCosts; - private final String mTooltip = GT_LanguageManager + private final String mTooltip = GTLanguageManager .addStringLocalization("gt.behaviour.plunger.fluid", "Clears 1000 Liters of Fluid from Tanks"); - public Behaviour_Plunger_Fluid(int aCosts) { + public BehaviourPlungerFluid(int aCosts) { this.mCosts = aCosts; } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { if (aWorld.isRemote) { return false; @@ -39,9 +39,9 @@ public class Behaviour_Plunger_Fluid extends Behaviour_None { for (ForgeDirection tDirection : ForgeDirection.VALID_DIRECTIONS) { if (((IFluidHandler) aTileEntity).drain(tDirection, 1000, false) != null) { if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { + || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) { ((IFluidHandler) aTileEntity).drain(tDirection, 1000, true); - GT_Utility.sendSoundToPlayers( + GTUtility.sendSoundToPlayers( aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, @@ -56,10 +56,10 @@ public class Behaviour_Plunger_Fluid extends Behaviour_None { } if (aTileEntity instanceof IGregTechTileEntity tTileEntity) { IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity(); - if (mTileEntity instanceof GT_MetaTileEntity_BasicTank machine) { + if (mTileEntity instanceof MTEBasicTank machine) { if (machine.mFluid != null && machine.mFluid.amount > 0) machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, 1000); - GT_Utility + GTUtility .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); return true; } @@ -68,7 +68,7 @@ public class Behaviour_Plunger_Fluid extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { aList.add(this.mTooltip); return aList; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java b/src/main/java/gregtech/common/items/behaviors/BehaviourPlungerItem.java index a5fa868a00..c0db5c76b4 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourPlungerItem.java @@ -14,23 +14,23 @@ import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.metatileentity.IMetaTileEntityItemPipe; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; -public class Behaviour_Plunger_Item extends Behaviour_None { +public class BehaviourPlungerItem extends BehaviourNone { private final int mCosts; - private final String mTooltip = GT_LanguageManager + private final String mTooltip = GTLanguageManager .addStringLocalization("gt.behaviour.plunger.item", "Clears Items from Pipes"); - public Behaviour_Plunger_Item(int aCosts) { + public BehaviourPlungerItem(int aCosts) { this.mCosts = aCosts; } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { if (aWorld.isRemote) { return false; @@ -39,7 +39,7 @@ public class Behaviour_Plunger_Item extends Behaviour_None { if (aTileEntity instanceof IGregTechTileEntity gtTE) { IMetaTileEntity tMetaTileEntity = gtTE.getMetaTileEntity(); if ((tMetaTileEntity instanceof IMetaTileEntityItemPipe)) { - for (IMetaTileEntityItemPipe tTileEntity : GT_Utility + for (IMetaTileEntityItemPipe tTileEntity : GTUtility .sortMapByValuesAcending( IMetaTileEntityItemPipe.Util .scanPipes((IMetaTileEntityItemPipe) tMetaTileEntity, new HashMap<>(), 0L, false, true)) @@ -48,7 +48,7 @@ public class Behaviour_Plunger_Item extends Behaviour_None { for (int j = tTileEntity.getSizeInventory(); i < j; i++) { if (tTileEntity.isValidSlot(i)) { if ((tTileEntity.getStackInSlot(i) != null) && ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts)))) { + || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts)))) { final ItemStack tStack = tTileEntity.decrStackSize(i, 64); if (tStack != null) { final EntityItem tEntity = new EntityItem( @@ -61,7 +61,7 @@ public class Behaviour_Plunger_Item extends Behaviour_None { tEntity.motionY = 0.0D; tEntity.motionZ = 0.0D; aWorld.spawnEntityInWorld(tEntity); - GT_Utility.sendSoundToPlayers( + GTUtility.sendSoundToPlayers( aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, @@ -81,7 +81,7 @@ public class Behaviour_Plunger_Item extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { aList.add(this.mTooltip); return aList; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_PrintedPages.java b/src/main/java/gregtech/common/items/behaviors/BehaviourPrintedPages.java index e3c4d58525..0716ffae7e 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_PrintedPages.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourPrintedPages.java @@ -5,10 +5,10 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTUtility; -public class Behaviour_PrintedPages extends Behaviour_None { +public class BehaviourPrintedPages extends BehaviourNone { public static String getTitle(ItemStack aStack) { NBTTagCompound tNBT = aStack.getTagCompound(); @@ -27,11 +27,11 @@ public class Behaviour_PrintedPages extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { - if (GT_Utility.isStringValid(getTitle(aStack))) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { + if (GTUtility.isStringValid(getTitle(aStack))) { aList.add(getTitle(aStack)); } - if (GT_Utility.isStringValid(getAuthor(aStack))) { + if (GTUtility.isStringValid(getAuthor(aStack))) { aList.add("by " + getAuthor(aStack)); } return aList; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java b/src/main/java/gregtech/common/items/behaviors/BehaviourProspecting.java index e64722fb87..98aed597f9 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourProspecting.java @@ -13,34 +13,34 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidBlock; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.SoundResource; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.items.MetaGeneratedTool; import gregtech.api.objects.ItemData; import gregtech.api.objects.XSTR; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.blocks.GT_Block_Ores_Abstract; -import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.blocks.BlockOresAbstract; +import gregtech.common.blocks.TileEntityOres; -public class Behaviour_Prospecting extends Behaviour_None { +public class BehaviourProspecting extends BehaviourNone { private final int mVanillaCosts; private final int mEUCosts; - private final String mTooltip = GT_LanguageManager + private final String mTooltip = GTLanguageManager .addStringLocalization("gt.behaviour.prospecting", "Usable for Prospecting"); - public Behaviour_Prospecting(int aVanillaCosts, int aEUCosts) { + public BehaviourProspecting(int aVanillaCosts, int aEUCosts) { this.mVanillaCosts = aVanillaCosts; this.mEUCosts = aEUCosts; } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { if (aWorld.isRemote) { return false; @@ -51,32 +51,32 @@ public class Behaviour_Prospecting extends Behaviour_None { } byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ); - ItemData tAssociation = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta)); + ItemData tAssociation = GTOreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta)); if (tAssociation != null && tAssociation.mPrefix != null && tAssociation.mMaterial != null && tAssociation.mPrefix.toString() .startsWith("ore")) { - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, - GT_Utility.trans("100", "This is ") + tAssociation.mMaterial.mMaterial.mDefaultLocalName - + GT_Utility.trans("101", " Ore.")); - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ); + GTUtility.trans("100", "This is ") + tAssociation.mMaterial.mMaterial.mDefaultLocalName + + GTUtility.trans("101", " Ore.")); + GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ); return true; } if (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone) || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.netherrack) || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone) - || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockStones) - || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites) - || aBlock == GregTech_API.sBlockOresUb1 - || aBlock == GregTech_API.sBlockOresUb2 - || aBlock == GregTech_API.sBlockOresUb3 - || aBlock == GregTech_API.sBlockOres1) { - if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ); + || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockStones) + || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockGranites) + || aBlock == GregTechAPI.sBlockOresUb1 + || aBlock == GregTechAPI.sBlockOresUb2 + || aBlock == GregTechAPI.sBlockOresUb3 + || aBlock == GregTechAPI.sBlockOres1) { + if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { + GTUtility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ); int tMetaID; - int tQuality = aItem instanceof GT_MetaGenerated_Tool ? aItem.getHarvestLevel(aStack, "") : 0; + int tQuality = aItem instanceof MetaGeneratedTool ? aItem.getHarvestLevel(aStack, "") : 0; int tX = aX, tY = aY, tZ = aZ; Block tBlock; for (int i = 0, j = 6 + tQuality; i < j; i++) { @@ -86,25 +86,24 @@ public class Behaviour_Prospecting extends Behaviour_None { tBlock = aWorld.getBlock(tX, tY, tZ); if (tBlock == Blocks.lava || tBlock == Blocks.flowing_lava) { - GT_Utility - .sendChatToPlayer(aPlayer, GT_Utility.trans("102", "There is Lava behind this Rock.")); + GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("102", "There is Lava behind this Rock.")); break; } if (tBlock instanceof BlockLiquid || tBlock instanceof IFluidBlock) { - GT_Utility - .sendChatToPlayer(aPlayer, GT_Utility.trans("103", "There is a Liquid behind this Rock.")); + GTUtility + .sendChatToPlayer(aPlayer, GTUtility.trans("103", "There is a Liquid behind this Rock.")); break; } - if (tBlock == Blocks.monster_egg || !GT_Utility.hasBlockHitBox(aWorld, tX, tY, tZ)) { - GT_Utility.sendChatToPlayer( + if (tBlock == Blocks.monster_egg || !GTUtility.hasBlockHitBox(aWorld, tX, tY, tZ)) { + GTUtility.sendChatToPlayer( aPlayer, - GT_Utility.trans("104", "There is an Air Pocket behind this Rock.")); + GTUtility.trans("104", "There is an Air Pocket behind this Rock.")); break; } if (tBlock != aBlock) { - if (i < 4) GT_Utility.sendChatToPlayer( + if (i < 4) GTUtility.sendChatToPlayer( aPlayer, - GT_Utility.trans("105", "Material is changing behind this Rock.")); + GTUtility.trans("105", "Material is changing behind this Rock.")); break; } } @@ -115,36 +114,36 @@ public class Behaviour_Prospecting extends Behaviour_None { tY = aY - 4 - tQuality + tRandom.nextInt(j); tZ = aZ - 4 - tQuality + tRandom.nextInt(j); tBlock = aWorld.getBlock(tX, tY, tZ); - if (tBlock instanceof GT_Block_Ores_Abstract) { + if (tBlock instanceof BlockOresAbstract) { final TileEntity tTileEntity = aWorld.getTileEntity(tX, tY, tZ); - if (tTileEntity instanceof GT_TileEntity_Ores) { - final Materials tMaterial = GregTech_API.sGeneratedMaterials[((GT_TileEntity_Ores) tTileEntity).mMetaData + if (tTileEntity instanceof TileEntityOres) { + final Materials tMaterial = GregTechAPI.sGeneratedMaterials[((TileEntityOres) tTileEntity).mMetaData % 1000]; if (tMaterial != null && tMaterial != Materials._NULL) { - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, - GT_Utility.trans("106", "Found traces of ") + tMaterial.mDefaultLocalName - + GT_Utility.trans("101", " Ore.")); + GTUtility.trans("106", "Found traces of ") + tMaterial.mDefaultLocalName + + GTUtility.trans("101", " Ore.")); return true; } } } else { tMetaID = aWorld.getBlockMetadata(tX, tY, tZ); - tAssociation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); + tAssociation = GTOreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); if (tAssociation != null && tAssociation.mPrefix != null && tAssociation.mMaterial != null && tAssociation.mPrefix.toString() .startsWith("ore")) { - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, - GT_Utility.trans("106", "Found traces of ") + GTUtility.trans("106", "Found traces of ") + tAssociation.mMaterial.mMaterial.mDefaultLocalName - + GT_Utility.trans("101", " Ore.")); + + GTUtility.trans("101", " Ore.")); return true; } } } - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("107", "No Ores found.")); + GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("107", "No Ores found.")); return true; } } @@ -152,7 +151,7 @@ public class Behaviour_Prospecting extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { aList.add(this.mTooltip); return aList; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java b/src/main/java/gregtech/common/items/behaviors/BehaviourScanner.java index 22b708e384..75e702a3a7 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourScanner.java @@ -13,42 +13,42 @@ import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.IItemBehaviour; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; -public class Behaviour_Scanner extends Behaviour_None { +public class BehaviourScanner extends BehaviourNone { - public static final IItemBehaviour<GT_MetaBase_Item> INSTANCE = new Behaviour_Scanner(); - private final String mTooltip = GT_LanguageManager + public static final IItemBehaviour<MetaBaseItem> INSTANCE = new BehaviourScanner(); + private final String mTooltip = GTLanguageManager .addStringLocalization("gt.behaviour.scanning", "Can scan Blocks in World"); @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { final NBTTagCompound tNBT = aStack.getTagCompound(); if (((aPlayer instanceof EntityPlayerMP)) && (aItem.canUse(aStack, 20000.0D))) { final ArrayList<String> tList = new ArrayList<>(); if (aItem.use( aStack, - GT_Utility.getCoordinateScan(tList, aPlayer, aWorld, 1, aX, aY, aZ, side, hitX, hitY, hitZ), + GTUtility.getCoordinateScan(tList, aPlayer, aWorld, 1, aX, aY, aZ, side, hitX, hitY, hitZ), aPlayer)) { final int tList_sS = tList.size(); tNBT.setInteger("dataLinesCount", tList_sS); for (int i = 0; i < tList_sS; i++) { tNBT.setString("dataLines" + i, tList.get(i)); - GT_Utility.sendChatToPlayer(aPlayer, tList.get(i)); + GTUtility.sendChatToPlayer(aPlayer, tList.get(i)); } } return true; } - GT_Utility.doSoundAtClient(SoundResource.IC2_TOOLS_OD_SCANNER, 1, 1.0F, aX, aY, aZ); + GTUtility.doSoundAtClient(SoundResource.IC2_TOOLS_OD_SCANNER, 1, 1.0F, aX, aY, aZ); // doGuiAtClient() return aPlayer instanceof EntityPlayerMP; } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { try { NBTTagCompound tNBT = aStack.getTagCompound(); int lines = tNBT.getInteger("dataLinesCount"); diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java b/src/main/java/gregtech/common/items/behaviors/BehaviourScoop.java index 65be65a96d..9f727dd8cc 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourScoop.java @@ -10,28 +10,27 @@ import net.minecraft.item.ItemStack; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IEntityButterfly; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.util.GTLanguageManager; -public class Behaviour_Scoop extends Behaviour_None { +public class BehaviourScoop extends BehaviourNone { private final int mCosts; - private final String mTooltip = GT_LanguageManager + private final String mTooltip = GTLanguageManager .addStringLocalization("gt.behaviour.scoop", "Catches Butterflies on Leftclick"); - public Behaviour_Scoop(int aCosts) { + public BehaviourScoop(int aCosts) { this.mCosts = aCosts; } @Override - public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { + public boolean onLeftClickEntity(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { if ((aEntity instanceof IEntityButterfly)) { if (aPlayer.worldObj.isRemote) { return true; } - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { + if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) { IButterfly tButterfly = ((IEntityButterfly) aEntity).getButterfly(); tButterfly.getGenome() .getPrimary() @@ -56,7 +55,7 @@ public class Behaviour_Scoop extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { aList.add(this.mTooltip); return aList; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Screwdriver.java b/src/main/java/gregtech/common/items/behaviors/BehaviourScrewdriver.java index d940226b84..599398349f 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Screwdriver.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourScrewdriver.java @@ -8,22 +8,22 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.SoundResource; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; -public class Behaviour_Screwdriver extends Behaviour_None { +public class BehaviourScrewdriver extends BehaviourNone { private final int mVanillaCosts; private final int mEUCosts; - public Behaviour_Screwdriver(int aVanillaCosts, int aEUCosts) { + public BehaviourScrewdriver(int aVanillaCosts, int aEUCosts) { this.mVanillaCosts = aVanillaCosts; this.mEUCosts = aEUCosts; } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { if (aWorld.isRemote) { return false; @@ -34,16 +34,16 @@ public class Behaviour_Screwdriver extends Behaviour_None { } byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ); if ((aBlock == Blocks.unpowered_repeater) || (aBlock == Blocks.powered_repeater)) { - if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { + if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aMeta / 4 * 4 + (aMeta % 4 + 1) % 4, 3); - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1.0F, aX, aY, aZ); + GTUtility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1.0F, aX, aY, aZ); } return true; } if ((aBlock == Blocks.unpowered_comparator) || (aBlock == Blocks.powered_comparator)) { - if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { + if (GTModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, aMeta / 4 * 4 + (aMeta % 4 + 1) % 4, 3); - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1.0F, aX, aY, aZ); + GTUtility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1.0F, aX, aY, aZ); } return true; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSense.java index b2ab0031ad..eb55802207 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSense.java @@ -8,23 +8,23 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.util.GTLanguageManager; import ic2.api.crops.ICropTile; -public class Behaviour_Sense extends Behaviour_None { +public class BehaviourSense extends BehaviourNone { private final int mCosts; - private final String mTooltip = GT_LanguageManager + private final String mTooltip = GTLanguageManager .addStringLocalization("gt.behaviour.sense", "Rightclick to harvest Crop Sticks"); - public Behaviour_Sense(int aCosts) { + public BehaviourSense(int aCosts) { this.mCosts = aCosts; } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { if (aWorld.isRemote) { return false; @@ -38,7 +38,7 @@ public class Behaviour_Sense extends Behaviour_None { && (((tTileEntity = aWorld.getTileEntity(aX + i, aY + j, aZ + k)) instanceof ICropTile)) && (((ICropTile) tTileEntity).harvest(true)) && (!aPlayer.capabilities.isCreativeMode)) { - ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts / 20); + ((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts / 20); } } } @@ -49,7 +49,7 @@ public class Behaviour_Sense extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { aList.add(this.mTooltip); return aList; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_SensorKit.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSensorKit.java index b12159d058..70ec04551e 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_SensorKit.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSensorKit.java @@ -13,18 +13,18 @@ import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.ItemList; import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; -public class Behaviour_SensorKit extends Behaviour_None { +public class BehaviourSensorKit extends BehaviourNone { - private final String mTooltip = GT_LanguageManager.addStringLocalization( + private final String mTooltip = GTLanguageManager.addStringLocalization( "gt.behaviour.sensorkit.tooltip", "Used to display Information using the Mod Nuclear Control"); @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { if ((aPlayer instanceof EntityPlayerMP)) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); @@ -33,7 +33,7 @@ public class Behaviour_SensorKit extends Behaviour_None { } if (((tTileEntity instanceof IGregTechDeviceInformation)) && (((IGregTechDeviceInformation) tTileEntity).isGivingInformation())) { - GT_Utility.setStack(aStack, ItemList.NC_SensorCard.get(aStack.stackSize)); + GTUtility.setStack(aStack, ItemList.NC_SensorCard.get(aStack.stackSize)); NBTTagCompound tNBT = aStack.getTagCompound(); if (tNBT == null) { tNBT = new NBTTagCompound(); @@ -49,7 +49,7 @@ public class Behaviour_SensorKit extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { aList.add(this.mTooltip); return aList; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSoftHammer.java index 159a0c4b27..83e458276d 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSoftHammer.java @@ -10,23 +10,23 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.SoundResource; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; -public class Behaviour_SoftHammer extends Behaviour_None { +public class BehaviourSoftHammer extends BehaviourNone { private final int mCosts; - private final String mTooltip = GT_LanguageManager + private final String mTooltip = GTLanguageManager .addStringLocalization("gt.behaviour.softhammer", "Activates and Deactivates Machines"); - public Behaviour_SoftHammer(int aCosts) { + public BehaviourSoftHammer(int aCosts) { this.mCosts = aCosts; } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { if (aWorld.isRemote) { return false; @@ -37,52 +37,47 @@ public class Behaviour_SoftHammer extends Behaviour_None { } byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ); if (aBlock == Blocks.lit_redstone_lamp) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { + if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, Blocks.redstone_lamp, 0, 0); aWorld.isRemote = false; - GT_Utility + GTUtility .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); } return true; } if (aBlock == Blocks.redstone_lamp) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { + if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, Blocks.lit_redstone_lamp, 0, 0); aWorld.isRemote = false; - GT_Utility + GTUtility .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); } return true; } if (aBlock == Blocks.golden_rail) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { + if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 8) % 16, 0); aWorld.isRemote = false; - GT_Utility + GTUtility .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); } return true; } if (aBlock == Blocks.activator_rail) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { + if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 8) % 16, 0); aWorld.isRemote = false; - GT_Utility + GTUtility .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); } return true; } if ((aBlock == Blocks.log) || (aBlock == Blocks.log2) || (aBlock == Blocks.hay_block)) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { + if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 4) % 12, 3); } return true; @@ -90,10 +85,9 @@ public class Behaviour_SoftHammer extends Behaviour_None { if ((aBlock == Blocks.piston) || (aBlock == Blocks.sticky_piston) || (aBlock == Blocks.dispenser) || (aBlock == Blocks.dropper)) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { + if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 1) % 6, 3); - GT_Utility + GTUtility .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); } return true; @@ -103,19 +97,17 @@ public class Behaviour_SoftHammer extends Behaviour_None { || (aBlock == Blocks.lit_furnace) || (aBlock == Blocks.chest) || (aBlock == Blocks.trapped_chest)) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { + if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta - 1) % 4 + 2, 3); - GT_Utility + GTUtility .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); } return true; } if (aBlock == Blocks.hopper) { - if ((aPlayer.capabilities.isCreativeMode) - || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { + if ((aPlayer.capabilities.isCreativeMode) || (((MetaGeneratedTool) aItem).doDamage(aStack, this.mCosts))) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 1) % 6 != 1 ? (aMeta + 1) % 6 : 2, 3); - GT_Utility + GTUtility .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); } return true; @@ -124,7 +116,7 @@ public class Behaviour_SoftHammer extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { aList.add(this.mTooltip); return aList; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSonictron.java index dbab764507..f362f7b3f4 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSonictron.java @@ -8,14 +8,14 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.interfaces.IItemBehaviour; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTUtility; -public class Behaviour_Sonictron extends Behaviour_None { +public class BehaviourSonictron extends BehaviourNone { - public static final IItemBehaviour<GT_MetaBase_Item> INSTANCE = new Behaviour_Sonictron(); + public static final IItemBehaviour<MetaBaseItem> INSTANCE = new BehaviourSonictron(); public static int getCurrentIndex(ItemStack aStack) { NBTTagCompound tNBTTagCompound = aStack.getTagCompound(); @@ -62,7 +62,7 @@ public class Behaviour_Sonictron extends Behaviour_None { NBTTagCompound tag = tNBT_ItemList.getCompoundTagAt(i); byte slot = tag.getByte("Slot"); if ((slot >= 0) && (slot < tInventory.length)) { - tInventory[slot] = GT_Utility.loadItem(tag); + tInventory[slot] = GTUtility.loadItem(tag); } } return tInventory; @@ -93,32 +93,32 @@ public class Behaviour_Sonictron extends Behaviour_None { if (aNewContent[i] == null) { aInventory[i] = null; } else { - aInventory[i] = GT_Utility.copyOrNull(aNewContent[i]); + aInventory[i] = GTUtility.copyOrNull(aNewContent[i]); } } } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { setCurrentIndex(aStack, -1); return false; } @Override - public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { + public ItemStack onItemRightClick(MetaBaseItem aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { setCurrentIndex(aStack, 0); return aStack; } @Override - public void onUpdate(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, + public void onUpdate(MetaBaseItem aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand) { int tTickTimer = getTickTimer(aStack); int tCurrentIndex = getCurrentIndex(aStack); if ((tTickTimer++ % 2 == 0) && (tCurrentIndex > -1)) { ItemStack[] tInventory = getNBTInventory(aStack); - GT_Values.GT.doSonictronSound( + GTValues.GT.doSonictronSound( tInventory[tCurrentIndex], aPlayer.worldObj, aPlayer.posX, diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColor.java index 216eb4d745..e79f8e0939 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColor.java @@ -22,12 +22,12 @@ import appeng.block.networking.BlockCableBus; import gregtech.api.enums.Dyes; import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; import gregtech.common.config.other.ConfigGeneral; -public class Behaviour_Spray_Color extends Behaviour_None { +public class BehaviourSprayColor extends BehaviourNone { private final ItemStack mEmpty; private final ItemStack mUsed; @@ -42,30 +42,30 @@ public class Behaviour_Spray_Color extends Behaviour_None { Blocks.carpet, Blocks.hardened_clay); protected String mTooltip; - private final String mTooltipUses = GT_LanguageManager + private final String mTooltipUses = GTLanguageManager .addStringLocalization("gt.behaviour.paintspray.uses", "Remaining Uses:"); - private final String mTooltipUnstackable = GT_LanguageManager + private final String mTooltipUnstackable = GTLanguageManager .addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!"); - private final String mTooltipChain = GT_LanguageManager.addStringLocalization( + private final String mTooltipChain = GTLanguageManager.addStringLocalization( "gt.behaviour.paintspray.chain", "If used while sneaking it will spray a chain of blocks"); - private final String mTooltipChainAmount = GT_LanguageManager.addStringLocalization( + private final String mTooltipChainAmount = GTLanguageManager.addStringLocalization( "gt.behaviour.paintspray.chain", "Sprays up to %d blocks, in the direction you're looking at"); - public Behaviour_Spray_Color(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses, int aColor) { + public BehaviourSprayColor(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses, int aColor) { this.mEmpty = aEmpty; this.mUsed = aUsed; this.mFull = aFull; this.mUses = aUses; this.mColor = ((byte) aColor); - this.mTooltip = GT_LanguageManager.addStringLocalization( + this.mTooltip = GTLanguageManager.addStringLocalization( "gt.behaviour.paintspray." + this.mColor + ".tooltip", "Can Color things in " + Dyes.get(this.mColor).mName); } - public Behaviour_Spray_Color(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses) { + public BehaviourSprayColor(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses) { this.mEmpty = aEmpty; this.mUsed = aUsed; this.mFull = aFull; @@ -75,7 +75,7 @@ public class Behaviour_Spray_Color extends Behaviour_None { } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { if ((aWorld.isRemote) || (aStack.stackSize != 1)) { return false; @@ -89,7 +89,7 @@ public class Behaviour_Spray_Color extends Behaviour_None { tNBT = new NBTTagCompound(); } long tUses = tNBT.getLong("GT.RemainingPaint"); - if (GT_Utility.areStacksEqual(aStack, this.mFull, true)) { + if (GTUtility.areStacksEqual(aStack, this.mFull, true)) { aStack.func_150996_a(this.mUsed.getItem()); Items.feather.setDamage(aStack, Items.feather.getDamage(this.mUsed)); tUses = this.mUses; @@ -111,8 +111,8 @@ public class Behaviour_Spray_Color extends Behaviour_None { Block initialBlock = aWorld.getBlock(aX, aY, aZ); int initialBlockMeta = aWorld.getBlockMetadata(aX, aY, aZ); TileEntity initialTE = aWorld.getTileEntity(aX, aY, aZ); - while ((GT_Utility.areStacksEqual(aStack, this.mUsed, true)) && (colorize(aWorld, aX, aY, aZ, side, aPlayer))) { - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, 1.0F, aX, aY, aZ); + while ((GTUtility.areStacksEqual(aStack, this.mUsed, true)) && (colorize(aWorld, aX, aY, aZ, side, aPlayer))) { + GTUtility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, 1.0F, aX, aY, aZ); if (!aPlayer.capabilities.isCreativeMode) { tUses -= 1L; } @@ -204,13 +204,13 @@ public class Behaviour_Spray_Color extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { aList.add(this.mTooltip); aList.add(this.mTooltipChain); aList.add(String.format(this.mTooltipChainAmount, ConfigGeneral.sprayCanChainRange)); NBTTagCompound tNBT = aStack.getTagCompound(); long tRemainingPaint = tNBT == null ? this.mUses - : GT_Utility.areStacksEqual(aStack, this.mFull, true) ? this.mUses : tNBT.getLong("GT.RemainingPaint"); + : GTUtility.areStacksEqual(aStack, this.mFull, true) ? this.mUses : tNBT.getLong("GT.RemainingPaint"); aList.add(this.mTooltipUses + " " + tRemainingPaint); aList.add(this.mTooltipUnstackable); return aList; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color_Remover.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorRemover.java index 0b73b4f7fc..cdf35161e3 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color_Remover.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorRemover.java @@ -12,13 +12,13 @@ import appeng.api.implementations.tiles.IColorableTile; import appeng.api.util.AEColor; import appeng.block.networking.BlockCableBus; import gregtech.api.interfaces.tileentity.IColoredTileEntity; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; -public class Behaviour_Spray_Color_Remover extends Behaviour_Spray_Color { +public class BehaviourSprayColorRemover extends BehaviourSprayColor { - public Behaviour_Spray_Color_Remover(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses) { + public BehaviourSprayColorRemover(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses) { super(aEmpty, aUsed, aFull, aUses); - this.mTooltip = GT_LanguageManager + this.mTooltip = GTLanguageManager .addStringLocalization("gt.behaviour.paintspray.solvent.tooltip", "Can remove paint from things"); } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Metadata.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMetadata.java index 03cf29b9dd..0d195660c2 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Metadata.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMetadata.java @@ -10,56 +10,56 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import gregtech.api.items.GT_Generic_Block; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_Util; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.GTGenericBlock; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTUtil; +import gregtech.api.util.GTUtility; -public class Behaviour_Switch_Metadata extends Behaviour_None { +public class BehaviourSwitchMetadata extends BehaviourNone { public final int mSwitchIndex; public final boolean mCheckTarget, mShowModeSwitchTooltip; - public Behaviour_Switch_Metadata(int aSwitchIndex) { + public BehaviourSwitchMetadata(int aSwitchIndex) { this(aSwitchIndex, false); } - public Behaviour_Switch_Metadata(int aSwitchIndex, boolean aCheckTarget) { + public BehaviourSwitchMetadata(int aSwitchIndex, boolean aCheckTarget) { this(aSwitchIndex, aCheckTarget, false); } - public Behaviour_Switch_Metadata(int aSwitchIndex, boolean aCheckTarget, boolean aShowModeSwitchTooltip) { + public BehaviourSwitchMetadata(int aSwitchIndex, boolean aCheckTarget, boolean aShowModeSwitchTooltip) { mSwitchIndex = aSwitchIndex; mCheckTarget = aCheckTarget; mShowModeSwitchTooltip = aShowModeSwitchTooltip; } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { - if (mShowModeSwitchTooltip) aList.add(GT_Utility.trans("330", "Sneak Rightclick to switch Mode")); + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { + if (mShowModeSwitchTooltip) aList.add(GTUtility.trans("330", "Sneak Rightclick to switch Mode")); return aList; } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float aHitX, float aHitY, float aHitZ) { if (aStack != null && (aPlayer == null || aPlayer.isSneaking()) && !aWorld.isRemote) { if (mCheckTarget) { Block aBlock = aWorld.blockExists(aX, aY, aZ) ? aWorld.getBlock(aX, aY, aZ) : Blocks.air; - if (aBlock instanceof GT_Generic_Block) { + if (aBlock instanceof GTGenericBlock) { Items.feather.setDamage(aStack, (short) mSwitchIndex); - GT_Utility.updateItemStack(aStack); + GTUtility.updateItemStack(aStack); return true; } - if (GT_Util.getTileEntity(aWorld, aX, aY, aZ, true) == null) { + if (GTUtil.getTileEntity(aWorld, aX, aY, aZ, true) == null) { Items.feather.setDamage(aStack, (short) mSwitchIndex); - GT_Utility.updateItemStack(aStack); + GTUtility.updateItemStack(aStack); return true; } return false; } Items.feather.setDamage(aStack, (short) mSwitchIndex); - GT_Utility.updateItemStack(aStack); + GTUtility.updateItemStack(aStack); return true; } return false; diff --git a/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMode.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMode.java new file mode 100644 index 0000000000..ba1730f805 --- /dev/null +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMode.java @@ -0,0 +1,53 @@ +package gregtech.common.items.behaviors; + +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +import gregtech.api.enums.GTValues; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.net.GTPacketToolSwitchMode; +import gregtech.api.util.GTUtility; + +public class BehaviourSwitchMode extends BehaviourNone { + + public BehaviourSwitchMode() {} + + @Override + public ItemStack onItemRightClick(MetaBaseItem aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { + if (aStack != null && (aPlayer == null || aPlayer.isSneaking()) && aWorld.isRemote) { + + MetaGeneratedTool itemTool = (MetaGeneratedTool) aItem; + final byte maxMode = itemTool.getToolMaxMode(aStack); + if (maxMode == 1) { + return aStack; + } + + MovingObjectPosition mop = GTUtility.getPlayerLookingTarget(aPlayer); + if (mop == null) { + GTValues.NW.sendToServer(new GTPacketToolSwitchMode()); + } + return aStack; + } + return aStack; + } + + @Override + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { + super.getAdditionalToolTips(aItem, aList, aStack); + if ((aItem instanceof MetaGeneratedTool)) { + MetaGeneratedTool itemTool = (MetaGeneratedTool) aItem; + final int maxMode = itemTool.getToolMaxMode(aStack); + if (maxMode > 1) { + aList.add("Shift+Rclick to change mode"); + } + } + + return aList; + } + +} diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java b/src/main/java/gregtech/common/items/behaviors/BehaviourWrench.java index 16c5c3f948..6155a6c739 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourWrench.java @@ -17,31 +17,31 @@ import appeng.api.parts.IPartHost; import appeng.api.util.IOrientable; import appeng.tile.misc.TileInterface; import gregtech.api.enums.SoundResource; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; import ic2.api.tile.IWrenchable; -public class Behaviour_Wrench extends Behaviour_None { +public class BehaviourWrench extends BehaviourNone { private final int mCosts; - private final String mTooltip = GT_LanguageManager + private final String mTooltip = GTLanguageManager .addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick"); - public Behaviour_Wrench(int aCosts) { + public BehaviourWrench(int aCosts) { this.mCosts = aCosts; } @Override - public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float hitX, float hitY, float hitZ) { final Block aBlock = aWorld.getBlock(aX, aY, aZ); if (aBlock == null) { return false; } final int aMeta = aWorld.getBlockMetadata(aX, aY, aZ); - final short targetSideOrdinal = (short) GT_Utility.determineWrenchingSide(side, hitX, hitY, hitZ) + final short targetSideOrdinal = (short) GTUtility.determineWrenchingSide(side, hitX, hitY, hitZ) .ordinal(); final TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); @@ -56,7 +56,7 @@ public class Behaviour_Wrench extends Behaviour_None { aY, aZ, aStack, - (GT_MetaGenerated_Tool) aItem, + (MetaGeneratedTool) aItem, mCosts); try { @@ -191,11 +191,11 @@ public class Behaviour_Wrench extends Behaviour_None { private final int x, y, z, meta; private final ItemStack stack; - private final GT_MetaGenerated_Tool item; + private final MetaGeneratedTool item; private final int costs; public WrenchHandler(Block block, int meta, short targetSideOrdinal, TileEntity tileEntity, EntityPlayer player, - World world, int x, int y, int z, ItemStack stack, GT_MetaGenerated_Tool item, int costs) { + World world, int x, int y, int z, ItemStack stack, MetaGeneratedTool item, int costs) { this.block = block; this.meta = meta; this.targetSideOrdinal = targetSideOrdinal; @@ -212,7 +212,7 @@ public class Behaviour_Wrench extends Behaviour_None { /** * this will run the operation, damage the tool and play the sound if possible (creative mode or - * {@link GT_MetaGenerated_Tool#canWrench(EntityPlayer, int, int, int)}) + * {@link MetaGeneratedTool#canWrench(EntityPlayer, int, int, int)}) * * @param damage damage to be applied to the wrench * @param operation the real operation of the click @@ -225,7 +225,7 @@ public class Behaviour_Wrench extends Behaviour_None { if (player.capabilities.isCreativeMode || item.canWrench(player, x, y, z)) { if (operation.getAsBoolean()) { item.doDamage(stack, damage); - GT_Utility.sendSoundToPlayers(world, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1.0F, x, y, z); + GTUtility.sendSoundToPlayers(world, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1.0F, x, y, z); return true; } } @@ -255,7 +255,7 @@ public class Behaviour_Wrench extends Behaviour_None { } public static boolean isVanillaCantFaceAxisY(Block block) { - return GT_Utility.arrayContains( + return GTUtility.arrayContains( block, Blocks.pumpkin, Blocks.lit_pumpkin, @@ -267,11 +267,11 @@ public class Behaviour_Wrench extends Behaviour_None { } public static boolean isVanillaAllSideRotatable(Block block) { - return GT_Utility.arrayContains(block, Blocks.piston, Blocks.sticky_piston, Blocks.dispenser, Blocks.dropper); + return GTUtility.arrayContains(block, Blocks.piston, Blocks.sticky_piston, Blocks.dispenser, Blocks.dropper); } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { aList.add(this.mTooltip); return aList; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java b/src/main/java/gregtech/common/items/behaviors/BehaviourWrittenBook.java index 0f645a93a9..54aa3d8b0d 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourWrittenBook.java @@ -11,16 +11,16 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.MetaBaseItem; +import gregtech.api.util.GTUtility; -public class Behaviour_WrittenBook extends Behaviour_None { +public class BehaviourWrittenBook extends BehaviourNone { @Override @SideOnly(Side.CLIENT) - public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, - int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) { - if ((GT_Utility.isStringValid(GT_Utility.ItemNBT.getBookTitle(aStack))) + public boolean onItemUse(MetaBaseItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, + int aZ, int ordinalSide, float hitX, float hitY, float hitZ) { + if ((GTUtility.isStringValid(GTUtility.ItemNBT.getBookTitle(aStack))) && ((aPlayer instanceof EntityPlayerSP))) { Minecraft.getMinecraft() .displayGuiScreen(new GuiScreenBook(aPlayer, aStack, false)); @@ -29,11 +29,11 @@ public class Behaviour_WrittenBook extends Behaviour_None { } @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { - String tTitle = GT_Utility.ItemNBT.getBookTitle(aStack); - if (GT_Utility.isStringValid(tTitle)) { + public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { + String tTitle = GTUtility.ItemNBT.getBookTitle(aStack); + if (GTUtility.isStringValid(tTitle)) { aList.add(tTitle); - aList.add("by " + GT_Utility.ItemNBT.getBookAuthor(aStack)); + aList.add("by " + GTUtility.ItemNBT.getBookAuthor(aStack)); } return aList; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Mode.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Mode.java deleted file mode 100644 index 4054377568..0000000000 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Mode.java +++ /dev/null @@ -1,53 +0,0 @@ -package gregtech.common.items.behaviors; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -import gregtech.api.enums.GT_Values; -import gregtech.api.items.GT_MetaBase_Item; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.net.GT_Packet_ToolSwitchMode; -import gregtech.api.util.GT_Utility; - -public class Behaviour_Switch_Mode extends Behaviour_None { - - public Behaviour_Switch_Mode() {} - - @Override - public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { - if (aStack != null && (aPlayer == null || aPlayer.isSneaking()) && aWorld.isRemote) { - - GT_MetaGenerated_Tool itemTool = (GT_MetaGenerated_Tool) aItem; - final byte maxMode = itemTool.getToolMaxMode(aStack); - if (maxMode == 1) { - return aStack; - } - - MovingObjectPosition mop = GT_Utility.getPlayerLookingTarget(aPlayer); - if (mop == null) { - GT_Values.NW.sendToServer(new GT_Packet_ToolSwitchMode()); - } - return aStack; - } - return aStack; - } - - @Override - public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) { - super.getAdditionalToolTips(aItem, aList, aStack); - if ((aItem instanceof GT_MetaGenerated_Tool)) { - GT_MetaGenerated_Tool itemTool = (GT_MetaGenerated_Tool) aItem; - final int maxMode = itemTool.getToolMaxMode(aStack); - if (maxMode > 1) { - aList.add("Shift+Rclick to change mode"); - } - } - - return aList; - } - -} |