mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 20:22:36 +00:00
some fixes
This commit is contained in:
1 parent
dc968ae355
commit
dfcc6e9d89
17 files changed
+32
-26
No files matched your search
@@ -34,7 +34,7 @@ public class DryingRack extends InventoryBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity (World world, int metadata)
|
||||
public TileEntity func_149915_a (World world, int metadata)
|
||||
{
|
||||
return new DryingRackLogic();
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ public class EquipBlock extends InventoryBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity (World world, int metadata)
|
||||
public TileEntity func_149915_a (World world, int metadata)
|
||||
{
|
||||
return new FrypanLogic();
|
||||
}
|
||||
@@ -184,4 +184,5 @@ public class EquipBlock extends InventoryBlock
|
||||
{
|
||||
return TConstruct.instance;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -21,12 +21,12 @@ public class FurnaceSlab extends InventorySlab
|
||||
public FurnaceSlab(Material material)
|
||||
{
|
||||
super(material);
|
||||
this.setCreativeTab(TConstructRegistry.blockTab);
|
||||
this.func_149647_a(TConstructRegistry.blockTab);
|
||||
this.setHardness(3.5f);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity (World world, int metadata)
|
||||
public TileEntity func_149915_a (World world, int metadata)
|
||||
{
|
||||
switch (metadata % 8)
|
||||
{
|
||||
|
||||
@@ -150,7 +150,7 @@ public class LavaTankBlock extends BlockContainer
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity (World world, int metadata)
|
||||
public TileEntity func_149915_a (World world, int metadata)
|
||||
{
|
||||
return new LavaTankLogic();
|
||||
}
|
||||
@@ -232,7 +232,7 @@ public class LavaTankBlock extends BlockContainer
|
||||
@Override
|
||||
public TileEntity createNewTileEntity (World world)
|
||||
{
|
||||
return createTileEntity(world, 0);
|
||||
return func_149915_a(world, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -291,7 +291,7 @@ public class LavaTankBlock extends BlockContainer
|
||||
double d1 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
|
||||
double d2 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
|
||||
EntityItem entityitem = new EntityItem(world, (double) x + d0, (double) y + d1, (double) z + d2, stack);
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
entityitem.field_145804_b = 10;
|
||||
world.spawnEntityInWorld(entityitem);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -228,7 +228,7 @@ public class SmelteryBlock extends InventoryBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity (World world, int metadata)
|
||||
public TileEntity func_149915_a (World world, int metadata)
|
||||
{
|
||||
switch (metadata)
|
||||
{
|
||||
|
||||
@@ -28,7 +28,7 @@ public class TankAirBlock extends BlockContainer
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity (World world)
|
||||
public TileEntity func_149915_a (World world, int i)
|
||||
{
|
||||
return new TankAirLogic();
|
||||
}
|
||||
@@ -104,4 +104,5 @@ public class TankAirBlock extends BlockContainer
|
||||
public void getSubBlocks (int id, CreativeTabs tab, List list)
|
||||
{
|
||||
}
|
||||
|
||||
}
|
||||
@@ -191,4 +191,6 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide
|
||||
writeNetworkNBT(tag);
|
||||
return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockLeaves;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
@@ -29,7 +30,7 @@ public class SlimeLeaves extends BlockLeaves
|
||||
public SlimeLeaves()
|
||||
{
|
||||
super();
|
||||
setCreativeTab(TConstructRegistry.blockTab);
|
||||
func_149647_a(TConstructRegistry.blockTab);
|
||||
setLightOpacity(1);
|
||||
this.func_149711_c(0.3f);
|
||||
}
|
||||
@@ -77,7 +78,7 @@ public class SlimeLeaves extends BlockLeaves
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks (Block b, CreativeTabs tab, List list)
|
||||
public void getSubBlocks (Item b, CreativeTabs tab, List list)
|
||||
{
|
||||
for (int iter = 0; iter < fastIcons.length; iter++)
|
||||
{
|
||||
|
||||
@@ -892,9 +892,9 @@ public class TRecipes
|
||||
OreDictionary.registerOre(glassTypes[15 - i], new ItemStack(TRepo.stainedGlassClear, 1, i));
|
||||
}
|
||||
|
||||
BlockDispenser.dispenseBehaviorRegistry.putObject(TRepo.titleIcon, new TDispenserBehaviorSpawnEgg());
|
||||
BlockDispenser.field_149943_a.putObject(TRepo.titleIcon, new TDispenserBehaviorSpawnEgg());
|
||||
|
||||
BlockDispenser.dispenseBehaviorRegistry.putObject(TRepo.arrow, new TDispenserBehaviorArrow());
|
||||
BlockDispenser.field_149943_a.putObject(TRepo.arrow, new TDispenserBehaviorArrow());
|
||||
|
||||
//Vanilla stuff
|
||||
OreDictionary.registerOre("slimeball", new ItemStack(Items.slime_ball));
|
||||
|
||||
@@ -24,7 +24,7 @@ public class WoolSlab1Item extends MultiItemBlock
|
||||
@Override
|
||||
public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
|
||||
{
|
||||
int id = world.getBlockId(x, y, z);
|
||||
int id = world.getBlock(x, y, z);
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
int trueMeta = meta % 8;
|
||||
boolean flag = (id & 8) != 0;
|
||||
|
||||
@@ -36,7 +36,7 @@ public abstract class ArmorCore extends ItemArmor implements IEnergyContainerIte
|
||||
this.setUnlocalizedName(SET_NAME);
|
||||
this.armorPart = part;
|
||||
this.baseProtection = baseProtection;
|
||||
BlockDispenser.dispenseBehaviorRegistry.putObject(this, dispenserBehavior);
|
||||
BlockDispenser.field_149943_a.putObject(this, dispenserBehavior);
|
||||
}
|
||||
|
||||
public String getArmorName ()
|
||||
@@ -92,7 +92,7 @@ public abstract class ArmorCore extends ItemArmor implements IEnergyContainerIte
|
||||
tags = new NBTTagCompound();
|
||||
stack.setTagCompound(tags);
|
||||
data = new NBTTagCompound();
|
||||
tags.setCompoundTag(SET_NAME, data);
|
||||
tags.setTag(SET_NAME, data);
|
||||
data.setInteger("damageReduction", baseProtection);
|
||||
data.setInteger("maxAbsorb", baseProtection);
|
||||
}
|
||||
|
||||
@@ -604,7 +604,7 @@ public class AbilityHelper
|
||||
float f6 = random.nextFloat() * f3 + (1.0F - f3) * 0.5F;
|
||||
entityitem = new EntityItem(world, f + f4, f1 + f5, f2 + f6, itemstack);
|
||||
}
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
entityitem.field_145804_b = 10;
|
||||
world.spawnEntityInWorld(entityitem);
|
||||
return entityitem;
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ public class TActiveOmniMod extends ActiveToolMod
|
||||
}
|
||||
EntityItem entityitem = new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, spawnme);
|
||||
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
entityitem.field_145804_b = 10;
|
||||
world.spawnEntityInWorld(entityitem);
|
||||
world.playAuxSFX(2001, x, y, z, bID + (meta << 12));
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ public class EnvironmentGui extends GuiScreen
|
||||
/**
|
||||
* Called when the screen is unloaded. Used to disable keyboard repeat events
|
||||
*/
|
||||
public void onGuiClosed ()
|
||||
public void func_146281_b ()
|
||||
{
|
||||
Keyboard.enableRepeatEvents(false);
|
||||
}
|
||||
@@ -51,7 +51,7 @@ public class EnvironmentGui extends GuiScreen
|
||||
/**
|
||||
* Fired when a control is clicked. This is the equivalent of ActionListener.actionPerformed(ActionEvent e).
|
||||
*/
|
||||
protected void actionPerformed (GuiButton button)
|
||||
protected void func_146284_a (GuiButton button)
|
||||
{
|
||||
if (button.field_146124_l)
|
||||
{
|
||||
|
||||
@@ -283,7 +283,7 @@ public class TEventHandler
|
||||
{
|
||||
ItemStack dropStack = new ItemStack(TRepo.heartCanister, 1, 1);
|
||||
EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack);
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
entityitem.field_145804_b = 10;
|
||||
event.drops.add(entityitem);
|
||||
}
|
||||
|
||||
@@ -291,7 +291,7 @@ public class TEventHandler
|
||||
{
|
||||
ItemStack dropStack = new ItemStack(TRepo.heartCanister, 1, 1);
|
||||
EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack);
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
entityitem.field_145804_b = 10;
|
||||
event.drops.add(entityitem);
|
||||
}
|
||||
|
||||
@@ -476,7 +476,7 @@ public class TEventHandler
|
||||
void addDrops (LivingDropsEvent event, ItemStack dropStack)
|
||||
{
|
||||
EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack);
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
entityitem.field_145804_b = 10;
|
||||
event.drops.add(entityitem);
|
||||
}
|
||||
|
||||
|
||||
@@ -2,8 +2,9 @@ package tconstruct.util.landmine.behavior;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import mantle.blocks.BlockUtils;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityFallingSand;
|
||||
import net.minecraft.entity.item.EntityFallingBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
@@ -64,7 +65,7 @@ public class BehaviorBlockThrow extends Behavior
|
||||
break;
|
||||
}
|
||||
|
||||
EntityFallingSand entityfallingsand = new EntityFallingSand(par1World, (double) ((float) par2 + 0.5F), (double) ((float) par3 + 2F), (double) ((float) par4 + 0.5F), par5ItemStack.getItem(),
|
||||
EntityFallingBlock entityfallingsand = new EntityFallingBlock(par1World, (double) ((float) par2 + 0.5F), (double) ((float) par3 + 2F), (double) ((float) par4 + 0.5F), BlockUtils.getBlockFromItemStack(par5ItemStack),
|
||||
par5ItemStack.getItemDamage());
|
||||
entityfallingsand.preventEntitySpawning = false;
|
||||
entityfallingsand.fallTime = 2;
|
||||
|
||||
@@ -83,7 +83,7 @@ public class BehaviorShears extends Behavior
|
||||
double d1 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
|
||||
double d2 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
|
||||
EntityItem entityitem = new EntityItem(par1World, (double) par2 + d0, (double) par3 + d1, (double) par4 + d2, par5ItemStack);
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
entityitem.field_145804_b = 10;
|
||||
par1World.spawnEntityInWorld(entityitem);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user