mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
even closer
This commit is contained in:
1 parent
7c0fc5ed4a
commit
5aec324ece
16 files changed
+139
-10
No files matched your search
@@ -4,6 +4,7 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
@@ -42,7 +43,7 @@ public class GlueBlock extends TConstructBlock {
|
||||
|
||||
public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z)
|
||||
{
|
||||
return Block.slowSand.getCollisionBoundingBoxFromPool(world, x, y, z);
|
||||
return Blocks.soul_sand.func_149668_a(world, x, y, z);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -60,11 +60,11 @@ public class GravelOre extends BlockSand
|
||||
return meta;
|
||||
}
|
||||
|
||||
public int idDropped (int par1, Random par2Random, int par3)
|
||||
public Block idDropped (int par1, Random par2Random, int par3)
|
||||
{
|
||||
/*if (par1 == 1)
|
||||
return Item.goldNugget.itemID;*/
|
||||
return this.blockID;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -214,4 +214,10 @@ public class ToolStationBlock extends InventoryBlock
|
||||
}
|
||||
super.func_149689_a(world, x, y, z, par5EntityLiving, par6ItemStack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity func_149915_a (World var1, int var2)
|
||||
{
|
||||
return createTileEntity(var1,var2);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package tconstruct.blocks.logic;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import mantle.blocks.abstracts.AdaptiveInventoryLogic;
|
||||
import mantle.blocks.iface.*;
|
||||
import mantle.world.CoordTuple;
|
||||
@@ -569,4 +570,17 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc
|
||||
writeNetworkNBT(tag);
|
||||
return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String func_145825_b ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return getDefaultName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_145818_k_ ()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -257,7 +257,6 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl
|
||||
@Override
|
||||
public boolean canDrain (ForgeDirection from, Fluid fluid)
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -420,4 +419,16 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String func_145825_b ()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_145818_k_ ()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -417,4 +417,16 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String func_145825_b ()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_145818_k_ ()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -103,4 +103,16 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String func_145825_b ()
|
||||
{
|
||||
return getDefaultName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_145818_k_ ()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -122,4 +122,16 @@ public class DryingRackLogic extends InventoryLogic
|
||||
AxisAlignedBB cbb = AxisAlignedBB.getAABBPool().getAABB(field_145851_c, field_145848_d - 1, field_145849_e, field_145851_c + 1, field_145848_d + 1, field_145849_e + 1);
|
||||
return cbb;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String func_145825_b ()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_145818_k_ ()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -292,6 +292,18 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic
|
||||
return new FrypanContainer(inventoryplayer.player, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String func_145825_b ()
|
||||
{
|
||||
return getDefaultName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_145818_k_ ()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public boolean canDropInventorySlot(int slot)
|
||||
{
|
||||
|
||||
@@ -340,4 +340,16 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String func_145825_b ()
|
||||
{
|
||||
return getDefaultName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_145818_k_ ()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -29,4 +29,16 @@ public class PatternChestLogic extends InventoryLogic
|
||||
{
|
||||
return new PatternChestContainer(inventoryplayer, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String func_145825_b ()
|
||||
{
|
||||
return getDefaultName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_145818_k_ ()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package tconstruct.blocks.logic;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import mantle.blocks.abstracts.*;
|
||||
import mantle.blocks.iface.*;
|
||||
import mantle.debug.DebugData;
|
||||
@@ -546,7 +547,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
}
|
||||
}
|
||||
|
||||
void updateFuelGague () //TODO: Call this method when the GUI is opened
|
||||
void updateFuelGague ()
|
||||
{
|
||||
if (activeLavaTank == null || useTime > 0)
|
||||
return;
|
||||
@@ -1154,4 +1155,16 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
str.add("inUse: " + inUse + ", tick: " + tick);
|
||||
return new DebugData(player, getClass(), str.toArray(new String[str.size()]));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String func_145825_b ()
|
||||
{
|
||||
return getDefaultName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_145818_k_ ()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -109,4 +109,16 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String func_145825_b ()
|
||||
{
|
||||
return getDefaultName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_145818_k_ ()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -100,7 +100,7 @@ public class Landmine extends MantleBlock
|
||||
*/
|
||||
public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4)
|
||||
{
|
||||
return par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) || BlockFence.func_149825_a(par1World.func_147439_a(par2, par3 - 1, par4));
|
||||
return par1World.func_147466_a(par1World, par2, par3 - 1, par4) || BlockFence.func_149825_a(par1World.func_147439_a(par2, par3 - 1, par4));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -111,14 +111,14 @@ public class Landmine extends MantleBlock
|
||||
{
|
||||
boolean var6 = false;
|
||||
|
||||
if (!par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) && !BlockFence.func_149825_a(par1World.func_147439_a(par2, par3 - 1, par4)))
|
||||
if (!par1World.func_147466_a(par1World, par2, par3 - 1, par4) && !BlockFence.func_149825_a(par1World.func_147439_a(par2, par3 - 1, par4)))
|
||||
{
|
||||
var6 = true;
|
||||
}
|
||||
|
||||
if (var6)
|
||||
{
|
||||
this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
|
||||
this.func_149697_b(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
|
||||
//par1World.setBlock(par2, par3, par4, 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -329,7 +329,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
|
||||
this.field_145791_d = movingobjectposition.blockX;
|
||||
this.field_145792_e = movingobjectposition.blockY;
|
||||
this.field_145789_f = movingobjectposition.blockZ;
|
||||
this.inTile = this.worldObj.func_147439_a(this.field_145791_d, this.field_145792_e, this.field_145789_f);
|
||||
this. = this.worldObj.func_147439_a(this.field_145791_d, this.field_145792_e, this.field_145789_f);
|
||||
this.inData = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f);
|
||||
this.motionX = (double) ((float) (movingobjectposition.hitVec.xCoord - this.posX));
|
||||
this.motionY = (double) ((float) (movingobjectposition.hitVec.yCoord - this.posY));
|
||||
|
||||
@@ -310,7 +310,7 @@ public class Hammer extends HarvestTool
|
||||
{
|
||||
for (int iter = 0; iter < materials.length; iter++)
|
||||
{
|
||||
if (materials[iter] == localBlock.func_149688_o() || localBlock == Block.silverfish)
|
||||
if (materials[iter] == localBlock.func_149688_o() || localBlock == Blocks.silverfish)
|
||||
{
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user