From b2c8cfb4ec8b82337a95f51364277964ec968b52 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 1 May 2023 02:45:56 -0700 Subject: ForgeDirection (#608) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java | 2 +- src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/bop') diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java index 22732d647a..b839f52d02 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java @@ -77,7 +77,7 @@ public class LeavesBase extends BlockLeaves { */ @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(int p_149691_1_, int metaID) { + public IIcon getIcon(int ordinalSide, int metaID) { return (metaID & 3) == 1 ? this.leafTextures[this.field_150127_b][1] : this.leafTextures[this.field_150127_b][0]; } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java index 75c0d5bd59..1c1cd515bb 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java @@ -59,7 +59,7 @@ public class SaplingBase extends BlockSapling { @SideOnly(Side.CLIENT) public IIcon getIcon(int someInt, int meta) { /* - * p_149691_2_ &= 7; return saplingTextures[MathHelper.clamp_int(p_149691_2_, 0, 5)]; + * meta &= 7; return saplingTextures[MathHelper.clamp_int(meta, 0, 5)]; */ // return this.saplingTextures[meta % this.saplingTextures.length]; try { -- cgit