From 6619e377d8c9c24715db68dbbf85b66eb623a94b Mon Sep 17 00:00:00 2001 From: Meredith Espinosa Date: Sat, 13 Jan 2018 00:15:55 -0800 Subject: [PATCH] Fix localization key and scanning validation, closes #3 and #5 --- .../betterboilers/block/BlockController.java | 1 + .../betterboilers/container/BoilerContainer.java | 6 ++++++ .../tile/TileEntityBoilerController.java | 8 +++++--- .../assets/betterboilers/lang/en_US.lang | 2 +- .../betterboilers/textures/gui/single_fire_bg.png | Bin 0 -> 89 bytes .../betterboilers/textures/gui/single_fire_fg.png | Bin 0 -> 154 bytes 6 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/betterboilers/textures/gui/single_fire_bg.png create mode 100644 src/main/resources/assets/betterboilers/textures/gui/single_fire_fg.png diff --git a/src/main/java/com/elytradev/betterboilers/block/BlockController.java b/src/main/java/com/elytradev/betterboilers/block/BlockController.java index a8165c0..f1c211f 100644 --- a/src/main/java/com/elytradev/betterboilers/block/BlockController.java +++ b/src/main/java/com/elytradev/betterboilers/block/BlockController.java @@ -19,6 +19,7 @@ public class BlockController extends BlockTileEntity public BlockController() { super(Material.ROCK, "controller"); + setUnlocalizedName("bb.controller"); // this.setDefaultState(blockState.getBaseState().withProperty(ACTIVE, false)); setCreativeTab(BetterBoilers.creativeTab); diff --git a/src/main/java/com/elytradev/betterboilers/container/BoilerContainer.java b/src/main/java/com/elytradev/betterboilers/container/BoilerContainer.java index fe5e972..431a64d 100644 --- a/src/main/java/com/elytradev/betterboilers/container/BoilerContainer.java +++ b/src/main/java/com/elytradev/betterboilers/container/BoilerContainer.java @@ -19,6 +19,8 @@ public class BoilerContainer extends ConcreteContainer { private ResourceLocation fireFG = new ResourceLocation(BetterBoilers.modId,"textures/gui/fire_fg.png"); private ResourceLocation arrowBG = new ResourceLocation(BetterBoilers.modId,"textures/gui/arrow_bg.png"); private ResourceLocation arrowFG = new ResourceLocation(BetterBoilers.modId,"textures/gui/arrow_fg.png"); + private ResourceLocation fireABG = new ResourceLocation(BetterBoilers.modId,"textures/gui/single_fire_bg.png"); + private ResourceLocation fireAFG = new ResourceLocation(BetterBoilers.modId,"textures/gui/single_fire_fg.png"); private static ResourceLocation[] pumpAnim = new ResourceLocation[13]; static { for (int i = 0; i <= 12; i++) { @@ -54,6 +56,10 @@ public BoilerContainer(IInventory player, IInventory container, TileEntityBoiler panel.add(fuelTicks0, 11, 46, 14, 14); panel.add(fuelTicks1, 29, 46, 14, 14); panel.add(fuelTicks2, 47, 46, 14, 14); +// panel.add(fuelTicks0, 10, 46, 4, 14); +// panel.add(fuelTicks1, 15, 46, 4, 14); +// panel.add(fuelTicks2, 20, 46, 4, 14); + if (boiler.pumpCount == 0) { panel.add(progressTicks, 75, 37, 24, 17); } else { diff --git a/src/main/java/com/elytradev/betterboilers/tile/TileEntityBoilerController.java b/src/main/java/com/elytradev/betterboilers/tile/TileEntityBoilerController.java index 188bae1..5314914 100644 --- a/src/main/java/com/elytradev/betterboilers/tile/TileEntityBoilerController.java +++ b/src/main/java/com/elytradev/betterboilers/tile/TileEntityBoilerController.java @@ -102,6 +102,7 @@ public void update() { public boolean isValid(World world, List blocks) { int minY = 255; + int validBlockCount = 0; for(BlockPos pos : blocks) minY = Math.min(pos.getY(), minY); if (this.pos.getY() != minY) { status = "msg.bb.badController"; @@ -114,27 +115,28 @@ public boolean isValid(World world, List blocks) { status = "msg.bb.tooManyControllers"; return false; } + validBlockCount++; } if (world.getBlockState(pos).getBlock() == ModBlocks.BOILER || world.getBlockState(pos).getBlock() == ModBlocks.VENT || world.getBlockState(pos).getBlock() == ModBlocks.VALVE || world.getBlockState(pos).getBlock() == ModBlocks.PUMP) { - boilerBlockCount++; if (pos.getY() == minY) { status = "msg.bb.badBoiler"; return false; } + validBlockCount++; } if (world.getBlockState(pos).getBlock() == ModBlocks.FIREBOX || world.getBlockState(pos).getBlock() == ModBlocks.HATCH) { - fireboxBlockCount++; if (pos.getY() != minY) { status = "msg.bb.badFirebox"; return false; } + validBlockCount++; } } - if (boilerBlockCount + fireboxBlockCount < BBConfig.defaultMinMultiblock) { + if (validBlockCount < BBConfig.defaultMinMultiblock) { status = "msg.bb.tooSmall"; return false; } diff --git a/src/main/resources/assets/betterboilers/lang/en_US.lang b/src/main/resources/assets/betterboilers/lang/en_US.lang index 6777057..5ac1cc1 100644 --- a/src/main/resources/assets/betterboilers/lang/en_US.lang +++ b/src/main/resources/assets/betterboilers/lang/en_US.lang @@ -9,7 +9,7 @@ tile.boiler_vent.name=Boiler Vent tile.boiler_pump.name=Boiler Pump tile.firebox.name=Firebox tile.firebox_hatch.name=Firebox Hatch -tile.controller.name=Boiler Controller +tile.bb.controller.name=Boiler Controller #tooltips tooltip.bb.inspector.0=What did you do this time? diff --git a/src/main/resources/assets/betterboilers/textures/gui/single_fire_bg.png b/src/main/resources/assets/betterboilers/textures/gui/single_fire_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..9e56d2bedbaec2b2a93cba04cd4290fd464de7a8 GIT binary patch literal 89 zcmeAS@N?(olHy`uVBq!ia0vp^EI`c1!3HEbvi3>95{5~ nz=47=F_&jsq z@(wU$G!6_-m7k$-e}jv_n?ex*2bV{?C+FBlU-uH8wC9Y^6Gcx&mYuaZiE)i=4B`CT zU*^^5EBzJxVAA0IaP^Y>EfvuMu8%{sjDveVs`2$-vfTcTJ^wJ!G6qjqKbLh*2~7ax Ctuk%^ literal 0 HcmV?d00001