mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 11:59:14 +00:00
1.7 stuffs
- Update tconstruct.util.landmine.Helper - Update some/all damage sources - A bit of stuffs in TProxyClient - Semi-update BehaviorBlockThrow - Semi-update SpecialStackHandler
This commit is contained in:
1 parent
bb5ab41f7a
commit
baf965d0d0
6 files changed
+29
-30
No files matched your search
@@ -1,9 +1,8 @@
|
||||
package tconstruct.util;
|
||||
|
||||
import net.minecraft.util.DamageSource;
|
||||
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.util.ChatMessageComponent;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.IChatComponent;
|
||||
|
||||
public class DamageSourceFireworkExplode extends DamageSource
|
||||
{
|
||||
@@ -14,9 +13,9 @@ public class DamageSourceFireworkExplode extends DamageSource
|
||||
this.setDamageBypassesArmor();
|
||||
}
|
||||
|
||||
public ChatMessageComponent getDeathMessage (EntityLivingBase par1EntityLivingBase)
|
||||
public IChatComponent func_151519_b (EntityLivingBase par1EntityLivingBase)
|
||||
{
|
||||
return super.getDeathMessage(par1EntityLivingBase);
|
||||
return super.func_151519_b(par1EntityLivingBase);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,9 +1,8 @@
|
||||
package tconstruct.util;
|
||||
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.util.ChatMessageComponent;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.util.IChatComponent;
|
||||
|
||||
public class DamageSourceLandmine extends DamageSource
|
||||
{
|
||||
@@ -14,9 +13,9 @@ public class DamageSourceLandmine extends DamageSource
|
||||
this.setDamageBypassesArmor();
|
||||
}
|
||||
|
||||
public ChatMessageComponent getDeathMessage (EntityLivingBase par1EntityLivingBase)
|
||||
public IChatComponent func_151519_b (EntityLivingBase par1EntityLivingBase)
|
||||
{
|
||||
return super.getDeathMessage(par1EntityLivingBase);
|
||||
return super.func_151519_b(par1EntityLivingBase);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -3,7 +3,7 @@ package tconstruct.util.landmine;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -44,32 +44,32 @@ public class Helper
|
||||
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(0.0F, 1.0F, 0.0F);
|
||||
renderer.renderFaceYPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 1, metadata));
|
||||
renderer.func_147806_b(block, 0, 0, 0, renderer.func_147787_a(block, 1, metadata));
|
||||
tessellator.draw();
|
||||
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(0.0F, -1.0F, 0.0F);
|
||||
renderer.renderFaceYNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 0, metadata));
|
||||
renderer.func_147768_a(block, 0, 0, 0, renderer.func_147787_a(block, 0, metadata));
|
||||
tessellator.draw();
|
||||
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(1.0F, 0.0F, 0.0F);
|
||||
renderer.renderFaceXPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 2, metadata));
|
||||
renderer.func_147764_f(block, 0, 0, 0, renderer.func_147787_a(block, 2, metadata));
|
||||
tessellator.draw();
|
||||
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(-1.0F, 0.0F, 0.0F);
|
||||
renderer.renderFaceXNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 3, metadata));
|
||||
renderer.func_147798_e(block, 0, 0, 0, renderer.func_147787_a(block, 3, metadata));
|
||||
tessellator.draw();
|
||||
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(0.0F, 0.0F, 1.0F);
|
||||
renderer.renderFaceZPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 4, metadata));
|
||||
renderer.func_147734_d(block, 0, 0, 0, renderer.func_147787_a(block, 4, metadata));
|
||||
tessellator.draw();
|
||||
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(0.0F, 0.0F, -1.0F);
|
||||
renderer.renderFaceZNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 5, metadata));
|
||||
renderer.func_147761_c(block, 0, 0, 0, renderer.func_147787_a(block, 5, metadata));
|
||||
tessellator.draw();
|
||||
}
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ package tconstruct.util.landmine.behavior;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityFallingBlock;
|
||||
import net.minecraft.entity.item.EntityFallingSand;
|
||||
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.itemID,
|
||||
EntityFallingBlock entityfallingsand = new EntityFallingBlock(par1World, (double) ((float) par2 + 0.5F), (double) ((float) par3 + 2F), (double) ((float) par4 + 0.5F), par5ItemStack.itemID,
|
||||
par5ItemStack.getItemDamage());
|
||||
entityfallingsand.preventEntitySpawning = false;
|
||||
entityfallingsand.fallTime = 2;
|
||||
|
||||
@@ -68,7 +68,7 @@ public abstract class SpecialStackHandler
|
||||
return;
|
||||
}
|
||||
|
||||
TileEntityLandmine tileEntity = (TileEntityLandmine) par1World.getBlockTileEntity(x, y, z);
|
||||
TileEntityLandmine tileEntity = (TileEntityLandmine) par1World.func_147438_o(x, y, z);
|
||||
|
||||
while (item.stackSize > 0)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user