mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-18 19:39:12 +00:00
run repo through formatter
This commit is contained in:
1 parent
5585d680a3
commit
ffaea7d4b7
140 files changed
+1050
-892
No files matched your search
@@ -24,17 +24,17 @@ public class BlockFalling extends Block
|
||||
super(p_i45405_1_);
|
||||
}
|
||||
|
||||
public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_)
|
||||
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 onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
|
||||
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 updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
|
||||
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)
|
||||
{
|
||||
@@ -42,7 +42,7 @@ public class BlockFalling extends Block
|
||||
}
|
||||
}
|
||||
|
||||
private void func_149830_m(World p_149830_1_, int p_149830_2_, int p_149830_3_, int p_149830_4_)
|
||||
private void func_149830_m (World p_149830_1_, int p_149830_2_, int p_149830_3_, int p_149830_4_)
|
||||
{
|
||||
if (func_149831_e(p_149830_1_, p_149830_2_, p_149830_3_ - 1, p_149830_4_) && p_149830_3_ >= 0)
|
||||
{
|
||||
@@ -74,14 +74,16 @@ public class BlockFalling extends Block
|
||||
}
|
||||
}
|
||||
|
||||
protected void func_149829_a(EntityFallingBlock p_149829_1_) {}
|
||||
protected void func_149829_a (EntityFallingBlock p_149829_1_)
|
||||
{
|
||||
}
|
||||
|
||||
public int tickRate(World p_149738_1_)
|
||||
public int tickRate (World p_149738_1_)
|
||||
{
|
||||
return 2;
|
||||
}
|
||||
|
||||
public static boolean func_149831_e(World p_149831_0_, int p_149831_1_, int p_149831_2_, int p_149831_3_)
|
||||
public static boolean func_149831_e (World p_149831_0_, int p_149831_1_, int p_149831_2_, int p_149831_3_)
|
||||
{
|
||||
Block block = p_149831_0_.getBlock(p_149831_1_, p_149831_2_, p_149831_3_);
|
||||
|
||||
@@ -98,9 +100,11 @@ public class BlockFalling extends Block
|
||||
//TODO: King, take a look here when doing liquids!
|
||||
//Material material = block.blockMaterial;
|
||||
//return material == Material.water ? true : material == Material.lava;
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public void func_149828_a(World p_149828_1_, int p_149828_2_, int p_149828_3_, int p_149828_4_, int p_149828_5_) {}
|
||||
public void func_149828_a (World p_149828_1_, int p_149828_2_, int p_149828_3_, int p_149828_4_, int p_149828_5_)
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -458,10 +458,10 @@ public class BlockLandmine extends BlockContainer
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static enum Sensitivity
|
||||
{
|
||||
everything, mobs, players;
|
||||
everything, mobs, players;
|
||||
}
|
||||
|
||||
protected int getMineState (World par1World, int par2, int par3, int par4)
|
||||
|
||||
@@ -15,13 +15,13 @@ public class BloodBlock extends TConstructFluid
|
||||
{
|
||||
super(fluid, material, texture);
|
||||
}
|
||||
|
||||
|
||||
public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
|
||||
{
|
||||
if (entity instanceof EntityLivingBase)
|
||||
{
|
||||
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 20*15, 0));
|
||||
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 20*5, 1));
|
||||
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 20 * 15, 0));
|
||||
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 20 * 5, 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -101,11 +101,11 @@ public class ConveyorBase extends MantleBlock
|
||||
world.setBlockMetadataWithNotify(x, y, z, face | meta, 2);
|
||||
}
|
||||
|
||||
public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side)
|
||||
public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side)
|
||||
{
|
||||
if (side == 1)
|
||||
return false;
|
||||
return super. shouldSideBeRendered(world, x, y, z, side);
|
||||
return super.shouldSideBeRendered(world, x, y, z, side);
|
||||
}
|
||||
|
||||
public IIcon[] icons;
|
||||
|
||||
@@ -101,10 +101,11 @@ public class CraftingStationBlock extends InventoryBlock
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World arg0, int arg1) {
|
||||
return new CraftingStationLogic();
|
||||
}
|
||||
@Override
|
||||
public TileEntity createNewTileEntity (World arg0, int arg1)
|
||||
{
|
||||
return new CraftingStationLogic();
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity func_149915_a (World arg0, int arg1)
|
||||
|
||||
@@ -585,10 +585,10 @@ public class GlassBlockConnected extends MantleBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
|
||||
public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
|
||||
{
|
||||
Block b = par1IBlockAccess.getBlock(par2, par3, par4);
|
||||
return b == (Block) this ? false : super. shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5);
|
||||
return b == (Block) this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -31,10 +31,10 @@ public class GlassBlockStained extends TConstructBlock
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side)
|
||||
public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side)
|
||||
{
|
||||
Block block = world.getBlock(x, y, z);
|
||||
return block == this ? false : super. shouldSideBeRendered(world, x, y, z, side);
|
||||
return block == this ? false : super.shouldSideBeRendered(world, x, y, z, side);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -37,8 +37,8 @@ public class GlassPaneConnected extends GlassBlockConnected
|
||||
{
|
||||
if (par5 == 0 || par5 == 1)
|
||||
{
|
||||
return par1IBlockAccess.getBlock(par2, par3 - 1, par4) == this && par5 == 0 ? icons[15]
|
||||
: par1IBlockAccess.getBlock(par2, par3 + 1, par4) == this && par5 == 1 ? icons[15] : getSideTextureIndex();
|
||||
return par1IBlockAccess.getBlock(par2, par3 - 1, par4) == this && par5 == 0 ? icons[15] : par1IBlockAccess.getBlock(par2, par3 + 1, par4) == this && par5 == 1 ? icons[15]
|
||||
: getSideTextureIndex();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -10,11 +10,12 @@ import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class GlueBlock extends TConstructBlock {
|
||||
public class GlueBlock extends TConstructBlock
|
||||
{
|
||||
|
||||
public GlueBlock()
|
||||
{
|
||||
super(Material.ground, 4.0f, new String[]{"glue"});
|
||||
super(Material.ground, 4.0f, new String[] { "glue" });
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -23,19 +24,26 @@ public class GlueBlock extends TConstructBlock {
|
||||
entity.motionX *= 0.1;
|
||||
entity.motionZ *= 0.1;
|
||||
|
||||
if (entity instanceof EntityLivingBase) {
|
||||
EntityLivingBase lvb = (EntityLivingBase)entity;
|
||||
if (entity instanceof EntityLivingBase)
|
||||
{
|
||||
EntityLivingBase lvb = (EntityLivingBase) entity;
|
||||
// Well you'd feel ill too standing on glue...
|
||||
if (lvb.isPotionActive(Potion.hunger)) {
|
||||
if (lvb.isPotionActive(Potion.hunger))
|
||||
{
|
||||
lvb.getActivePotionEffect(Potion.hunger).duration = 20;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
lvb.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4));
|
||||
}
|
||||
|
||||
// Glue is sticky stuff
|
||||
if (lvb.isPotionActive(Potion.moveSlowdown)) {
|
||||
if (lvb.isPotionActive(Potion.moveSlowdown))
|
||||
{
|
||||
lvb.getActivePotionEffect(Potion.moveSlowdown).duration = 30;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
lvb.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 30, 4));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,8 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.BlockFluidFinite;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class GlueFluid extends BlockFluidFinite {
|
||||
public class GlueFluid extends BlockFluidFinite
|
||||
{
|
||||
|
||||
IIcon stillIcon;
|
||||
IIcon flowIcon;
|
||||
@@ -41,23 +42,31 @@ public class GlueFluid extends BlockFluidFinite {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) {
|
||||
public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
|
||||
{
|
||||
entity.motionX *= 0.1;
|
||||
entity.motionZ *= 0.1;
|
||||
|
||||
if (entity instanceof EntityLivingBase) {
|
||||
EntityLivingBase lvb = (EntityLivingBase)entity;
|
||||
if (entity instanceof EntityLivingBase)
|
||||
{
|
||||
EntityLivingBase lvb = (EntityLivingBase) entity;
|
||||
// Well you'd feel ill too standing in glue...
|
||||
if (lvb.isPotionActive(Potion.hunger)) {
|
||||
if (lvb.isPotionActive(Potion.hunger))
|
||||
{
|
||||
lvb.getActivePotionEffect(Potion.hunger).duration = 20;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
lvb.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4));
|
||||
}
|
||||
|
||||
// Glue is sticky stuff
|
||||
if (lvb.isPotionActive(Potion.moveSlowdown)) {
|
||||
if (lvb.isPotionActive(Potion.moveSlowdown))
|
||||
{
|
||||
lvb.getActivePotionEffect(Potion.moveSlowdown).duration = 30;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
lvb.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 30, 4));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ public class LavaTankBlock extends BlockContainer
|
||||
//if (side == 0 && world.getBlockMetadata(x, y, z) == 0)
|
||||
//return super. shouldSideBeRendered(world, x, y, z, side);
|
||||
Block b = world.getBlock(x, y, z);
|
||||
return b == (Block)this ? false : super. shouldSideBeRendered(world, x, y, z, side);
|
||||
return b == (Block) this ? false : super.shouldSideBeRendered(world, x, y, z, side);
|
||||
//return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -172,17 +172,17 @@ public class MeatBlock extends BlockWood
|
||||
par3List.add(new ItemStack(b, 1, i));
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public boolean canSustainLeaves (World world, int x, int y, int z)
|
||||
// {
|
||||
// return true;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean isWood (World world, int x, int y, int z)
|
||||
// {
|
||||
// return true;
|
||||
// }
|
||||
// @Override
|
||||
// public boolean canSustainLeaves (World world, int x, int y, int z)
|
||||
// {
|
||||
// return true;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean isWood (World world, int x, int y, int z)
|
||||
// {
|
||||
// return true;
|
||||
// }
|
||||
|
||||
public boolean isBeaconBase (World worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ)
|
||||
{
|
||||
|
||||
@@ -110,6 +110,7 @@ public class MultiBrick extends TConstructBlock
|
||||
entity.fallDistance = 0;
|
||||
}
|
||||
}
|
||||
|
||||
//TODO getCollisionBoundingBoxFromPool
|
||||
@Override
|
||||
public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z)
|
||||
|
||||
@@ -22,6 +22,7 @@ public class MultiBrickFancy extends TConstructBlock
|
||||
{
|
||||
super(Material.rock, 3f, blockTextures);
|
||||
}
|
||||
|
||||
//TODO getBlockHardness
|
||||
@Override
|
||||
public float getBlockHardness (World world, int x, int y, int z)
|
||||
|
||||
@@ -326,9 +326,9 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable
|
||||
{
|
||||
return EnumPlantType.Cave;
|
||||
}
|
||||
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void setGraphicsLevel(boolean p_150122_1_)
|
||||
public void setGraphicsLevel (boolean p_150122_1_)
|
||||
{
|
||||
this.field_150121_P = p_150122_1_;
|
||||
this.field_150127_b = (p_150122_1_ ? 0 : 1);
|
||||
|
||||
@@ -30,7 +30,7 @@ public class OreberryBushEssence extends OreberryBush implements IPlantable
|
||||
{
|
||||
if (meta < 12)
|
||||
{
|
||||
world.setBlock(x, y, z,(Block) this, meta + 4, 3);
|
||||
world.setBlock(x, y, z, (Block) this, meta + 4, 3);
|
||||
}
|
||||
}
|
||||
/*else if (meta < 8)
|
||||
|
||||
@@ -34,12 +34,13 @@ public class PaneBase extends Block
|
||||
this.folder = folder;
|
||||
}
|
||||
|
||||
public final boolean canPaneConnectToBlock(Block p_150098_1_)
|
||||
public final boolean canPaneConnectToBlock (Block p_150098_1_)
|
||||
{
|
||||
return p_150098_1_.func_149730_j() || p_150098_1_ == this || p_150098_1_ == Blocks.glass || p_150098_1_ == Blocks.stained_glass || p_150098_1_ == Blocks.stained_glass_pane || p_150098_1_ instanceof BlockPane;
|
||||
return p_150098_1_.func_149730_j() || p_150098_1_ == this || p_150098_1_ == Blocks.glass || p_150098_1_ == Blocks.stained_glass || p_150098_1_ == Blocks.stained_glass_pane
|
||||
|| p_150098_1_ instanceof BlockPane;
|
||||
}
|
||||
|
||||
public boolean canConnectTo(IBlockAccess world, int x, int y, int z, ForgeDirection dir)
|
||||
|
||||
public boolean canConnectTo (IBlockAccess world, int x, int y, int z, ForgeDirection dir)
|
||||
{
|
||||
return canPaneConnectToBlock(world.getBlock(x, y, z)) || world.isSideSolid(x, y, z, dir.getOpposite(), false);
|
||||
}
|
||||
@@ -94,7 +95,7 @@ public class PaneBase extends Block
|
||||
return PaneRender.model;
|
||||
}
|
||||
|
||||
public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int i, int j, int k, int l)
|
||||
public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int i, int j, int k, int l)
|
||||
{
|
||||
Block b = iblockaccess.getBlock(i, j, k);
|
||||
if (b instanceof PaneBase || b instanceof BlockPane)
|
||||
@@ -103,7 +104,7 @@ public class PaneBase extends Block
|
||||
}
|
||||
else
|
||||
{
|
||||
return super. shouldSideBeRendered(iblockaccess, i, j, k, l);
|
||||
return super.shouldSideBeRendered(iblockaccess, i, j, k, l);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -43,7 +43,6 @@ public class SearedBlock extends InventoryBlock
|
||||
this.texturePrefix = texture;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity (World world, int metadata)
|
||||
{
|
||||
@@ -168,7 +167,7 @@ public class SearedBlock extends InventoryBlock
|
||||
}
|
||||
else if (logic.isStackInSlot(0))
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.post(new SmelteryEvent.ItemRemovedFromCasting(logic, x, y, z, logic.getStackInSlot(0), player));
|
||||
MinecraftForge.EVENT_BUS.post(new SmelteryEvent.ItemRemovedFromCasting(logic, x, y, z, logic.getStackInSlot(0), player));
|
||||
ItemStack stack = logic.decrStackSize(0, 1);
|
||||
if (stack != null)
|
||||
addItemToInventory(player, world, x, y, z, stack);
|
||||
|
||||
@@ -136,7 +136,7 @@ public class SlimeExplosive extends TConstructBlock
|
||||
if (entityarrow.isBurning())
|
||||
{
|
||||
this.primeTnt(par1World, par2, par3, par4, 1, entityarrow.shootingEntity instanceof EntityLivingBase ? (EntityLivingBase) entityarrow.shootingEntity : null);
|
||||
WorldHelper.setBlockToAir(par1World,par2, par3, par4);
|
||||
WorldHelper.setBlockToAir(par1World, par2, par3, par4);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,7 +24,8 @@ public class SoilBlock extends TConstructBlock
|
||||
@Override
|
||||
public void onEntityWalking (World world, int x, int y, int z, Entity entity)
|
||||
{
|
||||
if (entity instanceof EntityLivingBase){
|
||||
if (entity instanceof EntityLivingBase)
|
||||
{
|
||||
if (((EntityLivingBase) entity).getCreatureAttribute() == EnumCreatureAttribute.UNDEAD)
|
||||
{
|
||||
int metadata = world.getBlockMetadata(x, y, z);
|
||||
|
||||
@@ -84,9 +84,8 @@ public class StoneTorch extends MantleBlock
|
||||
*/
|
||||
public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4)
|
||||
{
|
||||
return par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) || par1World.isSideSolid(par2 + 1, par3, par4, WEST, true)
|
||||
|| par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true) || par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true)
|
||||
|| canPlaceTorchOn(par1World, par2, par3 - 1, par4);
|
||||
return par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) || par1World.isSideSolid(par2 + 1, par3, par4, WEST, true) || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true)
|
||||
|| par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true) || canPlaceTorchOn(par1World, par2, par3 - 1, par4);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -19,9 +19,9 @@ public class TConstructBlock extends MantleBlock
|
||||
public String[] textureNames;
|
||||
public IIcon[] icons;
|
||||
|
||||
public TConstructBlock( Material material, float hardness, String[] tex)
|
||||
public TConstructBlock(Material material, float hardness, String[] tex)
|
||||
{
|
||||
super( material);
|
||||
super(material);
|
||||
setHardness(hardness);
|
||||
this.setCreativeTab(TConstructRegistry.blockTab);
|
||||
textureNames = tex;
|
||||
|
||||
@@ -33,6 +33,7 @@ public class TConstructFluid extends BlockFluidClassic
|
||||
{
|
||||
return alpha ? 1 : 0;
|
||||
}
|
||||
|
||||
//TODO registerBlockIcons
|
||||
@Override
|
||||
public void registerBlockIcons (IIconRegister iconRegister)
|
||||
|
||||
@@ -116,7 +116,8 @@ public class ToolStationBlock extends InventoryBlock
|
||||
{
|
||||
int metadata = world.getBlockMetadata(x, y, z);
|
||||
if (metadata == 5)
|
||||
return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, (double) z + this.maxZ);
|
||||
return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125,
|
||||
(double) z + this.maxZ);
|
||||
return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ);
|
||||
}
|
||||
|
||||
@@ -218,6 +219,6 @@ public class ToolStationBlock extends InventoryBlock
|
||||
@Override
|
||||
public TileEntity createNewTileEntity (World var1, int var2)
|
||||
{
|
||||
return createTileEntity(var1,var2);
|
||||
return createTileEntity(var1, var2);
|
||||
}
|
||||
}
|
||||
@@ -44,7 +44,7 @@ public class SmelteryScan extends TankLayerScan
|
||||
protected boolean checkServant (int x, int y, int z)
|
||||
{
|
||||
Block block = world.getBlock(x, y, z);
|
||||
if (block == null || world.getBlock( x, y, z) == Blocks.air || !isValidBlock(x, y, z))
|
||||
if (block == null || world.getBlock(x, y, z) == Blocks.air || !isValidBlock(x, y, z))
|
||||
return false;
|
||||
|
||||
if (!block.hasTileEntity(world.getBlockMetadata(x, y, z)))
|
||||
@@ -130,7 +130,7 @@ public class SmelteryScan extends TankLayerScan
|
||||
{
|
||||
super.readNetworkNBT(tags);
|
||||
|
||||
NBTTagList tanks = tags.getTagList("Tanks",11);
|
||||
NBTTagList tanks = tags.getTagList("Tanks", 11);
|
||||
if (tanks != null)
|
||||
{
|
||||
lavaTanks.clear();
|
||||
|
||||
@@ -436,13 +436,13 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl
|
||||
public void closeInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -17,7 +17,7 @@ import tconstruct.TConstruct;
|
||||
|
||||
public class CastingChannelLogic extends TileEntity implements IFluidTank, IFluidHandler, IActiveLogic
|
||||
{
|
||||
public final static int fillMax = TConstruct.ingotLiquidValue*5;
|
||||
public final static int fillMax = TConstruct.ingotLiquidValue * 5;
|
||||
public final static int outputMax = TConstruct.ingotLiquidValue;
|
||||
public FluidStack liquid;
|
||||
public ForgeDirection lastProvider;
|
||||
|
||||
@@ -434,13 +434,13 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl
|
||||
public void closeInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -120,13 +120,13 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent
|
||||
public void closeInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -139,13 +139,13 @@ public class DryingRackLogic extends InventoryLogic
|
||||
public void closeInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -703,32 +703,31 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
Block eastBlock = worldObj.getBlock(x + 1, y, z);
|
||||
Block westBlock = worldObj.getBlock(x - 1, y, z);
|
||||
|
||||
if ((northBlock == null || northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air)
|
||||
&& (eastBlock == null || eastBlock == Blocks.air) && (westBlock == null || westBlock == Blocks.air))
|
||||
if ((northBlock == null || northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air) && (eastBlock == null || eastBlock == Blocks.air)
|
||||
&& (westBlock == null || westBlock == Blocks.air))
|
||||
{
|
||||
checkValidStructure(x, y, z);
|
||||
}
|
||||
|
||||
else if ((northBlock != null && !(northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air)
|
||||
&& (eastBlock == null || eastBlock == Blocks.air) && (westBlock == null || westBlock == Blocks.air)))
|
||||
else if ((northBlock != null && !(northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air) && (eastBlock == null || eastBlock == Blocks.air) && (westBlock == null || westBlock == Blocks.air)))
|
||||
{
|
||||
checkValidStructure(x, y, z - 1);
|
||||
}
|
||||
|
||||
else if ((northBlock == null || northBlock == Blocks.air) && (southBlock != null && !(southBlock == Blocks.air))
|
||||
&& (eastBlock == null || eastBlock == Blocks.air) && (westBlock == null || westBlock == Blocks.air))
|
||||
else if ((northBlock == null || northBlock == Blocks.air) && (southBlock != null && !(southBlock == Blocks.air)) && (eastBlock == null || eastBlock == Blocks.air)
|
||||
&& (westBlock == null || westBlock == Blocks.air))
|
||||
{
|
||||
checkValidStructure(x, y, z + 1);
|
||||
}
|
||||
|
||||
else if ((northBlock == null || northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air)
|
||||
&& (eastBlock != null && !(eastBlock == Blocks.air)) && (westBlock == null || westBlock == Blocks.air))
|
||||
else if ((northBlock == null || northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air) && (eastBlock != null && !(eastBlock == Blocks.air))
|
||||
&& (westBlock == null || westBlock == Blocks.air))
|
||||
{
|
||||
checkValidStructure(x - 1, y, z);
|
||||
}
|
||||
|
||||
else if ((northBlock == null || northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air)
|
||||
&& (eastBlock == null || eastBlock == Blocks.air) && (westBlock != null && !(westBlock == Blocks.air)))
|
||||
else if ((northBlock == null || northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air) && (eastBlock == null || eastBlock == Blocks.air)
|
||||
&& (westBlock != null && !(westBlock == Blocks.air)))
|
||||
{
|
||||
checkValidStructure(x + 1, y, z);
|
||||
}
|
||||
|
||||
@@ -131,7 +131,7 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide
|
||||
//DELETE
|
||||
public void updateEntity ()
|
||||
{
|
||||
WorldHelper.setBlockToAir(worldObj,xCoord, yCoord, zCoord);
|
||||
WorldHelper.setBlockToAir(worldObj, xCoord, yCoord, zCoord);
|
||||
}
|
||||
|
||||
//Keep TE regardless of metadata
|
||||
@@ -200,13 +200,12 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide
|
||||
|
||||
@Override
|
||||
public void closeInventory ()
|
||||
{
|
||||
{
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory ()
|
||||
{
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -69,7 +69,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory
|
||||
public void readFromNBT (NBTTagCompound par1NBTTagCompound)
|
||||
{
|
||||
super.readFromNBT(par1NBTTagCompound);
|
||||
NBTTagList nbttaglist = par1NBTTagCompound.getTagList("Items",9);
|
||||
NBTTagList nbttaglist = par1NBTTagCompound.getTagList("Items", 9);
|
||||
this.inventory = new ItemStack[this.getSizeInventory()];
|
||||
|
||||
for (int i = 0; i < nbttaglist.tagCount(); ++i)
|
||||
@@ -263,5 +263,4 @@ public class TileEntityLandmine extends TileEntity implements IInventory
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -124,11 +124,11 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
|
||||
|
||||
@Override
|
||||
public void closeInventory ()
|
||||
{
|
||||
{
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory ()
|
||||
{
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -123,7 +123,7 @@ public class SlimeGrass extends MantleBlock
|
||||
Block block = par1World.getBlock(posX, posY, posZ);
|
||||
if (block == Blocks.dirt)
|
||||
{
|
||||
par1World.setBlock(posX, posY, posZ,(Block) this, 1, 3);
|
||||
par1World.setBlock(posX, posY, posZ, (Block) this, 1, 3);
|
||||
return;
|
||||
}
|
||||
int blockMeta = par1World.getBlockMetadata(posX, posY, posZ);
|
||||
|
||||
@@ -151,8 +151,9 @@ public class SlimeLeaves extends BlockLeaves
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] func_150125_e() {
|
||||
return new String[]{"slime"};
|
||||
}
|
||||
@Override
|
||||
public String[] func_150125_e ()
|
||||
{
|
||||
return new String[] { "slime" };
|
||||
}
|
||||
}
|
||||
@@ -116,7 +116,6 @@ public class SlimeTallGrass extends BlockBush implements IShearable
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean isShearable (ItemStack item, IBlockAccess world, int x, int y, int z)
|
||||
{
|
||||
|
||||
@@ -60,8 +60,8 @@ public class Punji extends MantleBlock
|
||||
if (stack != null && stack == new ItemStack(TRepo.punji))
|
||||
{
|
||||
world.setBlockMetadataWithNotify(x, y, z, meta + 1, 3);
|
||||
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.stepSound.soundName,
|
||||
(this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F);
|
||||
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.stepSound.soundName, (this.stepSound.getVolume() + 1.0F) / 2.0F,
|
||||
this.stepSound.getPitch() * 0.8F);
|
||||
player.swingItem();
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user