diff --git a/contributing.md b/contributing.md index ce03bf13f..b20dfa94f 100644 --- a/contributing.md +++ b/contributing.md @@ -11,7 +11,6 @@ Hey there. Looks like you want to contribute with an issue. Great. Here's what y The following "bugs" are not accepted: * Intended Behaviour - * The e in Excaliber * Double tall flowers need be harvested with shears to not clutter the inventory * Already fixed but people keep reporting it for some reason * Wearing a Ring of Loki or Ring of the Aesir shows a wireframe below bedrock @@ -23,7 +22,6 @@ The following "bugs" are not accepted: * Mana Bursts get destroyed on Cauldron by the ClearLagg plugin (add botania:manaBurst to the ClearLagg blacklist) * Force Relays destroy blocks when used very fast (Can't fix due to the nature of the block) * Terrasteel crafting won't start (make sure your checkerboard is correct, there's Livingrock under the plate) - * The speed tooltip on Excaliber scales with the Sharpness enchant (Vanilla bug) * The Horn of the Canopy doesn't break Thaumcraft leaves (Thaumcraft doesn't use the typical class or material) * Some Baubles don't work properly on LAN (Baubles bug) diff --git a/contributors.properties b/contributors.properties index 3dd8ee871..e195d2f7b 100644 --- a/contributors.properties +++ b/contributors.properties @@ -51,3 +51,5 @@ _bloop=0 kgevans=15 l0nekitsune=14 swiftlileagle=14 +gryphonn=11 +loraanicus=10 diff --git a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java b/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java index 77e2e89d0..0cd0b4b9e 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java @@ -99,12 +99,14 @@ public class RenderLexicon implements IItemRenderer { font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); GlStateManager.translate(0F, 10F, 0F); - font.drawString(EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); + font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); GlStateManager.translate(0F, 50F, 0F); font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); + GlStateManager.translate(0F, 10F, 0F); - font.drawString(EnumChatFormatting.ITALIC + StatCollector.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); + font.drawString(EnumChatFormatting.UNDERLINE + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); + if(bevo || saice) { GlStateManager.translate(0F, 10F, 0F); font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index bf3163d60..57a424607 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -54,6 +54,11 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { return new BlockState(this, BotaniaStateProps.ALTGRASS_VARIANT); } + @Override + public boolean isToolEffective(String type, IBlockState state) { + return type.equals("shovel"); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.ALTGRASS_VARIANT).ordinal(); @@ -108,7 +113,8 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { @Override public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { - return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; + EnumPlantType type = plantable.getPlantType(world, pos.down()); + return type == EnumPlantType.Plains || type == EnumPlantType.Beach; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 0a35f0ab3..c2ba925d9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -121,8 +121,7 @@ public abstract class BlockCamo extends BlockModContainer { TileCamo camo = (TileCamo) tile; Block block = camo.camo; if(block != null) - return block instanceof BlockCamo ? 0xFFFFFF : block.colorMultiplier(par1World, pos, pass); - + return block instanceof BlockCamo ? 0xFFFFFF : block.getRenderColor(block.getDefaultState()); // todo } return 0xFFFFFF; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index d71d23cc0..ab284497a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -25,14 +25,17 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.world.WorldTypeSkyblock; import net.minecraftforge.fml.common.Optional; -public class BlockManaFlame extends BlockModContainer { +public class BlockManaFlame extends BlockModContainer implements ILexiconable { public BlockManaFlame() { super(Material.cloth); @@ -105,4 +108,9 @@ public class BlockManaFlame extends BlockModContainer { return new TileManaFlame(); } + @Override + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { + return LexiconData.lenses; + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index b086bbf39..0d7d13d65 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -35,6 +35,7 @@ public class BlockModPane extends BlockPane { setCreativeTab(BotaniaCreativeTab.INSTANCE); setHardness(0.3F); setStepSound(soundTypeGlass); + setLightLevel(1.0F); useNeighborBrightness = true; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 565da3142..a632c6e7f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -93,7 +93,7 @@ public class SubTileHopperhock extends SubTileFunctional { if(inv != null) { List filter = getFilterForInventory(inv, pos_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); - int availablePut = InventoryHelper.testInventoryInsertion(inv, stack, dir); + int availablePut = supertile.getWorld().isRemote ? 1 : InventoryHelper.testInventoryInsertion(inv, stack, dir); canAccept &= availablePut > 0; if(canAccept) { @@ -112,9 +112,9 @@ public class SubTileHopperhock extends SubTileFunctional { } } - if(invToPutItemIn != null) { + if(invToPutItemIn != null && !item.isDead) { boolean remote = supertile.getWorld().isRemote; - if(!item.isDead && remote) { + if(remote) { if(!particled.contains(item)) { SubTileSpectranthemum.spawnExplosionParticles(item, 3); particled.add(item); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index e3243bf4f..b12b79e39 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -2187,13 +2187,10 @@ public final class ModCraftingRecipes { for(int i = 0; i < 8; i++) addWall(ModFluffBlocks.biomeStoneA, i + 8, ModFluffBlocks.biomeStoneWall, i); - addWall(ModFluffBlocks.stone, 0, ModFluffBlocks.stoneWall, 0); // Andesite todo 1.8 convert to OreDict? - addWall(Blocks.stone, 5, ModFluffBlocks.stoneWall, 0); - addWall(ModFluffBlocks.stone, 1, ModFluffBlocks.stoneWall, 1); // Basalt - addWall(ModFluffBlocks.stone, 2, ModFluffBlocks.stoneWall, 2); // Diorite - addWall(Blocks.stone, 3, ModFluffBlocks.stoneWall, 2); // Diorite - addWall(ModFluffBlocks.stone, 3, ModFluffBlocks.stoneWall, 3); // Granite - addWall(Blocks.stone, 1, ModFluffBlocks.stoneWall, 3); // Granite + addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[0], ModFluffBlocks.stoneWall, 0); // Andesite + addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[1], ModFluffBlocks.stoneWall, 1); // Basalt + addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[2], ModFluffBlocks.stoneWall, 2); // Diorite + addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[3], ModFluffBlocks.stoneWall, 3); // Granite // Pane Recipes addPane(ModBlocks.manaGlass, ModFluffBlocks.managlassPane); @@ -2210,23 +2207,20 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModFluffBlocks.biomeStoneB, i, ModFluffBlocks.biomeStoneStairs[i + 16], ModFluffBlocks.biomeStoneSlabs[i + 16]); } - // Andesite Basalt Diorite Granite Stair/Slab todo 1.8 convert to oredict? - addStairsAndSlabs(ModFluffBlocks.stone, 0, ModFluffBlocks.stoneStairs[0], ModFluffBlocks.stoneSlabs[0]); - addStairsAndSlabs(Blocks.stone, 5, ModFluffBlocks.stoneStairs[0], ModFluffBlocks.stoneSlabs[0]); + // Andesite Basalt Diorite Granite Stair/Slab + addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[0], Blocks.stone, 5, ModFluffBlocks.stoneStairs[0], ModFluffBlocks.stoneSlabs[0]); - addStairsAndSlabs(ModFluffBlocks.stone, 1, ModFluffBlocks.stoneStairs[1], ModFluffBlocks.stoneSlabs[1]); + addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[1], ModFluffBlocks.stone, 1, ModFluffBlocks.stoneStairs[1], ModFluffBlocks.stoneSlabs[1]); - addStairsAndSlabs(ModFluffBlocks.stone, 2, ModFluffBlocks.stoneStairs[2], ModFluffBlocks.stoneSlabs[2]); - addStairsAndSlabs(Blocks.stone, 3, ModFluffBlocks.stoneStairs[2], ModFluffBlocks.stoneSlabs[2]); + addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[2], Blocks.stone, 3, ModFluffBlocks.stoneStairs[2], ModFluffBlocks.stoneSlabs[2]); - addStairsAndSlabs(ModFluffBlocks.stone, 3, ModFluffBlocks.stoneStairs[3], ModFluffBlocks.stoneSlabs[3]); - addStairsAndSlabs(Blocks.stone, 1, ModFluffBlocks.stoneStairs[3], ModFluffBlocks.stoneSlabs[3]); + addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[3], Blocks.stone, 1, ModFluffBlocks.stoneStairs[3], ModFluffBlocks.stoneSlabs[3]); // Andesite Basalt Diorite Granite Bricks Stair/Slab - addStairsAndSlabs(ModFluffBlocks.stone, 8, ModFluffBlocks.stoneStairs[4], ModFluffBlocks.stoneSlabs[4]); - addStairsAndSlabs(ModFluffBlocks.stone, 9, ModFluffBlocks.stoneStairs[5], ModFluffBlocks.stoneSlabs[5]); - addStairsAndSlabs(ModFluffBlocks.stone, 10, ModFluffBlocks.stoneStairs[6], ModFluffBlocks.stoneSlabs[6]); - addStairsAndSlabs(ModFluffBlocks.stone, 11, ModFluffBlocks.stoneStairs[7], ModFluffBlocks.stoneSlabs[7]); + addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[8], ModFluffBlocks.stone, 8, ModFluffBlocks.stoneStairs[4], ModFluffBlocks.stoneSlabs[4]); + addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[9], ModFluffBlocks.stone, 9, ModFluffBlocks.stoneStairs[5], ModFluffBlocks.stoneSlabs[5]); + addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[10], ModFluffBlocks.stone, 10, ModFluffBlocks.stoneStairs[6], ModFluffBlocks.stoneSlabs[6]); + addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[11], ModFluffBlocks.stone, 11, ModFluffBlocks.stoneStairs[7], ModFluffBlocks.stoneSlabs[7]); // Pavement Stairsm & Stairs for(int i = 0; i < ModFluffBlocks.pavementStairs.length; i++) @@ -2283,12 +2277,34 @@ public final class ModCraftingRecipes { 'Q', new ItemStack(slab)); } + // Same as above, but use od for forward recipes, only use block and meta for slab -> full block recipe + private static void addStairsAndSlabsWithOredict(String od, Block block, int meta, Block stairs, Block slab) { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(slab, 6), + "QQQ", + 'Q', od)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stairs, 4), + " Q", " QQ", "QQQ", + 'Q', od)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stairs, 4), + "Q ", "QQ ", "QQQ", + 'Q', od)); + GameRegistry.addRecipe(new ItemStack(block, 1, meta), + "Q", "Q", + 'Q', new ItemStack(slab)); // TODO this causes conflicts between the brick slab -> brick restoration recipe and the brick slab -> chiseled brick recipe + } + private static void addWall(Block block, int blockMeta, Block wall, int wallMeta) { GameRegistry.addRecipe(new ItemStack(wall, 6, wallMeta), "BBB", "BBB", 'B', new ItemStack(block, 1, blockMeta)); } + private static void addWallWithOreDict(String od, Block wall, int wallMeta) { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(wall, 6, wallMeta), + "BBB", "BBB", + 'B', od)); + } + private static void addPane(Block block, Block pane) { GameRegistry.addRecipe(new ItemStack(pane, 16), "BBB", "BBB", diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java index 5169f3333..dd675825a 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -45,6 +45,7 @@ public class LensDyeingRecipe implements IRecipe { foundDye = true; else return false; } + else return false;//This means we have an additional item in the recipe after the lens and dye } } @@ -61,7 +62,7 @@ public class LensDyeingRecipe implements IRecipe { if(stack != null) { if(stack.getItem() instanceof ILens && lens == null) lens = stack; - else color = getStackColor(stack); + else color = getStackColor(stack);//We can assume if its not a lens its a dye because we checked it in matches() } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index f80edd9be..a54fa2d2b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -57,9 +57,7 @@ public class ItemOdinRing extends ItemRelicBauble { @Override public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) { - //if(player.ticksExisted % 30 == 0) - //player.heal(1); - if(player.isBurning()) + if(player.isBurning() && ConfigHandler.ringOfOdinFireResist) player.extinguish(); } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 67e9ca043..80b174f38 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -34,10 +34,10 @@ botaniamisc.toolRank=%s&7 Rank botaniamisc.edition=%s Edition # ^ Leave this empty for no edition display botaniamisc.devEdition=Writer's -botaniamisc.lexiconcover0=Your guide to all -botaniamisc.lexiconcover1=Botanical needs -botaniamisc.lexiconcover2=From Bestselling author -botaniamisc.lexiconcover3=Lizbeth "Vazkii" Rika +botaniamisc.lexiconcover0=A manual by Lizbeth +botaniamisc.lexiconcover1="Vazkii" Whitewood +botaniamisc.lexiconcover2=The official guide for +botaniamisc.lexiconcover3=all your Botania needs! botaniamisc.lexiconcover4=Edited by BevoLJ botaniamisc.lexiconcover5=Edited by Saice botaniamisc.shiftinfo=Hold &bSHIFT&7 for more info