diff --git a/MODSRC/vazkii/botania/api/BotaniaAPI.java b/MODSRC/vazkii/botania/api/BotaniaAPI.java index 29b49904f..b8b834c8f 100644 --- a/MODSRC/vazkii/botania/api/BotaniaAPI.java +++ b/MODSRC/vazkii/botania/api/BotaniaAPI.java @@ -52,7 +52,7 @@ public final class BotaniaAPI { private static BiMap> subTiles = HashBiMap.> create(); public static Set subtilesForCreativeMenu = new LinkedHashSet(); - + public static Map oreWeights = new HashMap(); public static Map seeds = new HashMap(); @@ -180,7 +180,7 @@ public final class BotaniaAPI { public static void registerSubTile(String key, Class subtileClass) { subTiles.put(key, subtileClass); } - + /** * Adds the key for a SubTileEntity into the creative menu. This goes into the * subtilesForCreativeMenu Set. diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 54e34fc2a..73c6a85b9 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -175,7 +175,7 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_POLLIDISIAC, SubTilePollidisiac.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_CLAYCONIA, SubTileClayconia.class); } - + private static void registerTile(Class clazz, String key) { GameRegistry.registerTileEntityWithAlternatives(clazz, LibResources.PREFIX_MOD + key, key); } diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index c6eebf70d..71a786d17 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -68,10 +68,10 @@ public final class ConfigHandler { desc = "Set to false to remove the block breaking particles from the flowers and other items in the mod."; blockBreakParticles = loadPropBool("blockBreakingParticles.enabled", desc, blockBreakParticles); - + desc = "Set to false to remove the block breaking particles from the Mana Shatterer, as there can be a good amount in higher levels."; blockBreakParticlesTool = loadPropBool("blockBreakingParticlesTool.enabled", desc, blockBreakParticlesTool); - + desc = "Do not ever touch this value if not asked to. Possible symptoms of doing so include your head turning backwards, the appearance of Titans near the walls or you being trapped in a game of Sword Art Online."; spreaderPositionShift = loadPropInt("spreader.posShift", desc, spreaderPositionShift); diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index ef72c5a48..2f747f4f9 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -628,13 +628,13 @@ public final class ModCrafingRecipes { recipeMagnetRing = BotaniaAPI.getLatestAddedRecipe(); // Terra Shatterer Recipe - addOreDictRecipe(new ItemStack(ModItems.terraPick), + addOreDictRecipe(new ItemStack(ModItems.terraPick), "ITI", "ILI", " L ", 'T', new ItemStack(ModItems.manaTablet, 1, -1), 'I', LibOreDict.TERRA_STEEL, 'L', LibOreDict.LIVINGWOOD_TWIG); recipeTerraPick = BotaniaAPI.getLatestAddedRecipe(); - + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 35132a898..b3a213cb9 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -85,11 +85,11 @@ public final class ModManaAlchemyRecipes { gunpowderAndFlintRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.gunpowder), new ItemStack(Items.flint), 4000)); nameTagRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.name_tag), new ItemStack(Items.writable_book), 16000); - + stringRecipes = new ArrayList(); for(int i = 0; i < 16; i++) stringRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.string, 3, 1), new ItemStack(Blocks.wool, 1, i), 100)); - + enderPearlRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.ender_pearl, 2), new ItemStack(Items.ghast_tear), 28000); redstoneToGlowstoneRecipes = new ArrayList(); diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java index 3ac54eac8..c77aba63d 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java @@ -35,7 +35,7 @@ public class ItemManasteelPick extends ItemPickaxe { public ItemManasteelPick() { this(BotaniaAPI.manasteelToolMaterial, LibItemNames.MANASTEEL_PICK); } - + public ItemManasteelPick(ToolMaterial mat, String name) { super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java index 1c31842ed..642e7ed0c 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java @@ -14,14 +14,12 @@ package vazkii.botania.common.item.equipment.tool; import java.awt.Color; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -33,8 +31,6 @@ import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.relauncher.Side; @@ -52,7 +48,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem { private static final int[] LEVELS = new int[] { 0, 10000, 1000000, 10000000, 100000000, 1000000000 }; - + private static final int[] CREATIVE_MANA = new int[] { 10000 - 1, 1000000 - 1, 10000000 - 1, 100000000 - 1, 1000000000 - 1, MAX_MANA }; @@ -81,24 +77,24 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - int mana = getMana(par1ItemStack); + getMana(par1ItemStack); int level = getLevel(par1ItemStack); - + if(level != 0) { setEnabled(par1ItemStack, !isEnabled(par1ItemStack)); if(!par2World.isRemote) par2World.playSoundAtEntity(par3EntityPlayer, "random.orb", 0.5F, 0.4F); } - + return par1ItemStack; } - + @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { if(isEnabled(par1ItemStack)) { - int mana = getMana(par1ItemStack); + getMana(par1ItemStack); int level = getLevel(par1ItemStack); - + if(level == 0) setEnabled(par1ItemStack, false); else addMana(par1ItemStack, -level); @@ -137,7 +133,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem { return false; } - + @Override public int getEntityLifespan(ItemStack itemStack, World world) { return Integer.MAX_VALUE; @@ -165,13 +161,13 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem { if(par2 == 0 || !isEnabled(par1ItemStack)) return 0xFFFFFF; - return Color.HSBtoRGB(0.375F, (float) Math.min(1F, (Math.sin((double) System.currentTimeMillis() / 200D) * 0.5 + 1F)), 1F); + return Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F); } boolean isEnabled(ItemStack stack) { return ItemNBTHelper.getBoolean(stack, TAG_ENABLED, false); } - + void setEnabled(ItemStack stack, boolean enabled) { ItemNBTHelper.setBoolean(stack, TAG_ENABLED, enabled); } diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ManasteelToolCommons.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ManasteelToolCommons.java index 11b6c6351..736fe6641 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ManasteelToolCommons.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ManasteelToolCommons.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item.equipment.tool; import java.util.ArrayList; -import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -70,7 +69,7 @@ public final class ManasteelToolCommons { Material mat = world.getBlock(x, y, z).getMaterial(); if(blk != null && !blk.isAir(world, x, y, z) && blk.getPlayerRelativeBlockHardness(player, world, x, y, z) != 0) { - List items = new ArrayList(); + new ArrayList(); if(!blk.canHarvestBlock(player, meta) || !isRightMaterial(mat, materialsListing)) return; @@ -79,12 +78,12 @@ public final class ManasteelToolCommons { int localMeta = world.getBlockMetadata(x, y, z); if (blk.removedByPlayer(world, player, x, y, z)) blk.onBlockDestroyedByPlayer(world, x, y, z, localMeta); - + damageItem(stack, 1, player, 80); blk.harvestBlock(world, player, x, y, z, localMeta); blk.onBlockHarvested(world, x, y, z, localMeta, player); } else world.setBlockToAir(x, y, z); - + if(ConfigHandler.blockBreakParticles && ConfigHandler.blockBreakParticlesTool) world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(blk) + (meta << 12)); } diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 64cb1ce00..9559ddbd9 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -331,7 +331,7 @@ public final class LexiconData { new PageManaInfusionRecipe("2", ModManaAlchemyRecipes.leatherRecipe), new PageManaInfusionRecipe("3", ModManaAlchemyRecipes.woodRecipes), new PageManaInfusionRecipe("4", ModManaAlchemyRecipes.saplingRecipes), new PageManaInfusionRecipe("5", ModManaAlchemyRecipes.glowstoneDustRecipe), new PageManaInfusionRecipe("6", ModManaAlchemyRecipes.netherQuartzRecipe), new PageManaInfusionRecipe("7", ModManaAlchemyRecipes.chiseledBrickRecipe), new PageManaInfusionRecipe("8", ModManaAlchemyRecipes.iceRecipe), new PageManaInfusionRecipe("9", ModManaAlchemyRecipes.swampFolliageRecipes), new PageManaInfusionRecipe("10", ModManaAlchemyRecipes.fishRecipes), new PageManaInfusionRecipe("11", ModManaAlchemyRecipes.cropRecipes), new PageManaInfusionRecipe("12", ModManaAlchemyRecipes.potatoRecipe), new PageManaInfusionRecipe("13", ModManaAlchemyRecipes.netherWartRecipe), - new PageManaInfusionRecipe("14", ModManaAlchemyRecipes.gunpowderAndFlintRecipes), new PageManaInfusionRecipe("15", ModManaAlchemyRecipes.nameTagRecipe), new PageManaInfusionRecipe("16", ModManaAlchemyRecipes.stringRecipes), new PageManaInfusionRecipe("17", ModManaAlchemyRecipes.enderPearlRecipe), + new PageManaInfusionRecipe("14", ModManaAlchemyRecipes.gunpowderAndFlintRecipes), new PageManaInfusionRecipe("15", ModManaAlchemyRecipes.nameTagRecipe), new PageManaInfusionRecipe("16", ModManaAlchemyRecipes.stringRecipes), new PageManaInfusionRecipe("17", ModManaAlchemyRecipes.enderPearlRecipe), new PageManaInfusionRecipe("18", ModManaAlchemyRecipes.redstoneToGlowstoneRecipes), new PageManaInfusionRecipe("19", ModManaAlchemyRecipes.sandRecipe)); openCrate = new BLexiconEntry(LibLexicon.DEVICE_OPEN_CRATE, categoryDevices); @@ -372,7 +372,7 @@ public final class LexiconData { terraPick = new BLexiconEntry(LibLexicon.TOOL_TERRA_PICK, categoryTools); terraPick.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageCraftingRecipe("5", ModCrafingRecipes.recipeTerraPick)); - + // BAUBLES ENTRIES baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles); baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2")); diff --git a/build.properties b/build.properties index 31779727c..1351219b2 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ -#Sun, 18 May 2014 15:22:51 +0100 +#Wed, 21 May 2014 01:30:01 +0100 version=beta -build_number=35 +build_number=36 mc_version=1.7.2 mod_name=Botania dir.repo=./ diff --git a/web/changelog.txt b/web/changelog.txt index 177720bf8..80af63bcb 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,14 @@ +beta 35 +*Added a config option to remove block breaking particles. +*Added some new alchemy recipes - Cocoa Beans in the crop rotation and Wool to String. +*Added the Terra Shatterer, a new tool that increases power with the amount of mana you give it. +*Fixed a crash with the Wand of the Forest when placing it in a block from a mod that does not sync NBT tags (eg. Blood Magic). +*Fixed a small visual issue with Unstable Beacons displaying particles under the block. +*Lowered the amount of particles Unstable Beacons emit, they no longer eat your FPS as much. +*Mana spreaders with the bore lens will no longer break other full pools or spreaders. +*Swapped the aliases of the Tile Entities to prevent tiles with the same name from other mods conflicting, this comes with no backwards compatibility issues, you're fine. +*The magnetizing ring now pulls items to the center of the player, not the corner. +*[API] Added a LinkedHashSet for the SubTileEntity keys to be displayed on the creative menu for the getSubBlocks call for BlockSpecialFlower. beta 34 *Changed Ring Textures. *Fixed a crash with illegal blocks around the pure daisy. diff --git a/web/versions.ini b/web/versions.ini index 7a3561c70..73481db23 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -31,4 +31,5 @@ beta-30=1.7.2 beta-31=1.7.2 beta-32=1.7.2 beta-33=1.7.2 -beta-34=1.7.2 \ No newline at end of file +beta-34=1.7.2 +beta-35=1.7.2 \ No newline at end of file