mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-22 13:09:53 +00:00
few hundred errors gone just like that
This commit is contained in:
1 parent
c5426eb992
commit
0ee7ac1718
28 files changed
+720
-718
No files matched your search
@@ -12,6 +12,7 @@ import net.minecraft.enchantment.EnchantmentProtection;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.MathHelper;
|
||||
@@ -223,7 +224,7 @@ public class MiningExplosion extends Explosion
|
||||
|
||||
if (l == 0 && Block.opaqueCubeLookup[i1] && this.random.nextInt(3) == 0)
|
||||
{
|
||||
this.world.setBlock(i, j, k, Block.fire.blockID);
|
||||
this.world.setBlock(i, j, k, Blocks.fire);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,8 +50,8 @@ public abstract class Behavior
|
||||
addBehavior(new ItemStack(Blocks.torch), blockThrow);
|
||||
addBehavior(new ItemStack(Items.gunpowder), explosive);
|
||||
addBehavior(new ItemStack(Blocks.tnt), explosive);
|
||||
addBehavior(new ItemStack(Items.firework), firework);
|
||||
addBehavior(new ItemStack(Items.potion), potion);
|
||||
addBehavior(new ItemStack(Items.fireworks), firework);
|
||||
addBehavior(new ItemStack(Items.potionitem), potion);
|
||||
addBehavior(new ItemStack(Items.fireballCharge), fireball);
|
||||
addBehavior(new ItemStack(Items.monsterPlacer), spawn);
|
||||
addBehavior(new ItemStack(Items.arrow), shoot);
|
||||
|
||||
@@ -44,7 +44,7 @@ public class BehaviorFirecharge extends Behavior
|
||||
for (int j = par4 - 2; j <= (par4 + 2); j++)
|
||||
{
|
||||
if ((par1World.getBlockId(i, par3, j) == 0 || (Block.blocksList[par1World.getBlockId(i, par3, j)] != null && Block.blocksList[par1World.getBlockId(i, par3, j)].isBlockReplaceable(
|
||||
par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Block.fire.canPlaceBlockAt(par1World, i, par3, j))
|
||||
par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Blocks.fire.canPlaceBlockAt(par1World, i, par3, j))
|
||||
{
|
||||
par1World.setBlock(i, par3, j, Blocks.fire.blockID);
|
||||
}
|
||||
|
||||
@@ -15,7 +15,6 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.nbt.NBTTagString;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
import net.minecraftforge.event.entity.living.LivingFallEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerDropsEvent;
|
||||
import tconstruct.common.TRepo;
|
||||
@@ -24,6 +23,7 @@ import tconstruct.util.config.PHConstruct;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.IPlayerTracker;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
@@ -201,7 +201,7 @@ public class TPlayerHandler implements IPlayerTracker
|
||||
}
|
||||
}
|
||||
|
||||
@ForgeSubscribe
|
||||
@SubscribeEvent
|
||||
public void livingFall (LivingFallEvent evt) //Only for negating fall damage
|
||||
{
|
||||
if (evt.entityLiving instanceof EntityPlayer)
|
||||
@@ -210,7 +210,7 @@ public class TPlayerHandler implements IPlayerTracker
|
||||
}
|
||||
}
|
||||
|
||||
/*@ForgeSubscribe
|
||||
/*@SubscribeEvent
|
||||
public void livingUpdate (LivingUpdateEvent evt)
|
||||
{
|
||||
Side side = FMLCommonHandler.instance().getEffectiveSide();
|
||||
@@ -232,7 +232,7 @@ public class TPlayerHandler implements IPlayerTracker
|
||||
}
|
||||
}*/
|
||||
|
||||
@ForgeSubscribe
|
||||
@SubscribeEvent
|
||||
public void playerDrops (PlayerDropsEvent evt)
|
||||
{
|
||||
TPlayerStats stats = getPlayerStats(evt.entityPlayer.username);
|
||||
|
||||
Reference in new issue
Block a user