Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

remove old stuff that isn't really a thing anymore

Browse source
This commit is contained in:
Ellpeck 2016-11-20 17:26:10 +01:00
parent 5b4efb287d
commit 75a3a91e65
2 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java
View file

@ -128,7 +128,6 @@ public class ItemDrill extends ItemEnergy{
} }
//Notify the Player and log the Exception //Notify the Player and log the Exception
catch(Exception e){ catch(Exception e){
player.addChatMessage(new TextComponentString("Ouch! That really hurt! You must have done something wrong, don't do that again please!"));
ModUtil.LOGGER.error("Player "+player.getName()+" who should place a Block using a Drill at "+player.posX+", "+player.posY+", "+player.posZ+" in World "+world.provider.getDimension()+" threw an Exception! Don't let that happen again!"); ModUtil.LOGGER.error("Player "+player.getName()+" who should place a Block using a Drill at "+player.posX+", "+player.posY+", "+player.posZ+" in World "+world.provider.getDimension()+" threw an Exception! Don't let that happen again!");
} }
} }

18
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java
View file

@ -94,8 +94,9 @@ public class ItemPhantomConnector extends ItemBase{
if(tile != null){ if(tile != null){
//Passing to Phantom //Passing to Phantom
if(tile instanceof IPhantomTile){ if(tile instanceof IPhantomTile){
if(this.checkHasConnection(stack, player, tile) && getStoredWorld(stack) == world){ BlockPos stored = getStoredPosition(stack);
((IPhantomTile)tile).setBoundPosition(getStoredPosition(stack)); if(stored != null && getStoredWorld(stack) == world){
((IPhantomTile)tile).setBoundPosition(stored);
if(tile instanceof TileEntityBase){ if(tile instanceof TileEntityBase){
((TileEntityBase)tile).sendUpdate(); ((TileEntityBase)tile).sendUpdate();
} }
@ -113,19 +114,6 @@ public class ItemPhantomConnector extends ItemBase{
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} }
public boolean checkHasConnection(ItemStack stack, EntityPlayer player, TileEntity tile){
if(getStoredPosition(stack) != null){
return true;
}
else{
if(tile instanceof IPhantomTile){
((IPhantomTile)tile).setBoundPosition(null);
}
player.addChatMessage(new TextComponentTranslation("tooltip."+ModUtil.MOD_ID+".phantom.unbound.desc"));
return false;
}
}
@Override @Override
public boolean getShareTag(){ public boolean getShareTag(){
return true; return true;