diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-12-12 19:09:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-12 19:09:46 +0100 |
| commit | 896143b96132f5ac54aa8d8f7386f27487e5e530 (patch) | |
| tree | d61c1bced93b36545873414562b1dfd80718f496 /src/Java/gtPlusPlus/xmod/gregtech/common/tools | |
| parent | 9cbfc7a1bacdbe908632e0fff9ec5ad7f119e563 (diff) | |
| parent | 35585d4556d85a1a9cda33cdd39b5b257e3e5215 (diff) | |
| download | GT5-Unofficial-896143b96132f5ac54aa8d8f7386f27487e5e530.tar.gz GT5-Unofficial-896143b96132f5ac54aa8d8f7386f27487e5e530.tar.bz2 GT5-Unofficial-896143b96132f5ac54aa8d8f7386f27487e5e530.zip | |
Merge pull request #50 from GTNewHorizons/gtnh-milling
Milling/Nuclear Sciences revamp + Lots of minor fixes
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tools')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngelGrinder.java) | 4 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngelGrinder.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java index 905164802c..27f118e363 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngelGrinder.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java @@ -26,7 +26,7 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; import net.minecraftforge.event.world.BlockEvent; -public class TOOL_Gregtech_AngelGrinder +public class TOOL_Gregtech_AngleGrinder extends GT_Tool { public static final List<String> mEffectiveList = Arrays.asList(new String[]{EntityIronGolem.class.getName(), "EntityTowerGuardian"}); @@ -162,7 +162,7 @@ extends GT_Tool { } public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { - return !aIsToolHead + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java index 3da1763634..2277ce339f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tools; import gregtech.GT_Mod; +import gregtech.api.enums.Materials; import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -70,9 +71,9 @@ extends GT_Tool_WireCutter { } public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { - return !aIsToolHead + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa - : GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa; + : Materials.TungstenSteel.mRGBa; } |