From 9036e2436570953b22175bf4c131084ed16ea8cf Mon Sep 17 00:00:00 2001 From: Sam Quinn Date: Fri, 1 Jan 2016 09:52:51 -0600 Subject: [PATCH 01/12] Removed references to Excaliber The Excalibru doesn't even exist anymore, so it doesn't make sense to talk about it in contributing, as you should be working with latest version anyway --- contributing.md | 2 -- 1 file changed, 2 deletions(-) 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) From 820c042f405eeee0af0e304c01d1c26015b1bac3 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 2 Jan 2016 23:42:17 +0000 Subject: [PATCH 02/12] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 3dd8ee871..18ce7ec31 100644 --- a/contributors.properties +++ b/contributors.properties @@ -51,3 +51,4 @@ _bloop=0 kgevans=15 l0nekitsune=14 swiftlileagle=14 +gryphonn=11 From 124f8bb173b32d19da60ad2e667a0f57c42ee6b6 Mon Sep 17 00:00:00 2001 From: Sam Quinn Date: Sat, 2 Jan 2016 20:14:44 -0600 Subject: [PATCH 03/12] Added light to all panes, closing #1697 All the full glass blocks had lightning, so now these can too! --- .../vazkii/botania/common/block/decor/panes/BlockModPane.java | 1 + 1 file changed, 1 insertion(+) 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 0683a2e58..206ba158d 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 @@ -37,6 +37,7 @@ public class BlockModPane extends BlockPane { setCreativeTab(BotaniaCreativeTab.INSTANCE); setHardness(0.3F); setStepSound(soundTypeGlass); + setLightLevel(1.0F); useNeighborBrightness = true; } From 17ddae20afcce2ee20dca5d7b22feaf1a9e1e188 Mon Sep 17 00:00:00 2001 From: Sam Quinn Date: Sat, 2 Jan 2016 21:38:26 -0600 Subject: [PATCH 04/12] Add oredict support 1.8 stone recipes, closes #1660 the code was copy-pastaed from the addStairsAndSlabs helper function to hack in oredict support, feel free to just add it to the helper function if you want though. Looking at other Botania code, this is what comes to mind though. see #1703 There is also a very big problem that I marked with a comment that says "very big problem", where on many many different stone types (end, metamorph, 1.8) the recipe for stone bricks and for chisled is the same, so usually you can't craft chisled. sorry for long commit message --- .../common/crafting/ModCraftingRecipes.java | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 3b13254ec..bfe2040d2 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -2223,8 +2223,31 @@ public final class ModCraftingRecipes { // 1.8 Block Stone Stairs & Slabs for(int i = 0; i < 4; i++) { - addStairsAndSlabs(ModFluffBlocks.stone, i, ModFluffBlocks.stoneStairs[i], ModFluffBlocks.stoneSlabs[i]); - addStairsAndSlabs(ModFluffBlocks.stone, i + 8, ModFluffBlocks.stoneStairs[i + 4], ModFluffBlocks.stoneSlabs[i + 4]); + addOreDictRecipe(new ItemStack(ModFluffBlocks.stoneSlabs[i], 6), + "QQQ", + 'Q', LibOreDict.STONE_18_VARIANTS[i]); + addOreDictRecipe(new ItemStack(ModFluffBlocks.stoneStairs[i], 4), + " Q", " QQ", "QQQ", + 'Q', LibOreDict.STONE_18_VARIANTS[i]); + addOreDictRecipe(new ItemStack(ModFluffBlocks.stoneStairs[i], 4), + "Q ", "QQ ", "QQQ", + 'Q', LibOreDict.STONE_18_VARIANTS[i]); + addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 1, i), + "Q", "Q", + 'Q', new ItemStack(ModFluffBlocks.stoneSlabs[i])); + + addOreDictRecipe(new ItemStack(ModFluffBlocks.stoneSlabs[i + 4], 6), + "QQQ", + 'Q', LibOreDict.STONE_18_VARIANTS[i + 8]); + addOreDictRecipe(new ItemStack(ModFluffBlocks.stoneStairs[i + 4], 4), + " Q", " QQ", "QQQ", + 'Q', LibOreDict.STONE_18_VARIANTS[i + 8]); + addOreDictRecipe(new ItemStack(ModFluffBlocks.stoneStairs[i + 4], 4), + "Q ", "QQ ", "QQQ", + 'Q', LibOreDict.STONE_18_VARIANTS[i + 8]); + addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 1, i + 8), //VERY VERY + "Q", "Q", //BIG BIG + 'Q', new ItemStack(ModFluffBlocks.stoneSlabs[i + 4])); //PROBLEM PROBLEM } // Pavement Stairsm & Stairs From f9ce3676e176753317ec9951b4901db42578f31d Mon Sep 17 00:00:00 2001 From: Sam Quinn Date: Sat, 2 Jan 2016 22:48:51 -0600 Subject: [PATCH 05/12] Fixes mana lens dyeing, closing #1708 Fixes having extra items beyond a dye and a lens messing everything up --- .../botania/common/crafting/recipe/LensDyeingRecipe.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 90b1e3ff2..4f1fab8f9 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -44,6 +44,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 } } @@ -60,7 +61,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() } } From 69eac1f12e581a3ac0dd88305dd9d6ae8d5f5fb6 Mon Sep 17 00:00:00 2001 From: yrsegal Date: Mon, 4 Jan 2016 19:39:50 -0500 Subject: [PATCH 06/12] Make the render color for camo blocks work with meta before, blocks which required meta colors for determining their render color would use the meta of the Platform itself --- src/main/java/vazkii/botania/common/block/BlockCamo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index ba831f15e..968d83492 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -134,7 +134,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, par2, par3, par4); + return block instanceof BlockCamo ? 0xFFFFFF : block.getRenderColor(camo.camoMeta); } return 0xFFFFFF; From b108af404fc0e38e8a5f5d86bea356865d191e88 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 6 Jan 2016 22:23:28 +0000 Subject: [PATCH 07/12] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 18ce7ec31..e195d2f7b 100644 --- a/contributors.properties +++ b/contributors.properties @@ -52,3 +52,4 @@ kgevans=15 l0nekitsune=14 swiftlileagle=14 gryphonn=11 +loraanicus=10 From 8268c79353be2b53d2d88329d15d28d220365898 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 8 Jan 2016 14:27:53 +0000 Subject: [PATCH 08/12] New name --- .../vazkii/botania/client/render/item/RenderLexicon.java | 4 ++-- src/main/resources/assets/botania/lang/en_US.lang | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) 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 19b314357..694325ae3 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java @@ -97,12 +97,12 @@ public class RenderLexicon implements IItemRenderer { font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); GL11.glTranslatef(0F, 10F, 0F); - font.drawString(EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); + font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); GL11.glTranslatef(0F, 50F, 0F); font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); GL11.glTranslatef(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) { GL11.glTranslatef(0F, 10F, 0F); font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 78d0818e9..82176c461 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 From c8517f565bb3ba26ff7648cf00bb7fe11df66843 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 8 Jan 2016 14:30:55 +0000 Subject: [PATCH 09/12] Fixed Mana Flashes not having a lexicon binding. Closes #1719 --- .../botania/common/block/decor/BlockManaFlame.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 0b6a804dd..fdf5c95b6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -23,14 +23,17 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; 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 cpw.mods.fml.common.Optional; -public class BlockManaFlame extends BlockModContainer { +public class BlockManaFlame extends BlockModContainer implements ILexiconable { public BlockManaFlame() { super(Material.cloth); @@ -113,4 +116,9 @@ public class BlockManaFlame extends BlockModContainer { return new TileManaFlame(); } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.lenses; + } + } From 6b66163958c150e31549a73dacf834ae7537a905 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 8 Jan 2016 14:32:29 +0000 Subject: [PATCH 10/12] Fixed the Ring of Odin Fire Resistance config not changing its extinguish behaviour. --- .../java/vazkii/botania/common/item/relic/ItemOdinRing.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 650566022..3eaa7da18 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(); } From 68ea0b213e8f3aadf6307c7c0a42e1a5885a4f69 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 8 Jan 2016 14:35:06 +0000 Subject: [PATCH 11/12] Fixed alternate grass types not breaking faster with a shovel and not being able to sustain sugar cane. Closes #1711 --- .../java/vazkii/botania/common/block/BlockAltGrass.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index d283b919a..1f7a5c3da 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -50,6 +50,11 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { setTickRandomly(true); } + @Override + public boolean isToolEffective(String type, int metadata) { + return type.equals("shovel"); + } + @Override public Block setBlockName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); @@ -108,7 +113,8 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { @Override public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) { - return plantable.getPlantType(world, x, y - 1, z) == EnumPlantType.Plains; + EnumPlantType type = plantable.getPlantType(world, x, y - 1, z); + return type == EnumPlantType.Plains || type == EnumPlantType.Beach; } @Override From bf55ee4a609c8a4cc25f9766e82685a48c6ad6c3 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 8 Jan 2016 14:41:05 +0000 Subject: [PATCH 12/12] Fixed the Hopperhock calling inventory methods on the client side, and thus, crashing when used alongside a BetterStorage Crate. --- .../common/block/subtile/functional/SubTileHopperhock.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 dbaa47f0c..84aea3c2c 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 @@ -92,7 +92,7 @@ public class SubTileHopperhock extends SubTileFunctional { if(inv != null) { List filter = getFilterForInventory(inv, x_, y_, z_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); - int availablePut = InventoryHelper.testInventoryInsertion(inv, stack, dir); + int availablePut = supertile.getWorldObj().isRemote ? 1 : InventoryHelper.testInventoryInsertion(inv, stack, dir); canAccept &= availablePut > 0; if(canAccept) { @@ -111,9 +111,9 @@ public class SubTileHopperhock extends SubTileFunctional { } } - if(invToPutItemIn != null) { + if(invToPutItemIn != null && !item.isDead) { boolean remote = supertile.getWorldObj().isRemote; - if(!item.isDead && remote) { + if(remote) { if(!particled.contains(item)) { SubTileSpectranthemum.spawnExplosionParticles(item, 3); particled.add(item);