From 2a5ef725fb646943966b72ce99c2a4fd5f974066 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sun, 26 Oct 2014 15:17:23 +0800 Subject: [PATCH] #1153 Item conduits crash with invalid item stacks (one without an item assigned) --- ReleaseNotes.txt | 3 ++- .../enderio/config/AlloySmelterRecipes_Core.xml | 2 +- resources/assets/enderio/lang/en_US.lang | 5 +++++ .../enderio/textures/blocks/xpjuiceflowing.png | Bin 0 -> 17913 bytes .../textures/blocks/xpjuiceslowing.png.mcmeta | 5 +++++ .../crazypants/enderio/fluid/BlockFluidEio.java | 3 ++- 6 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/xpjuiceflowing.png create mode 100644 resources/assets/enderio/textures/blocks/xpjuiceslowing.png.mcmeta diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 32dfb71d..c7e8b9fa 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -11,7 +11,8 @@ Bugs - Fixed Transceivers losing items when single player worlds reloaded without restarting MC - More than one stack of quartz can now be placed in alloy smelter when making fused quartz - #1150 Crash when Farming Station Error trying to plant Pam's Mob Seeds (nb, they don't work, but it wont crash) -- #1153 Item conduits crash with invalid item stacks (one without an item assigned) +- #1152 Fluids blocks missing names +- #1153 Item conduits crash with invalid item stacks (one without an item assigned) ------------------------------------------------------ Version 2.1.6 diff --git a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml index f2e455a0..ea43ea9a 100644 --- a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml +++ b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml @@ -3,7 +3,7 @@ Please refer to the documentation in SAGMillRecipes_Core/_User for details on the format used. Recipes for the alloy smelter have multiple inputs (up to three) and a single output. Multiple output tags can be used as long as they are for the same item. This allows 'chance' outputs, for example, if you wanted to -output some 4 bronze ingots with a 50% chance of a fith, you would use: +output some 4 bronze ingots with a 50% chance of a fifth, you would use: diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 608428b3..78bc9a1f 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -97,15 +97,20 @@ enderio.tooltip.isBeaconBase=Can be used as beacon base //Fluids fluid.nutrient_distillation=Nutrient Distillation +tile.fluid.nutrient_distillation.name=Nutrient Distillation item.bucketNutrient_distillation.name=Nutrient Distillation Bucket fluid.hootch=Hootch +tile.fluid.hootch.name=Hootch item.bucketHootch.name=Hootch Bucket fluid.fire_water=Fire Water +tile.fluid.fire_water.name=Fire Water item.bucketFire_water.name=Fire Water Bucket fluid.rocket_fuel=Rocket Fuel +tile.fluid.rocket_fuel.name=Rocket Fuel item.bucketRocket_fuel.name=Rocket Fuel Bucket fluid.eio.xpjuice=Liquid XP +tile.fluid.eio.xpjuice.name=Liquid XP item.bucketXpjuice.name=XP Bucket diff --git a/resources/assets/enderio/textures/blocks/xpjuiceflowing.png b/resources/assets/enderio/textures/blocks/xpjuiceflowing.png new file mode 100644 index 0000000000000000000000000000000000000000..eccf64c104affd299989c41bc4c0023d2c7c52e2 GIT binary patch literal 17913 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/xpjuiceslowing.png.mcmeta b/resources/assets/enderio/textures/blocks/xpjuiceslowing.png.mcmeta new file mode 100644 index 00000000..034019ff --- /dev/null +++ b/resources/assets/enderio/textures/blocks/xpjuiceslowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java index d603045c..5b79ed25 100644 --- a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java +++ b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java @@ -26,7 +26,7 @@ public class BlockFluidEio extends BlockFluidClassic { public static BlockFluidEio create(Fluid fluid, Material material) { BlockFluidEio res = new BlockFluidEio(fluid, material); res.init(); - fluid.setBlock(res); + fluid.setBlock(res); return res; } @@ -35,6 +35,7 @@ public class BlockFluidEio extends BlockFluidClassic { protected BlockFluidEio(Fluid fluid, Material material) { super(fluid, material); this.fluid = fluid; + setBlockName(fluid.getUnlocalizedName()); } protected void init() {