deobfParams

This commit is contained in:
Lyfts authored and Martin Robertz committed 2024-05-16 18:51:58 +02:00
1 parent a5bec6c22b
commit c5d7770253
9 files changed
+38 -47

No files matched your search

@@ -23,20 +23,19 @@ public class BlockFalling extends Block {
}
@Override
public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_) {
p_149726_1_.scheduleBlockUpdate(p_149726_2_, p_149726_3_, p_149726_4_, this, this.tickRate(p_149726_1_));
public void onBlockAdded(World worldIn, int x, int y, int z) {
worldIn.scheduleBlockUpdate(x, y, z, this, this.tickRate(worldIn));
}
@Override
public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_,
Block p_149695_5_) {
p_149695_1_.scheduleBlockUpdate(p_149695_2_, p_149695_3_, p_149695_4_, this, this.tickRate(p_149695_1_));
public void onNeighborBlockChange(World worldIn, int x, int y, int z, Block neighbor) {
worldIn.scheduleBlockUpdate(x, y, z, this, this.tickRate(worldIn));
}
@Override
public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) {
if (!p_149674_1_.isRemote) {
this.func_149830_m(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_);
public void updateTick(World worldIn, int x, int y, int z, Random random) {
if (!worldIn.isRemote) {
this.func_149830_m(worldIn, x, y, z);
}
}
@@ -79,7 +78,7 @@ public class BlockFalling extends Block {
protected void func_149829_a(EntityFallingBlock p_149829_1_) {}
@Override
public int tickRate(World p_149738_1_) {
public int tickRate(World worldIn) {
return 2;
}
@@ -127,8 +127,8 @@ public class SlimeGrass extends MantleBlock {
}
@Override
public Item getItemDropped(int metadata, Random random, int p_149650_3_) {
if (metadata == 1) return Blocks.dirt.getItemDropped(metadata, random, p_149650_3_);
public Item getItemDropped(int metadata, Random random, int fortune) {
if (metadata == 1) return Blocks.dirt.getItemDropped(metadata, random, fortune);
else return ItemSaddle.getItemFromBlock(TinkerTools.craftedSoil);
}
}
@@ -88,7 +88,7 @@ public class SlimeLeaves extends BlockLeaves {
* Returns the ID of the items to drop on destruction.
*/
@Override
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
public Item getItemDropped(int meta, Random random, int fortune) {
return Item.getItemFromBlock(TinkerWorld.slimeSapling);
}
@@ -334,7 +334,7 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit
}
@Override
public void setVelocity(double p_70016_1_, double p_70016_3_, double p_70016_5_) {
public void setVelocity(double x, double y, double z) {
// don't do anything, we set it ourselves at spawn
// Mojangs code has a hard cap of 3.9 speed, but our projectiles can go faster, which desyncs client and server
// speeds
@@ -49,8 +49,8 @@ public abstract class BehaviorProjectileBaseDispense extends BehaviorDefaultDisp
/**
* Play the dispense sound from the specified block.
*/
protected void playDispenseSound(IBlockSource p_82485_1_) {
p_82485_1_.getWorld().playAuxSFX(1002, p_82485_1_.getXInt(), p_82485_1_.getYInt(), p_82485_1_.getZInt(), 0);
protected void playDispenseSound(IBlockSource source) {
source.getWorld().playAuxSFX(1002, source.getXInt(), source.getYInt(), source.getZInt(), 0);
}
/**
@@ -41,8 +41,8 @@ public class PaneBase extends BlockStainedGlassPane {
@Override
@SideOnly(Side.CLIENT)
public IIcon func_149735_b(int p_149735_1_, int p_149735_2_) {
return icons[p_149735_2_];
public IIcon func_149735_b(int side, int meta) {
return icons[meta];
}
@Override
@@ -52,8 +52,8 @@ public class PaneBase extends BlockStainedGlassPane {
}
@Override
public IIcon getIcon(int p_149691_1_, int p_149691_2_) {
return icons[p_149691_2_];
public IIcon getIcon(int side, int meta) {
return icons[meta];
}
@Override
@@ -33,14 +33,11 @@ public class BattlesignBlock extends EquipBlock {
@SideOnly(Side.CLIENT)
@Override
public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_,
int p_149646_5_) {
return p_149646_5_ == 0 && this.minY > 0.0D || (p_149646_5_ == 1 && this.maxY < 1.0D || (p_149646_5_ == 2
&& this.minZ > 0.0D
|| (p_149646_5_ == 3 && this.maxZ < 1.0D || (p_149646_5_ == 4 && this.minX > 0.0D || (p_149646_5_ == 5
&& this.maxX < 1.0D
|| !(p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_).isOpaqueCube()
&& p_149646_1_.getBlock(p_149646_2_, p_149646_3_ + 1, p_149646_4_).isOpaqueCube()))))));
public boolean shouldSideBeRendered(IBlockAccess worldIn, int x, int y, int z, int side) {
return side == 0 && this.minY > 0.0D || (side == 1 && this.maxY < 1.0D
|| (side == 2 && this.minZ > 0.0D || (side == 3 && this.maxZ < 1.0D || (side == 4 && this.minX > 0.0D
|| (side == 5 && this.maxX < 1.0D || !(worldIn.getBlock(x, y, z).isOpaqueCube()
&& worldIn.getBlock(x, y + 1, z).isOpaqueCube()))))));
}
@Override
@@ -281,12 +281,7 @@ public final class ToolStationGuiHelper {
/**
* Renders the specified text to the screen, center-aligned. Copied out of GUI
*/
public static void drawCenteredString(FontRenderer p_73732_1_, String p_73732_2_, int p_73732_3_, int p_73732_4_,
int p_73732_5_) {
p_73732_1_.drawStringWithShadow(
p_73732_2_,
p_73732_3_ - p_73732_1_.getStringWidth(p_73732_2_) / 2,
p_73732_4_,
p_73732_5_);
public static void drawCenteredString(FontRenderer fontRendererIn, String text, int x, int y, int color) {
fontRendererIn.drawStringWithShadow(text, x - fontRendererIn.getStringWidth(text) / 2, y, color);
}
}
@@ -126,22 +126,22 @@ public class StoneTorch extends MantleBlock {
}
// JAVADOC METHOD $$ func_149726_b
public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_) {
if (p_149726_1_.getBlockMetadata(p_149726_2_, p_149726_3_, p_149726_4_) == 0) {
if (p_149726_1_.isSideSolid(p_149726_2_ - 1, p_149726_3_, p_149726_4_, EAST, true)) {
p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 1, 2);
} else if (p_149726_1_.isSideSolid(p_149726_2_ + 1, p_149726_3_, p_149726_4_, WEST, true)) {
p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 2, 2);
} else if (p_149726_1_.isSideSolid(p_149726_2_, p_149726_3_, p_149726_4_ - 1, SOUTH, true)) {
p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 3, 2);
} else if (p_149726_1_.isSideSolid(p_149726_2_, p_149726_3_, p_149726_4_ + 1, NORTH, true)) {
p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 4, 2);
} else if (this.canPlaceTorchOn(p_149726_1_, p_149726_2_, p_149726_3_ - 1, p_149726_4_)) {
p_149726_1_.setBlockMetadataWithNotify(p_149726_2_, p_149726_3_, p_149726_4_, 5, 2);
public void onBlockAdded(World worldIn, int x, int y, int z) {
if (worldIn.getBlockMetadata(x, y, z) == 0) {
if (worldIn.isSideSolid(x - 1, y, z, EAST, true)) {
worldIn.setBlockMetadataWithNotify(x, y, z, 1, 2);
} else if (worldIn.isSideSolid(x + 1, y, z, WEST, true)) {
worldIn.setBlockMetadataWithNotify(x, y, z, 2, 2);
} else if (worldIn.isSideSolid(x, y, z - 1, SOUTH, true)) {
worldIn.setBlockMetadataWithNotify(x, y, z, 3, 2);
} else if (worldIn.isSideSolid(x, y, z + 1, NORTH, true)) {
worldIn.setBlockMetadataWithNotify(x, y, z, 4, 2);
} else if (this.canPlaceTorchOn(worldIn, x, y - 1, z)) {
worldIn.setBlockMetadataWithNotify(x, y, z, 5, 2);
}
}
this.dropTorchIfCantStay(p_149726_1_, p_149726_2_, p_149726_3_, p_149726_4_);
this.dropTorchIfCantStay(worldIn, x, y, z);
}
@Override