Skip to content

Refactor barrels as rotated pillars #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KAMKEEL wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor barrels as rotated pillars #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions src/main/java/kamkeel/plugin/Blocks/BlockBarrel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockPistonBase;
import net.minecraft.block.BlockRotatedPillar;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
Expand All @@ -16,7 +16,12 @@
import net.minecraft.world.World;


public class BlockBarrel extends Block {
/**
* Barrel block that behaves similarly to a {@link BlockRotatedPillar} so it can be rotated
* like vanilla pillars. The original orientation and texture logic is preserved so the
* block still renders the correct top and bottom faces regardless of placement direction.
*/
public class BlockBarrel extends BlockRotatedPillar {

public IIcon top;
public IIcon bottom;
Expand Down Expand Up @@ -65,4 +70,16 @@ public IIcon getIcon(int p_149691_1_, int p_149691_2_)
int k = BlockPistonBase.getPistonOrientation(p_149691_2_);
return k > 5 ? this.top : (p_149691_1_ == k ? this.top : (p_149691_1_ == Facing.oppositeSide[k] ? this.bottom : this.blockIcon));
}

@Override
protected IIcon getSideIcon(int meta)
{
return this.blockIcon;
}

@Override
protected IIcon getTopIcon(int meta)
{
return this.top;
}
}