Full Imports and Code Format Optimization

This commit is contained in:
Kam committed 2025-03-12 20:12:01 -04:00
1 parent 250edf099c
commit 6815f579a7
1192 files changed
+60344 -62167

No files matched your search

@@ -31,35 +31,36 @@ import static noppes.npcs.items.ItemNpcTool.BRUSH_COLOR_TAG;
public class BlockCouchWool extends BlockContainer {
public int renderId = -1;
public int renderId = -1;
public BlockCouchWool() {
super(Material.wood);
}
@Override
public boolean onBlockActivated(World par1World, int i, int j, int k, EntityPlayer player, int par6, float par7, float par8, float par9){
ItemStack item = player.inventory.getCurrentItem();
TileColorable.ColorChangeType colorChangeType = TileColorable.allowColorChange(item);
if(colorChangeType == TileColorable.ColorChangeType.NONE)
return BlockChair.MountBlock(par1World, i, j, k, player);
else if(colorChangeType == TileColorable.ColorChangeType.PAINTBRUSH)
return false;
int meta = par1World.getBlockMetadata(i, j, k);
if(meta >= 7)
j--;
TileColorable tile = (TileColorable) par1World.getTileEntity(i, j, k);
int color = colorTableInts[BlockColored.func_150031_c(item.getItemDamage())];
if(tile.color != color){
NoppesUtilServer.consumeItemStack(1, player);
tile.color = color;
par1World.markBlockForUpdate(i, j, k);
}
return true;
}
@Override
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List){
public boolean onBlockActivated(World par1World, int i, int j, int k, EntityPlayer player, int par6, float par7, float par8, float par9) {
ItemStack item = player.inventory.getCurrentItem();
TileColorable.ColorChangeType colorChangeType = TileColorable.allowColorChange(item);
if (colorChangeType == TileColorable.ColorChangeType.NONE)
return BlockChair.MountBlock(par1World, i, j, k, player);
else if (colorChangeType == TileColorable.ColorChangeType.PAINTBRUSH)
return false;
int meta = par1World.getBlockMetadata(i, j, k);
if (meta >= 7)
j--;
TileColorable tile = (TileColorable) par1World.getTileEntity(i, j, k);
int color = colorTableInts[BlockColored.func_150031_c(item.getItemDamage())];
if (tile.color != color) {
NoppesUtilServer.consumeItemStack(1, player);
tile.color = color;
par1World.markBlockForUpdate(i, j, k);
}
return true;
}
@Override
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
par3List.add(new ItemStack(par1, 1, 0));
par3List.add(new ItemStack(par1, 1, 1));
par3List.add(new ItemStack(par1, 1, 2));
@@ -69,134 +70,132 @@ public class BlockCouchWool extends BlockContainer {
}
@Override
public int damageDropped(int par1)
{
public int damageDropped(int par1) {
return par1;
}
public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int x, int y, int z){
public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int x, int y, int z) {
return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 0.5, z + 1);
}
@Override
public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack itemStack)
{
int l = MathHelper.floor_double((double)(par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack itemStack) {
int l = MathHelper.floor_double((double) (par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
l %= 4;
TileCouchWool tile = (TileCouchWool) par1World.getTileEntity(par2, par3, par4);
tile.rotation = l;
tile.color = colorTableInts[15 - itemStack.getItemDamage()];
if(itemStack.hasTagCompound() && itemStack.getTagCompound().hasKey(BRUSH_COLOR_TAG)){
if (itemStack.hasTagCompound() && itemStack.getTagCompound().hasKey(BRUSH_COLOR_TAG)) {
tile.color = itemStack.getTagCompound().getInteger(BRUSH_COLOR_TAG);
}
par1World.setBlockMetadataWithNotify(par2, par3, par4, itemStack.getItemDamage(), 2);
updateModel(par1World, par2, par3, par4, tile);
updateModel(par1World, par2, par3, par4, tile);
onNeighborBlockChange(par1World, par2 + 1, par3, par4, this);
onNeighborBlockChange(par1World, par2 - 1, par3, par4, this);
onNeighborBlockChange(par1World, par2, par3, par4 + 1, this);
onNeighborBlockChange(par1World, par2, par3, par4 - 1, this);
updateModel(par1World, par2, par3, par4, tile);
updateModel(par1World, par2, par3, par4, tile);
par1World.markBlockForUpdate(par2, par3, par4);
}
@Override
public void onNeighborBlockChange(World worldObj, int x, int y, int z, Block block) {
if(worldObj.isRemote || block != this)
return;
TileEntity tile = worldObj.getTileEntity(x, y, z);
if(tile == null || !(tile instanceof TileCouchWool))
return;
updateModel(worldObj, x, y, z, (TileCouchWool) tile);
worldObj.markBlockForUpdate(x, y, z);
if (worldObj.isRemote || block != this)
return;
TileEntity tile = worldObj.getTileEntity(x, y, z);
if (tile == null || !(tile instanceof TileCouchWool))
return;
updateModel(worldObj, x, y, z, (TileCouchWool) tile);
worldObj.markBlockForUpdate(x, y, z);
}
private void updateModel(World world, int x, int y, int z, TileCouchWool tile){
if(world.isRemote)
return;
int meta = tile.getBlockMetadata();
if(tile.rotation == 0){
tile.hasCornerLeft = compareCornerTiles(tile, x, y, z - 1, world, meta, true);
tile.hasCornerRight = compareCornerTiles(tile, x, y, z - 1, world, meta, false);
tile.hasLeft = compareTiles(tile, x - 1, y, z, world, meta);
tile.hasRight = compareTiles(tile, x + 1, y, z, world, meta);
}
else if(tile.rotation == 2){
tile.hasCornerLeft = compareCornerTiles(tile, x, y, z + 1, world, meta, true);
tile.hasCornerRight = compareCornerTiles(tile, x, y, z + 1, world, meta, false);
tile.hasLeft = compareTiles(tile, x + 1, y, z, world, meta);
tile.hasRight = compareTiles(tile, x - 1, y, z, world, meta);
}
else if(tile.rotation == 1){
tile.hasCornerLeft = compareCornerTiles(tile, x + 1, y, z, world, meta, true);
tile.hasCornerRight = compareCornerTiles(tile, x + 1, y, z, world, meta, false);
tile.hasLeft = compareTiles(tile, x, y, z - 1, world, meta);
tile.hasRight = compareTiles(tile, x, y, z + 1, world, meta);
}
else if(tile.rotation == 3){
tile.hasCornerLeft = compareCornerTiles(tile, x - 1, y, z, world, meta, true);
tile.hasCornerRight = compareCornerTiles(tile, x - 1, y, z, world, meta, false);
tile.hasLeft = compareTiles(tile, x, y, z + 1, world, meta);
tile.hasRight = compareTiles(tile, x, y, z - 1, world, meta);
}
private void updateModel(World world, int x, int y, int z, TileCouchWool tile) {
if (world.isRemote)
return;
int meta = tile.getBlockMetadata();
if (tile.rotation == 0) {
tile.hasCornerLeft = compareCornerTiles(tile, x, y, z - 1, world, meta, true);
tile.hasCornerRight = compareCornerTiles(tile, x, y, z - 1, world, meta, false);
tile.hasLeft = compareTiles(tile, x - 1, y, z, world, meta);
tile.hasRight = compareTiles(tile, x + 1, y, z, world, meta);
} else if (tile.rotation == 2) {
tile.hasCornerLeft = compareCornerTiles(tile, x, y, z + 1, world, meta, true);
tile.hasCornerRight = compareCornerTiles(tile, x, y, z + 1, world, meta, false);
tile.hasLeft = compareTiles(tile, x + 1, y, z, world, meta);
tile.hasRight = compareTiles(tile, x - 1, y, z, world, meta);
} else if (tile.rotation == 1) {
tile.hasCornerLeft = compareCornerTiles(tile, x + 1, y, z, world, meta, true);
tile.hasCornerRight = compareCornerTiles(tile, x + 1, y, z, world, meta, false);
tile.hasLeft = compareTiles(tile, x, y, z - 1, world, meta);
tile.hasRight = compareTiles(tile, x, y, z + 1, world, meta);
} else if (tile.rotation == 3) {
tile.hasCornerLeft = compareCornerTiles(tile, x - 1, y, z, world, meta, true);
tile.hasCornerRight = compareCornerTiles(tile, x - 1, y, z, world, meta, false);
tile.hasLeft = compareTiles(tile, x, y, z + 1, world, meta);
tile.hasRight = compareTiles(tile, x, y, z - 1, world, meta);
}
}
private boolean compareCornerTiles(TileCouchWool tile, int x, int y, int z, World world, int meta, boolean isLeft){
int meta2 = world.getBlockMetadata(x, y, z);
private boolean compareCornerTiles(TileCouchWool tile, int x, int y, int z, World world, int meta, boolean isLeft) {
int meta2 = world.getBlockMetadata(x, y, z);
// if(meta2 != meta)
// return false;
TileEntity tile2 = world.getTileEntity(x , y, z);
int rotation = (tile.rotation + (!isLeft?1:3)) % 4;
return tile2 != null & tile2 instanceof TileCouchWool && ((TileCouchWool)tile2).rotation == rotation;
TileEntity tile2 = world.getTileEntity(x, y, z);
int rotation = (tile.rotation + (!isLeft ? 1 : 3)) % 4;
return tile2 != null & tile2 instanceof TileCouchWool && ((TileCouchWool) tile2).rotation == rotation;
}
private boolean compareTiles(TileCouchWool tile, int x, int y, int z, World world, int meta){
int meta2 = world.getBlockMetadata(x, y, z);
private boolean compareTiles(TileCouchWool tile, int x, int y, int z, World world, int meta) {
int meta2 = world.getBlockMetadata(x, y, z);
// if(meta2 != meta)
// return false;
TileEntity tile2 = world.getTileEntity(x, y, z);
if(tile2 == null || !(tile2 instanceof TileCouchWool))
return false;
TileCouchWool couch = (TileCouchWool) tile2;
int rotation = couch.rotation;
if(tile.rotation == rotation)
return true;
if(couch.hasCornerLeft)
rotation += 3;
else if(couch.hasCornerRight)
rotation += 1;
rotation %= 4;
return tile.rotation == rotation;
TileEntity tile2 = world.getTileEntity(x, y, z);
if (tile2 == null || !(tile2 instanceof TileCouchWool))
return false;
TileCouchWool couch = (TileCouchWool) tile2;
int rotation = couch.rotation;
if (tile.rotation == rotation)
return true;
if (couch.hasCornerLeft)
rotation += 3;
else if (couch.hasCornerRight)
rotation += 1;
rotation %= 4;
return tile.rotation == rotation;
}
@Override
public boolean isOpaqueCube(){
return false;
}
public boolean isOpaqueCube() {
return false;
}
@Override
public boolean renderAsNormalBlock(){
return false;
}
public boolean renderAsNormalBlock() {
return false;
}
@Override
public int getRenderType(){
return renderId;
}
public int getRenderType() {
return renderId;
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IconRegister)
{
public void registerBlockIcons(IIconRegister par1IconRegister) {
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int p_149691_1_, int meta)
{
public IIcon getIcon(int p_149691_1_, int meta) {
return Blocks.planks.getIcon(p_149691_1_, meta);
}
@Override
public TileEntity createNewTileEntity(World var1, int var2) {
return new TileCouchWool();
}
@Override
public TileEntity createNewTileEntity(World var1, int var2) {
return new TileCouchWool();
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {