aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tools
diff options
context:
space:
mode:
authorNotAPenguin <michiel.vandeginste@gmail.com>2024-09-02 23:17:17 +0200
committerGitHub <noreply@github.com>2024-09-02 23:17:17 +0200
commit1b820de08a05070909a267e17f033fcf58ac8710 (patch)
tree02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gregtech/common/tools
parentafd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff)
downloadGT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip
The Great Renaming (#3014)
* move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names
Diffstat (limited to 'src/main/java/gregtech/common/tools')
-rw-r--r--src/main/java/gregtech/common/tools/GTTool.java (renamed from src/main/java/gregtech/common/tools/GT_Tool.java)10
-rw-r--r--src/main/java/gregtech/common/tools/ToolAxe.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Axe.java)28
-rw-r--r--src/main/java/gregtech/common/tools/ToolBranchCutter.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java)22
-rw-r--r--src/main/java/gregtech/common/tools/ToolButcheryKnife.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java)10
-rw-r--r--src/main/java/gregtech/common/tools/ToolBuzzSaw.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java)10
-rw-r--r--src/main/java/gregtech/common/tools/ToolChainsawHV.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java)5
-rw-r--r--src/main/java/gregtech/common/tools/ToolChainsawLV.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java)22
-rw-r--r--src/main/java/gregtech/common/tools/ToolChainsawMV.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java)5
-rw-r--r--src/main/java/gregtech/common/tools/ToolCrowbar.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java)18
-rw-r--r--src/main/java/gregtech/common/tools/ToolDrillHV.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java)11
-rw-r--r--src/main/java/gregtech/common/tools/ToolDrillLV.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java)24
-rw-r--r--src/main/java/gregtech/common/tools/ToolDrillMV.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java)5
-rw-r--r--src/main/java/gregtech/common/tools/ToolFile.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_File.java)16
-rw-r--r--src/main/java/gregtech/common/tools/ToolHardHammer.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java)40
-rw-r--r--src/main/java/gregtech/common/tools/ToolHoe.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Hoe.java)24
-rw-r--r--src/main/java/gregtech/common/tools/ToolJackHammer.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java)22
-rw-r--r--src/main/java/gregtech/common/tools/ToolKnife.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Knife.java)2
-rw-r--r--src/main/java/gregtech/common/tools/ToolMortar.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Mortar.java)8
-rw-r--r--src/main/java/gregtech/common/tools/ToolPickaxe.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java)24
-rw-r--r--src/main/java/gregtech/common/tools/ToolPlow.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Plow.java)18
-rw-r--r--src/main/java/gregtech/common/tools/ToolPlunger.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Plunger.java)30
-rw-r--r--src/main/java/gregtech/common/tools/ToolRollingPin.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_RollingPin.java)8
-rw-r--r--src/main/java/gregtech/common/tools/ToolSaw.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Saw.java)20
-rw-r--r--src/main/java/gregtech/common/tools/ToolScoop.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Scoop.java)24
-rw-r--r--src/main/java/gregtech/common/tools/ToolScrewdriver.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java)22
-rw-r--r--src/main/java/gregtech/common/tools/ToolScrewdriverLV.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Screwdriver_LV.java)10
-rw-r--r--src/main/java/gregtech/common/tools/ToolSense.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Sense.java)24
-rw-r--r--src/main/java/gregtech/common/tools/ToolShovel.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Shovel.java)20
-rw-r--r--src/main/java/gregtech/common/tools/ToolSoftHammer.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java)22
-rw-r--r--src/main/java/gregtech/common/tools/ToolSolderingIron.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java)22
-rw-r--r--src/main/java/gregtech/common/tools/ToolSword.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Sword.java)16
-rw-r--r--src/main/java/gregtech/common/tools/ToolTurbine.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Turbine.java)6
-rw-r--r--src/main/java/gregtech/common/tools/ToolTurbineHuge.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java)2
-rw-r--r--src/main/java/gregtech/common/tools/ToolTurbineLarge.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java)2
-rw-r--r--src/main/java/gregtech/common/tools/ToolTurbineNormal.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java)2
-rw-r--r--src/main/java/gregtech/common/tools/ToolTurbineSmall.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java)2
-rw-r--r--src/main/java/gregtech/common/tools/ToolUniversalSpade.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java)28
-rw-r--r--src/main/java/gregtech/common/tools/ToolWireCutter.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_WireCutter.java)14
-rw-r--r--src/main/java/gregtech/common/tools/ToolWrench.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Wrench.java)28
-rw-r--r--src/main/java/gregtech/common/tools/ToolWrenchHV.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Wrench_HV.java)10
-rw-r--r--src/main/java/gregtech/common/tools/ToolWrenchLV.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Wrench_LV.java)10
-rw-r--r--src/main/java/gregtech/common/tools/ToolWrenchMV.java (renamed from src/main/java/gregtech/common/tools/GT_Tool_Wrench_MV.java)10
-rw-r--r--src/main/java/gregtech/common/tools/pocket/ToolPocketBranchCutter.java (renamed from src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_BranchCutter.java)16
-rw-r--r--src/main/java/gregtech/common/tools/pocket/ToolPocketFile.java (renamed from src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_File.java)16
-rw-r--r--src/main/java/gregtech/common/tools/pocket/ToolPocketKnife.java (renamed from src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Knife.java)16
-rw-r--r--src/main/java/gregtech/common/tools/pocket/ToolPocketMultitool.java (renamed from src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Multitool.java)16
-rw-r--r--src/main/java/gregtech/common/tools/pocket/ToolPocketSaw.java (renamed from src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Saw.java)16
-rw-r--r--src/main/java/gregtech/common/tools/pocket/ToolPocketScrewdriver.java (renamed from src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_Screwdriver.java)16
-rw-r--r--src/main/java/gregtech/common/tools/pocket/ToolPocketWireCutter.java (renamed from src/main/java/gregtech/common/tools/pocket/GT_Tool_Pocket_WireCutter.java)16
49 files changed, 386 insertions, 382 deletions
diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GTTool.java
index cb637a1bd5..436ec767a9 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool.java
+++ b/src/main/java/gregtech/common/tools/GTTool.java
@@ -15,12 +15,12 @@ import net.minecraft.util.IChatComponent;
import net.minecraft.world.World;
import net.minecraftforge.event.world.BlockEvent;
-import gregtech.api.damagesources.GT_DamageSources;
+import gregtech.api.damagesources.GTDamageSources;
import gregtech.api.enums.SoundResource;
import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
-public abstract class GT_Tool implements IToolStats {
+public abstract class GTTool implements IToolStats {
public static final Enchantment[] FORTUNE_ENCHANTMENT = { Enchantment.fortune };
public static final Enchantment[] LOOTING_ENCHANTMENT = { Enchantment.looting };
@@ -129,7 +129,7 @@ public abstract class GT_Tool implements IToolStats {
@Override
public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity) {
- return GT_DamageSources.getCombatDamage(
+ return GTDamageSources.getCombatDamage(
(aPlayer instanceof EntityPlayer) ? "player" : "mob",
aPlayer,
(aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null);
@@ -169,7 +169,7 @@ public abstract class GT_Tool implements IToolStats {
}
@Override
- public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+ public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
@Override
public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/ToolAxe.java
index c54ebac3c9..03b761227c 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
+++ b/src/main/java/gregtech/common/tools/ToolAxe.java
@@ -14,13 +14,13 @@ import net.minecraft.util.IChatComponent;
import net.minecraft.world.World;
import net.minecraftforge.event.world.BlockEvent;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ToolHarvestHelper;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTToolHarvestHelper;
-public class GT_Tool_Axe extends GT_Tool {
+public class ToolAxe extends GTTool {
@Override
public int getToolDamagePerBlockBreak() {
@@ -94,16 +94,16 @@ public class GT_Tool_Axe extends GT_Tool {
@Override
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
- return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "axe")
- || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.wood)
- || GT_ToolHarvestHelper.isSpecialBlock(aBlock, Blocks.ladder);
+ return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "axe")
+ || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.wood)
+ || GTToolHarvestHelper.isSpecialBlock(aBlock, Blocks.ladder);
}
@Override
public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
int rAmount = 0;
- if ((GregTech_API.sTimber) && (!aPlayer.isSneaking())
+ if ((GregTechAPI.sTimber) && (!aPlayer.isSneaking())
&& (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) {
int tY = aY + 1;
for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++) {
@@ -125,7 +125,7 @@ public class GT_Tool_Axe extends GT_Tool {
&& OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))) {
float rAmount = 1.0F;
float tIncrement = 1.0F;
- if ((GregTech_API.sTimber) && !aPlayer.isSneaking()) {
+ if ((GregTechAPI.sTimber) && !aPlayer.isSneaking()) {
int tY = aY + 1;
for (int tH = aPlayer.worldObj.getHeight(); (tY < tH)
&& (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++) {
@@ -149,18 +149,18 @@ public class GT_Tool_Axe extends GT_Tool {
@Override
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
return aIsToolHead
- ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex]
- : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex];
+ ? MetaGeneratedTool.getPrimaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex]
+ : MetaGeneratedTool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex];
}
@Override
public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
- return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
- : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+ return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+ : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
}
@Override
- public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {}
+ public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID) {}
@Override
public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java b/src/main/java/gregtech/common/tools/ToolBranchCutter.java
index a8b83a0221..c9ad255a45 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
+++ b/src/main/java/gregtech/common/tools/ToolBranchCutter.java
@@ -16,12 +16,12 @@ import net.minecraftforge.event.world.BlockEvent;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_ToolHarvestHelper;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTToolHarvestHelper;
+import gregtech.api.util.GTUtility;
-public class GT_Tool_BranchCutter extends GT_Tool {
+public class ToolBranchCutter extends GTTool {
@Override
public float getBaseDamage() {
@@ -63,9 +63,9 @@ public class GT_Tool_BranchCutter extends GT_Tool {
} else if (aBlock == Blocks.leaves2) {
aDrops.clear();
aDrops.add(new ItemStack(Blocks.sapling, 1, (aMetaData & 0x3) + 4));
- } else if (aBlock == GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("rubberLeaves", 1L))) {
+ } else if (aBlock == GTUtility.getBlockFromStack(GTModHandler.getIC2Item("rubberLeaves", 1L))) {
aDrops.clear();
- aDrops.add(GT_ModHandler.getIC2Item("rubberSapling", 1L));
+ aDrops.add(GTModHandler.getIC2Item("rubberSapling", 1L));
}
}
return 0;
@@ -73,8 +73,8 @@ public class GT_Tool_BranchCutter extends GT_Tool {
@Override
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
- return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "grafter")
- || GT_ToolHarvestHelper.isAppropriateMaterial(aBlock, Material.leaves);
+ return GTToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "grafter")
+ || GTToolHarvestHelper.isAppropriateMaterial(aBlock, Material.leaves);
}
@Override
@@ -84,8 +84,8 @@ public class GT_Tool_BranchCutter extends GT_Tool {
@Override
public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
- return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
- : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+ return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+ : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
}
@Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java b/src/main/java/gregtech/common/tools/ToolButcheryKnife.java
index bdfe66401a..43323b8404 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java
+++ b/src/main/java/gregtech/common/tools/ToolButcheryKnife.java
@@ -11,9 +11,9 @@ import net.minecraft.util.IChatComponent;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
-public class GT_Tool_ButcheryKnife extends GT_Tool {
+public class ToolButcheryKnife extends GTTool {
@Override
public int getToolDamagePerBlockBreak() {
@@ -72,7 +72,7 @@ public class GT_Tool_ButcheryKnife extends GT_Tool {
@Override
public int[] getEnchantmentLevels(ItemStack aStack) {
- return new int[] { (2 + GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality) / 2 };
+ return new int[] { (2 + MetaGeneratedTool.getPrimaryMaterial(aStack).mToolQuality) / 2 };
}
@Override
@@ -82,8 +82,8 @@ public class GT_Tool_ButcheryKnife extends GT_Tool {
@Override
public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
- return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
- : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+ return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+ : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
}
@Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java b/src/main/java/gregtech/common/tools/ToolBuzzSaw.java
index 4d7192ce93..7e62ab7bb4 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java
+++ b/src/main/java/gregtech/common/tools/ToolBuzzSaw.java
@@ -10,9 +10,9 @@ import net.minecraft.util.IChatComponent;
import gregtech.api.enums.SoundResource;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
-public class GT_Tool_BuzzSaw extends GT_Tool_Saw {
+public class ToolBuzzSaw extends ToolSaw {
@Override
public int getToolDamagePerContainerCraft() {
@@ -57,15 +57,15 @@ public class GT_Tool_BuzzSaw extends GT_Tool_Saw {
@Override
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
return !aIsToolHead
- ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+ ? MetaGeneratedTool.getPrimaryMaterial(
aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadBuzzSaw.mTextureIndex]
: Textures.ItemIcons.HANDLE_BUZZSAW;
}
@Override
public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
- return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
- : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+ return !aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+ : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
}
@Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java b/src/main/java/gregtech/common/tools/ToolChainsawHV.java
index 38c1d3acb8..f2dc1df3bf 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java
+++ b/src/main/java/gregtech/common/tools/ToolChainsawHV.java
@@ -4,8 +4,9 @@ import net.minecraft.item.ItemStack;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.MetaGeneratedTool;
-public class GT_Tool_Chainsaw_HV extends GT_Tool_Chainsaw_LV {
+public class ToolChainsawHV extends ToolChainsawLV {
@Override
public int getToolDamagePerBlockBreak() {
@@ -50,7 +51,7 @@ public class GT_Tool_Chainsaw_HV extends GT_Tool_Chainsaw_LV {
@Override
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
return aIsToolHead
- ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
+ ? MetaGeneratedTool.getPrimaryMaterial(
aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
: Textures.ItemIcons.POWER_UNIT_HV;
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/src/main/java/gregtech/common/tools/ToolChainsawLV.java
index 142b0c50d2..ad47ae2cdc 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
+++ b/src/main/java/gregtech/common/tools/ToolChainsawLV.java
@@ -15,15 +15,15 @@ import net.minecraft.world.World;
import net.minecraftforge.common.IShearable;
import net.minecraftforge.event.world.BlockEvent;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
+import gregtech.GTMod;
+import gregtech.api.GregTechAPI;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.SoundResource;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.items.MetaGeneratedTool;
-public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
+public class ToolChainsawLV extends ToolSaw {
@Override
public int getToolDamagePerBlockBreak() {
@@ -99,8 +99,8 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
super.onToolCrafted(aStack, aPlayer);
try {
- GT_Mod.achievements.issueAchievement(aPlayer, "brrrr");
- GT_Mod.achievements.issueAchievement(aPlayer, "buildChainsaw");
+ GTMod.achievements.issueAchievement(aPlayer, "brrrr");
+ GTMod.achievements.issueAchievement(aPlayer, "buildChainsaw");
} catch (Exception ignored) {}
}
@@ -122,7 +122,7 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
aEvent.dropChance = 1.0F;
return 1;
}
- if ((GregTech_API.sTimber) && (!aPlayer.isSneaking())
+ if ((GregTechAPI.sTimber) && (!aPlayer.isSneaking())
&& (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) {
int tY = aY + 1;
for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++) {
@@ -143,7 +143,7 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
&& OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))) {
float rAmount = 1.0F;
float tIncrement = 1.0F;
- if ((GregTech_API.sTimber) && !aPlayer.isSneaking()) {
+ if ((GregTechAPI.sTimber) && !aPlayer.isSneaking()) {
int tY = aY + 1;
for (int tH = aPlayer.worldObj.getHeight(); (tY < tH)
&& (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++) {
@@ -161,15 +161,15 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
@Override
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
return aIsToolHead
- ? GT_MetaGenerated_Tool.getPrimaryMaterial(
+ ? MetaGeneratedTool.getPrimaryMaterial(
aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
: Textures.ItemIcons.POWER_UNIT_LV;
}
@Override
public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
- return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa
- : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+ return aIsToolHead ? MetaGeneratedTool.getPrimaryMaterial(aStack).mRGBa
+ : MetaGeneratedTool.getSecondaryMaterial(aStack).mRGBa;
}
@Override
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java b/src/main/java/gregtech/common/tools/ToolChainsawMV.java
index 6c88895e48..48fc79f86d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java
+++ b/src/main/java/gregtech/common/tools/ToolChainsawMV.java
@@ -4,8 +4,9 @@ import net.minecraft.item.ItemStack;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.MetaGeneratedTool;
-public class GT_Tool_Chainsaw_MV extends GT_Tool_Chainsaw_LV {
+public class ToolChainsawMV extends ToolChainsawLV {
@Override
public int getToolDamagePerBlockBreak() {
@@ -50,7 +51,7 @@ public class GT_Tool_Chainsaw_MV extends GT_Tool_Chainsaw_LV {
@Override
public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
return aIsToolHead
- ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(
+ ? MetaGeneratedTool.getPrimaryMaterial(
aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex]
: Textures.ItemIcons.POWER_UNIT_MV;
}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java b/src/main/java/gregtech/common/tools/ToolCrowbar.java
index 3db30faca1..db72d65a6d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java
+++ b/src/main/java/gregtech/common/tools/ToolCrowbar.java
@@ -13,11 +13,11 @@ import com.google.common.base.Strings;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.behaviors.Behaviour_Crowbar;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.common.items.MetaGeneratedTool01;
+import gregtech.common.items.behaviors.BehaviourCrowbar;
-public class GT_Tool_Crowbar extends GT_Tool {
+public class ToolCrowbar extends GTTool {
@Override
public int getToolDamagePerBlockBreak() {
@@ -96,8 +96,8 @@ public class GT_Tool_Crowbar extends GT_Tool {