Merge branch 'master' of github.com:Vazkii/Botania into 1.12
No files matched your search
@@ -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
|
||||
@@ -83,3 +83,4 @@ creeper_in_black=2
|
||||
egoisticalgoat=6
|
||||
konotyran=12
|
||||
rosareven=14
|
||||
xanderwolf4=11
|
||||
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 910 B After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 712 B After Width: | Height: | Size: 14 KiB |
@@ -1 +1 @@
|
||||
r1.9-344
|
||||
r1.9-345
|
||||
@@ -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.
|
||||
|
||||
@@ -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
|
||||
r1.9-344=1.11.2
|
||||
r1.9-345=1.11.2
|
||||