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>

5 files changed, 36 insertions, 1 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java
index 41631eaae8..60d4601132 100644
--- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java
+++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java
@@ -5,10 +5,12 @@ import ic2.api.crops.ICropTile;
 
 public abstract class BaseAestheticCrop extends BaseHarvestableCrop {
 
+    @Override
     public int tier() {
         return 1;
     }
 
+    @Override
     public int stat(int n) {
         switch (n) {
             case 0:
@@ -26,10 +28,12 @@ public abstract class BaseAestheticCrop extends BaseHarvestableCrop {
         }
     }
 
+    @Override
     public int growthDuration(ICropTile crop) {
         return CORE_Preloader.DEBUG_MODE ? 1 : 225;
     }
 
+    @Override
     public byte getSizeAfterHarvest(ICropTile crop) {
         return 1;
     }
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java
index e2951c8394..dec6413a82 100644
--- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java
+++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java
@@ -10,15 +10,16 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import speiger.src.crops.api.ICropCardInfo;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import ic2.api.crops.CropCard;
 import ic2.api.crops.ICropTile;
+import speiger.src.crops.api.ICropCardInfo;
 
 public abstract class BaseCrop extends CropCard implements ICropCardInfo {
 
+    @Override
     @SideOnly(Side.CLIENT)
     public void registerSprites(IIconRegister iconRegister) {
         this.textures = new IIcon[this.maxSize()];
@@ -28,26 +29,32 @@ public abstract class BaseCrop extends CropCard implements ICropCardInfo {
         }
     }
 
+    @Override
     public float dropGainChance() {
         return (float) (Math.pow(0.95D, (double) ((float) this.tier())) * (double) 1f);
     }
 
+    @Override
     public boolean canCross(ICropTile crop) {
         return crop.getSize() == this.maxSize();
     }
 
+    @Override
     public int getrootslength(ICropTile crop) {
         return 3;
     }
 
+    @Override
     public String discoveredBy() {
         return "Alkalus";
     }
 
+    @Override
     public String owner() {
         return "Gtplusplus";
     }
 
+    @Override
     public List<String> getCropInformation() {
         List<String> ret = new ArrayList<String>();
         ret.add(Arrays.toString(this.attributes()));
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java
index 3d56bba979..f5daa20fdf 100644
--- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java
+++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java
@@ -5,10 +5,12 @@ import ic2.api.crops.ICropTile;
 
 public abstract class BaseHarvestableCrop extends BaseCrop {
 
+    @Override
     public int tier() {
         return 2;
     }
 
+    @Override
     public int stat(int n) {
         switch (n) {
             case 0:
@@ -26,22 +28,27 @@ public abstract class BaseHarvestableCrop extends BaseCrop {
         }
     }
 
+    @Override
     public boolean canGrow(ICropTile crop) {
         return crop.getSize() < 3;
     }
 
+    @Override
     public int getOptimalHavestSize(ICropTile crop) {
         return 3;
     }
 
+    @Override
     public boolean canBeHarvested(ICropTile crop) {
         return crop.getSize() == 3;
     }
 
+    @Override
     public int weightInfluences(ICropTile crop, float humidity, float nutrients, float air) {
         return (int) ((double) humidity * 1.2D + (double) nutrients * 0.9D + (double) air * 0.9D);
     }
 
+    @Override
     public int growthDuration(ICropTile crop) {
         short r;
         if (CORE_Preloader.DEBUG_MODE) {
@@ -55,14 +62,17 @@ public abstract class BaseHarvestableCrop extends BaseCrop {
         return r;
     }
 
+    @Override
     public byte getSizeAfterHarvest(ICropTile crop) {
         return 2;
     }
 
+    @Override
     public int maxSize() {
         return 3;
     }
 
+    @Override
     public String discoveredBy() {
         return "Alkalus";
     }
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java
index 7bb8a0925a..da29ca7f50 100644
--- a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java
+++ b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java
@@ -10,18 +10,22 @@ import ic2.api.crops.ICropTile;
 
 public class Crop_Force extends BaseAestheticCrop {
 
+    @Override
     public int tier() {
         return 4;
     }
 
+    @Override
     public String name() {
         return "Force";
     }
 
+    @Override
     public String discoveredBy() {
         return "Alkalus";
     }
 
+    @Override
     public int growthDuration(ICropTile crop) {
         int ret = 800;
 
@@ -36,10 +40,12 @@ public class Crop_Force extends BaseAestheticCrop {
         return ret;
     }
 
+    @Override
     public String[] attributes() {
         return new String[] { "Power", "Soil", "Yellow", "Gold" };
     }
 
+    @Override
     public ItemStack getGain(ICropTile crop) {
         ItemStack ret = this.getDisplayItem();
         if (MathUtils.randInt(0, 10) > 8) {
@@ -48,6 +54,7 @@ public class Crop_Force extends BaseAestheticCrop {
         return ret;
     }
 
+    @Override
     public ItemStack getDisplayItem() {
         return STANDALONE.FORCE.getNugget(0);
     }
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java
index 5932f984ba..66f0d19fd2 100644
--- a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java
+++ b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java
@@ -11,18 +11,22 @@ import ic2.api.crops.ICropTile;
 
 public class Crop_Hemp extends BaseAestheticCrop {
 
+    @Override
     public int tier() {
         return 2;
     }
 
+    @Override
     public String name() {
         return "Hemp";
     }
 
+    @Override
     public String discoveredBy() {
         return "Alkalus";
     }
 
+    @Override
     public int growthDuration(ICropTile crop) {
         int ret = 550;
 
@@ -37,10 +41,12 @@ public class Crop_Hemp extends BaseAestheticCrop {
         return ret;
     }
 
+    @Override
     public String[] attributes() {
         return new String[] { "Green", "Soil", "Orange" };
     }
 
+    @Override
     public ItemStack getGain(ICropTile crop) {
 
         ItemStack ret = this.getDisplayItem();
@@ -51,6 +57,7 @@ public class Crop_Hemp extends BaseAestheticCrop {
         return ret;
     }
 
+    @Override
     public ItemStack getDisplayItem() {
         return ItemUtils.getSimpleStack(ModItems.itemRope, 0);
     }