diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2023-05-01 02:45:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-01 11:45:56 +0200 |
| commit | b2c8cfb4ec8b82337a95f51364277964ec968b52 (patch) | |
| tree | d4cf94acc93249cd649b33ec13c5b0d75f1f75db /src/main/java/gtPlusPlus/core/fluids | |
| parent | d2eda84e457d549ad9a51f40e9dd159147a141f8 (diff) | |
| download | GT5-Unofficial-b2c8cfb4ec8b82337a95f51364277964ec968b52.tar.gz GT5-Unofficial-b2c8cfb4ec8b82337a95f51364277964ec968b52.tar.bz2 GT5-Unofficial-b2c8cfb4ec8b82337a95f51364277964ec968b52.zip | |
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>
Diffstat (limited to 'src/main/java/gtPlusPlus/core/fluids')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java index 07388c35b6..9c4fb4d66a 100644 --- a/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java +++ b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java @@ -51,8 +51,8 @@ public class BlockFluidBase extends BlockFluidClassic { } @Override - public IIcon getIcon(int side, int meta) { - return (side == 0 || side == 1) ? stillIcon : flowingIcon; + public IIcon getIcon(int ordinalSide, int meta) { + return (ordinalSide == 0 || ordinalSide == 1) ? stillIcon : flowingIcon; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java index 476df9036f..120488acbb 100644 --- a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java +++ b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java @@ -66,6 +66,7 @@ public class ItemGenericFluidBucket extends ItemBucket { /** * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer */ + @Override public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer) { Block isFull = FluidFactory.mMetaToBlockMap.get(aStack.getItemDamage()); |