diff --git a/build.properties b/build.properties index cff894589..d52816bcc 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Tue Jun 13 14:30:58 BST 2017 +#Sat Jul 15 14:52:56 BST 2017 mod_name=Botania cf_meta_version=1.12 forge_version=14.21.1.2419 @@ -7,5 +7,5 @@ dir_repo=./ mc_mappings=snapshot_20170624 version=r1.9 dir_output=../Build Output/Botania/ -build_number=345 +build_number=346 mc_version=1.12 diff --git a/contributors.properties b/contributors.properties index e47896730..63f07e05c 100644 --- a/contributors.properties +++ b/contributors.properties @@ -83,3 +83,4 @@ creeper_in_black=2 egoisticalgoat=6 konotyran=12 rosareven=14 +xanderwolf4=11 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java index 4adc6bbeb..ced9f1129 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.decor; -import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -32,11 +31,6 @@ public class BlockElfGlass extends BlockManaGlass implements IElvenItem, ILexico return true; } - @Override - public boolean isFullBlock(IBlockState state) { - return true; - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.elvenResources; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index 2bf7b1afc..2dc9aac05 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -50,8 +50,8 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { } @Override - public boolean isFullBlock(IBlockState state) { - return true; + public boolean isFullCube(IBlockState state) { + return false; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index da87d3e50..77a9ceefb 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -259,7 +259,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override public boolean processInitialInteract(EntityPlayer player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand); - if(!stack.isEmpty()) { + if(!isDead && !stack.isEmpty()) { if(player.world.isRemote) { boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.dye || stack.getItem() == ModItems.phantomInk; if(valid) diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index e95b64b8b..75c8af5cd 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -239,7 +239,7 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override public boolean processInitialInteract(EntityPlayer player, EnumHand hand) { ItemStack stack = player.getHeldItem(hand); - if(!stack.isEmpty()) { + if(!isDead && !stack.isEmpty()) { if(world.isRemote) { boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.sparkUpgrade || stack.getItem() == ModItems.phantomInk; diff --git a/src/main/resources/assets/botania/shader/category_button.frag b/src/main/resources/assets/botania/shader/category_button.frag index f019d11f0..219b91ea1 100644 --- a/src/main/resources/assets/botania/shader/category_button.frag +++ b/src/main/resources/assets/botania/shader/category_button.frag @@ -14,5 +14,8 @@ void main() { if(maskgs <= heightMatch) gl_FragColor = vec4(color.r, color.g, color.b, color.a); - else gl_FragColor = vec4(0, 0, 0, color.a); + else { + float gs = (color.r + color.g + color.b) / 3.0; + gl_FragColor = vec4(gs, gs, gs, color.a * 0.75); + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/gui/categories/alfhomancy.png b/src/main/resources/assets/botania/textures/gui/categories/alfhomancy.png index c7a562ac8..122804f1f 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/alfhomancy.png and b/src/main/resources/assets/botania/textures/gui/categories/alfhomancy.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/basics.png b/src/main/resources/assets/botania/textures/gui/categories/basics.png index c336d8be3..48277515d 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/basics.png and b/src/main/resources/assets/botania/textures/gui/categories/basics.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/baubles.png b/src/main/resources/assets/botania/textures/gui/categories/baubles.png index b6c3af01e..882706ab3 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/baubles.png and b/src/main/resources/assets/botania/textures/gui/categories/baubles.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/devices.png b/src/main/resources/assets/botania/textures/gui/categories/devices.png index f6ad67aa3..e95185fd1 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/devices.png and b/src/main/resources/assets/botania/textures/gui/categories/devices.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/ender.png b/src/main/resources/assets/botania/textures/gui/categories/ender.png index 1ab2a789d..54524c26f 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/ender.png and b/src/main/resources/assets/botania/textures/gui/categories/ender.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/functionalflowers.png b/src/main/resources/assets/botania/textures/gui/categories/functionalflowers.png index 8b7010527..8da57e450 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/functionalflowers.png and b/src/main/resources/assets/botania/textures/gui/categories/functionalflowers.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/generationflowers.png b/src/main/resources/assets/botania/textures/gui/categories/generationflowers.png index c4fb147b5..c34d635e9 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/generationflowers.png and b/src/main/resources/assets/botania/textures/gui/categories/generationflowers.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/index.png b/src/main/resources/assets/botania/textures/gui/categories/index.png index e0552a173..0b9a2b93b 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/index.png and b/src/main/resources/assets/botania/textures/gui/categories/index.png differ diff --git a/src/main/resources/assets/botania/textures/gui/categories/tools.png b/src/main/resources/assets/botania/textures/gui/categories/tools.png index 8cd7c4e92..78df96f28 100644 Binary files a/src/main/resources/assets/botania/textures/gui/categories/tools.png and b/src/main/resources/assets/botania/textures/gui/categories/tools.png differ diff --git a/src/main/resources/assets/botania/textures/gui/manahud.png b/src/main/resources/assets/botania/textures/gui/manahud.png index ddde39f12..542d0a7d1 100644 Binary files a/src/main/resources/assets/botania/textures/gui/manahud.png and b/src/main/resources/assets/botania/textures/gui/manahud.png differ diff --git a/src/main/resources/assets/botania/textures/gui/stencil.png b/src/main/resources/assets/botania/textures/gui/stencil.png index 3bdbce084..41ca8843b 100644 Binary files a/src/main/resources/assets/botania/textures/gui/stencil.png and b/src/main/resources/assets/botania/textures/gui/stencil.png differ diff --git a/version/1.11.2.txt b/version/1.11.2.txt index b7ecc0eb0..7f6e8bb32 100644 --- a/version/1.11.2.txt +++ b/version/1.11.2.txt @@ -1 +1 @@ -r1.9-344 \ No newline at end of file +r1.9-345 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index cc3e5346a..6e7c847fd 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,8 @@ +r1.9 345 +*Fixed a bad pixel in the checkmark for mana infision. +*Fixed a dupe when interacting with sparks just as they're leaving the world. +*Fixed Managlass and Alfglass transparency (palaster). +*Fixed the Pure Daisy running its logic client sided as well. r1.9 344 *Fixed a lava dupe with the Petal Apothecary. *Fixed a Mana Enchanter game freeze. diff --git a/web/versions.ini b/web/versions.ini index bb70f54c0..20acd02ed 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -295,4 +295,5 @@ r1.9-340=1.10.2 r1.9-341=1.10.2 r1.9-342=1.11.2 r1.9-343=1.11.2 -r1.9-344=1.11.2 \ No newline at end of file +r1.9-344=1.11.2 +r1.9-345=1.11.2 \ No newline at end of file