From 6023100fac877125345bbf69f69ebf0a43738a03 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 6 Jul 2015 17:48:38 +0200 Subject: [PATCH] Changed the ESD description --- .../actuallyadditions/blocks/BlockInputter.java | 7 ++++--- .../actuallyadditions/items/ItemPhantomConnector.java | 7 ++----- .../actuallyadditions/tile/TileEntityPhantomface.java | 10 ---------- .../actuallyadditions/update/UpdateChecker.java | 2 ++ .../java/ellpeck/actuallyadditions/util/WorldUtil.java | 10 ++++++++++ .../resources/assets/actuallyadditions/lang/en_US.lang | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java index ba5175bbb..e9083067e 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java @@ -114,10 +114,11 @@ public class BlockInputter extends BlockContainerBase implements INameableItem{ @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { + list.add(StatCollector.translateToLocal("tooltip."+ModUtil.MOD_ID_LOWER+".blockInputter.desc.1")); if(KeyUtil.isShiftPressed()){ - list.add(StatCollector.translateToLocalFormatted("tooltip." + ModUtil.MOD_ID_LOWER + ".blockInputter.desc." + 1, StringUtil.OBFUSCATED, StringUtil.LIGHT_GRAY)); - for(int i = 1; i < 7; i++){ - list.add(StatCollector.translateToLocal("tooltip." + ModUtil.MOD_ID_LOWER + ".blockInputter.desc." + (i + 1))); + list.add(StatCollector.translateToLocalFormatted("tooltip."+ModUtil.MOD_ID_LOWER+".blockInputter.desc.2", StringUtil.OBFUSCATED, StringUtil.LIGHT_GRAY)); + for(int i = 3; i <= 7; i++){ + list.add(StatCollector.translateToLocal("tooltip." + ModUtil.MOD_ID_LOWER + ".blockInputter.desc." + i)); } if((((BlockInputter)theBlock).isAdvanced)) list.add(StatCollector.translateToLocal("tooltip." + ModUtil.MOD_ID_LOWER + "." + ((INameableItem)theBlock).getName() + ".desc")); } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java b/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java index 5ce46bde7..179c266c4 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java @@ -4,10 +4,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.tile.TileEntityPhantomPlacer; import ellpeck.actuallyadditions.tile.TileEntityPhantomface; -import ellpeck.actuallyadditions.util.INameableItem; -import ellpeck.actuallyadditions.util.ItemUtil; -import ellpeck.actuallyadditions.util.KeyUtil; -import ellpeck.actuallyadditions.util.ModUtil; +import ellpeck.actuallyadditions.util.*; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -42,7 +39,7 @@ public class ItemPhantomConnector extends Item implements INameableItem{ if(this.checkHasConnection(stack, player, tile)){ ((TileEntityPhantomface)tile).boundPosition = this.getStoredPosition(stack); ((TileEntityPhantomface)tile).boundWorld = this.getStoredWorld(stack); - TileEntityPhantomface.updateAround(tile); + WorldUtil.updateTileAndTilesAround(tile); this.clearStorage(stack); player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("tooltip."+ModUtil.MOD_ID_LOWER+".phantom.connected.desc"))); return true; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java index 8dc80323f..05fd7402b 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java @@ -47,16 +47,6 @@ public class TileEntityPhantomface extends TileEntityInventoryBase{ return newRange; } - public static void updateAround(TileEntity tile){ - tile.getWorldObj().markBlockForUpdate(tile.xCoord+1, tile.yCoord, tile.zCoord); - tile.getWorldObj().markBlockForUpdate(tile.xCoord-1, tile.yCoord, tile.zCoord); - tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord+1, tile.zCoord); - tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord-1, tile.zCoord); - tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord+1); - tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord-1); - tile.markDirty(); - } - public boolean isBoundTileInRage(){ if(this.hasBoundTile()){ int xDif = this.boundPosition.posX-this.xCoord; diff --git a/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java b/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java index b449c6128..8ce136941 100644 --- a/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java +++ b/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java @@ -45,10 +45,12 @@ public class UpdateChecker{ String notice2 = "info."+ModUtil.MOD_ID_LOWER+".update.versionComp.desc"; String notice3 = "info."+ModUtil.MOD_ID_LOWER+".update.changelog.desc"; String notice4 = "info."+ModUtil.MOD_ID_LOWER+".update.download.desc"; + player.addChatComponentMessage(new ChatComponentText("")); player.addChatComponentMessage(IChatComponent.Serializer.func_150699_a(StatCollector.translateToLocal(notice1))); player.addChatComponentMessage(IChatComponent.Serializer.func_150699_a(StatCollector.translateToLocalFormatted(notice2, ModUtil.VERSION, onlineVersion))); player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocalFormatted(notice3, changelog))); player.addChatComponentMessage(IChatComponent.Serializer.func_150699_a(StatCollector.translateToLocalFormatted(notice4, "http://minecraft.curseforge.com/mc-mods/228404-actually-additions/files"))); + player.addChatComponentMessage(new ChatComponentText("")); } } catch(Exception e){ diff --git a/src/main/java/ellpeck/actuallyadditions/util/WorldUtil.java b/src/main/java/ellpeck/actuallyadditions/util/WorldUtil.java index 2ccd6ac6a..553edf0c4 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/WorldUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/WorldUtil.java @@ -46,6 +46,16 @@ public class WorldUtil{ } } + public static void updateTileAndTilesAround(TileEntity tile){ + tile.getWorldObj().markBlockForUpdate(tile.xCoord+1, tile.yCoord, tile.zCoord); + tile.getWorldObj().markBlockForUpdate(tile.xCoord-1, tile.yCoord, tile.zCoord); + tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord+1, tile.zCoord); + tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord-1, tile.zCoord); + tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord+1); + tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord-1); + tile.markDirty(); + } + public static void pushFluid(World world, int x, int y, int z, ForgeDirection side, FluidTank tank){ TileEntity tile = getTileEntityFromSide(side, world, x, y, z); if(tile != null && tank.getFluid() != null && tile instanceof IFluidHandler){ diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 5eef799ed..5788785ac 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -390,8 +390,8 @@ tooltip.actuallyadditions.blockGrinderDouble.desc.1=Crushes Ores into Dusts! tooltip.actuallyadditions.blockGrinderDouble.desc.2=You get two Dusts per Ore and Extras! tooltip.actuallyadditions.blockGrinderDouble.desc.3=Can crush two Ores simultaneously! tooltip.actuallyadditions.blockFurnaceDouble.desc=Smelts two things simultaneously! -tooltip.actuallyadditions.blockInputter.desc.1=Its real name is %sObfuscated%s! -tooltip.actuallyadditions.blockInputter.desc.2=Acts like a more advanced Hopper +tooltip.actuallyadditions.blockInputter.desc.2=Its real name is %sObfuscated%s! +tooltip.actuallyadditions.blockInputter.desc.1=You could call it an extremely advanced Hopper! tooltip.actuallyadditions.blockInputter.desc.3=Turn me off with Redstone! tooltip.actuallyadditions.blockInputter.desc.4=Configurable: tooltip.actuallyadditions.blockInputter.desc.5=-Side to Output to and Input from