From 39750eaddcfacd741f3481e252cf776543cf7036 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 23 Jul 2014 02:06:35 +0100 Subject: [PATCH] Cleanup~ --- MODSRC/vazkii/botania/api/internal/IManaBurst.java | 2 +- .../botania/api/mana/ITinyPlanetExcempt.java | 2 +- .../core/handler/BotaniaPlayerController.java | 8 ++++---- .../botania/client/core/helper/IconHelper.java | 4 ++-- .../botania/client/core/proxy/ClientProxy.java | 4 ++-- .../botania/common/block/BlockForestDrum.java | 2 +- .../botania/common/block/BlockModFlower.java | 2 +- .../vazkii/botania/common/block/BlockPlatform.java | 4 ++-- .../botania/common/block/BlockSpecialFlower.java | 1 - .../block/subtile/functional/SubTileClayconia.java | 1 - .../botania/common/core/handler/ConfigHandler.java | 4 ++-- .../botania/common/core/proxy/CommonProxy.java | 4 ++-- .../botania/common/crafting/ModCrafingRecipes.java | 6 +++--- .../botania/common/entity/EntityDoppleganger.java | 2 +- .../botania/common/entity/EntityManaBurst.java | 12 ++++++------ MODSRC/vazkii/botania/common/item/ItemDirtRod.java | 2 +- .../botania/common/item/ItemLaputaShard.java | 10 +++++----- MODSRC/vazkii/botania/common/item/ItemLens.java | 1 - .../vazkii/botania/common/item/ItemSkyDirtRod.java | 14 +++++++------- MODSRC/vazkii/botania/common/item/ModItems.java | 2 +- .../item/equipment/bauble/ItemReachRing.java | 8 +++----- .../item/equipment/bauble/ItemTinyPlanet.java | 2 +- .../vazkii/botania/common/lexicon/LexiconData.java | 4 ++-- .../vazkii/botania/common/lib/LibObfuscation.java | 4 ++-- 24 files changed, 50 insertions(+), 55 deletions(-) diff --git a/MODSRC/vazkii/botania/api/internal/IManaBurst.java b/MODSRC/vazkii/botania/api/internal/IManaBurst.java index c19634508..38c5fd8c8 100644 --- a/MODSRC/vazkii/botania/api/internal/IManaBurst.java +++ b/MODSRC/vazkii/botania/api/internal/IManaBurst.java @@ -56,7 +56,7 @@ public interface IManaBurst { public void setSourceLens(ItemStack lens); public boolean hasAlreadyCollidedAt(int x, int y, int z); - + public int getTicksExisted(); } diff --git a/MODSRC/vazkii/botania/api/mana/ITinyPlanetExcempt.java b/MODSRC/vazkii/botania/api/mana/ITinyPlanetExcempt.java index 56570e1e8..004c52ed7 100644 --- a/MODSRC/vazkii/botania/api/mana/ITinyPlanetExcempt.java +++ b/MODSRC/vazkii/botania/api/mana/ITinyPlanetExcempt.java @@ -20,5 +20,5 @@ import net.minecraft.item.ItemStack; public interface ITinyPlanetExcempt { public boolean shouldPull(ItemStack stack); - + } diff --git a/MODSRC/vazkii/botania/client/core/handler/BotaniaPlayerController.java b/MODSRC/vazkii/botania/client/core/handler/BotaniaPlayerController.java index 244db8929..ab4f9eddb 100644 --- a/MODSRC/vazkii/botania/client/core/handler/BotaniaPlayerController.java +++ b/MODSRC/vazkii/botania/client/core/handler/BotaniaPlayerController.java @@ -11,17 +11,17 @@ */ package vazkii.botania.client.core.handler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.network.NetHandlerPlayClient; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class BotaniaPlayerController extends PlayerControllerMP { public float distance = 0F; - + public BotaniaPlayerController(Minecraft p_i45062_1_, NetHandlerPlayClient p_i45062_2_) { super(p_i45062_1_, p_i45062_2_); } @@ -30,5 +30,5 @@ public class BotaniaPlayerController extends PlayerControllerMP { public float getBlockReachDistance() { return super.getBlockReachDistance() + distance; } - + } diff --git a/MODSRC/vazkii/botania/client/core/helper/IconHelper.java b/MODSRC/vazkii/botania/client/core/helper/IconHelper.java index 68e267965..746ad1a63 100644 --- a/MODSRC/vazkii/botania/client/core/helper/IconHelper.java +++ b/MODSRC/vazkii/botania/client/core/helper/IconHelper.java @@ -31,7 +31,7 @@ public final class IconHelper { public static IIcon forBlock(IIconRegister ir, Block block, int i) { return forBlock(ir, block, Integer.toString(i)); } - + public static IIcon forBlock(IIconRegister ir, Block block, int i, String dir) { return forBlock(ir, block, Integer.toString(i), dir); } @@ -39,7 +39,7 @@ public final class IconHelper { public static IIcon forBlock(IIconRegister ir, Block block, String s) { return forName(ir, block.getUnlocalizedName().replaceAll("tile.", "") + s); } - + public static IIcon forBlock(IIconRegister ir, Block block, String s, String dir) { return forName(ir, dir + "/" + block.getUnlocalizedName().replaceAll("tile.", "") + s); } diff --git a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java index 09d75cc88..b3477f963 100644 --- a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java @@ -137,7 +137,7 @@ public class ClientProxy extends CommonProxy { public void setEntryToOpen(LexiconEntry entry) { GuiLexicon.currentOpenLexicon = new GuiLexiconEntry(entry, new GuiLexiconIndex(entry.category)); } - + @Override public void setExtraReach(EntityLivingBase entity, float reach) { super.setExtraReach(entity, reach); @@ -151,7 +151,7 @@ public class ClientProxy extends CommonProxy { controller.setGameType(type); mc.playerController = controller; } - + ((BotaniaPlayerController) mc.playerController).distance = reach; } } diff --git a/MODSRC/vazkii/botania/common/block/BlockForestDrum.java b/MODSRC/vazkii/botania/common/block/BlockForestDrum.java index 545f5351c..bd63b492d 100644 --- a/MODSRC/vazkii/botania/common/block/BlockForestDrum.java +++ b/MODSRC/vazkii/botania/common/block/BlockForestDrum.java @@ -76,7 +76,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona public boolean isOpaqueCube() { return false; } - + @Override public int damageDropped(int meta) { return meta; diff --git a/MODSRC/vazkii/botania/common/block/BlockModFlower.java b/MODSRC/vazkii/botania/common/block/BlockModFlower.java index 8e6c7a866..191cf64ca 100644 --- a/MODSRC/vazkii/botania/common/block/BlockModFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockModFlower.java @@ -44,7 +44,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable { public static IIcon[] iconsAlt; public static final String ALT_DIR = "alt"; - + protected BlockModFlower() { this(LibBlockNames.FLOWER); } diff --git a/MODSRC/vazkii/botania/common/block/BlockPlatform.java b/MODSRC/vazkii/botania/common/block/BlockPlatform.java index 952c52ac6..5e10ab5af 100644 --- a/MODSRC/vazkii/botania/common/block/BlockPlatform.java +++ b/MODSRC/vazkii/botania/common/block/BlockPlatform.java @@ -84,10 +84,10 @@ public class BlockPlatform extends BlockCamo implements ILexiconable { @Override public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { int meta = par1World.getBlockMetadata(par2, par3, par4); - if(meta == 2 || (meta == 0 && par7Entity != null && par7Entity.posY > par3 + (par7Entity instanceof EntityPlayer ? 2 : 0) && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking()))) + if(meta == 2 || meta == 0 && par7Entity != null && par7Entity.posY > par3 + (par7Entity instanceof EntityPlayer ? 2 : 0) && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } - + @Override public float getBlockHardness(World par1World, int par2, int par3, int par4) { int meta = par1World.getBlockMetadata(par2, par3, par4); diff --git a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java index c77ad26dd..f05494734 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java @@ -16,7 +16,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java index 574566f24..fc773d50c 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java @@ -16,7 +16,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index 712f1ec73..1d398447d 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -110,10 +110,10 @@ public final class ConfigHandler { desc = "Set to true to use alternate flower textures by Futureazoo, not all flowers are textured. http://redd.it/2b3o3f"; altFlowerTextures = loadPropBool("flowerTextures.alt", desc, altFlowerTextures); - + desc = "Set to true if you are the chosen one. For lovers of glitch art and just general mad people."; matrixMode = loadPropBool("matrixMode.enabled", desc, matrixMode); - + desc = "Set to false to disable the references in flower tooltips. (You monster D:)"; referencesEnabled = loadPropBool("references.enabled", desc, referencesEnabled); diff --git a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java index 8b9dd221b..d2fc42d9a 100644 --- a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java @@ -105,12 +105,12 @@ public class CommonProxy { public void setEntryToOpen(LexiconEntry entry) { // NO-OP } - + public void setExtraReach(EntityLivingBase entity, float reach) { if(entity instanceof EntityPlayerMP) ((EntityPlayerMP) entity).theItemInWorldManager.setBlockReachDistance(5.0 + reach); } - + public long getWorldElapsedTicks() { return MinecraftServer.getServer().worldServers[0].getTotalWorldTime(); } diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 7db1fb933..b0a4d9488 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -1018,16 +1018,16 @@ public final class ModCrafingRecipes { recipeVirusSkeleton = BotaniaAPI.getLatestAddedRecipe(); // Ring of Far Reach Recipe - addOreDictRecipe(new ItemStack(ModItems.reachRing), + addOreDictRecipe(new ItemStack(ModItems.reachRing), "RE ", "E E", " E ", 'R', LibOreDict.RUNE[15], 'E', LibOreDict.ELEMENTIUM); recipeReachRing = BotaniaAPI.getLatestAddedRecipe(); - + // Rod of the Highlands Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.skyDirtRod), new ItemStack(ModItems.dirtRod), LibOreDict.PIXIE_DUST, LibOreDict.RUNE[3]); recipeSkyDirtRod = BotaniaAPI.getLatestAddedRecipe(); - + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/MODSRC/vazkii/botania/common/entity/EntityDoppleganger.java b/MODSRC/vazkii/botania/common/entity/EntityDoppleganger.java index 320bb4049..e5e5ffed4 100644 --- a/MODSRC/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/MODSRC/vazkii/botania/common/entity/EntityDoppleganger.java @@ -267,7 +267,7 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa tries++; if(tries >= 50) teleportTo(source.posX + 0.5, source.posY + 1.6, source.posZ + 0.5); - + if(spawnLandmines && !worldObj.isRemote) for(int i = 0; i < 6; i++) { int x = source.posX - 10 + rand.nextInt(20); diff --git a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java index cc0af33ba..f506d7bbc 100644 --- a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java +++ b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java @@ -47,7 +47,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; public class EntityManaBurst extends EntityThrowable implements IManaBurst { - + private static final String TAG_TICKS_EXISTED = "ticksExisted"; private static final String TAG_COLOR = "color"; private static final String TAG_MANA = "mana"; @@ -346,7 +346,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { public void onUpdate() { setTicksExisted(getTicksExisted() + 1); superUpdate(); - + if(!fake && !isDead) { ChunkCoordinates coords = getBurstSourceChunkCoordinates(); TileEntity tile = worldObj.getTileEntity(coords.posX, coords.posY, coords.posZ); @@ -423,7 +423,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(stack != null) stack.writeToNBT(lensCmp); par1nbtTagCompound.setTag(TAG_LENS_STACK, lensCmp); - + ChunkCoordinates coords = getBurstSourceChunkCoordinates(); par1nbtTagCompound.setInteger(TAG_SPREADER_X, coords.posX); par1nbtTagCompound.setInteger(TAG_SPREADER_Y, coords.posY); @@ -450,7 +450,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(stack != null) setSourceLens(stack); else setSourceLens(new ItemStack(Blocks.stone, 0, 0)); - + int x = par1nbtTagCompound.getInteger(TAG_SPREADER_X); int y = par1nbtTagCompound.getInteger(TAG_SPREADER_Y); int z = par1nbtTagCompound.getInteger(TAG_SPREADER_Z); @@ -712,12 +712,12 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { public void setSourceLens(ItemStack lens) { dataWatcher.updateObject(dataWatcherStart + 9, lens == null ? new ItemStack(Blocks.stone, 0, 0) : lens); } - + @Override public int getTicksExisted() { return _ticksExisted; } - + public void setTicksExisted(int ticks) { _ticksExisted = ticks; } diff --git a/MODSRC/vazkii/botania/common/item/ItemDirtRod.java b/MODSRC/vazkii/botania/common/item/ItemDirtRod.java index 26f32d9cb..d8dfa8830 100644 --- a/MODSRC/vazkii/botania/common/item/ItemDirtRod.java +++ b/MODSRC/vazkii/botania/common/item/ItemDirtRod.java @@ -36,7 +36,7 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem { setMaxStackSize(1); setUnlocalizedName(name); } - + @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { if(ManaItemHandler.requestManaExact(par1ItemStack, par2EntityPlayer, COST, false)) { diff --git a/MODSRC/vazkii/botania/common/item/ItemLaputaShard.java b/MODSRC/vazkii/botania/common/item/ItemLaputaShard.java index f8ba0263d..405fab33c 100644 --- a/MODSRC/vazkii/botania/common/item/ItemLaputaShard.java +++ b/MODSRC/vazkii/botania/common/item/ItemLaputaShard.java @@ -66,7 +66,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet if(MathHelper.pointDistanceSpace(x, y, z, srcx, srcy, srcz) < range) { Block block = world.getBlock(x, y, z); - if(!block.isAir(world, x, y, z) && !block.isReplaceable(world, x, y, z) && !(block instanceof BlockFalling) && block.getBlockHardness(world, x, y, z) != -1) { + if(!block.isAir(world, x, y, z) && !block.isReplaceable(world, x, y, z) && !(block instanceof BlockFalling) && block.getBlockHardness(world, x, y, z) != -1) { int id = Block.getIdFromBlock(block); int meta = world.getBlockMetadata(x, y, z); TileEntity tile = world.getTileEntity(x, y, z); @@ -147,9 +147,9 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet if(y != -1) spawnBurst(entity.worldObj, x, y, z); } else if(burst.getTicksExisted() == placeTicks) { - int x = (int) net.minecraft.util.MathHelper.floor_double(entity.posX); - int y = (int) net.minecraft.util.MathHelper.floor_double(entity.posY); - int z = (int) net.minecraft.util.MathHelper.floor_double(entity.posZ); + int x = net.minecraft.util.MathHelper.floor_double(entity.posX); + int y = net.minecraft.util.MathHelper.floor_double(entity.posY); + int z = net.minecraft.util.MathHelper.floor_double(entity.posZ); if(entity.worldObj.isAirBlock(x, y, z)) { int id = ItemNBTHelper.getInt(lens, TAG_BLOCK, 0); @@ -170,7 +170,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet entity.worldObj.setTileEntity(x, y, z, tile); } } - + entity.setDead(); } } diff --git a/MODSRC/vazkii/botania/common/item/ItemLens.java b/MODSRC/vazkii/botania/common/item/ItemLens.java index 13a0de8fe..dca2b0b3c 100644 --- a/MODSRC/vazkii/botania/common/item/ItemLens.java +++ b/MODSRC/vazkii/botania/common/item/ItemLens.java @@ -57,7 +57,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; -import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/MODSRC/vazkii/botania/common/item/ItemSkyDirtRod.java b/MODSRC/vazkii/botania/common/item/ItemSkyDirtRod.java index 55746aaaa..ab7808e65 100644 --- a/MODSRC/vazkii/botania/common/item/ItemSkyDirtRod.java +++ b/MODSRC/vazkii/botania/common/item/ItemSkyDirtRod.java @@ -28,17 +28,17 @@ public class ItemSkyDirtRod extends ItemDirtRod { public ItemSkyDirtRod() { super(LibItemNames.SKY_DIRT_ROD); } - + @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if(!world.isRemote && ManaItemHandler.requestManaExact(stack, player, COST * 2, false)) { Vector3 playerVec = Vector3.fromEntityCenter(player); Vector3 lookVec = new Vector3(player.getLookVec()).multiply(3); Vector3 placeVec = playerVec.copy().add(lookVec); - - int x = (int) MathHelper.floor_double(placeVec.x); - int y = (int) MathHelper.floor_double(placeVec.y) + 1; - int z = (int) MathHelper.floor_double(placeVec.z); + + int x = MathHelper.floor_double(placeVec.x); + int y = MathHelper.floor_double(placeVec.y) + 1; + int z = MathHelper.floor_double(placeVec.z); int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1)).size(); @@ -55,8 +55,8 @@ public class ItemSkyDirtRod extends ItemDirtRod { } if(world.isRemote) player.swingItem(); - + return stack; } - + } diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index a9ffe4f0e..61c5d000a 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -213,7 +213,7 @@ public final class ModItems { virus = new ItemVirus(); reachRing = new ItemReachRing(); skyDirtRod = new ItemSkyDirtRod(); - + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); diff --git a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java index 4dd498682..6020edb08 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java +++ b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java @@ -12,12 +12,10 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; -import baubles.api.BaubleType; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; +import baubles.api.BaubleType; public class ItemReachRing extends ItemBauble { @@ -29,12 +27,12 @@ public class ItemReachRing extends ItemBauble { public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) { Botania.proxy.setExtraReach(player, 3.5F); } - + @Override public void onUnequipped(ItemStack stack, EntityLivingBase player) { Botania.proxy.setExtraReach(player, 0F); } - + @Override public BaubleType getBaubleType(ItemStack arg0) { return BaubleType.RING; diff --git a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index 534f46994..bab64e409 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -59,7 +59,7 @@ public class ItemTinyPlanet extends ItemBauble { ItemStack lens = burst.getSourceLens(); if(lens != null && lens.getItem() instanceof ITinyPlanetExcempt && !((ITinyPlanetExcempt) lens.getItem()).shouldPull(lens)) continue; - + int orbitTime = getEntityOrbitTime(entity); if(orbitTime == 0) burst.setMinManaLoss(burst.getMinManaLoss() * 3); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 885f88ebf..91c8827ac 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -465,7 +465,7 @@ public final class LexiconData { skyDirtRod = new ALexiconEntry(LibLexicon.TOOL_SKY_DIRT_ROD, categoryTools); skyDirtRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeSkyDirtRod)); - + // BAUBLES ENTRIES baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles); baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2")); @@ -517,7 +517,7 @@ public final class LexiconData { reachRing = new ALexiconEntry(LibLexicon.BAUBLE_REACH_RING, categoryBaubles); reachRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeReachRing)); - + // ALFHOMANCY ENTRIES alfhomancyIntro = new BLexiconEntry(LibLexicon.ALF_INTRO, categoryAlfhomancy); alfhomancyIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCrafingRecipes.recipeAlfPortal), new PageCraftingRecipe("3", ModCrafingRecipes.recipeNaturaPylon), diff --git a/MODSRC/vazkii/botania/common/lib/LibObfuscation.java b/MODSRC/vazkii/botania/common/lib/LibObfuscation.java index b30e09d4c..10d085899 100644 --- a/MODSRC/vazkii/botania/common/lib/LibObfuscation.java +++ b/MODSRC/vazkii/botania/common/lib/LibObfuscation.java @@ -50,10 +50,10 @@ public final class LibObfuscation { // EntityHorse public static final String[] HORSE_JUMP_STRENGTH = new String[] { "horseJumpStrength", "field_110271_bv", "bv" }; - + // PlayerControllerMP public static final String[] NET_CLIENT_HANDLER = new String[] { "netClientHandler", "field_78774_b", "b" }; public static final String[] CURRENT_GAME_TYPE = new String[] { "currentGameType", "field_78779_k", "k" }; - + }