From 6f3b3493067e31d54883868bb3f60bb737841753 Mon Sep 17 00:00:00 2001
From: Jason Mitchell <mitchej@gmail.com>
Date: Sun, 17 Jan 2021 21:29:47 -0800
Subject: More removal of commented out code, small formatting adjustments

---
 src/main/java/gregtech/common/tools/GT_Tool_Scoop.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main/java/gregtech/common/tools/GT_Tool_Scoop.java')

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
index 65af5d5c92..c600fd8b61 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
@@ -16,8 +16,7 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
-public class GT_Tool_Scoop
-        extends GT_Tool {
+public class GT_Tool_Scoop extends GT_Tool {
     public static Material sBeeHiveMaterial;
 
     public int getToolDamagePerBlockBreak() {
@@ -61,7 +60,7 @@ public class GT_Tool_Scoop
     }
 
     public String getBreakingSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
+        return (String) GregTech_API.sSoundList.get(0);
     }
 
     public String getMiningSound() {
-- 
cgit 


From a4e104881944bbc03eddeacb24a6b7bd94cc53ce Mon Sep 17 00:00:00 2001
From: Léa Gris <lea.gris@noiraude.net>
Date: Mon, 24 May 2021 15:37:22 +0200
Subject: feat(glow): iconset machines glow support

- Add glow support for all sides and states of iconset machines (same as with basicmachines).

Automated code cleanup with IDEA of:
- Optiimise all imports (remove unused, sort)
- Reorder all modifiers to the canonical preferred order (as stated in the Java Language Specification)
- Add all missing @Override annotations
---
 .../java/gregtech/common/tools/GT_Tool_Scoop.java    | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src/main/java/gregtech/common/tools/GT_Tool_Scoop.java')

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
index c600fd8b61..674a52133d 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
@@ -19,79 +19,98 @@ import net.minecraft.util.IChatComponent;
 public class GT_Tool_Scoop extends GT_Tool {
     public static Material sBeeHiveMaterial;
 
+    @Override
     public int getToolDamagePerBlockBreak() {
         return 200;
     }
 
+    @Override
     public int getToolDamagePerDropConversion() {
         return 100;
     }
 
+    @Override
     public int getToolDamagePerContainerCraft() {
         return 200;
     }
 
+    @Override
     public int getToolDamagePerEntityAttack() {
         return 200;
     }
 
+    @Override
     public int getBaseQuality() {
         return 0;
     }
 
+    @Override
     public float getBaseDamage() {
         return 1.0F;
     }
 
+    @Override
     public float getSpeedMultiplier() {
         return 1.0F;
     }
 
+    @Override
     public float getMaxDurabilityMultiplier() {
         return 1.0F;
     }
 
+    @Override
     public String getCraftingSound() {
         return null;
     }
 
+    @Override
     public String getEntityHitSound() {
         return null;
     }
 
+    @Override
     public String getBreakingSound() {
         return (String) GregTech_API.sSoundList.get(0);
     }
 
+    @Override
     public String getMiningSound() {
         return null;
     }
 
+    @Override
     public boolean canBlock() {
         return false;
     }
 
+    @Override
     public boolean isCrowbar() {
         return false;
     }
 
+    @Override
     public boolean isMinableBlock(Block aBlock, byte aMetaData) {
         String tTool = aBlock.getHarvestTool(aMetaData);
         return aBlock.getHarvestLevel(aMetaData) != -1 &&  (tTool == null || tTool.isEmpty() || (tTool.equals("scoop"))) || (aBlock.getMaterial() == sBeeHiveMaterial);
     }
 
+    @Override
     public ItemStack getBrokenItem(ItemStack aStack) {
         return null;
     }
 
+    @Override
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead ? Textures.ItemIcons.SCOOP : null;
     }
 
+    @Override
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
     }
 
+    @Override
     public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
         if(Loader.isModLoaded(GT_Values.MOD_ID_FR)){
             aItem.addItemBehavior(aID, new Behaviour_Scoop(200));
@@ -101,6 +120,7 @@ public class GT_Tool_Scoop extends GT_Tool {
 
     }
 
+    @Override
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
         return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got scooped up by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
     }
-- 
cgit