From ecf72667b171835de3c929635b550a11fd5a7f51 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 10 Jul 2015 14:36:50 +0200 Subject: [PATCH] Added Treasure Chest Particles --- .../blocks/BlockTreasureChest.java | 13 ++++++++++++- .../inventory/gui/GuiInputter.java | 10 ++++------ .../assets/actuallyadditions/lang/en_US.lang | 4 ++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java index f8f7ead60..9ba084929 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java @@ -41,6 +41,11 @@ public class BlockTreasureChest extends Block implements INameableItem{ this.setTickRandomly(true); } + @Override + public boolean canSilkHarvest(){ + return false; + } + @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ int rotation = MathHelper.floor_double((double)(player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; @@ -121,7 +126,13 @@ public class BlockTreasureChest extends Block implements INameableItem{ @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, int x, int y, int z, Random rand){ - //TODO Bubble Particles if in water + for(int i = 0; i < 2; i++){ + for(float f = 0; f <= 3; f += 0.5){ + float particleX = rand.nextFloat(); + float particleZ = rand.nextFloat(); + world.spawnParticle("bubble", (double)x+particleX, (double)y+f+1, (double)z+particleZ, 0.0D, 0.2D, 0.0D); + } + } } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java index 4515fe54b..6b223cd3d 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java @@ -226,21 +226,19 @@ public class GuiInputter extends GuiContainer{ //Info Mode on! if(x >= guiLeft+11 && y >= guiTop+65 && x <= guiLeft+11+31 && y <= guiTop+65+12){ - String[] strings = StatCollector.translateToLocalFormatted("info."+ModUtil.MOD_ID_LOWER+".inputter.info.1", StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.pull")).split(Pattern.quote("|")); + String[] strings = StatCollector.translateToLocalFormatted("info."+ModUtil.MOD_ID_LOWER+".inputter.info.1").replace("[p]", StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.pull")).split(Pattern.quote("|")); this.func_146283_a(Arrays.asList(strings), x, y); } if(x >= guiLeft+96 && y >= guiTop+65 && x <= guiLeft+96+31 && y <= guiTop+65+12){ - String[] strings = StatCollector.translateToLocalFormatted("info."+ModUtil.MOD_ID_LOWER+".inputter.info.1", StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.put")).split(Pattern.quote("|")); + String[] strings = StatCollector.translateToLocalFormatted("info."+ModUtil.MOD_ID_LOWER+".inputter.info.1").replace("[p]", StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.put")).split(Pattern.quote("|")); this.func_146283_a(Arrays.asList(strings), x, y); } if(x >= guiLeft+48 && y >= guiTop+65 && x <= guiLeft+48+31 && y <= guiTop+65+12){ - String pull = StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.pull"); - String[] strings = StatCollector.translateToLocalFormatted("info."+ModUtil.MOD_ID_LOWER+".inputter.info.2", pull, pull).split(Pattern.quote("|")); + String[] strings = StatCollector.translateToLocalFormatted("info."+ModUtil.MOD_ID_LOWER+".inputter.info.2").replace("[p]", StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.pull")).split(Pattern.quote("|")); this.func_146283_a(Arrays.asList(strings), x, y); } if(x >= guiLeft+133 && y >= guiTop+65 && x <= guiLeft+133+31 && y <= guiTop+65+12){ - String put = StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.put"); - String[] strings = StatCollector.translateToLocalFormatted("info."+ModUtil.MOD_ID_LOWER+".inputter.info.2", put, put).split(Pattern.quote("|")); + String[] strings = StatCollector.translateToLocalFormatted("info."+ModUtil.MOD_ID_LOWER+".inputter.info.2").replace("[p]", StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.put")).split(Pattern.quote("|")); this.func_146283_a(Arrays.asList(strings), x, y); } } diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 611d72e72..7f6af79c7 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -563,8 +563,8 @@ info.actuallyadditions.update.download.desc=[{"text":"Download the newest Versio info.actuallyadditions.update.failed.desc=[{"text":"The Update Check for "},{"text":"Actually Additions ","color":"dark_green","bold":"true"},{"text":"failed! Check your Internet Connection and the Logs for more Info!","color":"none"}] info.actuallyadditions.update.changelog.desc=Updates: %s -info.actuallyadditions.inputter.info.1=This is the first Slot in the |connected Inventory to %s at. -info.actuallyadditions.inputter.info.2=This is the slot after the last Slot |in the connected Inventory to %s at. |What that means: If you, for example, write 2 in |the field to the left and 5 in this one, |it will %s from Slot 2, 3, and 4. +info.actuallyadditions.inputter.info.1=This is the first Slot in the |connected Inventory to [p] at. +info.actuallyadditions.inputter.info.2=This is the slot after the last Slot |in the connected Inventory to [p] at. |What that means: If you, for example, write 2 in |the field to the left and 5 in this one, |it will [p] at Slot 2, 3, and 4. achievement.actuallyadditions.pickUpSolidXP=Square and yummy! achievement.actuallyadditions.pickUpSolidXP.desc=Pick up some Solidified Experience