mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-18 19:39:12 +00:00
more 1.7 work, attempts at figuring out log4j2
This commit is contained in:
1 parent
fb04e8eb08
commit
d911af378f
33 files changed
+96
-81
No files matched your search
@@ -30,7 +30,7 @@ public class GlassBlock extends TConstructBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getBlockHardness (World world, int x, int y, int z)
|
||||
public float func_149712_f (World world, int x, int y, int z)
|
||||
{
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
switch (meta)
|
||||
@@ -42,7 +42,7 @@ public class GlassBlock extends TConstructBlock
|
||||
case 2:
|
||||
return 50.0F;
|
||||
default:
|
||||
return blockHardness;
|
||||
return field_149782_v;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ public class GlassBlock extends TConstructBlock
|
||||
case 2:
|
||||
return 2000F;
|
||||
default:
|
||||
return getExplosionResistance(entity);
|
||||
return func_149638_a(entity);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ public class StoneTorch extends MantleBlock
|
||||
{
|
||||
public StoneTorch(int id)
|
||||
{
|
||||
super(Material.circuits);
|
||||
super(Material.field_151594_q);
|
||||
this.setCreativeTab(CreativeTabs.tabDecorations);
|
||||
setLightValue(0.9375F);
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import net.minecraft.block.BlockBaseRailLogic;
|
||||
import net.minecraft.block.BlockRailBase;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.item.EntityMinecart;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
@@ -40,9 +41,9 @@ public class WoodRail extends BlockRailBase
|
||||
this.theIcon = par1IconRegister.registerIcon("tinker:woodrail_turn");
|
||||
}
|
||||
|
||||
protected void func_94358_a (World par1World, int par2, int par3, int par4, int par5, int par6, int par7)
|
||||
protected void func_94358_a (World par1World, int par2, int par3, int par4, int par5, int par6, Block par7)
|
||||
{
|
||||
if (par7 > 0 && Block.blocksList[par7].canProvidePower() && (new BlockBaseRailLogic(this, par1World, par2, par3, par4)).getNumberOfAdjacentTracks() == 3)
|
||||
if (par7 != Blocks.air && par7.canProvidePower() && (new BlockBaseRailLogic(this, par1World, par2, par3, par4)).getNumberOfAdjacentTracks() == 3)
|
||||
{
|
||||
this.refreshTrackShape(par1World, par2, par3, par4, false);
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ public class SmelteryScan extends TankLayerScan
|
||||
@Override
|
||||
protected boolean checkServant (int x, int y, int z)
|
||||
{
|
||||
Block block = world.func_147439_a(x, y, z)];
|
||||
Block block = world.func_147439_a(x, y, z);
|
||||
if (block == null || world.func_147439_a( x, y, z) == Blocks.air || !isValidBlock(x, y, z))
|
||||
return false;
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateEntity ()
|
||||
public void func_145845_h ()
|
||||
{
|
||||
if (this.field_145850_b.isRemote)
|
||||
return;
|
||||
@@ -556,7 +556,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui
|
||||
{
|
||||
NBTTagCompound nbt = new NBTTagCompound();
|
||||
liquid.writeToNBT(nbt);
|
||||
tags.setCompoundTag("Fluid", nbt);
|
||||
tags.setTag("Fluid", nbt);
|
||||
}
|
||||
tags.setInteger("LastProvider", this.convertFDToInt(this.lastProvider));
|
||||
tags.setInteger("recentlyFilledDelay", this.recentlyFilledDelay);
|
||||
|
||||
@@ -300,7 +300,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl
|
||||
|
||||
/* Updating */
|
||||
@Override
|
||||
public void updateEntity ()
|
||||
public void func_145845_h ()
|
||||
{
|
||||
if (castingDelay > 0)
|
||||
{
|
||||
|
||||
@@ -169,7 +169,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateEntity ()
|
||||
public void func_145845_h ()
|
||||
{
|
||||
if (renderOffset > 0)
|
||||
{
|
||||
|
||||
@@ -255,7 +255,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateEntity ()
|
||||
public void func_145845_h ()
|
||||
{
|
||||
if (shouldUpdateLogic)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user