ForgeDirection (#608)

* ForgeDirection WIP

* Fix GTPP_Render_MachineBlock

Fix handling of getTexture with facing mask for pipes
Kill a bunch of magic numbers

* spotlessApply (#612)

Co-authored-by: GitHub GTNH Actions <>

* Bump bw/tt deps

---------

Co-authored-by: Léa Gris <lea.gris@noiraude.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

4 files changed, 11 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java b/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java
index e0af27a504..845358829d 100644
--- a/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java
+++ b/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java
@@ -27,11 +27,13 @@ public class BaseFish extends ItemFood {
         this.isCooked = cooked;
     }
 
+    @Override
     public int func_150905_g(ItemStack p_150905_1_) {
         BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(p_150905_1_);
         return this.isCooked && fishtype.isCooked() ? fishtype.func_150970_e() : fishtype.func_150975_c();
     }
 
+    @Override
     public float func_150906_h(ItemStack p_150906_1_) {
         BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(p_150906_1_);
         return this.isCooked && fishtype.isCooked() ? fishtype.func_150977_f() : fishtype.func_150967_d();
@@ -40,12 +42,14 @@ public class BaseFish extends ItemFood {
     /**
      * Returns a string representing what this item does to a potion.
      */
+    @Override
     public String getPotionEffect(ItemStack p_150896_1_) {
         return BaseFishTypes.getFishTypeFromStackDamage(p_150896_1_) == BaseFishTypes.PUFFERFISH
                 ? PotionHelper.field_151423_m
                 : null;
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public void registerIcons(IIconRegister p_94581_1_) {
         BaseFishTypes[] afishtype = BaseFishTypes.values();
@@ -57,6 +61,7 @@ public class BaseFish extends ItemFood {
         }
     }
 
+    @Override
     protected void onFoodEaten(ItemStack fish, World world, EntityPlayer player) {
         BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(fish);
 
@@ -72,6 +77,7 @@ public class BaseFish extends ItemFood {
     /**
      * Gets an icon index based on an item's damage value
      */
+    @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIconFromDamage(int dmg) {
         BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromDamageValue(dmg);
@@ -81,6 +87,7 @@ public class BaseFish extends ItemFood {
     /**
      * returns a list of items with the same ID, but different meta (eg: dye returns 16 items)
      */
+    @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) {
         BaseFishTypes[] afishtype = BaseFishTypes.values();
@@ -99,6 +106,7 @@ public class BaseFish extends ItemFood {
      * Returns the unlocalized name of this item. This version accepts an ItemStack so different stacks can have
      * different names based on their damage or NBT.
      */
+    @Override
     public String getUnlocalizedName(ItemStack p_77667_1_) {
         BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(p_77667_1_);
         return this.getUnlocalizedName() + "."
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
index 5bf1420c35..22ae6f29c6 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
@@ -30,6 +30,7 @@ public class VanillaBackgroundMusicFix implements IBugFix {
         }
     }
 
+    @Override
     public boolean isFixValid() {
         return enabled;
     }
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
index 5ae6e3e990..f4c4df492e 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
@@ -46,6 +46,7 @@ public class VanillaBedHeightFix implements IBugFix {
         }
     }
 
+    @Override
     public boolean isFixValid() {
         return mSleepInBedAt != null;
     }
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java b/src/main/java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java
index a2ab11cead..a620ed590b 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java
@@ -48,6 +48,7 @@ public class BlockGenericSpawner extends BlockMobSpawner {
     /**
      * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks)
      */
+    @Override
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) {
         for (int i = 0; i < Math.max(1, TileEntityGenericSpawner.mSpawners.size()); ++i) {