upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 08:54:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed most of the clientside rendering code

Browse Source
This commit is contained in:
Progwml6 committed 2014-01-16 01:36:18 -05:00
1 parent 8931171979
commit fa7a77a179
68 files changed
+268 -254
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/util/TEventHandler.java
+6 -7
View File
@@ -2,6 +2,7 @@ package tconstruct.util;
import tconstruct.util.player.ArmorExtended;
import mantle.blocks.BlockUtils;
import mantle.world.WorldHelper;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
import java.util.Random;
@@ -223,8 +224,6 @@ public class TEventHandler
public static boolean matchesLeaves (ItemStack stack)
{
if (stack.itemID >= 4096)
return false;
Block block = BlockUtils.getBlockFromItem(stack.getItem());
if (block != null)
{
@@ -526,7 +525,7 @@ public class TEventHandler
{
if (event.block == TRepo.slimeSapling)
{
if (TRepo.slimeSapling.boneFertilize(event.world, event.X, event.Y, event.Z, event.world.rand, event.entityPlayer))
if (TRepo.slimeSapling.boneFertilize(event.world, event.x, event.y, event.z, event.world.rand, event.entityPlayer))
event.setResult(Event.Result.ALLOW);
}
}
@@ -551,7 +550,7 @@ public class TEventHandler
@SubscribeEvent
public void bucketFill (FillBucketEvent evt)
{
if (evt.current.getItem() == Items.bucket && evt.target.typeOfHit == MovingObjectType.TILE)
if (evt.current.getItem() == Items.bucket && evt.target.typeOfHit == MovingObjectType.ENTITY)
{
int hitX = evt.target.blockX;
int hitY = evt.target.blockY;
@@ -569,13 +568,13 @@ public class TEventHandler
{
if (evt.entityPlayer.capabilities.isCreativeMode)
{
evt.world.setBlockToAir(hitX, hitY, hitZ);
WorldHelper.setBlockToAir(evt.world,hitX, hitY, hitZ);
}
else
{
if (TRepo.fluidBlocks[id] instanceof LiquidMetalFinite)
{
evt.world.setBlockToAir(hitX, hitY, hitZ);
WorldHelper.setBlockToAir(evt.world, hitX, hitY, hitZ);
/*int quanta = 0;
for (int posX = -1; posX <= 1; posX++)
{
@@ -614,7 +613,7 @@ public class TEventHandler
}
else
{
evt.world.setBlockToAir(hitX, hitY, hitZ);
WorldHelper.setBlockToAir(evt.world, hitX, hitY, hitZ);
}
evt.setResult(Result.ALLOW);