From e38556d265fcf43273c99ea1299a35400bf0c405 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 2 Oct 2016 21:29:35 +0100 Subject: [PATCH] Cleanup. Looks like it's been a while since this was run eh? --- .../java/vazkii/botania/api/BotaniaAPI.java | 19 +- .../vazkii/botania/api/BotaniaAPIClient.java | 7 +- .../vazkii/botania/api/boss/IBotaniaBoss.java | 12 +- .../java/vazkii/botania/api/brew/Brew.java | 9 +- .../botania/api/brew/IBrewContainer.java | 4 +- .../vazkii/botania/api/brew/IBrewItem.java | 4 +- .../botania/api/corporea/CorporeaHelper.java | 21 +- .../botania/api/corporea/CorporeaRequest.java | 6 +- .../api/corporea/CorporeaRequestEvent.java | 4 +- .../ICorporeaAutoCompleteController.java | 4 +- .../api/corporea/ICorporeaInterceptor.java | 8 +- .../api/corporea/ICorporeaRequestor.java | 4 +- .../botania/api/corporea/ICorporeaSpark.java | 8 +- .../api/corporea/IWrappedInventory.java | 8 +- .../botania/api/corporea/InvWithLocation.java | 38 +- .../api/internal/DummyManaNetwork.java | 9 +- .../api/internal/DummyMethodHandler.java | 8 +- .../botania/api/internal/DummyPage.java | 4 +- .../botania/api/internal/DummySubTile.java | 4 +- .../api/internal/IGuiLexiconEntry.java | 8 +- .../api/internal/IInternalMethodHandler.java | 8 +- .../botania/api/internal/IManaBurst.java | 8 +- .../botania/api/internal/IManaNetwork.java | 8 +- .../botania/api/internal/ShaderCallback.java | 4 +- .../api/internal/VanillaPacketDispatcher.java | 8 +- .../api/item/IAncientWillContainer.java | 4 +- .../vazkii/botania/api/item/IAvatarTile.java | 12 +- .../botania/api/item/IAvatarWieldable.java | 4 +- .../botania/api/item/IBaubleRender.java | 8 +- .../botania/api/item/IBlockProvider.java | 4 +- .../botania/api/item/IBurstViewerBauble.java | 4 +- .../botania/api/item/ICosmeticAttachable.java | 4 +- .../botania/api/item/ICosmeticBauble.java | 4 +- .../botania/api/item/IExoflameHeatable.java | 4 +- .../api/item/IExtendedPlayerController.java | 4 +- .../botania/api/item/IFloatingFlower.java | 15 +- .../botania/api/item/IFlowerPlaceable.java | 6 +- .../botania/api/item/IFlowerlessWorld.java | 4 +- .../botania/api/item/IHornHarvestable.java | 4 +- .../botania/api/item/IHourglassTrigger.java | 6 +- .../botania/api/item/IManaDissolvable.java | 4 +- .../api/item/IManaProficiencyArmor.java | 4 +- .../botania/api/item/IPetalApothecary.java | 4 +- .../botania/api/item/IPhantomInkable.java | 4 +- .../botania/api/item/IPixieSpawner.java | 4 +- .../java/vazkii/botania/api/item/IRelic.java | 8 +- .../botania/api/item/ISequentialBreaker.java | 4 +- .../botania/api/item/ISortableTool.java | 4 +- .../IWireframeCoordinateListProvider.java | 8 +- .../api/item/TinyPotatoRenderEvent.java | 4 +- .../lexicon/BotaniaTutorialStartEvent.java | 8 +- .../botania/api/lexicon/IAddonEntry.java | 4 +- .../botania/api/lexicon/ILexiconable.java | 4 +- .../api/lexicon/IRecipeKeyProvider.java | 4 +- .../botania/api/lexicon/ITwoNamedPage.java | 4 +- .../botania/api/lexicon/LexiconCategory.java | 11 +- .../botania/api/lexicon/LexiconEntry.java | 21 +- .../botania/api/lexicon/LexiconPage.java | 8 +- .../api/lexicon/LexiconRecipeMappings.java | 14 +- .../multiblock/IMultiblockRenderHook.java | 10 +- .../api/lexicon/multiblock/Multiblock.java | 16 +- .../api/lexicon/multiblock/MultiblockSet.java | 10 +- .../multiblock/component/AnyComponent.java | 4 +- .../component/ColorSwitchingComponent.java | 4 +- .../multiblock/component/FlowerComponent.java | 4 +- .../component/MultiblockComponent.java | 4 +- .../component/StateInsensitiveComponent.java | 22 +- .../botania/api/mana/BurstProperties.java | 4 +- .../botania/api/mana/IClientManaHandler.java | 4 +- .../botania/api/mana/ICompositableLens.java | 4 +- .../api/mana/ICreativeManaProvider.java | 4 +- .../vazkii/botania/api/mana/IDirectioned.java | 10 +- .../vazkii/botania/api/mana/IKeyLocked.java | 8 +- .../botania/api/mana/ILaputaImmobile.java | 4 +- .../java/vazkii/botania/api/mana/ILens.java | 4 +- .../vazkii/botania/api/mana/ILensControl.java | 4 +- .../vazkii/botania/api/mana/ILensEffect.java | 4 +- .../vazkii/botania/api/mana/IManaBlock.java | 4 +- .../botania/api/mana/IManaCollector.java | 6 +- .../botania/api/mana/IManaCollisionGhost.java | 4 +- .../botania/api/mana/IManaDiscountArmor.java | 4 +- .../botania/api/mana/IManaGivingItem.java | 4 +- .../vazkii/botania/api/mana/IManaItem.java | 4 +- .../vazkii/botania/api/mana/IManaPool.java | 10 +- .../botania/api/mana/IManaReceiver.java | 4 +- .../botania/api/mana/IManaSpreader.java | 10 +- .../botania/api/mana/IManaTooltipDisplay.java | 4 +- .../vazkii/botania/api/mana/IManaTrigger.java | 4 +- .../botania/api/mana/IManaUsingItem.java | 4 +- .../vazkii/botania/api/mana/IPingable.java | 10 +- .../api/mana/IPoolOverlayProvider.java | 4 +- .../botania/api/mana/IThrottledPacket.java | 4 +- .../botania/api/mana/ITinyPlanetExcempt.java | 4 +- .../botania/api/mana/ManaDiscountEvent.java | 10 +- .../botania/api/mana/ManaItemHandler.java | 36 +- .../botania/api/mana/ManaItemsEvent.java | 8 +- .../botania/api/mana/ManaNetworkEvent.java | 4 +- .../api/mana/spark/ISparkAttachable.java | 4 +- .../botania/api/mana/spark/ISparkEntity.java | 4 +- .../botania/api/mana/spark/SparkHelper.java | 11 +- .../api/mana/spark/SparkUpgradeType.java | 10 +- .../api/recipe/ElvenPortalUpdateEvent.java | 8 +- .../botania/api/recipe/IFlowerComponent.java | 4 +- .../vazkii/botania/api/recipe/RecipeBrew.java | 11 +- .../botania/api/recipe/RecipeElvenTrade.java | 9 +- .../api/recipe/RecipeManaInfusion.java | 11 +- .../botania/api/recipe/RecipeMiniFlower.java | 6 +- .../botania/api/recipe/RecipePetals.java | 11 +- .../botania/api/recipe/RecipePureDaisy.java | 15 +- .../botania/api/recipe/RecipeRuneAltar.java | 4 +- .../botania/api/sound/BotaniaSoundEvents.java | 94 ++-- .../botania/api/state/BotaniaStateProps.java | 1 + .../botania/api/state/PropertyObject.java | 5 +- .../api/state/enums/AlfPortalState.java | 4 +- .../api/state/enums/AltGrassVariant.java | 6 +- .../botania/api/state/enums/AltarVariant.java | 4 +- .../api/state/enums/BiomeBrickVariant.java | 4 +- .../api/state/enums/BiomeStoneVariant.java | 4 +- .../botania/api/state/enums/CratePattern.java | 4 +- .../botania/api/state/enums/CrateVariant.java | 4 +- .../api/state/enums/CustomBrickVariant.java | 4 +- .../botania/api/state/enums/DrumVariant.java | 4 +- .../api/state/enums/LivingRockVariant.java | 4 +- .../api/state/enums/LivingWoodVariant.java | 4 +- .../api/state/enums/LuminizerVariant.java | 4 +- .../api/state/enums/PlatformVariant.java | 4 +- .../botania/api/state/enums/PoolVariant.java | 4 +- .../botania/api/state/enums/PylonVariant.java | 4 +- .../api/state/enums/QuartzVariant.java | 4 +- .../api/state/enums/SpreaderVariant.java | 4 +- .../api/state/enums/StorageVariant.java | 4 +- .../botania/api/subtile/ISpecialFlower.java | 4 +- .../api/subtile/ISubTileContainer.java | 4 +- .../subtile/ISubTileSlowableContainer.java | 8 +- .../botania/api/subtile/RadiusDescriptor.java | 4 +- .../botania/api/subtile/SubTileEntity.java | 12 +- .../api/subtile/SubTileFunctional.java | 8 +- .../api/subtile/SubTileGenerating.java | 10 +- .../api/subtile/signature/BasicSignature.java | 8 +- .../subtile/signature/SubTileSignature.java | 8 +- .../vazkii/botania/api/wand/ITileBound.java | 4 +- .../botania/api/wand/IWandBindable.java | 4 +- .../vazkii/botania/api/wand/IWandHUD.java | 4 +- .../vazkii/botania/api/wand/IWandable.java | 4 +- .../api/wand/IWireframeAABBProvider.java | 4 +- .../botania/api/wiki/IWikiProvider.java | 4 +- .../botania/api/wiki/SimpleWikiProvider.java | 7 +- .../vazkii/botania/api/wiki/WikiHooks.java | 10 +- .../botania/client/challenge/Challenge.java | 4 +- .../client/challenge/EnumChallengeLevel.java | 4 +- .../client/challenge/ModChallenges.java | 16 +- .../core/handler/BaubleRenderHandler.java | 15 +- .../handler/BlockHighlightRenderHandler.java | 16 +- .../client/core/handler/BossBarHandler.java | 23 +- .../core/handler/BotaniaPlayerController.java | 4 +- .../core/handler/BoundTileRenderer.java | 21 +- .../core/handler/ClientMethodHandles.java | 77 ++- .../core/handler/ClientTickHandler.java | 5 +- .../client/core/handler/ColorHandler.java | 195 ++++---- .../handler/ContributorFancinessHandler.java | 78 +--- .../handler/CorporeaAutoCompleteHandler.java | 25 +- .../client/core/handler/DebugHandler.java | 24 +- .../client/core/handler/HUDHandler.java | 27 +- .../handler/ItemsRemainingRenderHandler.java | 11 +- .../client/core/handler/LightningHandler.java | 13 +- .../core/handler/MiscellaneousIcons.java | 299 ++++++------ .../client/core/handler/ModelHandler.java | 252 +++++----- .../core/handler/MultiblockBlockAccess.java | 8 +- .../core/handler/MultiblockRenderHandler.java | 11 +- .../handler/PersistentVariableHelper.java | 22 +- .../core/handler/RedStringRenderer.java | 15 +- .../client/core/handler/RenderLexicon.java | 253 +++++----- .../TooltipAdditionDisplayHandler.java | 19 +- .../client/core/handler/TooltipHandler.java | 6 +- .../client/core/helper/FontHelper.java | 4 +- .../client/core/helper/IconHelper.java | 137 +++--- .../client/core/helper/RenderHelper.java | 20 +- .../client/core/helper/ShaderHelper.java | 27 +- .../client/core/proxy/ClientProxy.java | 10 +- .../botania/client/core/proxy/GuiFactory.java | 8 +- .../vazkii/botania/client/fx/FXLightning.java | 352 +++++++------- .../client/fx/FXLightningBoltPoint.java | 16 +- .../botania/client/fx/FXLightningSegment.java | 100 ++-- .../vazkii/botania/client/fx/FXSparkle.java | 48 +- .../java/vazkii/botania/client/fx/FXWisp.java | 16 +- .../client/fx/ParticleRenderDispatcher.java | 7 +- .../client/gui/GuiAchievementsHacky.java | 4 +- .../botania/client/gui/GuiBotaniaConfig.java | 4 +- .../vazkii/botania/client/gui/SlotLocked.java | 4 +- .../client/gui/bag/ContainerFlowerBag.java | 10 +- .../botania/client/gui/bag/GuiFlowerBag.java | 9 +- .../client/gui/bag/InventoryFlowerBag.java | 6 +- .../client/gui/box/ContainerBaubleBox.java | 8 +- .../botania/client/gui/box/GuiBaubleBox.java | 4 +- .../client/gui/box/InventoryBaubleBox.java | 6 +- .../gui/crafting/ContainerCraftingHalo.java | 8 +- .../client/gui/crafting/GuiCraftingHalo.java | 4 +- .../gui/crafting/InventoryCraftingHalo.java | 4 +- .../client/gui/lexicon/GuiLexicon.java | 62 ++- .../gui/lexicon/GuiLexiconChallenge.java | 8 +- .../gui/lexicon/GuiLexiconChallengesList.java | 10 +- .../client/gui/lexicon/GuiLexiconEntry.java | 15 +- .../client/gui/lexicon/GuiLexiconHistory.java | 10 +- .../client/gui/lexicon/GuiLexiconIndex.java | 29 +- .../lexicon/button/GuiButtonAchievement.java | 13 +- .../gui/lexicon/button/GuiButtonBack.java | 13 +- .../button/GuiButtonBackWithShift.java | 10 +- .../gui/lexicon/button/GuiButtonBookmark.java | 15 +- .../gui/lexicon/button/GuiButtonCategory.java | 19 +- .../button/GuiButtonChallengeIcon.java | 15 +- .../button/GuiButtonChallengeInfo.java | 13 +- .../lexicon/button/GuiButtonChallenges.java | 21 +- .../gui/lexicon/button/GuiButtonDoot.java | 13 +- .../gui/lexicon/button/GuiButtonHistory.java | 19 +- .../lexicon/button/GuiButtonInvisible.java | 25 +- .../gui/lexicon/button/GuiButtonLexicon.java | 4 +- .../gui/lexicon/button/GuiButtonNotes.java | 21 +- .../gui/lexicon/button/GuiButtonOptions.java | 21 +- .../gui/lexicon/button/GuiButtonPage.java | 11 +- .../lexicon/button/GuiButtonScaleChange.java | 4 +- .../gui/lexicon/button/GuiButtonShare.java | 21 +- .../button/GuiButtonUpdateWarning.java | 15 +- .../lexicon/button/GuiButtonViewOnline.java | 21 +- .../integration/jei/JEIBotaniaPlugin.java | 8 +- .../jei/brewery/BreweryRecipeCategory.java | 21 +- .../jei/brewery/BreweryRecipeHandler.java | 4 +- .../jei/brewery/BreweryRecipeWrapper.java | 10 +- .../elventrade/ElvenTradeRecipeCategory.java | 20 +- .../elventrade/ElvenTradeRecipeHandler.java | 4 +- .../elventrade/ElvenTradeRecipeWrapper.java | 10 +- .../jei/manapool/ManaPoolRecipeCategory.java | 21 +- .../jei/manapool/ManaPoolRecipeHandler.java | 4 +- .../jei/manapool/ManaPoolRecipeWrapper.java | 12 +- .../PetalApothecaryRecipeCategory.java | 19 +- .../PetalApothecaryRecipeHandler.java | 4 +- .../PetalApothecaryRecipeWrapper.java | 10 +- .../puredaisy/PureDaisyRecipeCategory.java | 19 +- .../jei/puredaisy/PureDaisyRecipeHandler.java | 4 +- .../jei/puredaisy/PureDaisyRecipeWrapper.java | 12 +- .../runicaltar/RunicAltarRecipeCategory.java | 17 +- .../runicaltar/RunicAltarRecipeHandler.java | 4 +- .../runicaltar/RunicAltarRecipeWrapper.java | 10 +- .../botania/client/lib/LibResources.java | 4 +- .../client/model/FloatingFlowerModel.java | 53 +-- .../vazkii/botania/client/model/GunModel.java | 280 ++++++----- .../botania/client/model/IPylonModel.java | 4 +- .../botania/client/model/LexiconModel.java | 47 +- .../botania/client/model/ModelAvatar.java | 4 +- .../botania/client/model/ModelBellows.java | 4 +- .../botania/client/model/ModelBrewery.java | 4 +- .../botania/client/model/ModelCloak.java | 63 ++- .../client/model/ModelCrystalCube.java | 4 +- .../botania/client/model/ModelHourglass.java | 21 +- .../botania/client/model/ModelPixie.java | 4 +- .../botania/client/model/ModelPylon.java | 82 ++-- .../botania/client/model/ModelPylonOld.java | 4 +- .../client/model/ModelSpinningCubes.java | 7 +- .../botania/client/model/ModelSpreader.java | 4 +- .../client/model/ModelTeruTeruBozu.java | 4 +- .../botania/client/model/ModelTinyPotato.java | 4 +- .../botania/client/model/PlatformModel.java | 8 +- .../client/model/SpecialFlowerModel.java | 43 +- .../model/armor/ModelArmorElementium.java | 12 +- .../model/armor/ModelArmorManasteel.java | 11 +- .../model/armor/ModelArmorManaweave.java | 11 +- .../model/armor/ModelArmorTerrasteel.java | 11 +- .../botania/client/render/IModelRegister.java | 14 +- .../client/render/entity/LayerGaiaHead.java | 76 +-- .../render/entity/RenderBabylonWeapon.java | 14 +- .../render/entity/RenderCorporeaSpark.java | 11 +- .../render/entity/RenderDoppleganger.java | 45 +- .../client/render/entity/RenderManaStorm.java | 8 +- .../render/entity/RenderPinkWither.java | 8 +- .../client/render/entity/RenderPixie.java | 27 +- .../render/entity/RenderPoolMinecart.java | 8 +- .../render/entity/RenderSnowballStack.java | 27 +- .../client/render/entity/RenderSpark.java | 5 +- .../client/render/entity/RenderSparkBase.java | 14 +- .../render/entity/RenderThornChakram.java | 18 +- .../render/tile/RenderTileAlfPortal.java | 11 +- .../client/render/tile/RenderTileAltar.java | 13 +- .../render/tile/RenderTileAnimatedTorch.java | 12 +- .../client/render/tile/RenderTileAvatar.java | 99 ++-- .../client/render/tile/RenderTileBellows.java | 14 +- .../client/render/tile/RenderTileBrewery.java | 8 +- .../client/render/tile/RenderTileCocoon.java | 11 +- .../tile/RenderTileCorporeaCrystalCube.java | 27 +- .../render/tile/RenderTileCorporeaIndex.java | 8 +- .../render/tile/RenderTileEnchanter.java | 11 +- .../render/tile/RenderTileFloatingFlower.java | 13 +- .../render/tile/RenderTileGaiaHead.java | 20 +- .../render/tile/RenderTileHourglass.java | 14 +- .../render/tile/RenderTileIncensePlate.java | 12 +- .../render/tile/RenderTileLightRelay.java | 14 +- .../client/render/tile/RenderTilePool.java | 19 +- .../client/render/tile/RenderTilePrism.java | 8 +- .../client/render/tile/RenderTilePylon.java | 16 +- .../render/tile/RenderTileRedString.java | 4 +- .../render/tile/RenderTileRuneAltar.java | 8 +- .../render/tile/RenderTileSparkChanger.java | 8 +- .../render/tile/RenderTileSpreader.java | 18 +- .../render/tile/RenderTileStarfield.java | 62 +-- .../render/tile/RenderTileTerraPlate.java | 11 +- .../render/tile/RenderTileTeruTeruBozu.java | 16 +- .../render/tile/RenderTileTinyPotato.java | 50 +- .../render/world/SkyblockRenderEvents.java | 6 +- .../render/world/SkyblockSkyRenderer.java | 142 +++--- .../java/vazkii/botania/common/Botania.java | 4 +- .../common/achievement/AchievementMod.java | 10 +- .../achievement/AchievementTriggerer.java | 4 +- .../common/achievement/ICraftAchievement.java | 4 +- .../achievement/IPickupAchievement.java | 4 +- .../common/achievement/ModAchievements.java | 6 +- .../botania/common/block/BlockAlfPortal.java | 8 +- .../botania/common/block/BlockAltGrass.java | 29 +- .../botania/common/block/BlockAltar.java | 17 +- .../common/block/BlockAnimatedTorch.java | 54 +-- .../botania/common/block/BlockAvatar.java | 11 +- .../botania/common/block/BlockBifrost.java | 12 +- .../common/block/BlockBifrostPerm.java | 13 +- .../common/block/BlockCacophonium.java | 13 +- .../botania/common/block/BlockCamo.java | 4 +- .../botania/common/block/BlockCell.java | 13 +- .../botania/common/block/BlockCocoon.java | 13 +- .../common/block/BlockEnchantedSoil.java | 11 +- .../botania/common/block/BlockEnderEye.java | 8 +- .../botania/common/block/BlockFakeAir.java | 14 +- .../botania/common/block/BlockFelPumpkin.java | 8 +- .../block/BlockFloatingSpecialFlower.java | 17 +- .../botania/common/block/BlockForestEye.java | 8 +- .../botania/common/block/BlockGaiaHead.java | 49 +- .../botania/common/block/BlockGhostRail.java | 8 +- .../botania/common/block/BlockHourglass.java | 4 +- .../common/block/BlockIncensePlate.java | 8 +- .../common/block/BlockLightLauncher.java | 13 +- .../botania/common/block/BlockLightRelay.java | 33 +- .../botania/common/block/BlockLivingrock.java | 11 +- .../botania/common/block/BlockLivingwood.java | 11 +- .../botania/common/block/BlockManaBomb.java | 6 +- .../vazkii/botania/common/block/BlockMod.java | 4 +- .../common/block/BlockModDoubleFlower.java | 28 +- .../common/block/BlockModDoubleFlower1.java | 78 ++-- .../common/block/BlockModDoubleFlower2.java | 78 ++-- .../botania/common/block/BlockModFlower.java | 17 +- .../botania/common/block/BlockOpenCrate.java | 16 +- .../common/block/BlockPistonRelay.java | 33 +- .../botania/common/block/BlockPlatform.java | 13 +- .../botania/common/block/BlockPylon.java | 11 +- .../botania/common/block/BlockRoot.java | 11 +- .../botania/common/block/BlockSolidVines.java | 11 +- .../common/block/BlockSparkChanger.java | 11 +- .../common/block/BlockSpecialFlower.java | 18 +- .../botania/common/block/BlockStorage.java | 11 +- .../common/block/BlockTeruTeruBozu.java | 10 +- .../botania/common/block/BlockTinyPlanet.java | 8 +- .../botania/common/block/ModBanners.java | 4 +- .../botania/common/block/ModBlocks.java | 9 +- .../botania/common/block/ModFluffBlocks.java | 8 +- .../botania/common/block/ModMultiblocks.java | 4 +- .../block/corporea/BlockCorporeaBase.java | 11 +- .../corporea/BlockCorporeaCrystalCube.java | 9 +- .../block/corporea/BlockCorporeaFunnel.java | 8 +- .../block/corporea/BlockCorporeaIndex.java | 20 +- .../corporea/BlockCorporeaInterceptor.java | 11 +- .../block/corporea/BlockCorporeaRetainer.java | 8 +- .../common/block/decor/BlockBlaze.java | 4 +- .../common/block/decor/BlockBuriedPetals.java | 15 +- .../common/block/decor/BlockCustomBrick.java | 11 +- .../common/block/decor/BlockElfGlass.java | 6 +- .../block/decor/BlockFloatingFlower.java | 17 +- .../common/block/decor/BlockManaFlame.java | 12 +- .../common/block/decor/BlockManaGlass.java | 8 +- .../common/block/decor/BlockModMushroom.java | 6 +- .../common/block/decor/BlockPavement.java | 39 +- .../common/block/decor/BlockPetalBlock.java | 13 +- .../common/block/decor/BlockShimmerrock.java | 4 +- .../block/decor/BlockShimmerwoodPlanks.java | 4 +- .../common/block/decor/BlockShinyFlower.java | 11 +- .../common/block/decor/BlockStarfield.java | 8 +- .../common/block/decor/BlockTinyPotato.java | 30 +- .../decor/biomestone/BlockBiomeStone.java | 11 +- .../decor/biomestone/BlockBiomeStoneA.java | 8 +- .../decor/biomestone/BlockBiomeStoneB.java | 8 +- .../block/decor/panes/BlockAlfglassPane.java | 8 +- .../block/decor/panes/BlockBifrostPane.java | 8 +- .../block/decor/panes/BlockManaglassPane.java | 8 +- .../block/decor/panes/BlockModPane.java | 4 +- .../decor/quartz/BlockSpecialQuartz.java | 11 +- .../decor/quartz/BlockSpecialQuartzSlab.java | 11 +- .../quartz/BlockSpecialQuartzStairs.java | 4 +- .../decor/slabs/BlockBiomeStoneSlab.java | 4 +- .../block/decor/slabs/BlockLivingSlab.java | 2 +- .../block/decor/slabs/BlockModSlab.java | 5 +- .../block/decor/slabs/BlockPavementSlab.java | 4 +- .../slabs/living/BlockShimmerrockSlab.java | 4 +- .../living/BlockShimmerwoodPlankSlab.java | 4 +- .../decor/stairs/BlockBiomeStoneStairs.java | 4 +- .../decor/stairs/BlockPavementStairs.java | 4 +- .../stairs/living/BlockShimmerrockStairs.java | 4 +- .../living/BlockShimmerwoodPlankStairs.java | 4 +- .../decor/walls/BlockBiomeStoneWall.java | 17 +- .../block/decor/walls/BlockModWall.java | 6 +- .../walls/living/BlockDreamwoodWall.java | 4 +- .../walls/living/BlockLivingrockWall.java | 4 +- .../walls/living/BlockLivingwoodWall.java | 4 +- .../block/dispenser/BehaviourCocoaBeans.java | 4 +- .../block/dispenser/BehaviourFelPumpkin.java | 76 +-- .../dispenser/BehaviourPoolMinecart.java | 8 +- .../block/dispenser/BehaviourSeeds.java | 4 +- .../common/block/dispenser/BehaviourWand.java | 8 +- .../block/dispenser/SeedBehaviours.java | 8 +- .../block/mana/BlockAlchemyCatalyst.java | 4 +- .../common/block/mana/BlockBellows.java | 8 +- .../common/block/mana/BlockBrewery.java | 11 +- .../block/mana/BlockConjurationCatalyst.java | 4 +- .../common/block/mana/BlockDistributor.java | 8 +- .../common/block/mana/BlockEnchanter.java | 22 +- .../common/block/mana/BlockForestDrum.java | 15 +- .../common/block/mana/BlockManaDetector.java | 11 +- .../common/block/mana/BlockManaVoid.java | 8 +- .../botania/common/block/mana/BlockPool.java | 15 +- .../botania/common/block/mana/BlockPrism.java | 13 +- .../botania/common/block/mana/BlockPump.java | 8 +- .../common/block/mana/BlockRFGenerator.java | 8 +- .../common/block/mana/BlockRuneAltar.java | 11 +- .../common/block/mana/BlockSpawnerClaw.java | 11 +- .../common/block/mana/BlockSpreader.java | 11 +- .../common/block/mana/BlockTerraPlate.java | 8 +- .../common/block/mana/BlockTurntable.java | 8 +- .../common/block/string/BlockRedString.java | 8 +- .../string/BlockRedStringComparator.java | 8 +- .../block/string/BlockRedStringContainer.java | 8 +- .../block/string/BlockRedStringDispenser.java | 8 +- .../string/BlockRedStringFertilizer.java | 11 +- .../string/BlockRedStringInterceptor.java | 11 +- .../block/string/BlockRedStringRelay.java | 8 +- .../common/block/subtile/SubTileManastar.java | 4 +- .../block/subtile/SubTilePureDaisy.java | 4 +- .../functional/BergamuteEventHandler.java | 137 +++--- .../functional/SubTileAgricarnation.java | 4 +- .../subtile/functional/SubTileBellethorn.java | 10 +- .../subtile/functional/SubTileBergamute.java | 86 ++-- .../subtile/functional/SubTileBubbell.java | 5 +- .../subtile/functional/SubTileClayconia.java | 16 +- .../subtile/functional/SubTileDaffomill.java | 8 +- .../subtile/functional/SubTileDreadthorn.java | 8 +- .../subtile/functional/SubTileExoflame.java | 4 +- .../functional/SubTileFallenKanade.java | 8 +- .../functional/SubTileHeiseiDream.java | 13 +- .../subtile/functional/SubTileHopperhock.java | 18 +- .../subtile/functional/SubTileHyacidus.java | 8 +- .../functional/SubTileJadedAmaranthus.java | 14 +- .../subtile/functional/SubTileJiyuulia.java | 4 +- .../subtile/functional/SubTileLoonuim.java | 12 +- .../functional/SubTileMarimorphosis.java | 28 +- .../subtile/functional/SubTileMedumone.java | 8 +- .../subtile/functional/SubTileOrechid.java | 12 +- .../functional/SubTileOrechidIgnem.java | 8 +- .../functional/SubTilePollidisiac.java | 10 +- .../functional/SubTileRannuncarpus.java | 19 +- .../subtile/functional/SubTileSolegnolia.java | 12 +- .../functional/SubTileSpectranthemum.java | 23 +- .../functional/SubTileTangleberrie.java | 8 +- .../subtile/functional/SubTileTigerseye.java | 10 +- .../subtile/functional/SubTileVinculotus.java | 16 +- .../subtile/generating/SubTileArcaneRose.java | 8 +- .../generating/SubTileDandelifeon.java | 10 +- .../subtile/generating/SubTileEndoflame.java | 16 +- .../generating/SubTileEntropinnyum.java | 10 +- .../generating/SubTileGourmaryllis.java | 8 +- .../subtile/generating/SubTileKekimurus.java | 4 +- .../subtile/generating/SubTileMunchdew.java | 12 +- .../subtile/generating/SubTileNarslimmus.java | 8 +- .../subtile/generating/SubTileRafflowsia.java | 10 +- .../subtile/generating/SubTileSpectrolus.java | 17 +- .../subtile/generating/SubTileThermalily.java | 4 +- .../common/block/tile/TileAlfPortal.java | 6 +- .../botania/common/block/tile/TileAltar.java | 14 +- .../common/block/tile/TileAnimatedTorch.java | 8 +- .../botania/common/block/tile/TileAvatar.java | 6 +- .../common/block/tile/TileBifrost.java | 8 +- .../common/block/tile/TileBrewery.java | 15 +- .../common/block/tile/TileCacophonium.java | 4 +- .../botania/common/block/tile/TileCamo.java | 4 +- .../botania/common/block/tile/TileCell.java | 18 +- .../botania/common/block/tile/TileCocoon.java | 4 +- .../common/block/tile/TileCraftCrate.java | 11 +- .../common/block/tile/TileEnchanter.java | 268 ++++++----- .../common/block/tile/TileEnderEye.java | 10 +- .../common/block/tile/TileFakeAir.java | 16 +- .../common/block/tile/TileFloatingFlower.java | 4 +- .../block/tile/TileFloatingSpecialFlower.java | 4 +- .../common/block/tile/TileForestEye.java | 4 +- .../common/block/tile/TileGaiaHead.java | 10 +- .../common/block/tile/TileHourglass.java | 14 +- .../common/block/tile/TileIncensePlate.java | 10 +- .../common/block/tile/TileLightRelay.java | 32 +- .../common/block/tile/TileManaFlame.java | 4 +- .../botania/common/block/tile/TileMod.java | 8 +- .../common/block/tile/TileOpenCrate.java | 24 +- .../common/block/tile/TilePlatform.java | 4 +- .../botania/common/block/tile/TilePylon.java | 14 +- .../common/block/tile/TileRuneAltar.java | 18 +- .../block/tile/TileSimpleInventory.java | 10 +- .../common/block/tile/TileSparkChanger.java | 12 +- .../common/block/tile/TileSpawnerClaw.java | 50 +- .../common/block/tile/TileSpecialFlower.java | 12 +- .../common/block/tile/TileSpiritShrine.java | 16 +- .../common/block/tile/TileStarfield.java | 4 +- .../common/block/tile/TileTerraPlate.java | 19 +- .../common/block/tile/TileTeruTeruBozu.java | 4 +- .../common/block/tile/TileTinyPlanet.java | 4 +- .../common/block/tile/TileTinyPotato.java | 7 +- .../block/tile/corporea/TileCorporeaBase.java | 4 +- .../corporea/TileCorporeaCrystalCube.java | 12 +- .../tile/corporea/TileCorporeaFunnel.java | 10 +- .../tile/corporea/TileCorporeaIndex.java | 27 +- .../corporea/TileCorporeaInterceptor.java | 10 +- .../tile/corporea/TileCorporeaRetainer.java | 4 +- .../common/block/tile/mana/TileBellows.java | 42 +- .../block/tile/mana/TileDistributor.java | 10 +- .../block/tile/mana/TileManaDetector.java | 5 +- .../common/block/tile/mana/TileManaVoid.java | 4 +- .../common/block/tile/mana/TilePool.java | 23 +- .../common/block/tile/mana/TilePrism.java | 4 +- .../common/block/tile/mana/TilePump.java | 9 +- .../block/tile/mana/TileRFGenerator.java | 10 +- .../common/block/tile/mana/TileSpreader.java | 21 +- .../common/block/tile/mana/TileTurntable.java | 7 +- .../block/tile/string/TileRedString.java | 8 +- .../tile/string/TileRedStringComparator.java | 5 +- .../tile/string/TileRedStringContainer.java | 11 +- .../tile/string/TileRedStringDispenser.java | 4 +- .../tile/string/TileRedStringFertilizer.java | 8 +- .../tile/string/TileRedStringInterceptor.java | 14 +- .../block/tile/string/TileRedStringRelay.java | 4 +- .../vazkii/botania/common/brew/BrewMod.java | 8 +- .../vazkii/botania/common/brew/ModBrews.java | 4 +- .../botania/common/brew/ModPotions.java | 4 +- .../common/brew/potion/PotionAllure.java | 11 +- .../common/brew/potion/PotionBloodthirst.java | 4 +- .../common/brew/potion/PotionClear.java | 8 +- .../common/brew/potion/PotionEmptiness.java | 4 +- .../common/brew/potion/PotionFeatherfeet.java | 13 +- .../botania/common/brew/potion/PotionMod.java | 4 +- .../common/brew/potion/PotionSoulCross.java | 4 +- .../common/core/BotaniaCreativeTab.java | 16 +- .../core/command/CommandDownloadLatest.java | 8 +- .../common/core/command/CommandOpen.java | 8 +- .../common/core/command/CommandShare.java | 4 +- .../core/command/CommandSkyblockSpread.java | 8 +- .../core/handler/BiomeDecorationHandler.java | 4 +- .../core/handler/CommonTickHandler.java | 4 +- .../common/core/handler/ConfigHandler.java | 36 +- .../common/core/handler/IMCHandler.java | 1 + .../core/handler/InternalMethodHandler.java | 8 +- .../core/handler/ManaNetworkHandler.java | 18 +- .../common/core/handler/MethodHandles.java | 130 +++--- .../common/core/handler/ModSounds.java | 106 ++--- .../common/core/handler/SheddingHandler.java | 37 +- .../common/core/helper/ExperienceHelper.java | 4 +- .../common/core/helper/InventoryHelper.java | 48 +- .../common/core/helper/MathHelper.java | 9 +- .../common/core/helper/PlayerHelper.java | 164 +++---- .../botania/common/core/helper/Quat.java | 15 +- .../botania/common/core/helper/Vector3.java | 22 +- .../botania/common/core/loot/BindUuid.java | 54 +-- .../common/core/loot/EnableRelics.java | 40 +- .../botania/common/core/loot/LootHandler.java | 85 ++-- .../common/core/loot/TrueGuardianKiller.java | 42 +- .../botania/common/core/proxy/IProxy.java | 90 ++-- .../common/core/version/AdaptorNotifier.java | 4 +- .../core/version/ThreadDownloadMod.java | 20 +- .../core/version/ThreadVersionChecker.java | 4 +- .../common/core/version/VersionChecker.java | 4 +- .../common/crafting/ModBrewRecipes.java | 4 +- .../common/crafting/ModCraftingRecipes.java | 42 +- .../common/crafting/ModElvenTradeRecipes.java | 6 +- .../crafting/ModManaAlchemyRecipes.java | 10 +- .../crafting/ModManaConjurationRecipes.java | 10 +- .../crafting/ModManaInfusionRecipes.java | 10 +- .../common/crafting/ModMigrationRecipes.java | 10 +- .../common/crafting/ModPetalRecipes.java | 8 +- .../common/crafting/ModPureDaisyRecipes.java | 4 +- .../common/crafting/ModRuneRecipes.java | 10 +- .../crafting/recipe/AesirRingRecipe.java | 11 +- .../crafting/recipe/AncientWillRecipe.java | 8 +- .../crafting/recipe/ArmorUpgradeRecipe.java | 36 +- .../BlackHoleTalismanExtractRecipe.java | 8 +- .../crafting/recipe/CompositeLensRecipe.java | 8 +- .../crafting/recipe/CosmeticAttachRecipe.java | 8 +- .../crafting/recipe/CosmeticRemoveRecipe.java | 8 +- .../common/crafting/recipe/HeadRecipe.java | 4 +- .../crafting/recipe/HelmRevealingRecipe.java | 8 +- .../common/crafting/recipe/KeepIvyRecipe.java | 8 +- .../crafting/recipe/LensDyeingRecipe.java | 13 +- .../crafting/recipe/ManaGunClipRecipe.java | 8 +- .../crafting/recipe/ManaGunLensRecipe.java | 8 +- .../recipe/ManaGunRemoveLensRecipe.java | 8 +- .../crafting/recipe/ManaUpgradeRecipe.java | 46 +- .../crafting/recipe/PhantomInkRecipe.java | 8 +- .../recipe/ShapelessManaUpgradeRecipe.java | 14 +- .../recipe/SpecialFloatingFlowerRecipe.java | 8 +- .../crafting/recipe/SpellClothRecipe.java | 10 +- .../recipe/TerraPickTippingRecipe.java | 8 +- .../common/entity/EntityBabylonWeapon.java | 11 +- .../common/entity/EntityCorporeaSpark.java | 16 +- .../common/entity/EntityDoppleganger.java | 75 +-- .../common/entity/EntityEnderAirBottle.java | 17 +- .../common/entity/EntityFallingStar.java | 10 +- .../common/entity/EntityFlameRing.java | 11 +- .../common/entity/EntityMagicLandmine.java | 11 +- .../common/entity/EntityMagicMissile.java | 42 +- .../common/entity/EntityManaBurst.java | 124 +++-- .../common/entity/EntityManaStorm.java | 8 +- .../common/entity/EntityPinkWither.java | 18 +- .../botania/common/entity/EntityPixie.java | 8 +- .../common/entity/EntityPoolMinecart.java | 11 +- .../common/entity/EntitySignalFlare.java | 10 +- .../botania/common/entity/EntitySpark.java | 168 ++++--- .../common/entity/EntityThornChakram.java | 68 +-- .../common/entity/EntityThrowableCopy.java | 253 +++++----- .../common/entity/EntityThrownItem.java | 11 +- .../botania/common/entity/EntityVineBall.java | 14 +- .../botania/common/entity/ModEntities.java | 4 +- .../buildcraft/StatementAPIPlugin.java | 6 +- .../buildcraft/TriggerManaDetector.java | 3 +- .../buildcraft/TriggerManaLevel.java | 3 +- .../corporea/WrappedDeepStorage.java | 18 +- .../corporea/WrappedIInventory.java | 10 +- .../corporea/WrappedInventoryBase.java | 12 +- .../corporea/WrappedStorageDrawers.java | 15 +- .../multipart/MultipartHandler.java | 4 +- .../common/item/IFloatingFlowerVariant.java | 2 +- .../botania/common/item/Item16Colors.java | 11 +- .../botania/common/item/ItemAncientWill.java | 11 +- .../common/item/ItemAutocraftingHalo.java | 5 +- .../botania/common/item/ItemBaubleBox.java | 14 +- .../common/item/ItemBlackHoleTalisman.java | 14 +- .../botania/common/item/ItemBlackLotus.java | 11 +- .../botania/common/item/ItemBottledMana.java | 11 +- .../botania/common/item/ItemCacophonium.java | 16 +- .../vazkii/botania/common/item/ItemClip.java | 4 +- .../common/item/ItemCorporeaSpark.java | 13 +- .../botania/common/item/ItemCraftPattern.java | 11 +- .../botania/common/item/ItemCraftingHalo.java | 15 +- .../botania/common/item/ItemEnderHand.java | 9 +- .../botania/common/item/ItemFertilizer.java | 13 +- .../botania/common/item/ItemFlowerBag.java | 16 +- .../botania/common/item/ItemGaiaHead.java | 6 +- .../botania/common/item/ItemGrassHorn.java | 27 +- .../botania/common/item/ItemGrassSeeds.java | 44 +- .../botania/common/item/ItemKeepIvy.java | 10 +- .../botania/common/item/ItemLaputaShard.java | 11 +- .../botania/common/item/ItemLexicon.java | 12 +- .../botania/common/item/ItemManaCookie.java | 14 +- .../botania/common/item/ItemManaGun.java | 22 +- .../botania/common/item/ItemManaMirror.java | 11 +- .../botania/common/item/ItemManaTablet.java | 14 +- .../vazkii/botania/common/item/ItemMod.java | 8 +- .../common/item/ItemObedienceStick.java | 9 +- .../botania/common/item/ItemOpenBucket.java | 10 +- .../common/item/ItemOvergrowthSeed.java | 8 +- .../botania/common/item/ItemPhantomInk.java | 4 +- .../botania/common/item/ItemPinkinator.java | 11 +- .../botania/common/item/ItemPoolMinecart.java | 9 +- .../botania/common/item/ItemSextant.java | 22 +- .../botania/common/item/ItemSlimeBottle.java | 4 +- .../botania/common/item/ItemSlingshot.java | 15 +- .../vazkii/botania/common/item/ItemSpark.java | 8 +- .../botania/common/item/ItemSparkUpgrade.java | 11 +- .../botania/common/item/ItemSpawnerMover.java | 11 +- .../botania/common/item/ItemSpellCloth.java | 11 +- .../common/item/ItemTemperanceStone.java | 11 +- .../botania/common/item/ItemThornChakram.java | 11 +- .../botania/common/item/ItemTwigWand.java | 22 +- .../botania/common/item/ItemVineBall.java | 4 +- .../vazkii/botania/common/item/ItemVirus.java | 15 +- .../botania/common/item/ItemWaterBowl.java | 8 +- .../botania/common/item/ItemWorldSeed.java | 8 +- .../vazkii/botania/common/item/ModItems.java | 6 +- .../common/item/block/IRarityBlock.java | 4 +- .../common/item/block/ItemBlockElven.java | 4 +- .../block/ItemBlockFloatingSpecialFlower.java | 8 +- .../common/item/block/ItemBlockMod.java | 8 +- .../common/item/block/ItemBlockModSlab.java | 8 +- .../common/item/block/ItemBlockPool.java | 21 +- .../item/block/ItemBlockSpecialFlower.java | 48 +- .../item/block/ItemBlockSpecialQuartz.java | 8 +- .../common/item/block/ItemBlockStorage.java | 4 +- .../item/block/ItemBlockTinyPotato.java | 44 +- .../block/ItemBlockWithMetadataAndName.java | 8 +- .../common/item/brew/ItemBrewBase.java | 11 +- .../common/item/brew/ItemBrewFlask.java | 4 +- .../common/item/brew/ItemBrewVial.java | 4 +- .../common/item/brew/ItemIncenseStick.java | 11 +- .../botania/common/item/brew/ItemVial.java | 11 +- .../armor/elementium/ItemElementiumArmor.java | 12 +- .../armor/manasteel/ItemManasteelArmor.java | 25 +- .../armor/manasteel/ItemManasteelBoots.java | 4 +- .../armor/manasteel/ItemManasteelChest.java | 4 +- .../armor/manasteel/ItemManasteelHelm.java | 4 +- .../armor/manasteel/ItemManasteelLegs.java | 4 +- .../armor/manaweave/ItemManaweaveArmor.java | 34 +- .../armor/manaweave/ItemManaweaveBoots.java | 4 +- .../armor/manaweave/ItemManaweaveChest.java | 4 +- .../armor/manaweave/ItemManaweaveHelm.java | 4 +- .../armor/manaweave/ItemManaweaveLegs.java | 4 +- .../armor/terrasteel/ItemTerrasteelArmor.java | 24 +- .../armor/terrasteel/ItemTerrasteelBoots.java | 4 +- .../armor/terrasteel/ItemTerrasteelChest.java | 4 +- .../armor/terrasteel/ItemTerrasteelHelm.java | 8 +- .../armor/terrasteel/ItemTerrasteelLegs.java | 4 +- .../item/equipment/bauble/ItemAuraRing.java | 4 +- .../item/equipment/bauble/ItemBauble.java | 9 +- .../equipment/bauble/ItemBaubleCosmetic.java | 374 +++++++-------- .../equipment/bauble/ItemBaubleModifier.java | 5 +- .../equipment/bauble/ItemBloodPendant.java | 18 +- .../item/equipment/bauble/ItemDivaCharm.java | 13 +- .../item/equipment/bauble/ItemDodgeRing.java | 50 +- .../equipment/bauble/ItemFlightTiara.java | 34 +- .../equipment/bauble/ItemGoldenLaurel.java | 4 +- .../equipment/bauble/ItemGreaterAuraRing.java | 4 +- .../bauble/ItemGreaterMagnetRing.java | 4 +- .../equipment/bauble/ItemGreaterManaRing.java | 4 +- .../item/equipment/bauble/ItemHolyCloak.java | 16 +- .../item/equipment/bauble/ItemIcePendant.java | 4 +- .../item/equipment/bauble/ItemItemFinder.java | 12 +- .../equipment/bauble/ItemKnockbackBelt.java | 7 +- .../equipment/bauble/ItemLavaPendant.java | 4 +- .../item/equipment/bauble/ItemMagnetRing.java | 11 +- .../item/equipment/bauble/ItemManaRing.java | 11 +- .../item/equipment/bauble/ItemMiningRing.java | 4 +- .../item/equipment/bauble/ItemMonocle.java | 4 +- .../item/equipment/bauble/ItemPixieRing.java | 4 +- .../item/equipment/bauble/ItemReachRing.java | 4 +- .../equipment/bauble/ItemSpeedUpBelt.java | 4 +- .../bauble/ItemSuperLavaPendant.java | 4 +- .../equipment/bauble/ItemSuperTravelBelt.java | 4 +- .../item/equipment/bauble/ItemSwapRing.java | 4 +- .../item/equipment/bauble/ItemTinyPlanet.java | 11 +- .../item/equipment/bauble/ItemTravelBelt.java | 24 +- .../equipment/bauble/ItemUnholyCloak.java | 15 +- .../item/equipment/bauble/ItemWaterRing.java | 4 +- .../item/equipment/tool/ItemEnderDagger.java | 9 +- .../item/equipment/tool/ItemGlassPick.java | 8 +- .../item/equipment/tool/ItemStarSword.java | 8 +- .../item/equipment/tool/ItemThunderSword.java | 20 +- .../item/equipment/tool/ToolCommons.java | 6 +- .../equipment/tool/bow/ItemCrystalBow.java | 6 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 45 +- .../tool/elementium/ItemElementiumAxe.java | 5 +- .../tool/elementium/ItemElementiumPick.java | 6 +- .../tool/elementium/ItemElementiumShears.java | 15 +- .../tool/manasteel/ItemManasteelAxe.java | 14 +- .../tool/manasteel/ItemManasteelPick.java | 11 +- .../tool/manasteel/ItemManasteelShears.java | 13 +- .../tool/manasteel/ItemManasteelShovel.java | 8 +- .../tool/manasteel/ItemManasteelSword.java | 9 +- .../tool/terrasteel/ItemTerraAxe.java | 139 +++--- .../tool/terrasteel/ItemTerraPick.java | 15 +- .../tool/terrasteel/ItemTerraSword.java | 11 +- .../ItemElementiumHelmRevealing.java | 4 +- .../thaumcraft/ItemManaInkwell.java | 11 +- .../ItemManasteelHelmRevealing.java | 4 +- .../ItemTerrasteelHelmRevealing.java | 4 +- .../botania/common/item/lens/ItemLens.java | 13 +- .../vazkii/botania/common/item/lens/Lens.java | 4 +- .../botania/common/item/lens/LensBounce.java | 4 +- .../botania/common/item/lens/LensDamage.java | 8 +- .../common/item/lens/LensEfficiency.java | 4 +- .../common/item/lens/LensExplosive.java | 4 +- .../botania/common/item/lens/LensFire.java | 4 +- .../common/item/lens/LensFirework.java | 4 +- .../botania/common/item/lens/LensFlare.java | 8 +- .../botania/common/item/lens/LensGravity.java | 4 +- .../common/item/lens/LensInfluence.java | 9 +- .../botania/common/item/lens/LensLight.java | 4 +- .../botania/common/item/lens/LensMagnet.java | 5 +- .../common/item/lens/LensMessenger.java | 6 +- .../botania/common/item/lens/LensMine.java | 14 +- .../botania/common/item/lens/LensPaint.java | 10 +- .../botania/common/item/lens/LensPhantom.java | 4 +- .../botania/common/item/lens/LensPiston.java | 4 +- .../botania/common/item/lens/LensPower.java | 4 +- .../common/item/lens/LensRedirect.java | 4 +- .../botania/common/item/lens/LensSpeed.java | 4 +- .../botania/common/item/lens/LensStorm.java | 4 +- .../botania/common/item/lens/LensTime.java | 4 +- .../common/item/lens/LensTripwire.java | 13 +- .../botania/common/item/lens/LensWarp.java | 6 +- .../botania/common/item/lens/LensWeight.java | 15 +- .../botania/common/item/material/ItemDye.java | 8 +- .../item/material/ItemManaResource.java | 11 +- .../item/material/ItemPestleAndMortar.java | 4 +- .../common/item/material/ItemPetal.java | 8 +- .../common/item/material/ItemQuartz.java | 11 +- .../common/item/material/ItemRune.java | 11 +- .../common/item/record/ItemModRecord.java | 8 +- .../common/item/record/ItemRecordGaia1.java | 4 +- .../common/item/record/ItemRecordGaia2.java | 4 +- .../common/item/relic/ItemAesirRing.java | 13 +- .../botania/common/item/relic/ItemDice.java | 8 +- .../common/item/relic/ItemFlugelEye.java | 10 +- .../common/item/relic/ItemInfiniteFruit.java | 15 +- .../common/item/relic/ItemKingKey.java | 13 +- .../common/item/relic/ItemLokiRing.java | 13 +- .../common/item/relic/ItemOdinRing.java | 15 +- .../botania/common/item/relic/ItemRelic.java | 13 +- .../common/item/relic/ItemRelicBauble.java | 15 +- .../common/item/relic/ItemThorRing.java | 4 +- .../common/item/rod/ItemCobbleRod.java | 8 +- .../botania/common/item/rod/ItemDirtRod.java | 12 +- .../common/item/rod/ItemDiviningRod.java | 11 +- .../common/item/rod/ItemExchangeRod.java | 36 +- .../botania/common/item/rod/ItemFireRod.java | 8 +- .../common/item/rod/ItemGravityRod.java | 23 +- .../common/item/rod/ItemMissileRod.java | 10 +- .../common/item/rod/ItemRainbowRod.java | 14 +- .../common/item/rod/ItemSkyDirtRod.java | 8 +- .../botania/common/item/rod/ItemSmeltRod.java | 15 +- .../common/item/rod/ItemTerraformRod.java | 18 +- .../common/item/rod/ItemTornadoRod.java | 11 +- .../botania/common/item/rod/ItemWaterRod.java | 4 +- .../common/lexicon/BLexiconCategory.java | 4 +- .../common/lexicon/BasicLexiconEntry.java | 8 +- .../common/lexicon/CompatLexiconEntry.java | 4 +- .../common/lexicon/DogLexiconEntry.java | 6 +- .../common/lexicon/HeadLexiconEntry.java | 4 +- .../botania/common/lexicon/LexiconData.java | 164 +++---- .../common/lexicon/RelicLexiconEntry.java | 4 +- .../common/lexicon/TutLexiconEntry.java | 4 +- .../common/lexicon/WIPLexiconEntry.java | 4 +- .../common/lexicon/WelcomeLexiconEntry.java | 8 +- .../botania/common/lexicon/page/PageBrew.java | 10 +- .../lexicon/page/PageCraftingRecipe.java | 15 +- .../common/lexicon/page/PageElvenRecipe.java | 11 +- .../common/lexicon/page/PageEntity.java | 10 +- .../common/lexicon/page/PageGuide.java | 14 +- .../common/lexicon/page/PageImage.java | 7 +- .../common/lexicon/page/PageLoreText.java | 7 +- .../lexicon/page/PageManaInfusionRecipe.java | 17 +- .../common/lexicon/page/PageMultiblock.java | 13 +- .../common/lexicon/page/PagePetalRecipe.java | 15 +- .../common/lexicon/page/PageRecipe.java | 19 +- .../common/lexicon/page/PageRuneRecipe.java | 11 +- .../common/lexicon/page/PageShedding.java | 4 +- .../common/lexicon/page/PageTerrasteel.java | 13 +- .../botania/common/lexicon/page/PageText.java | 11 +- .../common/lexicon/page/PageTutorial.java | 10 +- .../common/lib/LibAchievementNames.java | 4 +- .../botania/common/lib/LibBlockNames.java | 4 +- .../botania/common/lib/LibBrewNames.java | 4 +- .../botania/common/lib/LibEntityNames.java | 4 +- .../vazkii/botania/common/lib/LibGuiIDs.java | 4 +- .../botania/common/lib/LibItemNames.java | 100 ++-- .../vazkii/botania/common/lib/LibLexicon.java | 4 +- .../vazkii/botania/common/lib/LibMisc.java | 14 +- .../botania/common/lib/LibObfuscation.java | 6 +- .../vazkii/botania/common/lib/LibOreDict.java | 48 +- .../botania/common/lib/LibPotionNames.java | 4 +- .../botania/common/network/GuiHandler.java | 4 +- .../common/network/PacketBotaniaEffect.java | 438 +++++++++--------- .../botania/common/network/PacketDodge.java | 58 ++- .../botania/common/network/PacketHandler.java | 64 +-- .../common/network/PacketLeftClick.java | 25 +- .../common/world/SkyblockWorldEvents.java | 32 +- .../common/world/WorldTypeSkyblock.java | 12 +- .../resources/assets/botania/lang/en_US.lang | 2 +- .../resources/assets/botania/sounds/way.ogg | Bin 143821 -> 217701 bytes 870 files changed, 7429 insertions(+), 7424 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 5e9c9180b..8331bdc17 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -10,9 +10,18 @@ */ package vazkii.botania.api; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import com.google.common.base.Preconditions; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; + import net.minecraft.block.Block; import net.minecraft.block.BlockCarpet; import net.minecraft.block.BlockColored; @@ -22,7 +31,6 @@ import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.EnumRarity; @@ -32,7 +40,6 @@ import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.SoundEvent; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.common.Loader; @@ -59,14 +66,6 @@ import vazkii.botania.api.wiki.IWikiProvider; import vazkii.botania.api.wiki.SimpleWikiProvider; import vazkii.botania.api.wiki.WikiHooks; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - public final class BotaniaAPI { private static final List categories = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java index fc13589fe..daf926d62 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -8,8 +8,12 @@ */ package vazkii.botania.api; +import java.util.Collections; +import java.util.Map; + import com.google.common.base.Preconditions; import com.google.common.collect.Maps; + import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.LoaderState; @@ -18,9 +22,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.subtile.SubTileEntity; -import java.util.Collections; -import java.util.Map; - /** * Class for API calls that must be made clientside */ diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index 5ba3b5f87..78c06afb6 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -2,23 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 29, 2014, 6:09:48 PM (GMT)] */ package vazkii.botania.api.boss; +import java.awt.Rectangle; +import java.util.UUID; + import net.minecraft.client.gui.ScaledResolution; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.ShaderCallback; -import java.awt.*; -import java.util.UUID; - /** * A Botania boss, that is subject to special rendering. */ @@ -59,7 +59,7 @@ public interface IBotaniaBoss { * Note that this is NOT the entity's UUID, nor is it the clientside UUID of the BossInfoServer instance! * You will most likely need to sync this yourself using the datawatcher * @return The uuid. - */ + */ public UUID getBossInfoUuid(); /** diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index 2e5a26142..dbbf4e179 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -2,20 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 6:22:54 PM (GMT)] */ package vazkii.botania.api.brew; +import java.util.List; + import com.google.common.collect.ImmutableList; + import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; -import java.util.List; - /** * The class for a Brew definition, each one is a singleton. */ diff --git a/src/main/java/vazkii/botania/api/brew/IBrewContainer.java b/src/main/java/vazkii/botania/api/brew/IBrewContainer.java index 0d155ecdb..36f659b6b 100644 --- a/src/main/java/vazkii/botania/api/brew/IBrewContainer.java +++ b/src/main/java/vazkii/botania/api/brew/IBrewContainer.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 6:26:40 PM (GMT)] */ package vazkii.botania.api.brew; diff --git a/src/main/java/vazkii/botania/api/brew/IBrewItem.java b/src/main/java/vazkii/botania/api/brew/IBrewItem.java index d51c9fa44..1ae2badae 100644 --- a/src/main/java/vazkii/botania/api/brew/IBrewItem.java +++ b/src/main/java/vazkii/botania/api/brew/IBrewItem.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 9:20:33 PM (GMT)] */ package vazkii.botania.api.brew; diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index 5bb7808ac..a9cc8fc37 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -2,16 +2,24 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 14, 2015, 3:28:54 PM (GMT)] */ package vazkii.botania.api.corporea; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.WeakHashMap; +import java.util.regex.Pattern; + import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; + import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -21,13 +29,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.BotaniaAPI; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; -import java.util.regex.Pattern; - public final class CorporeaHelper { private static final List empty = ImmutableList.of(); @@ -216,7 +217,7 @@ public final class CorporeaHelper { */ public static ICorporeaSpark getSparkForBlock(World world, BlockPos pos) { List sparks = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.up(), pos.add(1, 2, 1)), Predicates.instanceOf(ICorporeaSpark.class)); - return sparks.isEmpty() ? null : ((ICorporeaSpark) sparks.get(0)); + return sparks.isEmpty() ? null : (ICorporeaSpark) sparks.get(0); } /** diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaRequest.java b/src/main/java/vazkii/botania/api/corporea/CorporeaRequest.java index 576062879..143d22b4b 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaRequest.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaRequest.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * */ package vazkii.botania.api.corporea; @@ -15,7 +15,7 @@ public class CorporeaRequest { public int count; public int foundItems = 0; public int extractedItems = 0; - + public CorporeaRequest(Object matcher, boolean checkNBT, int count) { super(); this.matcher = matcher; diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java b/src/main/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java index ea628ef56..cbeccb269 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 30, 2015, 2:55:57 PM (GMT)] */ package vazkii.botania.api.corporea; diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java index 1017006c6..b528020d8 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [June 8, 2015, 1:04:05 PM (GMT)] */ package vazkii.botania.api.corporea; diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java index c7d7f4609..8c1db88af 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java @@ -2,18 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 19, 2015, 6:23:31 PM (GMT)] */ package vazkii.botania.api.corporea; -import net.minecraft.item.ItemStack; - import java.util.List; +import net.minecraft.item.ItemStack; + /** * A TileEntity that implements this will be able to intercept corporea * requests case there is a Corporea Spark on top. diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaRequestor.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaRequestor.java index 66881b5b3..f1e5d4608 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaRequestor.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaRequestor.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 28, 2015, 11:25:48 AM (GMT)] */ package vazkii.botania.api.corporea; diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java index f44048595..ddc3721a9 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java @@ -2,19 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 13, 2015, 10:53:05 PM (GMT)] */ package vazkii.botania.api.corporea; +import java.util.List; + import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; -import java.util.List; - /** * An interface for a Corporea Spark. Includes functions for handling * connections. diff --git a/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java b/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java index 96f863af3..5bc57d600 100644 --- a/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java +++ b/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java @@ -2,17 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * */ package vazkii.botania.api.corporea; -import net.minecraft.item.ItemStack; - import java.util.List; +import net.minecraft.item.ItemStack; + /** * This interface wraps IInventory corporea works with in order to provide * compatibility with different storage mods. diff --git a/src/main/java/vazkii/botania/api/corporea/InvWithLocation.java b/src/main/java/vazkii/botania/api/corporea/InvWithLocation.java index 6fdff5a7d..e5af2cd98 100644 --- a/src/main/java/vazkii/botania/api/corporea/InvWithLocation.java +++ b/src/main/java/vazkii/botania/api/corporea/InvWithLocation.java @@ -6,27 +6,27 @@ import net.minecraftforge.items.IItemHandler; public class InvWithLocation { - public final IItemHandler handler; - public final World world; - public final BlockPos pos; + public final IItemHandler handler; + public final World world; + public final BlockPos pos; - public InvWithLocation(IItemHandler itemHandler, World world, BlockPos pos) { - this.handler = itemHandler; - this.world = world; - this.pos = pos; - } + public InvWithLocation(IItemHandler itemHandler, World world, BlockPos pos) { + handler = itemHandler; + this.world = world; + this.pos = pos; + } - @Override - public int hashCode() { - return 31 * handler.hashCode() ^ world.hashCode() ^ pos.hashCode(); - } + @Override + public int hashCode() { + return 31 * handler.hashCode() ^ world.hashCode() ^ pos.hashCode(); + } - @Override - public boolean equals(Object o) { - return o instanceof InvWithLocation - && handler.equals(((InvWithLocation) o).handler) - && world == ((InvWithLocation) o).world - && pos.equals(((InvWithLocation) o).pos); - } + @Override + public boolean equals(Object o) { + return o instanceof InvWithLocation + && handler.equals(((InvWithLocation) o).handler) + && world == ((InvWithLocation) o).world + && pos.equals(((InvWithLocation) o).pos); + } } diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index f28a7c9b2..a6dc1c6d6 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -2,22 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 7, 2014, 3:47:43 PM (GMT)] */ package vazkii.botania.api.internal; +import java.util.Set; + import com.google.common.collect.ImmutableSet; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; -import java.util.Set; - public class DummyManaNetwork implements IManaNetwork { public static final DummyManaNetwork instance = new DummyManaNetwork(); diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index b1f724be2..5bc4d9612 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:43:03 PM (GMT)] */ package vazkii.botania.api.internal; +import java.util.List; + import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; @@ -36,8 +38,6 @@ import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.SubTileEntity; -import java.util.List; - public class DummyMethodHandler implements IInternalMethodHandler { @Override diff --git a/src/main/java/vazkii/botania/api/internal/DummyPage.java b/src/main/java/vazkii/botania/api/internal/DummyPage.java index 3c5db7166..0b73dd4fa 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyPage.java +++ b/src/main/java/vazkii/botania/api/internal/DummyPage.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:41:23 PM (GMT)] */ package vazkii.botania.api.internal; diff --git a/src/main/java/vazkii/botania/api/internal/DummySubTile.java b/src/main/java/vazkii/botania/api/internal/DummySubTile.java index d8ac6ab5b..cec661fc3 100644 --- a/src/main/java/vazkii/botania/api/internal/DummySubTile.java +++ b/src/main/java/vazkii/botania/api/internal/DummySubTile.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2014, 4:17:33 PM (GMT)] */ package vazkii.botania.api.internal; diff --git a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java index f7703eea1..fb0ee87b4 100644 --- a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java @@ -2,19 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:48:41 PM (GMT)] */ package vazkii.botania.api.internal; +import java.util.List; + import net.minecraft.client.gui.GuiButton; import vazkii.botania.api.lexicon.LexiconEntry; -import java.util.List; - /** * Internal interface for the Lexicon Entry GUI. This contains * everything that can be accessed from it. It's safe to cast diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index a28793a87..71e36b7d8 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:34:34 PM (GMT)] */ package vazkii.botania.api.internal; +import java.util.List; + import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; @@ -37,8 +39,6 @@ import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.SubTileEntity; -import java.util.List; - /** * Any methods that refer to internal methods in Botania are here. * This is defaulted to a dummy handler, whose methods do nothing. diff --git a/src/main/java/vazkii/botania/api/internal/IManaBurst.java b/src/main/java/vazkii/botania/api/internal/IManaBurst.java index 099e402d7..e7c7de69b 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaBurst.java +++ b/src/main/java/vazkii/botania/api/internal/IManaBurst.java @@ -2,19 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 31, 2014, 4:36:13 PM (GMT)] */ package vazkii.botania.api.internal; +import java.util.UUID; + import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import java.util.UUID; - /** * Interface for the Mana Burst entity. This can safely be casted to EntityThrowable. */ diff --git a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java index 95e169c90..f45b5087d 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java @@ -2,21 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 7, 2014, 3:39:48 PM (GMT)] */ package vazkii.botania.api.internal; +import java.util.Set; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; -import java.util.Set; - /** * A basic interface for a world's Mana Network. * @see IInternalMethodHandler#getManaNetworkInstance() diff --git a/src/main/java/vazkii/botania/api/internal/ShaderCallback.java b/src/main/java/vazkii/botania/api/internal/ShaderCallback.java index 26ac40a42..f158f662b 100644 --- a/src/main/java/vazkii/botania/api/internal/ShaderCallback.java +++ b/src/main/java/vazkii/botania/api/internal/ShaderCallback.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 29, 2014, 6:31:35 PM (GMT)] */ package vazkii.botania.api.internal; diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index 6d66580ed..57846994f 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -2,22 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 9, 2015, 9:38:44 PM (GMT)] */ package vazkii.botania.api.internal; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; public final class VanillaPacketDispatcher { diff --git a/src/main/java/vazkii/botania/api/item/IAncientWillContainer.java b/src/main/java/vazkii/botania/api/item/IAncientWillContainer.java index 2d2abe2b3..1096430ed 100644 --- a/src/main/java/vazkii/botania/api/item/IAncientWillContainer.java +++ b/src/main/java/vazkii/botania/api/item/IAncientWillContainer.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 30, 2015, 11:24:54 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IAvatarTile.java b/src/main/java/vazkii/botania/api/item/IAvatarTile.java index 495a82c8d..358eee50d 100644 --- a/src/main/java/vazkii/botania/api/item/IAvatarTile.java +++ b/src/main/java/vazkii/botania/api/item/IAvatarTile.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 24, 2015, 7:00:21 PM (GMT)] */ package vazkii.botania.api.item; @@ -22,14 +22,14 @@ public interface IAvatarTile extends IManaReceiver { /** * Gets the avatar's inventory * @return An IItemhandler representing the avatar's inventory - */ + */ public IItemHandler getInventory(); - + /** * Gets the avatar's facing. */ public EnumFacing getAvatarFacing(); - + /** * Gets the amount of ticks that have elapsed on this avatar while it's functional * (has redstone signal). @@ -40,6 +40,6 @@ public interface IAvatarTile extends IManaReceiver { * Gets if this avatar is enabled (isn't powered by a redstone signal). */ public boolean isEnabled(); - + } diff --git a/src/main/java/vazkii/botania/api/item/IAvatarWieldable.java b/src/main/java/vazkii/botania/api/item/IAvatarWieldable.java index 96910090a..fbcf817f2 100644 --- a/src/main/java/vazkii/botania/api/item/IAvatarWieldable.java +++ b/src/main/java/vazkii/botania/api/item/IAvatarWieldable.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 24, 2015, 6:45:50 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 6eb04fcc0..e73b609b7 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Dec 4, 2014, 3:28:43 PM (GMT)] */ package vazkii.botania.api.item; @@ -40,7 +40,7 @@ public interface IBaubleRender { /** * Rotates the render for a bauble correctly if the player is sneaking. * Use for renders under {@link RenderType#BODY}. - */ + */ public static void rotateIfSneaking(EntityPlayer player) { if(player.isSneaking()) applySneakingRotation(); @@ -58,7 +58,7 @@ public interface IBaubleRender { /** * Shifts the render for a bauble correctly to the head, including sneaking rotation. * Use for renders under {@link RenderType#HEAD}. - */ + */ public static void translateToHeadLevel(EntityPlayer player) { GlStateManager.translate(0, -player.getDefaultEyeHeight(), 0); if (player.isSneaking()) diff --git a/src/main/java/vazkii/botania/api/item/IBlockProvider.java b/src/main/java/vazkii/botania/api/item/IBlockProvider.java index 42f2e3f89..f2cf1729a 100644 --- a/src/main/java/vazkii/botania/api/item/IBlockProvider.java +++ b/src/main/java/vazkii/botania/api/item/IBlockProvider.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 20, 2015, 10:31:54 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IBurstViewerBauble.java b/src/main/java/vazkii/botania/api/item/IBurstViewerBauble.java index 4402a715f..1dfec9889 100644 --- a/src/main/java/vazkii/botania/api/item/IBurstViewerBauble.java +++ b/src/main/java/vazkii/botania/api/item/IBurstViewerBauble.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 3:08:40 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/ICosmeticAttachable.java b/src/main/java/vazkii/botania/api/item/ICosmeticAttachable.java index 4fbee0ec0..c5b5d772a 100644 --- a/src/main/java/vazkii/botania/api/item/ICosmeticAttachable.java +++ b/src/main/java/vazkii/botania/api/item/ICosmeticAttachable.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 22, 2015, 8:31:39 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/ICosmeticBauble.java b/src/main/java/vazkii/botania/api/item/ICosmeticBauble.java index d488ad4e9..7b001ac02 100644 --- a/src/main/java/vazkii/botania/api/item/ICosmeticBauble.java +++ b/src/main/java/vazkii/botania/api/item/ICosmeticBauble.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 22, 2015, 2:02:02 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IExoflameHeatable.java b/src/main/java/vazkii/botania/api/item/IExoflameHeatable.java index bd007342d..62a611ecf 100644 --- a/src/main/java/vazkii/botania/api/item/IExoflameHeatable.java +++ b/src/main/java/vazkii/botania/api/item/IExoflameHeatable.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 30, 2014, 4:28:29 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IExtendedPlayerController.java b/src/main/java/vazkii/botania/api/item/IExtendedPlayerController.java index e07d07666..707829eea 100644 --- a/src/main/java/vazkii/botania/api/item/IExtendedPlayerController.java +++ b/src/main/java/vazkii/botania/api/item/IExtendedPlayerController.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 6, 2014, 6:02:29 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java index b685b8c92..1a124a49f 100644 --- a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java @@ -2,18 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 17, 2014, 6:05:18 PM (GMT)] */ package vazkii.botania.api.item; -import net.minecraft.item.ItemStack; - import java.util.HashMap; +import net.minecraft.item.ItemStack; + public interface IFloatingFlower { public ItemStack getDisplayStack(); @@ -42,10 +42,10 @@ public interface IFloatingFlower { * Instantiates and registers a new floating flower island type * Note that you need to register the model for this island type, see BotaniaAPIClient * @param name The name of this floating flower island type - */ + */ public IslandType(String name) { if (registry.containsKey(name)) throw new IllegalArgumentException(name+" already registered!"); - this.typeName = name; + typeName = name; registry.put(name, this); } @@ -54,8 +54,9 @@ public interface IFloatingFlower { return type == null ? GRASS : type; } + @Override public String toString() { - return this.typeName; + return typeName; } } diff --git a/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java index bfdf24789..72964e39b 100644 --- a/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java +++ b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [17/11/2015, 20:10:53 (GMT)] */ package vazkii.botania.api.item; @@ -29,6 +29,6 @@ public interface IFlowerPlaceable { * @param stack The stack that was placed. * @param flower The flower doing the placing. * @param pos The position that was placed at. - */ + */ public void onBlockPlacedByFlower(ItemStack stack, SubTileEntity flower, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/api/item/IFlowerlessWorld.java b/src/main/java/vazkii/botania/api/item/IFlowerlessWorld.java index 5d25d7979..2c7278f1a 100644 --- a/src/main/java/vazkii/botania/api/item/IFlowerlessWorld.java +++ b/src/main/java/vazkii/botania/api/item/IFlowerlessWorld.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IHornHarvestable.java b/src/main/java/vazkii/botania/api/item/IHornHarvestable.java index a6ef982fc..a441b785a 100644 --- a/src/main/java/vazkii/botania/api/item/IHornHarvestable.java +++ b/src/main/java/vazkii/botania/api/item/IHornHarvestable.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 24, 2015, 11:16:00 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IHourglassTrigger.java b/src/main/java/vazkii/botania/api/item/IHourglassTrigger.java index b6d524d32..a759a9e17 100644 --- a/src/main/java/vazkii/botania/api/item/IHourglassTrigger.java +++ b/src/main/java/vazkii/botania/api/item/IHourglassTrigger.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [28/09/2016, 20:01:14 (GMT)] */ package vazkii.botania.api.item; @@ -21,5 +21,5 @@ import net.minecraft.world.World; public interface IHourglassTrigger { public void onTriggeredByHourglass(World world, BlockPos pos, TileEntity hourglass); - + } diff --git a/src/main/java/vazkii/botania/api/item/IManaDissolvable.java b/src/main/java/vazkii/botania/api/item/IManaDissolvable.java index 8e389ff63..26570020f 100644 --- a/src/main/java/vazkii/botania/api/item/IManaDissolvable.java +++ b/src/main/java/vazkii/botania/api/item/IManaDissolvable.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 18, 2015, 12:10:00 AM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java index bce037fa3..82f8bcd17 100644 --- a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java +++ b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 28, 2015, 9:04:53 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IPetalApothecary.java b/src/main/java/vazkii/botania/api/item/IPetalApothecary.java index 15ae69c0b..3df0e22c6 100644 --- a/src/main/java/vazkii/botania/api/item/IPetalApothecary.java +++ b/src/main/java/vazkii/botania/api/item/IPetalApothecary.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 30, 2014, 4:22:15 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IPhantomInkable.java b/src/main/java/vazkii/botania/api/item/IPhantomInkable.java index dc2f397b0..36d727309 100644 --- a/src/main/java/vazkii/botania/api/item/IPhantomInkable.java +++ b/src/main/java/vazkii/botania/api/item/IPhantomInkable.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 17, 2015, 4:57:44 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IPixieSpawner.java b/src/main/java/vazkii/botania/api/item/IPixieSpawner.java index de8c9730d..ae4477049 100644 --- a/src/main/java/vazkii/botania/api/item/IPixieSpawner.java +++ b/src/main/java/vazkii/botania/api/item/IPixieSpawner.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 6, 2014, 6:06:27 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IRelic.java b/src/main/java/vazkii/botania/api/item/IRelic.java index 39e7528a3..9c365ee71 100644 --- a/src/main/java/vazkii/botania/api/item/IRelic.java +++ b/src/main/java/vazkii/botania/api/item/IRelic.java @@ -2,19 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 29, 2015, 7:17:41 PM (GMT)] */ package vazkii.botania.api.item; +import java.util.UUID; + import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import java.util.UUID; - /** * An item that implements this counts as a Relic item. This is purely for interaction * and other mod items should not implement this interface. diff --git a/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java b/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java index 6d7969468..bb25ee2f2 100644 --- a/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java +++ b/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 30, 2015, 2:46:05 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/ISortableTool.java b/src/main/java/vazkii/botania/api/item/ISortableTool.java index af450bcee..6abe650fb 100644 --- a/src/main/java/vazkii/botania/api/item/ISortableTool.java +++ b/src/main/java/vazkii/botania/api/item/ISortableTool.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 23, 2015, 7:03:48 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index 91786ad12..a885fbd40 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -2,20 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 29, 2015, 11:30:41 PM (GMT)] */ package vazkii.botania.api.item; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import java.util.List; - /** * An item that implements this will allow for various wireframes to be drawn * around the player. This will be called while the item is in the inventory, diff --git a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java index 440004a12..130b250a4 100644 --- a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java +++ b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 25, 2015, 8:02:41 PM (GMT)] */ package vazkii.botania.api.item; diff --git a/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java b/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java index 73ec1c9b0..2bcd9fe51 100644 --- a/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java +++ b/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java @@ -2,18 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [04/12/2015, 18:29:56 (GMT)] */ package vazkii.botania.api.lexicon; -import net.minecraftforge.fml.common.eventhandler.Event; - import java.util.Queue; +import net.minecraftforge.fml.common.eventhandler.Event; + /** * Fired when the Lexica Botania's tutorial is started. You can add your * own entries to the tutorial here. Please use this responsibly. diff --git a/src/main/java/vazkii/botania/api/lexicon/IAddonEntry.java b/src/main/java/vazkii/botania/api/lexicon/IAddonEntry.java index a92e608c5..b2f871ebb 100644 --- a/src/main/java/vazkii/botania/api/lexicon/IAddonEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/IAddonEntry.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 8, 2014, 7:02:48 PM (GMT)] */ package vazkii.botania.api.lexicon; diff --git a/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java b/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java index 13b076278..a2245505e 100644 --- a/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java +++ b/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 20, 2014, 7:05:44 PM (GMT)] */ package vazkii.botania.api.lexicon; diff --git a/src/main/java/vazkii/botania/api/lexicon/IRecipeKeyProvider.java b/src/main/java/vazkii/botania/api/lexicon/IRecipeKeyProvider.java index 5b0c0631f..1d04127d3 100644 --- a/src/main/java/vazkii/botania/api/lexicon/IRecipeKeyProvider.java +++ b/src/main/java/vazkii/botania/api/lexicon/IRecipeKeyProvider.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 20, 2014, 6:08:48 PM (GMT)] */ package vazkii.botania.api.lexicon; diff --git a/src/main/java/vazkii/botania/api/lexicon/ITwoNamedPage.java b/src/main/java/vazkii/botania/api/lexicon/ITwoNamedPage.java index 073b8704c..19592b177 100644 --- a/src/main/java/vazkii/botania/api/lexicon/ITwoNamedPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/ITwoNamedPage.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 3, 2014, 2:59:55 PM (GMT)] */ package vazkii.botania.api.lexicon; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java index 88d339381..f6bd51d95 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java @@ -2,20 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:23:47 PM (GMT)] */ package vazkii.botania.api.lexicon; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nonnull; + +import net.minecraft.util.ResourceLocation; + public class LexiconCategory implements Comparable { private static int count = 0; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 22ad55673..4c4150211 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -2,25 +2,26 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:17:06 PM (GMT)] */ package vazkii.botania.api.lexicon; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - public class LexiconEntry implements Comparable { public final String unlocalizedName; @@ -31,7 +32,7 @@ public class LexiconEntry implements Comparable { public final List pages = new ArrayList<>(); private boolean priority = false; private ItemStack icon = null; - + private final List extraDisplayedRecipes = new ArrayList<>(); /** @@ -149,12 +150,12 @@ public class LexiconEntry implements Comparable { } } } - + list.addAll(extraDisplayedRecipes); return list; } - + public void addExtraDisplayedRecipe(ItemStack stack) { extraDisplayedRecipes.add(stack); } diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java index 9fa6fbe49..199a9babc 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java @@ -2,22 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:17:24 PM (GMT)] */ package vazkii.botania.api.lexicon; +import java.util.List; + import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IGuiLexiconEntry; -import java.util.List; - public abstract class LexiconPage { public String unlocalizedName; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 156d34298..ef9f778ee 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -2,21 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 6, 2014, 3:54:12 PM (GMT)] */ package vazkii.botania.api.lexicon; +import java.util.HashMap; +import java.util.Map; + import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.mana.IManaItem; -import java.util.HashMap; -import java.util.Map; - /** * This class contains mappings for which entry and page correspond to each * craftable ItemStack. Use the map method to map an ItemStack to a page in @@ -53,11 +53,11 @@ public final class LexiconRecipeMappings { return mappings.get(wildKey); return mappings.get(stackToString(stack)); } - + public static String stackToString(ItemStack stack) { return stackToString(stack, false); } - + public static String stackToString(ItemStack stack, boolean forceIgnore) { if(stack == null || stack.getItem() == null) return "NULL"; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java index c94a90932..7787a98c7 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java @@ -2,22 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 27, 2015, 7:48:47 PM (GMT)] */ package vazkii.botania.api.lexicon.multiblock; +import java.util.HashMap; +import java.util.Map; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.world.IBlockAccess; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; -import java.util.HashMap; -import java.util.Map; - /** * A hook for rendering blocks in the multiblock display. */ diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index b37bc101d..b51ce62cd 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -2,26 +2,26 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 27, 2015, 2:37:22 PM (GMT)] */ package vazkii.botania.api.lexicon.multiblock; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; - import java.util.ArrayList; import java.util.EnumMap; import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; + /** * This class describes a Mutiblock object. It's used to display a * multiblock in the lexicon and to show the player in a ghost-like diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java index ebc675e1a..3c83f67d3 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java @@ -2,20 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 27, 2015, 7:31:58 PM (GMT)] */ package vazkii.botania.api.lexicon.multiblock; -import net.minecraft.entity.Entity; -import net.minecraft.util.EnumFacing; - import java.util.Collections; import java.util.Map; +import net.minecraft.entity.Entity; +import net.minecraft.util.EnumFacing; + /** * A set of Multiblock objects for various rotations. */ diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java index 99ef62906..eb9841e81 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [01/11/2015, 19:05:57 (GMT)] */ package vazkii.botania.api.lexicon.multiblock.component; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java index 60d54bf07..b0429382e 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 27, 2015, 7:20:09 PM (GMT)] */ package vazkii.botania.api.lexicon.multiblock.component; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java index 2ce755b55..9b92bce4a 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 28, 2015, 3:23:15 PM (GMT)] */ package vazkii.botania.api.lexicon.multiblock.component; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index 43859286c..6631068fc 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 27, 2015, 2:42:32 PM (GMT)] */ package vazkii.botania.api.lexicon.multiblock.component; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java index 1f5bcf353..78cc42395 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java @@ -7,18 +7,18 @@ import net.minecraft.world.World; // Multiblock component that only compares blocks, not blockstates public class StateInsensitiveComponent extends MultiblockComponent { - public StateInsensitiveComponent(BlockPos relPos, Block block) { - super(relPos, block.getDefaultState(), false, null); - } + public StateInsensitiveComponent(BlockPos relPos, Block block) { + super(relPos, block.getDefaultState(), false, null); + } - @Override - public boolean matches(World world, BlockPos pos) { - return world.getBlockState(pos).getBlock() == this.getBlockState().getBlock(); - } + @Override + public boolean matches(World world, BlockPos pos) { + return world.getBlockState(pos).getBlock() == getBlockState().getBlock(); + } - @Override - public MultiblockComponent copy() { - return new StateInsensitiveComponent(getRelativePosition(), getBlockState().getBlock()); - } + @Override + public MultiblockComponent copy() { + return new StateInsensitiveComponent(getRelativePosition(), getBlockState().getBlock()); + } } diff --git a/src/main/java/vazkii/botania/api/mana/BurstProperties.java b/src/main/java/vazkii/botania/api/mana/BurstProperties.java index 75ff0f8d2..384fc962c 100644 --- a/src/main/java/vazkii/botania/api/mana/BurstProperties.java +++ b/src/main/java/vazkii/botania/api/mana/BurstProperties.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 31, 2014, 3:49:30 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/IClientManaHandler.java b/src/main/java/vazkii/botania/api/mana/IClientManaHandler.java index aea14b9e8..0b652ff1e 100644 --- a/src/main/java/vazkii/botania/api/mana/IClientManaHandler.java +++ b/src/main/java/vazkii/botania/api/mana/IClientManaHandler.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 2, 2014, 5:26:02 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/ICompositableLens.java b/src/main/java/vazkii/botania/api/mana/ICompositableLens.java index 775719d8d..29d17c098 100644 --- a/src/main/java/vazkii/botania/api/mana/ICompositableLens.java +++ b/src/main/java/vazkii/botania/api/mana/ICompositableLens.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 23, 2015, 10:30:34 AM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/ICreativeManaProvider.java b/src/main/java/vazkii/botania/api/mana/ICreativeManaProvider.java index 2556663c2..3d152133f 100644 --- a/src/main/java/vazkii/botania/api/mana/ICreativeManaProvider.java +++ b/src/main/java/vazkii/botania/api/mana/ICreativeManaProvider.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 25, 2014, 7:34:00 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/IDirectioned.java b/src/main/java/vazkii/botania/api/mana/IDirectioned.java index 49fc53ccd..04568f4a0 100644 --- a/src/main/java/vazkii/botania/api/mana/IDirectioned.java +++ b/src/main/java/vazkii/botania/api/mana/IDirectioned.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [15/11/2015, 19:27:07 (GMT)] */ package vazkii.botania.api.mana; @@ -19,7 +19,7 @@ public interface IDirectioned { /** * @return The X rotation, in degrees - */ + */ public float getRotationX(); /** @@ -30,13 +30,13 @@ public interface IDirectioned { /** * Set the X rotation * @param rot X rotation, in degrees - */ + */ public void setRotationX(float rot); /** * Set the Y rotation * @param rot Y rotation, in degrees - */ + */ public void setRotationY(float rot); /** diff --git a/src/main/java/vazkii/botania/api/mana/IKeyLocked.java b/src/main/java/vazkii/botania/api/mana/IKeyLocked.java index ce71694e4..6ed598db3 100644 --- a/src/main/java/vazkii/botania/api/mana/IKeyLocked.java +++ b/src/main/java/vazkii/botania/api/mana/IKeyLocked.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 11, 2014, 4:29:32 PM (GMT)] */ package vazkii.botania.api.mana; @@ -13,10 +13,10 @@ package vazkii.botania.api.mana; /** * A TileEntity that implements this interface has an IO key lock. This * interface defines an input and output key.

- * + * * A Spreader can only shoot mana into a IKeyLocked interfaced TE if the Input * key of the TE is equal to the Output key of the Spreader.

- * + * * A Spreader can only pull mana from a IKeyLocked interfaced IManaPool TE if the * Output key of the IManaPool is equal to the Input key of the Spreader. */ diff --git a/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java b/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java index e6fdb3d91..1b91011e0 100644 --- a/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java +++ b/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 26, 2014, 9:51:58 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/ILens.java b/src/main/java/vazkii/botania/api/mana/ILens.java index 7b7405ec3..f65ce6218 100644 --- a/src/main/java/vazkii/botania/api/mana/ILens.java +++ b/src/main/java/vazkii/botania/api/mana/ILens.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 31, 2014, 3:03:04 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/ILensControl.java b/src/main/java/vazkii/botania/api/mana/ILensControl.java index ad0cc6c69..55669327b 100644 --- a/src/main/java/vazkii/botania/api/mana/ILensControl.java +++ b/src/main/java/vazkii/botania/api/mana/ILensControl.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [15/11/2015, 21:00:32 (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/ILensEffect.java b/src/main/java/vazkii/botania/api/mana/ILensEffect.java index 9cac0414b..875524aa6 100644 --- a/src/main/java/vazkii/botania/api/mana/ILensEffect.java +++ b/src/main/java/vazkii/botania/api/mana/ILensEffect.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 14, 2014, 7:30:00 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/IManaBlock.java b/src/main/java/vazkii/botania/api/mana/IManaBlock.java index 56aa037c7..63d098ef2 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaBlock.java +++ b/src/main/java/vazkii/botania/api/mana/IManaBlock.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 22, 2014, 4:59:05 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/IManaCollector.java b/src/main/java/vazkii/botania/api/mana/IManaCollector.java index f62352864..6fca30a60 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaCollector.java +++ b/src/main/java/vazkii/botania/api/mana/IManaCollector.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 22, 2014, 5:01:19 PM (GMT)] */ package vazkii.botania.api.mana; @@ -15,7 +15,7 @@ import vazkii.botania.api.internal.IManaBurst; /** * Any TileEntity that implements this is considered a mana collector, by * which nearby generating flowers will pump mana into it.

- * + * * Implementation Instructions:
* - Override invalidate() and onChunkUnload(), calling ManaNetworkEvent.removeCollector(this); on both.
* - On the first tick of update() (or onLoad() in Forge build 1606 or higher), call ManaNetworkEvent.addCollector(this); diff --git a/src/main/java/vazkii/botania/api/mana/IManaCollisionGhost.java b/src/main/java/vazkii/botania/api/mana/IManaCollisionGhost.java index 99de9d14e..35ee2d4c1 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaCollisionGhost.java +++ b/src/main/java/vazkii/botania/api/mana/IManaCollisionGhost.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 10, 2014, 7:49:19 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java b/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java index 56a9683f9..ab004b62f 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java +++ b/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 28, 2015, 9:22:53 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/IManaGivingItem.java b/src/main/java/vazkii/botania/api/mana/IManaGivingItem.java index a1d7f04d9..57f506dfc 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaGivingItem.java +++ b/src/main/java/vazkii/botania/api/mana/IManaGivingItem.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [08/12/2015, 18:10:29 (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/IManaItem.java b/src/main/java/vazkii/botania/api/mana/IManaItem.java index f4463fb1d..9dfcf5525 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaItem.java +++ b/src/main/java/vazkii/botania/api/mana/IManaItem.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 6, 2014, 9:07:40 AM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/IManaPool.java b/src/main/java/vazkii/botania/api/mana/IManaPool.java index e6df9ff7c..951d98ae1 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaPool.java +++ b/src/main/java/vazkii/botania/api/mana/IManaPool.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 22, 2014, 5:03:09 PM (GMT)] */ package vazkii.botania.api.mana; @@ -16,7 +16,7 @@ import net.minecraft.item.EnumDyeColor; * Any TileEntity that implements this is considered a Mana Pool, * by which nearby functional flowers will pull mana from it.
* Mana Distributors will also accept it as valid output.

- * + * * Implementation Instructions:
* - Override invalidate() and onChunkUnload(), calling ManaNetworkEvent.removePool(this); on both.
* - On the first tick of onUpdate(), call ManaNetworkEvent.addPool(this); @@ -31,13 +31,13 @@ public interface IManaPool extends IManaReceiver { /** * @return The color of this pool. - */ + */ public EnumDyeColor getColor(); /** * Sets the color of this pool. * @param color The color to set. - */ + */ public void setColor(EnumDyeColor color); } diff --git a/src/main/java/vazkii/botania/api/mana/IManaReceiver.java b/src/main/java/vazkii/botania/api/mana/IManaReceiver.java index 178856fad..441a8e5b5 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaReceiver.java +++ b/src/main/java/vazkii/botania/api/mana/IManaReceiver.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 22, 2014, 4:55:00 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/IManaSpreader.java b/src/main/java/vazkii/botania/api/mana/IManaSpreader.java index 8e727c7f6..b35c337b8 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaSpreader.java +++ b/src/main/java/vazkii/botania/api/mana/IManaSpreader.java @@ -2,19 +2,15 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 18, 2015, 7:30:00 PM (GMT)] */ package vazkii.botania.api.mana; -import org.apache.commons.lang3.tuple.Pair; - -import net.minecraft.util.math.BlockPos; import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.common.entity.EntityManaBurst; /** * Any TileEntity that implements this is considered a Mana Spreader, @@ -31,7 +27,7 @@ public interface IManaSpreader extends IManaBlock, IPingable, IDirectioned { public int getLastBurstDeathTick(); public void setLastBurstDeathTick(int ticksExisted); - + public IManaBurst runBurstSimulation(); } diff --git a/src/main/java/vazkii/botania/api/mana/IManaTooltipDisplay.java b/src/main/java/vazkii/botania/api/mana/IManaTooltipDisplay.java index 21de4740e..b62093a98 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaTooltipDisplay.java +++ b/src/main/java/vazkii/botania/api/mana/IManaTooltipDisplay.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 23, 2015, 3:54:03 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/IManaTrigger.java b/src/main/java/vazkii/botania/api/mana/IManaTrigger.java index b6eb8403b..477c0cef0 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaTrigger.java +++ b/src/main/java/vazkii/botania/api/mana/IManaTrigger.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 16, 2014, 7:52:53 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/IManaUsingItem.java b/src/main/java/vazkii/botania/api/mana/IManaUsingItem.java index 9fe55fc46..0356f8307 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaUsingItem.java +++ b/src/main/java/vazkii/botania/api/mana/IManaUsingItem.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 25, 2014, 7:32:10 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/IPingable.java b/src/main/java/vazkii/botania/api/mana/IPingable.java index dec5fe57d..96250c259 100644 --- a/src/main/java/vazkii/botania/api/mana/IPingable.java +++ b/src/main/java/vazkii/botania/api/mana/IPingable.java @@ -2,18 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 19, 2015, 9:52:05 PM (GMT)] */ package vazkii.botania.api.mana; -import vazkii.botania.api.internal.IManaBurst; - import java.util.UUID; +import vazkii.botania.api.internal.IManaBurst; + /** * This describes an interface of a Mana Sender block that should be able to pingbackable * by a burst to tell it that the burst is still alive. @@ -30,7 +30,7 @@ public interface IPingable { /** * @return A unique and persistent identifier for this IPingable - */ + */ public UUID getIdentifier(); } diff --git a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java index fd3288d8d..0f1711f17 100644 --- a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java +++ b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 2, 2014, 6:36:54 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/IThrottledPacket.java b/src/main/java/vazkii/botania/api/mana/IThrottledPacket.java index ff760bed0..b909e3fa8 100644 --- a/src/main/java/vazkii/botania/api/mana/IThrottledPacket.java +++ b/src/main/java/vazkii/botania/api/mana/IThrottledPacket.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 12, 2015, 3:08:09 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/ITinyPlanetExcempt.java b/src/main/java/vazkii/botania/api/mana/ITinyPlanetExcempt.java index a82114c3a..ab591e4e7 100644 --- a/src/main/java/vazkii/botania/api/mana/ITinyPlanetExcempt.java +++ b/src/main/java/vazkii/botania/api/mana/ITinyPlanetExcempt.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 22, 2014, 2:26:14 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java b/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java index 0e8a0fb58..f7ef8c640 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java +++ b/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java @@ -2,17 +2,15 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 25, 2016, 9:02:12 PM (GMT)] */ package vazkii.botania.api.mana; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.Event; public class ManaDiscountEvent extends Event { @@ -24,11 +22,11 @@ public class ManaDiscountEvent extends Event { this.entityPlayer = entityPlayer; this.discount = discount; } - + public EntityPlayer getEntityPlayer() { return entityPlayer; } - + public float getDiscount() { return discount; } diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java index c0e0d59c2..7c7c76b53 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 13, 2014, 5:32:24 PM (GMT)] */ package vazkii.botania.api.mana; @@ -33,9 +33,9 @@ public final class ManaItemHandler { public static List getManaItems(EntityPlayer player) { if (player == null) return new ArrayList(); - + IInventory mainInv = player.inventory; - + List toReturn = new ArrayList(); int size = mainInv.getSizeInventory(); @@ -46,13 +46,13 @@ public final class ManaItemHandler { toReturn.add(stackInSlot); } } - + ManaItemsEvent event = new ManaItemsEvent(player, toReturn); MinecraftForge.EVENT_BUS.post(event); toReturn = event.getItems(); return toReturn; } - + /** * Gets a list containing all mana-holding items in a player's baubles inventory. * @return The list of items @@ -60,12 +60,12 @@ public final class ManaItemHandler { public static Map getManaBaubles(EntityPlayer player) { if (player == null) return new HashMap(); - + IInventory baublesInv = BotaniaAPI.internalHandler.getBaublesInventory(player); if (baublesInv == null) return new HashMap(); - - + + Map toReturn = new HashMap(); int size = baublesInv.getSizeInventory(); @@ -76,10 +76,10 @@ public final class ManaItemHandler { toReturn.put(slot, stackInSlot); } } - + return toReturn; } - + /** * Requests mana from items in a given player's inventory. * @param manaToGet How much mana is to be requested, if less mana exists than this amount, @@ -108,7 +108,7 @@ public final class ManaItemHandler { return mana; } } - + Map baubles = getManaBaubles(player); for (Entry entry : baubles.entrySet()) { ItemStack stackInSlot = entry.getValue(); @@ -123,7 +123,7 @@ public final class ManaItemHandler { if(remove) manaItem.addMana(stackInSlot, -mana); - + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, entry.getKey()); return mana; @@ -159,7 +159,7 @@ public final class ManaItemHandler { return true; } } - + Map baubles = getManaBaubles(player); for (Entry entry : baubles.entrySet()) { ItemStack stackInSlot = entry.getValue(); @@ -213,7 +213,7 @@ public final class ManaItemHandler { return received; } } - + Map baubles = getManaBaubles(player); for (Entry entry : baubles.entrySet()) { ItemStack stackInSlot = entry.getValue(); @@ -263,11 +263,11 @@ public final class ManaItemHandler { if(add) manaItemSlot.addMana(stackInSlot, manaToSend); - + return true; } } - + Map baubles = getManaBaubles(player); for (Entry entry : baubles.entrySet()) { ItemStack stackInSlot = entry.getValue(); @@ -328,7 +328,7 @@ public final class ManaItemHandler { if(armor != null && armor.getItem() instanceof IManaDiscountArmor) discount += ((IManaDiscountArmor) armor.getItem()).getDiscount(armor, i, player); } - + ManaDiscountEvent event = new ManaDiscountEvent(player, discount); MinecraftForge.EVENT_BUS.post(event); discount = event.getDiscount(); diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemsEvent.java b/src/main/java/vazkii/botania/api/mana/ManaItemsEvent.java index 379256559..1834b59ed 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemsEvent.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemsEvent.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 23, 2016, 11:59:12 PM (GMT)] */ package vazkii.botania.api.mana; @@ -25,11 +25,11 @@ public class ManaItemsEvent extends Event { this.entityPlayer = entityPlayer; this.items = items; } - + public EntityPlayer getEntityPlayer() { return entityPlayer; } - + public List getItems() { return items; } diff --git a/src/main/java/vazkii/botania/api/mana/ManaNetworkEvent.java b/src/main/java/vazkii/botania/api/mana/ManaNetworkEvent.java index 747b19379..c48a254ee 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaNetworkEvent.java +++ b/src/main/java/vazkii/botania/api/mana/ManaNetworkEvent.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 22, 2014, 5:04:30 PM (GMT)] */ package vazkii.botania.api.mana; diff --git a/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java b/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java index 6a924671c..8421bd49c 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java +++ b/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 21, 2014, 5:44:13 PM (GMT)] */ package vazkii.botania.api.mana.spark; diff --git a/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java b/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java index 81f6d14ca..b7bc2ffdd 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java +++ b/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 21, 2014, 5:44:07 PM (GMT)] */ package vazkii.botania.api.mana.spark; diff --git a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java index 82bcd0214..748e533aa 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java +++ b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java @@ -2,21 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 21, 2014, 7:16:11 PM (GMT)] */ package vazkii.botania.api.mana.spark; +import java.util.List; + import com.google.common.base.Predicates; + import net.minecraft.entity.Entity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; -import java.util.List; - public final class SparkHelper { public static final int SPARK_SCAN_RANGE = 12; @@ -28,7 +29,7 @@ public final class SparkHelper { public static List getEntitiesAround(Class clazz, World world, double x, double y, double z) { int r = SPARK_SCAN_RANGE; List entities = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(x - r, y - r, z - r, x + r, y + r, z + r), Predicates.instanceOf(clazz)); - return ((List) entities); + return entities; } } diff --git a/src/main/java/vazkii/botania/api/mana/spark/SparkUpgradeType.java b/src/main/java/vazkii/botania/api/mana/spark/SparkUpgradeType.java index cdfc48a40..c6d4d99f5 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/SparkUpgradeType.java +++ b/src/main/java/vazkii/botania/api/mana/spark/SparkUpgradeType.java @@ -1,9 +1,9 @@ package vazkii.botania.api.mana.spark; public enum SparkUpgradeType { - NONE, - DISPERSIVE, - DOMINANT, - RECESSIVE, - ISOLATED + NONE, + DISPERSIVE, + DOMINANT, + RECESSIVE, + ISOLATED } diff --git a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java index 605243ab6..1829e8816 100644 --- a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java +++ b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java @@ -2,21 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 17, 2015, 4:58:30 PM (GMT)] */ package vazkii.botania.api.recipe; +import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.common.eventhandler.Event; -import java.util.List; - /** * An event fired when an Elven Portal TE updates. The portal's * relevant AABB and other stuff is passed in for convenience. This diff --git a/src/main/java/vazkii/botania/api/recipe/IFlowerComponent.java b/src/main/java/vazkii/botania/api/recipe/IFlowerComponent.java index 329ad9ce2..ffd793ed8 100644 --- a/src/main/java/vazkii/botania/api/recipe/IFlowerComponent.java +++ b/src/main/java/vazkii/botania/api/recipe/IFlowerComponent.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 15, 2014, 2:36:35 PM (GMT)] */ package vazkii.botania.api.recipe; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index ebb05cae3..f56f0175b 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -2,15 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 8:52:00 PM (GMT)] */ package vazkii.botania.api.recipe; +import java.util.ArrayList; +import java.util.List; + import com.google.common.collect.ImmutableList; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; @@ -18,9 +22,6 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; -import java.util.ArrayList; -import java.util.List; - public class RecipeBrew { private final Brew brew; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index 834d5993f..56beaa12c 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -1,12 +1,13 @@ package vazkii.botania.api.recipe; -import com.google.common.collect.ImmutableList; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + public class RecipeElvenTrade { private final ImmutableList outputs; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index be05608c6..5a8e477ca 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -2,21 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 30, 2014, 5:57:07 PM (GMT)] */ package vazkii.botania.api.recipe; +import java.util.List; + +import javax.annotation.Nullable; + import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import javax.annotation.Nullable; -import java.util.List; - public class RecipeManaInfusion { private final ItemStack output; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java index 351b9639a..a1eb3f030 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 22, 2015, 5:57:59 PM (GMT)] */ package vazkii.botania.api.recipe; @@ -23,7 +23,7 @@ public class RecipeMiniFlower extends RecipeManaInfusion { @Override public boolean matches(ItemStack stack) { String key = BotaniaAPI.internalHandler.getStackSubTileKey(stack); - String input = this.getInput() instanceof String ? (String) this.getInput() : BotaniaAPI.internalHandler.getStackSubTileKey((ItemStack) this.getInput()); + String input = getInput() instanceof String ? (String) getInput() : BotaniaAPI.internalHandler.getStackSubTileKey((ItemStack) getInput()); return key != null && key.equals(input); } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index 7f0072791..1a65d9b60 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -2,22 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 22, 2014, 2:02:44 PM (GMT)] */ package vazkii.botania.api.recipe; +import java.util.ArrayList; +import java.util.List; + import com.google.common.collect.ImmutableList; + import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.oredict.OreDictionary; -import java.util.ArrayList; -import java.util.List; - public class RecipePetals { private final ItemStack output; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index 51aea7e31..530741a26 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -2,15 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 17, 2015, 5:07:25 PM (GMT)] */ package vazkii.botania.api.recipe; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import com.google.common.base.Preconditions; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; @@ -19,10 +24,6 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.subtile.SubTileEntity; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public class RecipePureDaisy { public static final int DEFAULT_TIME = 150; @@ -39,7 +40,7 @@ public class RecipePureDaisy { public RecipePureDaisy(Object input, IBlockState state, int time) { Preconditions.checkArgument(time >= 0, "Time must be nonnegative"); this.input = input; - this.outputState = state; + outputState = state; this.time = time; if(input != null && !(input instanceof String || input instanceof Block)) throw new IllegalArgumentException("input must be an oredict String or a Block."); diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java b/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java index 22c6dcf37..025924c41 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 5, 2014, 1:41:14 PM (GMT)] */ package vazkii.botania.api.recipe; diff --git a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java index a5bcb6eb3..2e9938229 100644 --- a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java +++ b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java @@ -9,54 +9,54 @@ import net.minecraft.util.SoundEvent; */ public final class BotaniaSoundEvents { - public static final SoundEvent airRod = getRegisteredSoundEvent("botania:airRod"); - public static final SoundEvent agricarnation = getRegisteredSoundEvent("botania:agricarnation"); - public static final SoundEvent altarCraft = getRegisteredSoundEvent("botania:altarCraft"); - public static final SoundEvent babylonAttack = getRegisteredSoundEvent("botania:babylonAttack"); - public static final SoundEvent babylonSpawn = getRegisteredSoundEvent("botania:babylonSpawn"); - public static final SoundEvent bellows = getRegisteredSoundEvent("botania:bellows"); - public static final SoundEvent bifrostRod = getRegisteredSoundEvent("botania:bifrostRod"); - public static final SoundEvent blackLotus = getRegisteredSoundEvent("botania:blackLotus"); - public static final SoundEvent dash = getRegisteredSoundEvent("botania:dash"); - public static final SoundEvent ding = getRegisteredSoundEvent("botania:ding"); - public static final SoundEvent divaCharm = getRegisteredSoundEvent("botania:divaCharm"); - public static final SoundEvent divinationRod = getRegisteredSoundEvent("botania:divinationRod"); - public static final SoundEvent doit = getRegisteredSoundEvent("botania:doit"); - public static final SoundEvent enchanterFade = getRegisteredSoundEvent("botania:enchanterForm"); - public static final SoundEvent enchanterForm = getRegisteredSoundEvent("botania:enchanterFade"); - public static final SoundEvent enchanterEnchant = getRegisteredSoundEvent("botania:enchanterEnchant"); - public static final SoundEvent endoflame = getRegisteredSoundEvent("botania:endoflame"); - public static final SoundEvent equipBauble = getRegisteredSoundEvent("botania:equipBauble"); - public static final SoundEvent gaiaTrap = getRegisteredSoundEvent("botania:gaiaTrap"); - public static final SoundEvent goldenLaurel = getRegisteredSoundEvent("botania:goldenLaurel"); - public static final SoundEvent holyCloak = getRegisteredSoundEvent("botania:holyCloak"); - public static final SoundEvent laputaStart = getRegisteredSoundEvent("botania:laputaStart"); - public static final SoundEvent lexiconOpen = getRegisteredSoundEvent("botania:lexiconOpen"); - public static final SoundEvent lexiconPage = getRegisteredSoundEvent("botania:lexiconPage"); - public static final SoundEvent lightRelay = getRegisteredSoundEvent("botania:lightRelay"); - public static final SoundEvent manaBlaster = getRegisteredSoundEvent("botania:manaBlaster"); - public static final SoundEvent manaPoolCraft = getRegisteredSoundEvent("botania:manaPoolCraft"); - public static final SoundEvent missile = getRegisteredSoundEvent("botania:missile"); - public static final SoundEvent orechid = getRegisteredSoundEvent("botania:orechid"); - public static final SoundEvent potionCreate = getRegisteredSoundEvent("botania:potionCreate"); - public static final SoundEvent runeAltarCraft = getRegisteredSoundEvent("botania:runeAltarCraft"); - public static final SoundEvent runeAltarStart = getRegisteredSoundEvent("botania:runeAltarStart"); - public static final SoundEvent spreaderFire = getRegisteredSoundEvent("botania:spreaderFire"); - public static final SoundEvent starcaller = getRegisteredSoundEvent("botania:starcaller"); - public static final SoundEvent terraBlade = getRegisteredSoundEvent("botania:terraBlade"); - public static final SoundEvent terraformRod = getRegisteredSoundEvent("botania:terraformRod"); - public static final SoundEvent terraPickMode = getRegisteredSoundEvent("botania:terraPickMode"); - public static final SoundEvent terrasteelCraft = getRegisteredSoundEvent("botania:terrasteelCraft"); - public static final SoundEvent thermalily = getRegisteredSoundEvent("botania:thermalily"); - public static final SoundEvent unholyCloak = getRegisteredSoundEvent("botania:unholyCloak"); - public static final SoundEvent way = getRegisteredSoundEvent("botania:way"); + public static final SoundEvent airRod = getRegisteredSoundEvent("botania:airRod"); + public static final SoundEvent agricarnation = getRegisteredSoundEvent("botania:agricarnation"); + public static final SoundEvent altarCraft = getRegisteredSoundEvent("botania:altarCraft"); + public static final SoundEvent babylonAttack = getRegisteredSoundEvent("botania:babylonAttack"); + public static final SoundEvent babylonSpawn = getRegisteredSoundEvent("botania:babylonSpawn"); + public static final SoundEvent bellows = getRegisteredSoundEvent("botania:bellows"); + public static final SoundEvent bifrostRod = getRegisteredSoundEvent("botania:bifrostRod"); + public static final SoundEvent blackLotus = getRegisteredSoundEvent("botania:blackLotus"); + public static final SoundEvent dash = getRegisteredSoundEvent("botania:dash"); + public static final SoundEvent ding = getRegisteredSoundEvent("botania:ding"); + public static final SoundEvent divaCharm = getRegisteredSoundEvent("botania:divaCharm"); + public static final SoundEvent divinationRod = getRegisteredSoundEvent("botania:divinationRod"); + public static final SoundEvent doit = getRegisteredSoundEvent("botania:doit"); + public static final SoundEvent enchanterFade = getRegisteredSoundEvent("botania:enchanterForm"); + public static final SoundEvent enchanterForm = getRegisteredSoundEvent("botania:enchanterFade"); + public static final SoundEvent enchanterEnchant = getRegisteredSoundEvent("botania:enchanterEnchant"); + public static final SoundEvent endoflame = getRegisteredSoundEvent("botania:endoflame"); + public static final SoundEvent equipBauble = getRegisteredSoundEvent("botania:equipBauble"); + public static final SoundEvent gaiaTrap = getRegisteredSoundEvent("botania:gaiaTrap"); + public static final SoundEvent goldenLaurel = getRegisteredSoundEvent("botania:goldenLaurel"); + public static final SoundEvent holyCloak = getRegisteredSoundEvent("botania:holyCloak"); + public static final SoundEvent laputaStart = getRegisteredSoundEvent("botania:laputaStart"); + public static final SoundEvent lexiconOpen = getRegisteredSoundEvent("botania:lexiconOpen"); + public static final SoundEvent lexiconPage = getRegisteredSoundEvent("botania:lexiconPage"); + public static final SoundEvent lightRelay = getRegisteredSoundEvent("botania:lightRelay"); + public static final SoundEvent manaBlaster = getRegisteredSoundEvent("botania:manaBlaster"); + public static final SoundEvent manaPoolCraft = getRegisteredSoundEvent("botania:manaPoolCraft"); + public static final SoundEvent missile = getRegisteredSoundEvent("botania:missile"); + public static final SoundEvent orechid = getRegisteredSoundEvent("botania:orechid"); + public static final SoundEvent potionCreate = getRegisteredSoundEvent("botania:potionCreate"); + public static final SoundEvent runeAltarCraft = getRegisteredSoundEvent("botania:runeAltarCraft"); + public static final SoundEvent runeAltarStart = getRegisteredSoundEvent("botania:runeAltarStart"); + public static final SoundEvent spreaderFire = getRegisteredSoundEvent("botania:spreaderFire"); + public static final SoundEvent starcaller = getRegisteredSoundEvent("botania:starcaller"); + public static final SoundEvent terraBlade = getRegisteredSoundEvent("botania:terraBlade"); + public static final SoundEvent terraformRod = getRegisteredSoundEvent("botania:terraformRod"); + public static final SoundEvent terraPickMode = getRegisteredSoundEvent("botania:terraPickMode"); + public static final SoundEvent terrasteelCraft = getRegisteredSoundEvent("botania:terrasteelCraft"); + public static final SoundEvent thermalily = getRegisteredSoundEvent("botania:thermalily"); + public static final SoundEvent unholyCloak = getRegisteredSoundEvent("botania:unholyCloak"); + public static final SoundEvent way = getRegisteredSoundEvent("botania:way"); - public static final SoundEvent gaiaMusic1 = getRegisteredSoundEvent("botania:music.gaia1"); - public static final SoundEvent gaiaMusic2 = getRegisteredSoundEvent("botania:music.gaia2"); + public static final SoundEvent gaiaMusic1 = getRegisteredSoundEvent("botania:music.gaia1"); + public static final SoundEvent gaiaMusic2 = getRegisteredSoundEvent("botania:music.gaia2"); - private static SoundEvent getRegisteredSoundEvent(String name) { - return SoundEvent.REGISTRY.getObject(new ResourceLocation(name)); - } + private static SoundEvent getRegisteredSoundEvent(String name) { + return SoundEvent.REGISTRY.getObject(new ResourceLocation(name)); + } - private BotaniaSoundEvents() {} + private BotaniaSoundEvents() {} } diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index f31df9465..9d195b609 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -10,6 +10,7 @@ package vazkii.botania.api.state; import com.google.common.base.Predicate; import com.google.common.base.Predicates; + import net.minecraft.block.BlockRailBase; import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockRotatedPillar; diff --git a/src/main/java/vazkii/botania/api/state/PropertyObject.java b/src/main/java/vazkii/botania/api/state/PropertyObject.java index 8dd5ac757..497b2ae31 100644 --- a/src/main/java/vazkii/botania/api/state/PropertyObject.java +++ b/src/main/java/vazkii/botania/api/state/PropertyObject.java @@ -8,12 +8,13 @@ */ package vazkii.botania.api.state; +import java.util.Objects; + import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import net.minecraftforge.common.property.IUnlistedProperty; -import java.util.Objects; +import net.minecraftforge.common.property.IUnlistedProperty; // Generic base class for unlisted properties public class PropertyObject implements IUnlistedProperty { diff --git a/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java index 91d52e25d..40545896d 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java +++ b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum AlfPortalState implements IStringSerializable { OFF, ON_Z, diff --git a/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java index 612742b73..39c9abd58 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum AltGrassVariant implements IStringSerializable { DRY, GOLDEN, @@ -22,7 +22,7 @@ public enum AltGrassVariant implements IStringSerializable { @Override public String getName() { - return this.name().toLowerCase(Locale.ROOT); + return name().toLowerCase(Locale.ROOT); } } diff --git a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java index 056b2b428..3d7dfbb82 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum AltarVariant implements IStringSerializable { DEFAULT, FOREST, diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java index 4808a5893..99e3204c9 100644 --- a/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum BiomeBrickVariant implements IStringSerializable { FOREST, PLAINS, diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java index 946e8fee0..83d40c719 100644 --- a/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum BiomeStoneVariant implements IStringSerializable { FOREST, PLAINS, diff --git a/src/main/java/vazkii/botania/api/state/enums/CratePattern.java b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java index 653a29776..68fa20d67 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CratePattern.java +++ b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum CratePattern implements IStringSerializable { NONE, CRAFTY_1_1, diff --git a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java index ba2fa8784..de58be763 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum CrateVariant implements IStringSerializable { OPEN, CRAFTY; diff --git a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java index 182a4c019..56607013f 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum CustomBrickVariant implements IStringSerializable { HELLISH_BRICK, SOUL_BRICK, diff --git a/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java index 50d954002..0782734c1 100644 --- a/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum DrumVariant implements IStringSerializable { WILD, GATHERING, diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java index bd28a9730..49cad3eb5 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum LivingRockVariant implements IStringSerializable { DEFAULT, BRICK, diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java index e9d27c2f1..a00e061c3 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum LivingWoodVariant implements IStringSerializable { DEFAULT, PLANKS, diff --git a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java index 8ade0a003..8eeeb96f0 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum LuminizerVariant implements IStringSerializable { DEFAULT, DETECTOR, diff --git a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java index 37c2e64db..cdaf94d7d 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum PlatformVariant implements IStringSerializable { ABSTRUSE, SPECTRAL, diff --git a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java index fe2a2e702..9103957c3 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum PoolVariant implements IStringSerializable { DEFAULT, CREATIVE, diff --git a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java index 3a4ed9f09..ce68aeca0 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum PylonVariant implements IStringSerializable { MANA, NATURA, diff --git a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java index 3bb9a1ea2..ccf793f4f 100644 --- a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum QuartzVariant implements IStringSerializable { NORMAL, CHISELED, diff --git a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java index 3794b113f..a4c9a4e48 100644 --- a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum SpreaderVariant implements IStringSerializable { MANA, REDSTONE, diff --git a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java index 6626730d4..595fd5cde 100644 --- a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import net.minecraft.util.IStringSerializable; - import java.util.Locale; +import net.minecraft.util.IStringSerializable; + public enum StorageVariant implements IStringSerializable { MANASTEEL, TERRASTEEL, diff --git a/src/main/java/vazkii/botania/api/subtile/ISpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/ISpecialFlower.java index 3bca4313c..cc3db2a8d 100644 --- a/src/main/java/vazkii/botania/api/subtile/ISpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/ISpecialFlower.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 22, 2014, 7:12:28 PM (GMT)] */ package vazkii.botania.api.subtile; diff --git a/src/main/java/vazkii/botania/api/subtile/ISubTileContainer.java b/src/main/java/vazkii/botania/api/subtile/ISubTileContainer.java index 3a99d6d86..7ff6c45f5 100644 --- a/src/main/java/vazkii/botania/api/subtile/ISubTileContainer.java +++ b/src/main/java/vazkii/botania/api/subtile/ISubTileContainer.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 26, 2014, 5:42:16 PM (GMT)] */ package vazkii.botania.api.subtile; diff --git a/src/main/java/vazkii/botania/api/subtile/ISubTileSlowableContainer.java b/src/main/java/vazkii/botania/api/subtile/ISubTileSlowableContainer.java index 6092cd618..f32629ac1 100644 --- a/src/main/java/vazkii/botania/api/subtile/ISubTileSlowableContainer.java +++ b/src/main/java/vazkii/botania/api/subtile/ISubTileSlowableContainer.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [29/12/2015, 23:00:06 (GMT)] */ package vazkii.botania.api.subtile; @@ -20,7 +20,7 @@ public interface ISubTileSlowableContainer extends ISubTileContainer { public static final int SLOWDOWN_FACTOR_PODZOL = 5; public static final int SLOWDOWN_FACTOR_MYCEL = 10; - + public int getSlowdownFactor(); - + } diff --git a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java index a9f322fba..5d832888c 100644 --- a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java +++ b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 31, 2015, 2:59:19 PM (GMT)] */ package vazkii.botania.api.subtile; diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index a9fbbf435..e98186e83 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2014, 3:59:06 PM (GMT)] */ package vazkii.botania.api.subtile; +import java.util.List; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -30,8 +32,6 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandBindable; -import java.util.List; - /** * A Sub-TileEntity, this is used for the flower system. Make sure to map subclasses * of this using BotaniaAPI.mapSubTile(String, Class). Any subclass of this must have @@ -232,7 +232,7 @@ public class SubTileEntity { public boolean isOvergrowthAffected() { return true; } - + /** * Gets ths slowdown factor of this SubTile. * @see ISubTileSlowableContainer @@ -242,7 +242,7 @@ public class SubTileEntity { ISubTileSlowableContainer slowable = (ISubTileSlowableContainer) supertile; return slowable.getSlowdownFactor(); } - + return 0; } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 5c13a3a54..4eb541368 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2014, 8:03:44 PM (GMT)] */ package vazkii.botania.api.subtile; +import java.awt.Color; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.resources.I18n; @@ -27,8 +29,6 @@ import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.sound.BotaniaSoundEvents; -import java.awt.*; - /** * The basic class for a Functional Flower. */ diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index fb2778418..ce7da0c25 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2014, 8:03:36 PM (GMT)] */ package vazkii.botania.api.subtile; +import java.awt.Color; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -32,9 +35,6 @@ import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.sound.BotaniaSoundEvents; -import java.awt.*; -import java.util.List; - /** * The basic class for a Generating Flower. */ diff --git a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java index 5bfa0433b..7fcdae848 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 17, 2014, 5:34:35 PM (GMT)] */ package vazkii.botania.api.subtile.signature; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; @@ -19,8 +21,6 @@ import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.api.subtile.SubTileGenerating; -import java.util.List; - /** * A basic (and fallback) implementation of SubTileSignature. */ diff --git a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java index 31b8c75b6..ed4ac5bcf 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java @@ -2,19 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 17, 2014, 5:29:26 PM (GMT)] */ package vazkii.botania.api.subtile.signature; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import java.util.List; - /** * A singleton instance for a SubTileEntity, this is called for a few methods. */ diff --git a/src/main/java/vazkii/botania/api/wand/ITileBound.java b/src/main/java/vazkii/botania/api/wand/ITileBound.java index 6468870cd..b3ce32b5e 100644 --- a/src/main/java/vazkii/botania/api/wand/ITileBound.java +++ b/src/main/java/vazkii/botania/api/wand/ITileBound.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 24, 2014, 6:47:53 PM (GMT)] */ package vazkii.botania.api.wand; diff --git a/src/main/java/vazkii/botania/api/wand/IWandBindable.java b/src/main/java/vazkii/botania/api/wand/IWandBindable.java index 49506f91c..a0d60eab2 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandBindable.java +++ b/src/main/java/vazkii/botania/api/wand/IWandBindable.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 9, 2014, 3:01:58 PM (GMT)] */ package vazkii.botania.api.wand; diff --git a/src/main/java/vazkii/botania/api/wand/IWandHUD.java b/src/main/java/vazkii/botania/api/wand/IWandHUD.java index a61860877..eee22fc35 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandHUD.java +++ b/src/main/java/vazkii/botania/api/wand/IWandHUD.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 5, 2014, 1:34:44 PM (GMT)] */ package vazkii.botania.api.wand; diff --git a/src/main/java/vazkii/botania/api/wand/IWandable.java b/src/main/java/vazkii/botania/api/wand/IWandable.java index 13997803e..1979a4980 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandable.java +++ b/src/main/java/vazkii/botania/api/wand/IWandable.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 22, 2014, 5:12:53 PM (GMT)] */ package vazkii.botania.api.wand; diff --git a/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java b/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java index d41acb51d..48927cc02 100644 --- a/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java +++ b/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 19, 2014, 7:23:59 PM (GMT)] */ package vazkii.botania.api.wand; diff --git a/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java index c7ef0b27a..3ad45e16e 100644 --- a/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 2, 2014, 5:57:35 PM (GMT)] */ package vazkii.botania.api.wiki; diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index b8baba53e..65574df64 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -2,21 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 2, 2014, 5:58:39 PM (GMT)] */ package vazkii.botania.api.wiki; +import org.apache.commons.lang3.text.WordUtils; + import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import org.apache.commons.lang3.text.WordUtils; public class SimpleWikiProvider implements IWikiProvider { diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index 2c28a1208..2ef5338e1 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -2,20 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 2, 2014, 6:05:03 PM (GMT)] */ package vazkii.botania.api.wiki; -import net.minecraft.block.Block; -import net.minecraft.util.ResourceLocation; - import java.util.HashMap; import java.util.Map; +import net.minecraft.block.Block; +import net.minecraft.util.ResourceLocation; + public class WikiHooks { private static final IWikiProvider FALLBACK_PROVIDER = new SimpleWikiProvider("FTB Wiki", "http://ftb.gamepedia.com/%s"); diff --git a/src/main/java/vazkii/botania/client/challenge/Challenge.java b/src/main/java/vazkii/botania/client/challenge/Challenge.java index ea3dc228f..0483679cf 100644 --- a/src/main/java/vazkii/botania/client/challenge/Challenge.java +++ b/src/main/java/vazkii/botania/client/challenge/Challenge.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 29, 2015, 4:45:25 PM (GMT)] */ package vazkii.botania.client.challenge; diff --git a/src/main/java/vazkii/botania/client/challenge/EnumChallengeLevel.java b/src/main/java/vazkii/botania/client/challenge/EnumChallengeLevel.java index 5fe690ac9..1644eb8d7 100644 --- a/src/main/java/vazkii/botania/client/challenge/EnumChallengeLevel.java +++ b/src/main/java/vazkii/botania/client/challenge/EnumChallengeLevel.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 29, 2015, 4:46:16 PM (GMT)] */ package vazkii.botania.client.challenge; diff --git a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java index f3839130f..a86482739 100644 --- a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java +++ b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 29, 2015, 4:44:49 PM (GMT)] */ package vazkii.botania.client.challenge; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -18,12 +24,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public final class ModChallenges { public static final Map> challenges = new EnumMap<>(EnumChallengeLevel.class); diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 38b1c7f38..be3b7ebf7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 27, 2014, 8:55:00 PM (GMT)] */ package vazkii.botania.client.core.handler; +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import net.minecraft.client.Minecraft; @@ -23,7 +27,6 @@ import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.item.IBaubleRender.RenderType; @@ -33,8 +36,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; -import javax.annotation.Nonnull; - public final class BaubleRenderHandler implements LayerRenderer { @Override @@ -82,7 +83,7 @@ public final class BaubleRenderHandler implements LayerRenderer { ItemStack cosmetic = attachable.getCosmeticItem(stack); if(cosmetic != null) { GlStateManager.pushMatrix(); - GL11.glColor3ub(((byte) 255), ((byte) 255), ((byte) 255)); // Some of the baubles use this so we must restore it manually as well + GL11.glColor3ub((byte) 255, (byte) 255, (byte) 255); // Some of the baubles use this so we must restore it manually as well GlStateManager.color(1F, 1F, 1F, 1F); ((IBaubleRender) cosmetic.getItem()).onPlayerBaubleRender(cosmetic, player, type, partialTicks); GlStateManager.popMatrix(); @@ -92,7 +93,7 @@ public final class BaubleRenderHandler implements LayerRenderer { if(item instanceof IBaubleRender) { GlStateManager.pushMatrix(); - GL11.glColor3ub(((byte) 255), ((byte) 255), ((byte) 255)); // Some of the baubles use this so we must restore it manually as well + GL11.glColor3ub((byte) 255, (byte) 255, (byte) 255); // Some of the baubles use this so we must restore it manually as well GlStateManager.color(1F, 1F, 1F, 1F); ((IBaubleRender) stack.getItem()).onPlayerBaubleRender(stack, player, type, partialTicks); GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index b2f4eb597..ef7db6ce0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 31, 2015, 3:16:02 PM (GMT)] */ package vazkii.botania.client.core.handler; @@ -84,19 +84,19 @@ public final class BlockHighlightRenderHandler { if(e instanceof EntityMagicLandmine) { BlockPos bpos = e.getPosition(); AxisAlignedBB aabb = new AxisAlignedBB(bpos).offset(0, offY, 0).expand(2.5, 0, 2.5); - + float gs = (float) (Math.sin(ClientTickHandler.total / 20) + 1) * 0.2F + 0.6F; int r = (int) (105 * gs); int g = (int) (25 * gs); int b = (int) (145 * gs); Color color = new Color(r, g, b); - + int alpha = 32; if(e.ticksExisted < 8) alpha *= Math.min((e.ticksExisted + event.getPartialTicks()) / 8F, 1F); else if(e.ticksExisted > 47) alpha *= Math.min(1F - (e.ticksExisted - 47 + event.getPartialTicks()) / 8F, 1F); - + renderRectangle(aabb, false, color, (byte) alpha); offY += 0.001; } @@ -120,7 +120,7 @@ public final class BlockHighlightRenderHandler { GlStateManager.pushMatrix(); GlStateManager.translate(aabb.minX - renderPosX, aabb.minY - renderPosY, aabb.minZ - renderPosZ); - + if(color == null) color = Color.getHSBColor(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), alpha); @@ -150,7 +150,7 @@ public final class BlockHighlightRenderHandler { tessellator.draw(); } - GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); + GL11.glColor4ub((byte) 255, (byte) 255, (byte) 255, (byte) 255); GlStateManager.popMatrix(); } @@ -207,7 +207,7 @@ public final class BlockHighlightRenderHandler { } tessellator.getBuffer().pos(0, f1, 0).endVertex(); tessellator.draw(); - GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); + GL11.glColor4ub((byte) 255, (byte) 255, (byte) 255, (byte) 255); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 037f0a538..d6edfdc4d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -2,33 +2,34 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 29, 2014, 6:46:10 PM (GMT)] */ package vazkii.botania.client.core.handler; +import java.awt.Rectangle; +import java.util.Collections; +import java.util.Set; +import java.util.UUID; +import java.util.WeakHashMap; + +import org.lwjgl.opengl.ARBShaderObjects; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; -import java.awt.*; -import java.util.Collections; -import java.util.Set; -import java.util.UUID; -import java.util.WeakHashMap; - public final class BossBarHandler { private BossBarHandler() {} @@ -54,7 +55,7 @@ public final class BossBarHandler { int y = evt.getY(); int xf = x + (bgRect.width - fgRect.width) / 2; int yf = y + (bgRect.height - fgRect.height) / 2; - int fw = (int) ((double) fgRect.width * (evt.getBossInfo().getPercent())); + int fw = (int) ((double) fgRect.width * evt.getBossInfo().getPercent()); int tx = c - mc.fontRendererObj.getStringWidth(name) / 2; GlStateManager.color(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java b/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java index 7170e0603..0877b5349 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java +++ b/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 22, 2014, 3:33:25 PM (GMT)] */ package vazkii.botania.client.core.handler; diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index db585084f..c053e4f7d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 24, 2014, 7:02:37 PM (GMT)] */ package vazkii.botania.client.core.handler; +import java.awt.Color; +import java.util.List; + +import org.lwjgl.opengl.GL11; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -28,15 +33,11 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.CombinedInvWrapper; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; -import java.awt.*; -import java.util.List; - public final class BoundTileRenderer { private BoundTileRenderer() {} @@ -51,7 +52,7 @@ public final class BoundTileRenderer { EntityPlayer player = Minecraft.getMinecraft().thePlayer; int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); - + if(player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ICoordBoundItem) { BlockPos coords = ((ICoordBoundItem) player.getHeldItemMainhand().getItem()).getBinding(player.getHeldItemMainhand()); if(coords != null) @@ -64,7 +65,7 @@ public final class BoundTileRenderer { renderBlockOutlineAt(coords, color); } - IItemHandlerModifiable mainInv = ((IItemHandlerModifiable) player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP)); + IItemHandlerModifiable mainInv = (IItemHandlerModifiable) player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP); IItemHandlerModifiable baublesInv = BotaniaAPI.internalHandler.getBaublesInventoryWrapped(player); IItemHandler joined = baublesInv != null ? new CombinedInvWrapper(mainInv, baublesInv) : mainInv; @@ -133,12 +134,12 @@ public final class BoundTileRenderer { renderBlockOutline(axis); GL11.glLineWidth(thickness + 3F); - GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), ((byte) 64)); + GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); renderBlockOutline(axis); } } - GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); + GL11.glColor4ub((byte) 255, (byte) 255, (byte) 255, (byte) 255); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java index cd87afeb2..abe798f65 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java @@ -1,59 +1,58 @@ package vazkii.botania.client.core.handler; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.reflect.Field; + import com.google.common.base.Throwables; -import net.minecraft.client.renderer.EntityRenderer; + import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibObfuscation; -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - public final class ClientMethodHandles { - public static final MethodHandle - renderPosX_getter, renderPosY_getter, renderPosZ_getter, // RenderManager - starGLCallList_getter, starVBO_getter, glSkyList_getter, skyVBO_getter; // RenderGlobal + public static final MethodHandle + renderPosX_getter, renderPosY_getter, renderPosZ_getter, // RenderManager + starGLCallList_getter, starVBO_getter, glSkyList_getter, skyVBO_getter; // RenderGlobal - static { - try { - Field f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSX); - f.setAccessible(true); - renderPosX_getter = MethodHandles.publicLookup().unreflectGetter(f); + static { + try { + Field f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSX); + f.setAccessible(true); + renderPosX_getter = MethodHandles.publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSY); - f.setAccessible(true); - renderPosY_getter = MethodHandles.publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSY); + f.setAccessible(true); + renderPosY_getter = MethodHandles.publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSZ); - f.setAccessible(true); - renderPosZ_getter = MethodHandles.publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSZ); + f.setAccessible(true); + renderPosZ_getter = MethodHandles.publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(RenderGlobal.class, LibObfuscation.STAR_GL_CALL_LIST); - f.setAccessible(true); - starGLCallList_getter = MethodHandles.publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(RenderGlobal.class, LibObfuscation.STAR_GL_CALL_LIST); + f.setAccessible(true); + starGLCallList_getter = MethodHandles.publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(RenderGlobal.class, LibObfuscation.STAR_VBO); - f.setAccessible(true); - starVBO_getter = MethodHandles.publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(RenderGlobal.class, LibObfuscation.STAR_VBO); + f.setAccessible(true); + starVBO_getter = MethodHandles.publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(RenderGlobal.class, LibObfuscation.GL_SKY_LIST); - f.setAccessible(true); - glSkyList_getter = MethodHandles.publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(RenderGlobal.class, LibObfuscation.GL_SKY_LIST); + f.setAccessible(true); + glSkyList_getter = MethodHandles.publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(RenderGlobal.class, LibObfuscation.SKY_VBO); - f.setAccessible(true); - skyVBO_getter = MethodHandles.publicLookup().unreflectGetter(f); - } catch (IllegalAccessException e) { - Botania.LOGGER.fatal("Couldn't initialize client methodhandles! Things will be broken!"); - e.printStackTrace(); - throw Throwables.propagate(e); - } - } + f = ReflectionHelper.findField(RenderGlobal.class, LibObfuscation.SKY_VBO); + f.setAccessible(true); + skyVBO_getter = MethodHandles.publicLookup().unreflectGetter(f); + } catch (IllegalAccessException e) { + Botania.LOGGER.fatal("Couldn't initialize client methodhandles! Things will be broken!"); + e.printStackTrace(); + throw Throwables.propagate(e); + } + } - private ClientMethodHandles() {} + private ClientMethodHandles() {} } diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 1fa7197b0..55d1de7b6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -2,15 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 3, 2014, 9:59:17 PM (GMT)] */ package vazkii.botania.client.core.handler; import com.google.common.collect.ImmutableList; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index 16259110e..1b379c736 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -9,7 +9,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.color.BlockColors; import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.client.renderer.color.ItemColors; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBlock; @@ -40,126 +39,126 @@ import vazkii.botania.common.item.lens.ItemLens; public final class ColorHandler { - public static void init() { - BlockColors blocks = Minecraft.getMinecraft().getBlockColors(); - Map, IBlockColor> map = ReflectionHelper.getPrivateValue(BlockColors.class, blocks, "blockColorMap"); + public static void init() { + BlockColors blocks = Minecraft.getMinecraft().getBlockColors(); + Map, IBlockColor> map = ReflectionHelper.getPrivateValue(BlockColors.class, blocks, "blockColorMap"); - // Steal vine colorer - blocks.registerBlockColorHandler(map.get(Blocks.VINE.delegate), ModBlocks.solidVines); + // Steal vine colorer + blocks.registerBlockColorHandler(map.get(Blocks.VINE.delegate), ModBlocks.solidVines); - // Pool - blocks.registerBlockColorHandler( - (state, world, pos, tintIndex) -> { - if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { - float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return Color.HSBtoRGB(time * 0.005F, 0.6F, 1F); - } else { - return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; - } - }, - ModBlocks.pool - ); + // Pool + blocks.registerBlockColorHandler( + (state, world, pos, tintIndex) -> { + if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { + float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; + return Color.HSBtoRGB(time * 0.005F, 0.6F, 1F); + } else { + return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; + } + }, + ModBlocks.pool + ); - // Spreader - blocks.registerBlockColorHandler( - (state, world, pos, tintIndex) -> { - if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) - return 0xFFFFFF; - float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return Color.HSBtoRGB((time * 5) % 360 / 360F, 0.4F, 0.9F); - }, - ModBlocks.spreader - ); - - // Petal Block - blocks.registerBlockColorHandler((state, world, pos, tintIndex) -> { - int meta = ModBlocks.petalBlock.getMetaFromState(state); - return EnumDyeColor.byMetadata(meta).getMapColor().colorValue; - }, - ModBlocks.petalBlock - ); + // Spreader + blocks.registerBlockColorHandler( + (state, world, pos, tintIndex) -> { + if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) + return 0xFFFFFF; + float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; + return Color.HSBtoRGB(time * 5 % 360 / 360F, 0.4F, 0.9F); + }, + ModBlocks.spreader + ); - // Platforms - blocks.registerBlockColorHandler( - (state, world, pos, tintIndex) -> { - if (world != null && pos != null) { - TileEntity tile = world.getTileEntity(pos); - if(tile instanceof TileCamo) { - TileCamo camo = (TileCamo) tile; - IBlockState camoState = camo.camoState; - if(camoState != null) - return camoState.getBlock() instanceof BlockCamo - ? 0xFFFFFF - : Minecraft.getMinecraft().getBlockColors().colorMultiplier(camoState, world, pos, tintIndex); - } - } - return 0xFFFFFF; - }, ModBlocks.platform); + // Petal Block + blocks.registerBlockColorHandler((state, world, pos, tintIndex) -> { + int meta = ModBlocks.petalBlock.getMetaFromState(state); + return EnumDyeColor.byMetadata(meta).getMapColor().colorValue; + }, + ModBlocks.petalBlock + ); - ItemColors items = Minecraft.getMinecraft().getItemColors(); + // Platforms + blocks.registerBlockColorHandler( + (state, world, pos, tintIndex) -> { + if (world != null && pos != null) { + TileEntity tile = world.getTileEntity(pos); + if(tile instanceof TileCamo) { + TileCamo camo = (TileCamo) tile; + IBlockState camoState = camo.camoState; + if(camoState != null) + return camoState.getBlock() instanceof BlockCamo + ? 0xFFFFFF + : Minecraft.getMinecraft().getBlockColors().colorMultiplier(camoState, world, pos, tintIndex); + } + } + return 0xFFFFFF; + }, ModBlocks.platform); - items.registerItemColorHandler((s, t) -> (s.getItemDamage() == 5 || s.getItemDamage() == 14) - ? Color.HSBtoRGB(Botania.proxy.getWorldElapsedTicks() * 2 % 360 / 360F, 0.25F, 1F) : -1, - ModItems.manaResource); + ItemColors items = Minecraft.getMinecraft().getItemColors(); - items.registerItemColorHandler((s, t) -> - t == 1 ? EnumDyeColor.byMetadata(ItemTwigWand.getColor1(s)).getMapColor().colorValue - : t == 2 ? EnumDyeColor.byMetadata(ItemTwigWand.getColor2(s)).getMapColor().colorValue - : -1, - ModItems.twigWand); + items.registerItemColorHandler((s, t) -> s.getItemDamage() == 5 || s.getItemDamage() == 14 + ? Color.HSBtoRGB(Botania.proxy.getWorldElapsedTicks() * 2 % 360 / 360F, 0.25F, 1F) : -1, + ModItems.manaResource); - items.registerItemColorHandler((s, t) -> EnumDyeColor.byMetadata(s.getItemDamage()).getMapColor().colorValue, ModItems.dye, ModItems.petal); - items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).block.getStateFromMeta(s.getMetadata()), null, null, t), - ModBlocks.petalBlock, ModBlocks.pool, ModBlocks.spreader); + items.registerItemColorHandler((s, t) -> + t == 1 ? EnumDyeColor.byMetadata(ItemTwigWand.getColor1(s)).getMapColor().colorValue + : t == 2 ? EnumDyeColor.byMetadata(ItemTwigWand.getColor2(s)).getMapColor().colorValue + : -1, + ModItems.twigWand); - items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, ((ItemManaMirror) ModItems.manaMirror).getMana(s) / TilePool.MAX_MANA, 1F) : -1, ModItems.manaMirror); + items.registerItemColorHandler((s, t) -> EnumDyeColor.byMetadata(s.getItemDamage()).getMapColor().colorValue, ModItems.dye, ModItems.petal); + items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).block.getStateFromMeta(s.getMetadata()), null, null, t), + ModBlocks.petalBlock, ModBlocks.pool, ModBlocks.spreader); - items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, ((ItemManaTablet) ModItems.manaTablet).getMana(s) / ItemManaTablet.MAX_MANA, 1F) : -1, ModItems.manaTablet); + items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, ((ItemManaMirror) ModItems.manaMirror).getMana(s) / TilePool.MAX_MANA, 1F) : -1, ModItems.manaMirror); - items.registerItemColorHandler((s, t) -> Color.HSBtoRGB(0.55F, ((float) s.getMaxDamage() - (float) s.getItemDamage()) / s.getMaxDamage() * 0.5F, 1F), ModItems.spellCloth); + items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, ((ItemManaTablet) ModItems.manaTablet).getMana(s) / ItemManaTablet.MAX_MANA, 1F) : -1, ModItems.manaTablet); - items.registerItemColorHandler((s, t) -> { - if(t != 1) - return -1; + items.registerItemColorHandler((s, t) -> Color.HSBtoRGB(0.55F, ((float) s.getMaxDamage() - (float) s.getItemDamage()) / s.getMaxDamage() * 0.5F, 1F), ModItems.spellCloth); - Brew brew = ((IBrewItem) s.getItem()).getBrew(s); - if(brew == BotaniaAPI.fallbackBrew) - return s.getItem() instanceof ItemBloodPendant ? 0xC6000E : 0x989898; + items.registerItemColorHandler((s, t) -> { + if(t != 1) + return -1; - Color color = new Color(brew.getColor(s)); - double speed = s.getItem() == ModItems.brewFlask || s.getItem() == ModItems.brewVial ? 0.1 : 0.2; - int add = (int) (Math.sin(ClientTickHandler.ticksInGame * speed) * 24); + Brew brew = ((IBrewItem) s.getItem()).getBrew(s); + if(brew == BotaniaAPI.fallbackBrew) + return s.getItem() instanceof ItemBloodPendant ? 0xC6000E : 0x989898; - int r = Math.max(0, Math.min(255, color.getRed() + add)); - int g = Math.max(0, Math.min(255, color.getGreen() + add)); - int b = Math.max(0, Math.min(255, color.getBlue() + add)); + Color color = new Color(brew.getColor(s)); + double speed = s.getItem() == ModItems.brewFlask || s.getItem() == ModItems.brewVial ? 0.1 : 0.2; + int add = (int) (Math.sin(ClientTickHandler.ticksInGame * speed) * 24); - return r << 16 | g << 8 | b; - }, ModItems.bloodPendant, ModItems.incenseStick, ModItems.brewFlask, ModItems.brewVial); + int r = Math.max(0, Math.min(255, color.getRed() + add)); + int g = Math.max(0, Math.min(255, color.getGreen() + add)); + int b = Math.max(0, Math.min(255, color.getBlue() + add)); - items.registerItemColorHandler((s, t) -> { - ItemStack lens = ItemManaGun.getLens(s); - if(lens != null && t == 0) - return Minecraft.getMinecraft().getItemColors().getColorFromItemstack(lens, t); + return r << 16 | g << 8 | b; + }, ModItems.bloodPendant, ModItems.incenseStick, ModItems.brewFlask, ModItems.brewVial); - if(t == 2) { - EntityManaBurst burst = ((ItemManaGun) s.getItem()).getBurst(Minecraft.getMinecraft().thePlayer, s, false); - Color color = new Color(burst == null ? 0x20FF20 : burst.getColor()); + items.registerItemColorHandler((s, t) -> { + ItemStack lens = ItemManaGun.getLens(s); + if(lens != null && t == 0) + return Minecraft.getMinecraft().getItemColors().getColorFromItemstack(lens, t); - float mul = (float) (Math.sin((double) ClientTickHandler.ticksInGame / 5) * 0.15F); - int c = (int) (255 * mul); + if(t == 2) { + EntityManaBurst burst = ((ItemManaGun) s.getItem()).getBurst(Minecraft.getMinecraft().thePlayer, s, false); + Color color = new Color(burst == null ? 0x20FF20 : burst.getColor()); - return new Color(Math.max(0, Math.min(255, color.getRed() + c)), Math.max(0, Math.min(255, color.getGreen() + c)), Math.max(0, Math.min(255, color.getBlue() + c))).getRGB(); - } else return -1; - }, ModItems.manaGun); + float mul = (float) (Math.sin((double) ClientTickHandler.ticksInGame / 5) * 0.15F); + int c = (int) (255 * mul); - items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.75F, 1F, 1.5F - (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 100D) * 0.5 + 1.2F)) : -1, ModItems.enderDagger); + return new Color(Math.max(0, Math.min(255, color.getRed() + c)), Math.max(0, Math.min(255, color.getGreen() + c)), Math.max(0, Math.min(255, color.getBlue() + c))).getRGB(); + } else return -1; + }, ModItems.manaGun); - items.registerItemColorHandler((s, t) -> t == 1 && ItemTerraPick.isEnabled(s) ? Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F) : -1, ModItems.terraPick); + items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.75F, 1F, 1.5F - (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 100D) * 0.5 + 1.2F)) : -1, ModItems.enderDagger); - items.registerItemColorHandler((s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1, ModItems.lens); - } + items.registerItemColorHandler((s, t) -> t == 1 && ItemTerraPick.isEnabled(s) ? Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F) : -1, ModItems.terraPick); - private ColorHandler() {} + items.registerItemColorHandler((s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1, ModItems.lens); + } + + private ColorHandler() {} } diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 294c5a0d4..9740368f1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -2,14 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 9, 2015, 5:35:26 PM (GMT)] */ package vazkii.botania.client.core.handler; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -19,12 +28,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IBaubleRender.Helper; -import vazkii.botania.api.subtile.signature.SubTileSignature; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.Botania; @@ -32,21 +37,11 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import javax.annotation.Nonnull; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - public final class ContributorFancinessHandler implements LayerRenderer { public volatile static Map flowerMap = null; private volatile static boolean startedLoading = false; - private static final boolean phi = false; - @Override public void doRenderLayer(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { String name = player.getDisplayName().getUnformattedText(); @@ -100,57 +95,6 @@ public final class ContributorFancinessHandler implements LayerRenderer. It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [June 8, 2015, 12:55:20 AM (GMT)] */ package vazkii.botania.client.core.handler; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; + +import javax.annotation.Nonnull; + +import org.lwjgl.input.Keyboard; + import com.google.common.collect.ImmutableList; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiScreen; @@ -22,17 +33,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.relauncher.ReflectionHelper; -import org.lwjgl.input.Keyboard; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.common.lib.LibObfuscation; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; - public class CorporeaAutoCompleteHandler { private boolean isAutoCompleted = false; @@ -137,7 +140,7 @@ public class CorporeaAutoCompleteHandler { String s = prefix.trim(); if(s.isEmpty()) return ImmutableList.of(); - + TreeSet result = new TreeSet<>(); String[] words = s.split(" "); int i = words.length - 1; diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index bb3acc68e..2e9386b27 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -2,15 +2,25 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 21, 2014, 4:58:55 PM (GMT)] */ package vazkii.botania.client.core.handler; +import java.util.Map; +import java.util.UUID; + +import org.lwjgl.opengl.ARBFragmentShader; +import org.lwjgl.opengl.ContextCapabilities; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL20; +import org.lwjgl.opengl.GLContext; + import com.google.common.base.Optional; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -22,19 +32,11 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.lwjgl.opengl.ARBFragmentShader; -import org.lwjgl.opengl.ContextCapabilities; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL20; -import org.lwjgl.opengl.GLContext; import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.lib.LibMisc; -import java.util.Map; -import java.util.UUID; - public final class DebugHandler { private DebugHandler() {} @@ -78,7 +80,7 @@ public final class DebugHandler { event.getLeft().add(" OpenGL13: " + caps.OpenGL13); if (Minecraft.getMinecraft().objectMouseOver != null - && Minecraft.getMinecraft().objectMouseOver.getBlockPos() != null) { + && Minecraft.getMinecraft().objectMouseOver.getBlockPos() != null) { BlockPos pos = Minecraft.getMinecraft().objectMouseOver.getBlockPos(); IBlockState state = world.getBlockState(pos); state = state.getActualState(world, pos); diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 4ed121a72..b7ca46099 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 25, 2014, 6:11:10 PM (GMT)] */ package vazkii.botania.client.core.handler; @@ -15,6 +15,9 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import org.lwjgl.opengl.GL11; + +import baubles.common.lib.PlayerHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; @@ -40,9 +43,6 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; - -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -62,6 +62,7 @@ import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; +import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex.InputHandler; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.PlayerHelper; @@ -73,7 +74,6 @@ import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lib.LibObfuscation; -import baubles.common.lib.PlayerHandler; public final class HUDHandler { @@ -95,7 +95,7 @@ public final class HUDHandler { ItemFlightTiara.renderHUD(event.getResolution(), mc.thePlayer, amulet); profiler.endSection(); } - + dodgeRing: { ItemStack ring = baublesInv.getStackInSlot(1); if(ring == null || !(ring.getItem() instanceof ItemDodgeRing)) { @@ -103,7 +103,7 @@ public final class HUDHandler { if(ring == null || !(ring.getItem() instanceof ItemDodgeRing)) break dodgeRing; } - + profiler.startSection("dodgeRing"); ItemDodgeRing.renderHUD(event.getResolution(), mc.thePlayer, ring, event.getPartialTicks()); profiler.endSection(); @@ -152,7 +152,8 @@ public final class HUDHandler { renderCrystalCubeHUD(event.getResolution(), (TileCorporeaCrystalCube) tile); } - if(!TileCorporeaIndex.getInputHandler().getNearbyIndexes(mc.thePlayer).isEmpty() && mc.currentScreen != null && mc.currentScreen instanceof GuiChat) { + TileCorporeaIndex.getInputHandler(); + if(!InputHandler.getNearbyIndexes(mc.thePlayer).isEmpty() && mc.currentScreen != null && mc.currentScreen instanceof GuiChat) { profiler.startSection("nearIndex"); renderNearIndexDisplay(event.getResolution()); profiler.endSection(); @@ -221,7 +222,7 @@ public final class HUDHandler { anyRequest = anyRequest || ((IManaUsingItem) item).usesMana(stack); } } - + List items = ManaItemHandler.getManaItems(player); for (ItemStack stack : items) { Item item = stack.getItem(); @@ -232,7 +233,7 @@ public final class HUDHandler { if(item instanceof ICreativeManaProvider && ((ICreativeManaProvider) item).isCreative(stack)) creative = true; } - + Map baubles = ManaItemHandler.getManaBaubles(player); for (Entry entry : baubles.entrySet()) { ItemStack stack = entry.getValue(); @@ -307,7 +308,7 @@ public final class HUDHandler { GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); RenderHelper.drawTexturedModalRect(x, y, 0, 0, 251, width, 5); GlStateManager.disableBlend(); - GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); + GL11.glColor4ub((byte) 255, (byte) 255, (byte) 255, (byte) 255); } private static void renderPoolRecipeHUD(ScaledResolution res, TilePool tile, ItemStack stack) { @@ -522,6 +523,6 @@ public final class HUDHandler { Color color_ = new Color(color); GL11.glColor4ub((byte) color_.getRed(), (byte) color_.getGreen(),(byte) color_.getBlue(), (byte) (255F * alpha)); RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, Math.min(100, manaPercentage), 3); - GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); + GL11.glColor4ub((byte) 255, (byte) 255, (byte) 255, (byte) 255); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 0a76127c5..1369dec76 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 23, 2015, 9:22:10 PM (GMT)] */ package vazkii.botania.client.core.handler; +import java.util.regex.Pattern; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -19,9 +23,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - -import java.util.regex.Pattern; public final class ItemsRemainingRenderHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index a14cb4bd9..a3668f29f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 3, 2014, 9:05:38 PM (GMT)] */ package vazkii.botania.client.core.handler; +import java.util.ArrayDeque; +import java.util.Deque; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -20,14 +25,10 @@ import net.minecraft.profiler.Profiler; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.fx.FXLightning; import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.client.lib.LibResources; -import java.util.ArrayDeque; -import java.util.Deque; - public class LightningHandler { private LightningHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 524ceaf92..dd72a13a0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -8,7 +8,21 @@ */ package vazkii.botania.client.core.handler; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.nio.IntBuffer; +import java.util.Map; + +import javax.imageio.ImageIO; + +import org.apache.commons.lang3.text.WordUtils; +import org.lwjgl.BufferUtils; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + import com.google.common.collect.Maps; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -19,10 +33,6 @@ import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.apache.commons.lang3.text.WordUtils; -import org.lwjgl.BufferUtils; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.GunModel; @@ -34,181 +44,174 @@ import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.relic.ItemKingKey; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.nio.IntBuffer; -import java.util.Map; - public class MiscellaneousIcons { - public static final MiscellaneousIcons INSTANCE = new MiscellaneousIcons(); + public static final MiscellaneousIcons INSTANCE = new MiscellaneousIcons(); - public TextureAtlasSprite - alfPortalTex, - lightRelayWorldIcon, - lightRelayWorldIconRed, - lightRelayWorldIconGreen, - lightRelayWorldIconPurple, - alchemyCatalystOverlay, - conjurationCatalystOverlay, - enchanterOverlay, - manaVoidOverlay, - manaWater, - terraPlateOverlay, - corporeaWorldIcon, - corporeaWorldIconMaster, - corporeaIconStar, - sparkWorldIcon, - manaDetectorIcon, - runeAltarTriggerIcon, - terrasteelHelmWillIcon; + public TextureAtlasSprite + alfPortalTex, + lightRelayWorldIcon, + lightRelayWorldIconRed, + lightRelayWorldIconGreen, + lightRelayWorldIconPurple, + alchemyCatalystOverlay, + conjurationCatalystOverlay, + enchanterOverlay, + manaVoidOverlay, + manaWater, + terraPlateOverlay, + corporeaWorldIcon, + corporeaWorldIconMaster, + corporeaIconStar, + sparkWorldIcon, + manaDetectorIcon, + runeAltarTriggerIcon, + terrasteelHelmWillIcon; - public TextureAtlasSprite[] sparkUpgradeIcons; - public TextureAtlasSprite[] kingKeyWeaponIcons; - public final Map manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); - public TextureAtlasSprite[] tiaraWingIcons; + public TextureAtlasSprite[] sparkUpgradeIcons; + public TextureAtlasSprite[] kingKeyWeaponIcons; + public final Map manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); + public TextureAtlasSprite[] tiaraWingIcons; - // begin dank_memes - public TextureAtlasSprite tailIcon = null; - public TextureAtlasSprite phiFlowerIcon = null; - public TextureAtlasSprite goldfishIcon = null; - public TextureAtlasSprite nerfBatIcon = null; - // end dank_memes + // begin dank_memes + public TextureAtlasSprite tailIcon = null; + public TextureAtlasSprite phiFlowerIcon = null; + public TextureAtlasSprite goldfishIcon = null; + public TextureAtlasSprite nerfBatIcon = null; + // end dank_memes - // Icons for baubles that don't render their own model on the player - public TextureAtlasSprite - bloodPendantChain, - bloodPendantGem, - snowflakePendantGem, - itemFinderGem, - pyroclastGem, - crimsonGem; + // Icons for baubles that don't render their own model on the player + public TextureAtlasSprite + bloodPendantChain, + bloodPendantGem, + snowflakePendantGem, + itemFinderGem, + pyroclastGem, + crimsonGem; - @SubscribeEvent - public void onModelBake(ModelBakeEvent evt) { - // Floating flowers - FloatingFlowerModel model = new FloatingFlowerModel(); - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), model); - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), model); - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), model); - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), model); + @SubscribeEvent + public void onModelBake(ModelBakeEvent evt) { + // Floating flowers + FloatingFlowerModel model = new FloatingFlowerModel(); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), model); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), model); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), model); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), model); - // Platforms - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); + // Platforms + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); - // Lexicon - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel()); + // Lexicon + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel()); - // Mana Blaster - ModelResourceLocation key = new ModelResourceLocation("botania:manaGun", "inventory"); - IBakedModel originalModel = evt.getModelRegistry().getObject(key); - evt.getModelRegistry().putObject(key, new GunModel(originalModel)); + // Mana Blaster + ModelResourceLocation key = new ModelResourceLocation("botania:manaGun", "inventory"); + IBakedModel originalModel = evt.getModelRegistry().getObject(key); + evt.getModelRegistry().putObject(key, new GunModel(originalModel)); - key = new ModelResourceLocation("botania:manaGunClip", "inventory"); - originalModel = evt.getModelRegistry().getObject(key); - evt.getModelRegistry().putObject(key, new GunModel(originalModel)); - } + key = new ModelResourceLocation("botania:manaGunClip", "inventory"); + originalModel = evt.getModelRegistry().getObject(key); + evt.getModelRegistry().putObject(key, new GunModel(originalModel)); + } - @SubscribeEvent - public void onTextureStitch(TextureStitchEvent.Pre evt) { - alfPortalTex = IconHelper.forName(evt.getMap(), "alfheimPortalInside", "blocks"); - lightRelayWorldIcon = IconHelper.forName(evt.getMap(), "lightRelay1", "blocks"); - lightRelayWorldIconRed = IconHelper.forName(evt.getMap(), "lightRelay3", "blocks"); - lightRelayWorldIconGreen = IconHelper.forName(evt.getMap(), "lightRelay5", "blocks"); - lightRelayWorldIconPurple = IconHelper.forName(evt.getMap(), "lightRelay7", "blocks"); - alchemyCatalystOverlay = IconHelper.forName(evt.getMap(), "alchemyCatalyst3", "blocks"); - conjurationCatalystOverlay = IconHelper.forName(evt.getMap(), "conjurationCatalyst3", "blocks"); - enchanterOverlay = IconHelper.forName(evt.getMap(), "enchanterOverlay", "blocks"); - manaVoidOverlay = IconHelper.forName(evt.getMap(), "manaVoid1", "blocks"); - manaWater = IconHelper.forName(evt.getMap(), "manaWater", "blocks"); - terraPlateOverlay = IconHelper.forName(evt.getMap(), "terraPlateOverlay", "blocks"); - corporeaWorldIcon = IconHelper.forName(evt.getMap(), "corporeaSpark1", "items"); - corporeaWorldIconMaster = IconHelper.forName(evt.getMap(), "corporeaSpark3", "items"); - corporeaIconStar = IconHelper.forName(evt.getMap(), "corporeaSparkStar", "items"); - sparkWorldIcon = IconHelper.forName(evt.getMap(), "spark1", "items"); + @SubscribeEvent + public void onTextureStitch(TextureStitchEvent.Pre evt) { + alfPortalTex = IconHelper.forName(evt.getMap(), "alfheimPortalInside", "blocks"); + lightRelayWorldIcon = IconHelper.forName(evt.getMap(), "lightRelay1", "blocks"); + lightRelayWorldIconRed = IconHelper.forName(evt.getMap(), "lightRelay3", "blocks"); + lightRelayWorldIconGreen = IconHelper.forName(evt.getMap(), "lightRelay5", "blocks"); + lightRelayWorldIconPurple = IconHelper.forName(evt.getMap(), "lightRelay7", "blocks"); + alchemyCatalystOverlay = IconHelper.forName(evt.getMap(), "alchemyCatalyst3", "blocks"); + conjurationCatalystOverlay = IconHelper.forName(evt.getMap(), "conjurationCatalyst3", "blocks"); + enchanterOverlay = IconHelper.forName(evt.getMap(), "enchanterOverlay", "blocks"); + manaVoidOverlay = IconHelper.forName(evt.getMap(), "manaVoid1", "blocks"); + manaWater = IconHelper.forName(evt.getMap(), "manaWater", "blocks"); + terraPlateOverlay = IconHelper.forName(evt.getMap(), "terraPlateOverlay", "blocks"); + corporeaWorldIcon = IconHelper.forName(evt.getMap(), "corporeaSpark1", "items"); + corporeaWorldIconMaster = IconHelper.forName(evt.getMap(), "corporeaSpark3", "items"); + corporeaIconStar = IconHelper.forName(evt.getMap(), "corporeaSparkStar", "items"); + sparkWorldIcon = IconHelper.forName(evt.getMap(), "spark1", "items"); - sparkUpgradeIcons = new TextureAtlasSprite[ItemSparkUpgrade.VARIANTS]; - for(int i = 0; i < ItemSparkUpgrade.VARIANTS; i++) { - sparkUpgradeIcons[i] = IconHelper.forName(evt.getMap(), "sparkUpgradeL" + i, "items"); - } + sparkUpgradeIcons = new TextureAtlasSprite[ItemSparkUpgrade.VARIANTS]; + for(int i = 0; i < ItemSparkUpgrade.VARIANTS; i++) { + sparkUpgradeIcons[i] = IconHelper.forName(evt.getMap(), "sparkUpgradeL" + i, "items"); + } - tailIcon = IconHelper.forName(evt.getMap(), "tail", "items"); - phiFlowerIcon = IconHelper.forName(evt.getMap(), "phiFlower", "items"); - goldfishIcon = IconHelper.forName(evt.getMap(), "goldfish", "items"); - nerfBatIcon = IconHelper.forName(evt.getMap(), "nerfBat", "items"); + tailIcon = IconHelper.forName(evt.getMap(), "tail", "items"); + phiFlowerIcon = IconHelper.forName(evt.getMap(), "phiFlower", "items"); + goldfishIcon = IconHelper.forName(evt.getMap(), "goldfish", "items"); + nerfBatIcon = IconHelper.forName(evt.getMap(), "nerfBat", "items"); - kingKeyWeaponIcons = new TextureAtlasSprite[ItemKingKey.WEAPON_TYPES]; - for(int i = 0; i < ItemKingKey.WEAPON_TYPES; i++) - kingKeyWeaponIcons[i] = IconHelper.forName(evt.getMap(), "gateWeapon" + i, "items"); + kingKeyWeaponIcons = new TextureAtlasSprite[ItemKingKey.WEAPON_TYPES]; + for(int i = 0; i < ItemKingKey.WEAPON_TYPES; i++) + kingKeyWeaponIcons[i] = IconHelper.forName(evt.getMap(), "gateWeapon" + i, "items"); - manaDetectorIcon = IconHelper.forName(evt.getMap(), "triggers/manaDetector", "items"); - runeAltarTriggerIcon = IconHelper.forName(evt.getMap(), "triggers/runeAltarCanCraft", "items"); + manaDetectorIcon = IconHelper.forName(evt.getMap(), "triggers/manaDetector", "items"); + runeAltarTriggerIcon = IconHelper.forName(evt.getMap(), "triggers/runeAltarCanCraft", "items"); - for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { - manaLevelTriggerIcons.put(s, IconHelper.forName(evt.getMap(), "triggers/mana" + WordUtils.capitalizeFully(s.name()), "items")); - } + for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { + manaLevelTriggerIcons.put(s, IconHelper.forName(evt.getMap(), "triggers/mana" + WordUtils.capitalizeFully(s.name()), "items")); + } - tiaraWingIcons = new TextureAtlasSprite[ItemFlightTiara.WING_TYPES]; - for (int i = 0; i < tiaraWingIcons.length; i++) { - tiaraWingIcons[i] = IconHelper.forName(evt.getMap(), "flightTiara" + (i + 1), "items"); - } + tiaraWingIcons = new TextureAtlasSprite[ItemFlightTiara.WING_TYPES]; + for (int i = 0; i < tiaraWingIcons.length; i++) { + tiaraWingIcons[i] = IconHelper.forName(evt.getMap(), "flightTiara" + (i + 1), "items"); + } - terrasteelHelmWillIcon = IconHelper.forName(evt.getMap(), "willFlame", "items"); + terrasteelHelmWillIcon = IconHelper.forName(evt.getMap(), "willFlame", "items"); - bloodPendantChain = IconHelper.forName(evt.getMap(), "bloodPendant2", "items"); - bloodPendantGem = IconHelper.forName(evt.getMap(), "bloodPendant3", "items"); - snowflakePendantGem = IconHelper.forName(evt.getMap(), "icePendantGem", "items"); - itemFinderGem = IconHelper.forName(evt.getMap(), "itemFinderGem", "items"); - pyroclastGem = IconHelper.forName(evt.getMap(), "lavaPendantGem", "items"); - crimsonGem = IconHelper.forName(evt.getMap(), "superLavaPendantGem", "items"); - } + bloodPendantChain = IconHelper.forName(evt.getMap(), "bloodPendant2", "items"); + bloodPendantGem = IconHelper.forName(evt.getMap(), "bloodPendant3", "items"); + snowflakePendantGem = IconHelper.forName(evt.getMap(), "icePendantGem", "items"); + itemFinderGem = IconHelper.forName(evt.getMap(), "itemFinderGem", "items"); + pyroclastGem = IconHelper.forName(evt.getMap(), "lavaPendantGem", "items"); + crimsonGem = IconHelper.forName(evt.getMap(), "superLavaPendantGem", "items"); + } - @SubscribeEvent - public void dumpAtlas(ArrowLooseEvent evt) { - if (!evt.getEntityPlayer().worldObj.isRemote || !((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) - || !evt.getEntityPlayer().isSneaking()) - return; - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + @SubscribeEvent + public void dumpAtlas(ArrowLooseEvent evt) { + if (!evt.getEntityPlayer().worldObj.isRemote || !((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) + || !evt.getEntityPlayer().isSneaking()) + return; + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - int width = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH); - int height = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_HEIGHT); + int width = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH); + int height = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_HEIGHT); - Botania.LOGGER.debug("Dumped atlas %d wide by %d tall%n", width, height); + Botania.LOGGER.debug("Dumped atlas %d wide by %d tall%n", width, height); - int pixels = width * height; - - IntBuffer buffer = BufferUtils.createIntBuffer(pixels); - int[] pixelValues = new int[pixels]; + int pixels = width * height; - GL11.glPixelStorei(GL11.GL_PACK_ALIGNMENT, 1); - GL11.glPixelStorei(GL11.GL_UNPACK_ALIGNMENT, 1); + IntBuffer buffer = BufferUtils.createIntBuffer(pixels); + int[] pixelValues = new int[pixels]; - GL11.glGetTexImage(GL11.GL_TEXTURE_2D, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, buffer); + GL11.glPixelStorei(GL11.GL_PACK_ALIGNMENT, 1); + GL11.glPixelStorei(GL11.GL_UNPACK_ALIGNMENT, 1); - buffer.get(pixelValues); + GL11.glGetTexImage(GL11.GL_TEXTURE_2D, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, buffer); - BufferedImage bufferedimage = new BufferedImage(width, height, 2); + buffer.get(pixelValues); - for (int k = 0; k < height; ++k) - { - for (int l = 0; l < width; ++l) - { - bufferedimage.setRGB(l, k, pixelValues[k * width + l]); - } - } + BufferedImage bufferedimage = new BufferedImage(width, height, 2); - File mcFolder = Minecraft.getMinecraft().mcDataDir; - File result = new File(mcFolder, "atlas.png"); + for (int k = 0; k < height; ++k) + { + for (int l = 0; l < width; ++l) + { + bufferedimage.setRGB(l, k, pixelValues[k * width + l]); + } + } - try { - ImageIO.write(bufferedimage, "png", result); - } catch (IOException e) { - Botania.LOGGER.warn("Failed to dump debug atlas"); - } - } + File mcFolder = Minecraft.getMinecraft().mcDataDir; + File result = new File(mcFolder, "atlas.png"); - private MiscellaneousIcons() {} + try { + ImageIO.write(bufferedimage, "png", result); + } catch (IOException e) { + Botania.LOGGER.warn("Failed to dump debug atlas"); + } + } + + private MiscellaneousIcons() {} } diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index f3044ac53..da62e32c6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -72,148 +72,148 @@ import vazkii.botania.common.lib.LibMisc; public final class ModelHandler { - public static void registerModels() { - ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); - OBJLoader.INSTANCE.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); + public static void registerModels() { + ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); + OBJLoader.INSTANCE.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); - registerSubtiles(); + registerSubtiles(); - for(Block block : Block.REGISTRY) { - if(block instanceof IModelRegister) - ((IModelRegister) block).registerModels(); - } + for(Block block : Block.REGISTRY) { + if(block instanceof IModelRegister) + ((IModelRegister) block).registerModels(); + } - for(Item item : Item.REGISTRY) { - if(item instanceof IModelRegister) - ((IModelRegister) item).registerModels(); - } - } + for(Item item : Item.REGISTRY) { + if(item instanceof IModelRegister) + ((IModelRegister) item).registerModels(); + } + } - private static void registerSubtiles() { - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GRASS, new ModelResourceLocation("botania:miniIsland", "variant=grass")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.PODZOL, new ModelResourceLocation("botania:miniIsland", "variant=podzol")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MYCEL, new ModelResourceLocation("botania:miniIsland", "variant=mycel")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SNOW, new ModelResourceLocation("botania:miniIsland", "variant=snow")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.DRY, new ModelResourceLocation("botania:miniIsland", "variant=dry")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GOLDEN, new ModelResourceLocation("botania:miniIsland", "variant=golden")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.VIVID, new ModelResourceLocation("botania:miniIsland", "variant=vivid")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SCORCHED, new ModelResourceLocation("botania:miniIsland", "variant=scorched")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.INFUSED, new ModelResourceLocation("botania:miniIsland", "variant=infused")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MUTATED, new ModelResourceLocation("botania:miniIsland", "variant=mutated")); + private static void registerSubtiles() { + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GRASS, new ModelResourceLocation("botania:miniIsland", "variant=grass")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.PODZOL, new ModelResourceLocation("botania:miniIsland", "variant=podzol")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MYCEL, new ModelResourceLocation("botania:miniIsland", "variant=mycel")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SNOW, new ModelResourceLocation("botania:miniIsland", "variant=snow")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.DRY, new ModelResourceLocation("botania:miniIsland", "variant=dry")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GOLDEN, new ModelResourceLocation("botania:miniIsland", "variant=golden")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.VIVID, new ModelResourceLocation("botania:miniIsland", "variant=vivid")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SCORCHED, new ModelResourceLocation("botania:miniIsland", "variant=scorched")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.INFUSED, new ModelResourceLocation("botania:miniIsland", "variant=infused")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MUTATED, new ModelResourceLocation("botania:miniIsland", "variant=mutated")); - BotaniaAPIClient.registerSubtileModel(SubTileManastar.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MANASTAR)); - BotaniaAPIClient.registerSubtileModel(SubTilePureDaisy.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_PUREDAISY)); + BotaniaAPIClient.registerSubtileModel(SubTileManastar.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MANASTAR)); + BotaniaAPIClient.registerSubtileModel(SubTilePureDaisy.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_PUREDAISY)); - BotaniaAPIClient.registerSubtileModel(SubTileEndoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENDOFLAME)); - BotaniaAPIClient.registerSubtileModel(SubTileHydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS)); - BotaniaAPIClient.registerSubtileModel(SubTileThermalily.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_THERMALILY)); - BotaniaAPIClient.registerSubtileModel(SubTileArcaneRose.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ARCANE_ROSE)); - BotaniaAPIClient.registerSubtileModel(SubTileMunchdew.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MUNCHDEW)); - BotaniaAPIClient.registerSubtileModel(SubTileEntropinnyum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENTROPINNYUM)); - BotaniaAPIClient.registerSubtileModel(SubTileKekimurus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_KEKIMURUS)); - BotaniaAPIClient.registerSubtileModel(SubTileGourmaryllis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_GOURMARYLLIS)); - BotaniaAPIClient.registerSubtileModel(SubTileNarslimmus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NARSLIMMUS)); - BotaniaAPIClient.registerSubtileModel(SubTileSpectrolus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTROLUS)); - BotaniaAPIClient.registerSubtileModel(SubTileDandelifeon.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DANDELIFEON)); - BotaniaAPIClient.registerSubtileModel(SubTileRafflowsia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RAFFLOWSIA)); + BotaniaAPIClient.registerSubtileModel(SubTileEndoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENDOFLAME)); + BotaniaAPIClient.registerSubtileModel(SubTileHydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS)); + BotaniaAPIClient.registerSubtileModel(SubTileThermalily.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_THERMALILY)); + BotaniaAPIClient.registerSubtileModel(SubTileArcaneRose.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ARCANE_ROSE)); + BotaniaAPIClient.registerSubtileModel(SubTileMunchdew.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MUNCHDEW)); + BotaniaAPIClient.registerSubtileModel(SubTileEntropinnyum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENTROPINNYUM)); + BotaniaAPIClient.registerSubtileModel(SubTileKekimurus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_KEKIMURUS)); + BotaniaAPIClient.registerSubtileModel(SubTileGourmaryllis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_GOURMARYLLIS)); + BotaniaAPIClient.registerSubtileModel(SubTileNarslimmus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NARSLIMMUS)); + BotaniaAPIClient.registerSubtileModel(SubTileSpectrolus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTROLUS)); + BotaniaAPIClient.registerSubtileModel(SubTileDandelifeon.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DANDELIFEON)); + BotaniaAPIClient.registerSubtileModel(SubTileRafflowsia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RAFFLOWSIA)); - BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN)); - BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN + "Chibi")); - BotaniaAPIClient.registerSubtileModel(SubTileDreadthorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DREADTHORN)); - BotaniaAPIClient.registerSubtileModel(SubTileHeiseiDream.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HEISEI_DREAM)); - BotaniaAPIClient.registerSubtileModel(SubTileTigerseye.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TIGERSEYE)); - BotaniaAPIClient.registerSubtileModel(SubTileJadedAmaranthus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JADED_AMARANTHUS)); - BotaniaAPIClient.registerSubtileModel(SubTileOrechid.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID)); - BotaniaAPIClient.registerSubtileModel(SubTileOrechidIgnem.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID_IGNEM)); - BotaniaAPIClient.registerSubtileModel(SubTileFallenKanade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_FALLEN_KANADE)); - BotaniaAPIClient.registerSubtileModel(SubTileExoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_EXOFLAME)); - BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION)); - BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION + "Chibi")); - BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK)); - BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK + "Chibi")); - BotaniaAPIClient.registerSubtileModel(SubTileTangleberrie.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TANGLEBERRIE)); - BotaniaAPIClient.registerSubtileModel(SubTileJiyuulia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JIYUULIA)); - BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS)); - BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS + "Chibi")); - BotaniaAPIClient.registerSubtileModel(SubTileHyacidus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYACIDUS)); - BotaniaAPIClient.registerSubtileModel(SubTilePollidisiac.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_POLLIDISIAC)); - BotaniaAPIClient.registerSubtileModel(SubTileClayconia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA)); - BotaniaAPIClient.registerSubtileModel(SubTileClayconia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA + "Chibi")); - BotaniaAPIClient.registerSubtileModel(SubTileLoonuim.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_LOONIUM)); - BotaniaAPIClient.registerSubtileModel(SubTileDaffomill.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAFFOMILL)); - BotaniaAPIClient.registerSubtileModel(SubTileVinculotus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_VINCULOTUS)); - BotaniaAPIClient.registerSubtileModel(SubTileSpectranthemum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTRANTHEMUM)); - BotaniaAPIClient.registerSubtileModel(SubTileMedumone.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MEDUMONE)); - BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS)); - BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS + "Chibi")); - BotaniaAPIClient.registerSubtileModel(SubTileBubbell.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL)); - BotaniaAPIClient.registerSubtileModel(SubTileBubbell.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL + "Chibi")); - BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA)); - BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA + "Chibi")); - BotaniaAPIClient.registerSubtileModel(SubTileBergamute.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BERGAMUTE)); - } + BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN)); + BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileDreadthorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DREADTHORN)); + BotaniaAPIClient.registerSubtileModel(SubTileHeiseiDream.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HEISEI_DREAM)); + BotaniaAPIClient.registerSubtileModel(SubTileTigerseye.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TIGERSEYE)); + BotaniaAPIClient.registerSubtileModel(SubTileJadedAmaranthus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JADED_AMARANTHUS)); + BotaniaAPIClient.registerSubtileModel(SubTileOrechid.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID)); + BotaniaAPIClient.registerSubtileModel(SubTileOrechidIgnem.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID_IGNEM)); + BotaniaAPIClient.registerSubtileModel(SubTileFallenKanade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_FALLEN_KANADE)); + BotaniaAPIClient.registerSubtileModel(SubTileExoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_EXOFLAME)); + BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION)); + BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK)); + BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileTangleberrie.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TANGLEBERRIE)); + BotaniaAPIClient.registerSubtileModel(SubTileJiyuulia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JIYUULIA)); + BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS)); + BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileHyacidus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYACIDUS)); + BotaniaAPIClient.registerSubtileModel(SubTilePollidisiac.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_POLLIDISIAC)); + BotaniaAPIClient.registerSubtileModel(SubTileClayconia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA)); + BotaniaAPIClient.registerSubtileModel(SubTileClayconia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileLoonuim.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_LOONIUM)); + BotaniaAPIClient.registerSubtileModel(SubTileDaffomill.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAFFOMILL)); + BotaniaAPIClient.registerSubtileModel(SubTileVinculotus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_VINCULOTUS)); + BotaniaAPIClient.registerSubtileModel(SubTileSpectranthemum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTRANTHEMUM)); + BotaniaAPIClient.registerSubtileModel(SubTileMedumone.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MEDUMONE)); + BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS)); + BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileBubbell.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL)); + BotaniaAPIClient.registerSubtileModel(SubTileBubbell.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA)); + BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileBergamute.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BERGAMUTE)); + } - public static void registerItemAllMeta(Item item, int range) { - registerItemMetas(item, range, i -> item.getRegistryName().getResourcePath()); - } + public static void registerItemAllMeta(Item item, int range) { + registerItemMetas(item, range, i -> item.getRegistryName().getResourcePath()); + } - public static void registerItemAppendMeta(Item item, int maxExclusive, String loc) { - registerItemMetas(item, maxExclusive, i -> loc + i); - } + public static void registerItemAppendMeta(Item item, int maxExclusive, String loc) { + registerItemMetas(item, maxExclusive, i -> loc + i); + } - public static void registerItemMetas(Item item, int maxExclusive, IntFunction metaToName) { - for (int i = 0; i < maxExclusive; i++) { - ModelLoader.setCustomModelResourceLocation( - item, i, - new ModelResourceLocation(LibMisc.MOD_ID + ":" + metaToName.apply(i), "inventory") - ); - } - } + public static void registerItemMetas(Item item, int maxExclusive, IntFunction metaToName) { + for (int i = 0; i < maxExclusive; i++) { + ModelLoader.setCustomModelResourceLocation( + item, i, + new ModelResourceLocation(LibMisc.MOD_ID + ":" + metaToName.apply(i), "inventory") + ); + } + } - private static final Map, IStateMapper> customStateMappers = ReflectionHelper.getPrivateValue(ModelLoader.class, null, "customStateMappers"); - private static final DefaultStateMapper fallbackMapper = new DefaultStateMapper(); + private static final Map, IStateMapper> customStateMappers = ReflectionHelper.getPrivateValue(ModelLoader.class, null, "customStateMappers"); + private static final DefaultStateMapper fallbackMapper = new DefaultStateMapper(); - private static ModelResourceLocation getMrlForState(IBlockState state) { - return customStateMappers - .getOrDefault(state.getBlock().delegate, fallbackMapper) - .putStateModelLocations(state.getBlock()) - .get(state); - } + private static ModelResourceLocation getMrlForState(IBlockState state) { + return customStateMappers + .getOrDefault(state.getBlock().delegate, fallbackMapper) + .putStateModelLocations(state.getBlock()) + .get(state); + } - public static void registerBlockToState(Block b, int meta, IBlockState state) { - ModelLoader.setCustomModelResourceLocation( - Item.getItemFromBlock(b), - meta, - getMrlForState(state) - ); - } + public static void registerBlockToState(Block b, int meta, IBlockState state) { + ModelLoader.setCustomModelResourceLocation( + Item.getItemFromBlock(b), + meta, + getMrlForState(state) + ); + } - public static void registerBlockToState(Block b, int maxExclusive) { - for(int i = 0; i < maxExclusive; i++) - registerBlockToState(b, i, b.getStateFromMeta(i)); - } + public static void registerBlockToState(Block b, int maxExclusive) { + for(int i = 0; i < maxExclusive; i++) + registerBlockToState(b, i, b.getStateFromMeta(i)); + } - // Registers the ItemBlock to models/item/#inventory - public static void registerInventoryVariant(Block b) { - ModelLoader.setCustomModelResourceLocation( - Item.getItemFromBlock(b), 0, - new ModelResourceLocation(b.getRegistryName(), "inventory")); - } + // Registers the ItemBlock to models/item/#inventory + public static void registerInventoryVariant(Block b) { + ModelLoader.setCustomModelResourceLocation( + Item.getItemFromBlock(b), 0, + new ModelResourceLocation(b.getRegistryName(), "inventory")); + } - // Registers the ItemBlock to a custom path in models/item/itemblock/ - public static void registerCustomItemblock(Block b, String path) { - registerCustomItemblock(b, 1, i -> path); - } + // Registers the ItemBlock to a custom path in models/item/itemblock/ + public static void registerCustomItemblock(Block b, String path) { + registerCustomItemblock(b, 1, i -> path); + } - public static void registerCustomItemblock(Block b, int maxExclusive, IntFunction metaToPath) { - Item item = Item.getItemFromBlock(b); - for (int i = 0; i < maxExclusive; i++) { - ModelLoader.setCustomModelResourceLocation( - item, i, - new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + metaToPath.apply(i), "inventory") - ); - } - } + public static void registerCustomItemblock(Block b, int maxExclusive, IntFunction metaToPath) { + Item item = Item.getItemFromBlock(b); + for (int i = 0; i < maxExclusive; i++) { + ModelLoader.setCustomModelResourceLocation( + item, i, + new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + metaToPath.apply(i), "inventory") + ); + } + } - private ModelHandler() {} + private ModelHandler() {} } diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java index 768cdec89..5e3656d79 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 31, 2015, 11:40:59 PM (GMT)] */ package vazkii.botania.client.core.handler; +import javax.annotation.Nonnull; + import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; @@ -21,8 +23,6 @@ import net.minecraft.world.biome.Biome; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; -import javax.annotation.Nonnull; - /** * This class acts as a wrapper around a block access to * replace blocks with the blocks involved in the multiblock specified diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index 47c8add7f..bab099fee 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 27, 2015, 7:28:29 PM (GMT)] */ package vazkii.botania.client.core.handler; +import org.lwjgl.opengl.ARBShaderObjects; +import org.lwjgl.opengl.GL11; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; @@ -29,8 +32,6 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; @@ -127,7 +128,7 @@ public final class MultiblockRenderHandler { rendering = false; GL11.glPopAttrib(); GlStateManager.popMatrix(); - + if(!didAny) { setMultiblock(null); player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.structureComplete").setStyle(new Style().setColor(TextFormatting.GREEN))); diff --git a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java index 23803be52..30f60a15e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java +++ b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java @@ -2,21 +2,14 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 24, 2015, 5:54:45 PM (GMT)] */ package vazkii.botania.client.core.handler; -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTTagCompound; -import vazkii.botania.client.challenge.Challenge; -import vazkii.botania.client.challenge.ModChallenges; -import vazkii.botania.client.gui.lexicon.GuiLexicon; -import vazkii.botania.common.lib.LibMisc; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -24,6 +17,13 @@ import java.io.IOException; import java.util.List; import java.util.Set; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTTagCompound; +import vazkii.botania.client.challenge.Challenge; +import vazkii.botania.client.challenge.ModChallenges; +import vazkii.botania.client.gui.lexicon.GuiLexicon; +import vazkii.botania.common.lib.LibMisc; + public final class PersistentVariableHelper { private static final String TAG_FIRST_LOAD = "firstLoad"; @@ -75,7 +75,7 @@ public final class PersistentVariableHelper { cmp.setBoolean(TAG_DOG, dog); cmp.setString(TAG_LAST_BOTANIA_VERSION, lastBotaniaVersion); cmp.setInteger(TAG_LEXICON_GUI_SCALE, lexiconGuiScale); - + injectNBTToFile(cmp, getCacheFile()); } @@ -115,7 +115,7 @@ public final class PersistentVariableHelper { firstLoad = cmp.hasKey(TAG_FIRST_LOAD) ? cmp.getBoolean(TAG_FIRST_LOAD) : firstLoad; if(firstLoad) lastBotaniaVersion = LibMisc.VERSION; - + dog = cmp.getBoolean(TAG_DOG); lexiconGuiScale = cmp.getInteger(TAG_LEXICON_GUI_SCALE); } diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 292eea138..9108e8f4f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 14, 2014, 7:05:32 PM (GMT)] */ package vazkii.botania.client.core.handler; +import java.util.ArrayDeque; +import java.util.Queue; +import java.util.Random; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -17,16 +23,11 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; -import java.util.ArrayDeque; -import java.util.Queue; -import java.util.Random; - public final class RedStringRenderer { public static final Queue redStringTiles = new ArrayDeque<>(); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index db309755a..f28457810 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -2,31 +2,22 @@ package vazkii.botania.client.core.handler; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.model.ModelBook; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.resources.I18n; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHandSide; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.client.event.RenderSpecificHandEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.lwjgl.util.glu.Project; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.page.PageText; @@ -34,147 +25,145 @@ import vazkii.botania.common.lexicon.page.PageText; // Hacky way to render 3D lexicon, will be reevaluated in the future. public class RenderLexicon { - private final ModelBook model = new ModelBook(); - private final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); + private final ModelBook model = new ModelBook(); + private final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); - private final String[] QUOTES = new String[] { - "\"Neat!\" - Direwolf20", - "\"It's pretty ledge.\" - Haighyorkie", - "\"I don't really like it.\" - CrustyMustard", - "\"It's a very thinky mod.\" - AdamG3691", - "\"You must craft the tiny potato.\" - TheFractangle", - "\"Vazkii did a thing.\" - cpw" - }; - - int quote = -1; - - @SubscribeEvent - public void renderItem(RenderSpecificHandEvent evt) { - Minecraft mc = Minecraft.getMinecraft(); - if(!ConfigHandler.lexicon3dModel - || mc.gameSettings.thirdPersonView != 0 - || mc.thePlayer.getHeldItem(evt.getHand()) == null - || mc.thePlayer.getHeldItem(evt.getHand()).getItem() != ModItems.lexicon) - return; - evt.setCanceled(true); - try { - renderItemInFirstPerson(mc.thePlayer, evt.getPartialTicks(), evt.getInterpolatedPitch(), evt.getHand(), evt.getSwingProgress(), evt.getItemStack(), evt.getEquipProgress()); - } catch (Throwable throwable) { - Botania.LOGGER.warn("Failed to render lexicon"); - } - } + private final String[] QUOTES = new String[] { + "\"Neat!\" - Direwolf20", + "\"It's pretty ledge.\" - Haighyorkie", + "\"I don't really like it.\" - CrustyMustard", + "\"It's a very thinky mod.\" - AdamG3691", + "\"You must craft the tiny potato.\" - TheFractangle", + "\"Vazkii did a thing.\" - cpw" + }; - private void renderItemInFirstPerson(AbstractClientPlayer player, float partialTicks, float interpPitch, EnumHand hand, float swingProgress, ItemStack stack, float equipProgress) throws Throwable { - // Cherry picked from ItemRenderer.renderItemInFirstPerson - boolean flag = hand == EnumHand.MAIN_HAND; - EnumHandSide enumhandside = flag ? player.getPrimaryHand() : player.getPrimaryHand().opposite(); - GlStateManager.pushMatrix(); - boolean flag1 = enumhandside == EnumHandSide.RIGHT; - float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(swingProgress) * (float)Math.PI); - float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(swingProgress) * ((float)Math.PI * 2F)); - float f2 = -0.2F * MathHelper.sin(swingProgress * (float)Math.PI); - int i = flag1 ? 1 : -1; - GlStateManager.translate((float)i * f, f1, f2); - this.transformSideFirstPerson(enumhandside, equipProgress); - this.transformFirstPerson(enumhandside, swingProgress); - doRender(enumhandside, partialTicks, stack); - GlStateManager.popMatrix(); - } - - private void doRender(EnumHandSide side, float partialTicks, ItemStack stack) { - Minecraft mc = Minecraft.getMinecraft(); + int quote = -1; - GlStateManager.pushMatrix(); - mc.renderEngine.bindTexture(texture); - float opening; - float pageFlip; + @SubscribeEvent + public void renderItem(RenderSpecificHandEvent evt) { + Minecraft mc = Minecraft.getMinecraft(); + if(!ConfigHandler.lexicon3dModel + || mc.gameSettings.thirdPersonView != 0 + || mc.thePlayer.getHeldItem(evt.getHand()) == null + || mc.thePlayer.getHeldItem(evt.getHand()).getItem() != ModItems.lexicon) + return; + evt.setCanceled(true); + try { + renderItemInFirstPerson(mc.thePlayer, evt.getPartialTicks(), evt.getInterpolatedPitch(), evt.getHand(), evt.getSwingProgress(), evt.getItemStack(), evt.getEquipProgress()); + } catch (Throwable throwable) { + Botania.LOGGER.warn("Failed to render lexicon"); + } + } - float ticks = ClientTickHandler.ticksWithLexicaOpen; - if(ticks > 0 && ticks < 10) { - if(Minecraft.getMinecraft().currentScreen instanceof GuiLexicon) - ticks += partialTicks; - else ticks -= partialTicks; - } + private void renderItemInFirstPerson(AbstractClientPlayer player, float partialTicks, float interpPitch, EnumHand hand, float swingProgress, ItemStack stack, float equipProgress) throws Throwable { + // Cherry picked from ItemRenderer.renderItemInFirstPerson + boolean flag = hand == EnumHand.MAIN_HAND; + EnumHandSide enumhandside = flag ? player.getPrimaryHand() : player.getPrimaryHand().opposite(); + GlStateManager.pushMatrix(); + boolean flag1 = enumhandside == EnumHandSide.RIGHT; + float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(swingProgress) * (float)Math.PI); + float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(swingProgress) * ((float)Math.PI * 2F)); + float f2 = -0.2F * MathHelper.sin(swingProgress * (float)Math.PI); + int i = flag1 ? 1 : -1; + GlStateManager.translate(i * f, f1, f2); + transformSideFirstPerson(enumhandside, equipProgress); + transformFirstPerson(enumhandside, swingProgress); + doRender(enumhandside, partialTicks, stack); + GlStateManager.popMatrix(); + } - GlStateManager.translate(0.3F + 0.02F * ticks, 0.475F + 0.01F * ticks, -0.2F - 0.01F * ticks); - GlStateManager.rotate(87.5F + ticks * (side == EnumHandSide.RIGHT ? 5 : 10), 0F, 1F, 0F); - GlStateManager.rotate(ticks * 2.85F, 0F, 0F, 1F); - opening = ticks / 12F; + private void doRender(EnumHandSide side, float partialTicks, ItemStack stack) { + Minecraft mc = Minecraft.getMinecraft(); - float pageFlipTicks = ClientTickHandler.pageFlipTicks; - if(pageFlipTicks > 0) - pageFlipTicks -= ClientTickHandler.partialTicks; + GlStateManager.pushMatrix(); + mc.renderEngine.bindTexture(texture); + float opening; + float pageFlip; - pageFlip = pageFlipTicks / 5F; + float ticks = ClientTickHandler.ticksWithLexicaOpen; + if(ticks > 0 && ticks < 10) { + if(Minecraft.getMinecraft().currentScreen instanceof GuiLexicon) + ticks += partialTicks; + else ticks -= partialTicks; + } - model.render(null, 0F, 0F, pageFlip, opening, 0F, 1F / 16F); - if(ticks < 3) { - FontRenderer font = Minecraft.getMinecraft().fontRendererObj; - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.3F, -0.21F, -0.07F); - GlStateManager.scale(0.0035F, 0.0035F, -0.0035F); + GlStateManager.translate(0.3F + 0.02F * ticks, 0.475F + 0.01F * ticks, -0.2F - 0.01F * ticks); + GlStateManager.rotate(87.5F + ticks * (side == EnumHandSide.RIGHT ? 5 : 10), 0F, 1F, 0F); + GlStateManager.rotate(ticks * 2.85F, 0F, 0F, 1F); + opening = ticks / 12F; - String title = ModItems.lexicon.getItemStackDisplayName(null); - String origTitle = title; + float pageFlipTicks = ClientTickHandler.pageFlipTicks; + if(pageFlipTicks > 0) + pageFlipTicks -= ClientTickHandler.partialTicks; - if(stack != null) - title = stack.getDisplayName(); + pageFlip = pageFlipTicks / 5F; - font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700); + model.render(null, 0F, 0F, pageFlip, opening, 0F, 1F / 16F); + if(ticks < 3) { + FontRenderer font = Minecraft.getMinecraft().fontRendererObj; + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.3F, -0.21F, -0.07F); + GlStateManager.scale(0.0035F, 0.0035F, -0.0035F); - GlStateManager.translate(0F, 10F, 0F); - GlStateManager.scale(0.6F, 0.6F, 0.6F); - font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + I18n.format("botaniamisc.edition", ItemLexicon.getEdition()), 0, 0, 0xA07100); - - if(quote == -1) - quote = mc.theWorld.rand.nextInt(QUOTES.length); - - String quoteStr = QUOTES[quote]; - - GlStateManager.translate(-5F, 3F, 0F); - PageText.renderText(0, 0, 140, 100, 0, false, 0x79ff92, quoteStr); - GlStateManager.color(1F, 1F, 1F); + String title = ModItems.lexicon.getItemStackDisplayName(null); + if(stack != null) + title = stack.getDisplayName(); - GlStateManager.translate(2F, 98F, 0F); - font.drawString(I18n.format("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); + font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700); - GlStateManager.translate(0F, 10F, 0F); - font.drawString(TextFormatting.UNDERLINE + "" + TextFormatting.ITALIC + I18n.format("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); + GlStateManager.translate(0F, 10F, 0F); + GlStateManager.scale(0.6F, 0.6F, 0.6F); + font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + I18n.format("botaniamisc.edition", ItemLexicon.getEdition()), 0, 0, 0xA07100); - GlStateManager.translate(0F, -30F, 0F); + if(quote == -1) + quote = mc.theWorld.rand.nextInt(QUOTES.length); - String authorTitle = I18n.format("botaniamisc.lexiconcover2"); - int len = font.getStringWidth(authorTitle); - font.drawString(authorTitle, 62 - len / 2, 0, 0xD69700); - } + String quoteStr = QUOTES[quote]; - GlStateManager.popMatrix(); - } + GlStateManager.translate(-5F, 3F, 0F); + PageText.renderText(0, 0, 140, 100, 0, false, 0x79ff92, quoteStr); + GlStateManager.color(1F, 1F, 1F); - // Copy - ItemRenderer.transformSideFirstPerson - // Arg - Side, EquipProgress - private void transformSideFirstPerson(EnumHandSide p_187459_1_, float p_187459_2_) - { - int i = p_187459_1_ == EnumHandSide.RIGHT ? 1 : -1; - GlStateManager.translate((float)i * 0.56F, -0.52F + p_187459_2_ * -0.6F, -0.72F); - } + GlStateManager.translate(2F, 98F, 0F); + font.drawString(I18n.format("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); - // Copy with modification - ItemRenderer.transformFirstPerson - // Arg - Side, SwingProgress - private void transformFirstPerson(EnumHandSide p_187453_1_, float p_187453_2_) - { - int i = p_187453_1_ == EnumHandSide.RIGHT ? 1 : -1; - // Botania - added - GlStateManager.translate(p_187453_1_ == EnumHandSide.RIGHT ? 0.5F : 0.3F, -0.25F, 0.2F); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.rotate(12F, 0F, 0F, -1F); - // End add - float f = MathHelper.sin(p_187453_2_ * p_187453_2_ * (float)Math.PI); - GlStateManager.rotate((float)i * (45.0F + f * -20.0F), 0.0F, 1.0F, 0.0F); - float f1 = MathHelper.sin(MathHelper.sqrt_float(p_187453_2_) * (float)Math.PI); - GlStateManager.rotate((float)i * f1 * -20.0F, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(f1 * -80.0F, 1.0F, 0.0F, 0.0F); - GlStateManager.rotate((float)i * -45.0F, 0.0F, 1.0F, 0.0F); - } + GlStateManager.translate(0F, 10F, 0F); + font.drawString(TextFormatting.UNDERLINE + "" + TextFormatting.ITALIC + I18n.format("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); + + GlStateManager.translate(0F, -30F, 0F); + + String authorTitle = I18n.format("botaniamisc.lexiconcover2"); + int len = font.getStringWidth(authorTitle); + font.drawString(authorTitle, 62 - len / 2, 0, 0xD69700); + } + + GlStateManager.popMatrix(); + } + + // Copy - ItemRenderer.transformSideFirstPerson + // Arg - Side, EquipProgress + private void transformSideFirstPerson(EnumHandSide p_187459_1_, float p_187459_2_) + { + int i = p_187459_1_ == EnumHandSide.RIGHT ? 1 : -1; + GlStateManager.translate(i * 0.56F, -0.52F + p_187459_2_ * -0.6F, -0.72F); + } + + // Copy with modification - ItemRenderer.transformFirstPerson + // Arg - Side, SwingProgress + private void transformFirstPerson(EnumHandSide p_187453_1_, float p_187453_2_) + { + int i = p_187453_1_ == EnumHandSide.RIGHT ? 1 : -1; + // Botania - added + GlStateManager.translate(p_187453_1_ == EnumHandSide.RIGHT ? 0.5F : 0.3F, -0.25F, 0.2F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.rotate(12F, 0F, 0F, -1F); + // End add + float f = MathHelper.sin(p_187453_2_ * p_187453_2_ * (float)Math.PI); + GlStateManager.rotate(i * (45.0F + f * -20.0F), 0.0F, 1.0F, 0.0F); + float f1 = MathHelper.sin(MathHelper.sqrt_float(p_187453_2_) * (float)Math.PI); + GlStateManager.rotate(i * f1 * -20.0F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(f1 * -80.0F, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(i * -45.0F, 0.0F, 1.0F, 0.0F); + } } diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index a4ec22c11..522462968 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -2,34 +2,32 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 23, 2015, 4:24:56 PM (GMT)] */ package vazkii.botania.client.core.handler; +import java.awt.Color; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.client.event.RenderTooltipEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; @@ -39,11 +37,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; -import vazkii.botania.common.lib.LibObfuscation; - -import java.awt.*; -import java.util.ArrayList; -import java.util.List; public final class TooltipAdditionDisplayHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java index eb0e7851c..7bc70254e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -2,17 +2,15 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 26, 2014, 2:33:04 AM (GMT)] */ package vazkii.botania.client.core.handler; import net.minecraft.client.resources.I18n; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/vazkii/botania/client/core/helper/FontHelper.java b/src/main/java/vazkii/botania/client/core/helper/FontHelper.java index 49ce8994d..4eaf8d1e3 100644 --- a/src/main/java/vazkii/botania/client/core/helper/FontHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/FontHelper.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 16, 2014, 5:30:52 PM (GMT)] */ package vazkii.botania.client.core.helper; diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index 6892e9caa..f56752027 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -2,21 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 5:28:21 PM (GMT)] */ package vazkii.botania.client.core.helper; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibResources; public final class IconHelper { @@ -34,79 +35,79 @@ public final class IconHelper { * Adapted from ItemRenderer.renderItemIn2D, 1.7.10 */ public static void renderIconIn3D(Tessellator tess, float p_78439_1_, float p_78439_2_, float p_78439_3_, float p_78439_4_, int width, int height, float thickness) { - VertexBuffer wr = tess.getBuffer(); - wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); - wr.pos(0.0D, 0.0D, 0.0D).tex(p_78439_1_, p_78439_4_).normal(0, 0, 1).endVertex(); - wr.pos(1.0D, 0.0D, 0.0D).tex(p_78439_3_, p_78439_4_).normal(0, 0, 1).endVertex(); - wr.pos(1.0D, 1.0D, 0.0D).tex(p_78439_3_, p_78439_2_).normal(0, 0, 1).endVertex(); - wr.pos(0.0D, 1.0D, 0.0D).tex(p_78439_1_, p_78439_2_).normal(0, 0, 1).endVertex(); - tess.draw(); - wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); - wr.pos(0.0D, 1.0D, (0.0F - thickness)).tex(p_78439_1_, p_78439_2_).normal(0, 0, -1).endVertex(); - wr.pos(1.0D, 1.0D, (0.0F - thickness)).tex(p_78439_3_, p_78439_2_).normal(0, 0, -1).endVertex(); - wr.pos(1.0D, 0.0D, (0.0F - thickness)).tex(p_78439_3_, p_78439_4_).normal(0, 0, -1).endVertex(); - wr.pos(0.0D, 0.0D, (0.0F - thickness)).tex(p_78439_1_, p_78439_4_).normal(0, 0, -1).endVertex(); - tess.draw(); - float f5 = 0.5F * (p_78439_1_ - p_78439_3_) / (float)width; - float f6 = 0.5F * (p_78439_4_ - p_78439_2_) / (float)height; - wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); - int k; - float f7; - float f8; + VertexBuffer wr = tess.getBuffer(); + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + wr.pos(0.0D, 0.0D, 0.0D).tex(p_78439_1_, p_78439_4_).normal(0, 0, 1).endVertex(); + wr.pos(1.0D, 0.0D, 0.0D).tex(p_78439_3_, p_78439_4_).normal(0, 0, 1).endVertex(); + wr.pos(1.0D, 1.0D, 0.0D).tex(p_78439_3_, p_78439_2_).normal(0, 0, 1).endVertex(); + wr.pos(0.0D, 1.0D, 0.0D).tex(p_78439_1_, p_78439_2_).normal(0, 0, 1).endVertex(); + tess.draw(); + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + wr.pos(0.0D, 1.0D, 0.0F - thickness).tex(p_78439_1_, p_78439_2_).normal(0, 0, -1).endVertex(); + wr.pos(1.0D, 1.0D, 0.0F - thickness).tex(p_78439_3_, p_78439_2_).normal(0, 0, -1).endVertex(); + wr.pos(1.0D, 0.0D, 0.0F - thickness).tex(p_78439_3_, p_78439_4_).normal(0, 0, -1).endVertex(); + wr.pos(0.0D, 0.0D, 0.0F - thickness).tex(p_78439_1_, p_78439_4_).normal(0, 0, -1).endVertex(); + tess.draw(); + float f5 = 0.5F * (p_78439_1_ - p_78439_3_) / width; + float f6 = 0.5F * (p_78439_4_ - p_78439_2_) / height; + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + int k; + float f7; + float f8; - for (k = 0; k < width; ++k) - { - f7 = (float)k / (float)width; - f8 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f7 - f5; - wr.pos(f7, 0.0D, (0.0F - thickness)).tex(f8, p_78439_4_).normal(-1, 0, 0).endVertex(); - wr.pos(f7, 0.0D, 0.0D).tex(f8, p_78439_4_).normal(-1, 0, 0).endVertex(); - wr.pos(f7, 1.0D, 0.0D).tex(f8, p_78439_2_).normal(-1, 0, 0).endVertex(); - wr.pos(f7, 1.0D, (0.0F - thickness)).tex(f8, p_78439_2_).normal(-1, 0, 0).endVertex(); - } + for (k = 0; k < width; ++k) + { + f7 = (float)k / (float)width; + f8 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f7 - f5; + wr.pos(f7, 0.0D, 0.0F - thickness).tex(f8, p_78439_4_).normal(-1, 0, 0).endVertex(); + wr.pos(f7, 0.0D, 0.0D).tex(f8, p_78439_4_).normal(-1, 0, 0).endVertex(); + wr.pos(f7, 1.0D, 0.0D).tex(f8, p_78439_2_).normal(-1, 0, 0).endVertex(); + wr.pos(f7, 1.0D, 0.0F - thickness).tex(f8, p_78439_2_).normal(-1, 0, 0).endVertex(); + } - tess.draw(); - wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); - float f9; + tess.draw(); + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + float f9; - for (k = 0; k < width; ++k) - { - f7 = (float)k / (float)width; - f8 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f7 - f5; - f9 = f7 + 1.0F / (float)width; - wr.pos(f9, 1.0D, (0.0F - thickness)).tex(f8, p_78439_2_).normal(1, 0, 0).endVertex(); - wr.pos(f9, 1.0D, 0.0D).tex(f8, p_78439_2_).normal(1, 0, 0).endVertex(); - wr.pos(f9, 0.0D, 0.0D).tex(f8, p_78439_4_).normal(1, 0, 0).endVertex(); - wr.pos(f9, 0.0D, (0.0F - thickness)).tex(f8, p_78439_4_).normal(1, 0, 0).endVertex(); - } + for (k = 0; k < width; ++k) + { + f7 = (float)k / (float)width; + f8 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f7 - f5; + f9 = f7 + 1.0F / width; + wr.pos(f9, 1.0D, 0.0F - thickness).tex(f8, p_78439_2_).normal(1, 0, 0).endVertex(); + wr.pos(f9, 1.0D, 0.0D).tex(f8, p_78439_2_).normal(1, 0, 0).endVertex(); + wr.pos(f9, 0.0D, 0.0D).tex(f8, p_78439_4_).normal(1, 0, 0).endVertex(); + wr.pos(f9, 0.0D, 0.0F - thickness).tex(f8, p_78439_4_).normal(1, 0, 0).endVertex(); + } - tess.draw(); - wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + tess.draw(); + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); - for (k = 0; k < height; ++k) - { - f7 = (float)k / (float)height; - f8 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f7 - f6; - f9 = f7 + 1.0F / (float)height; - wr.pos(0.0D, f9, 0.0D).tex(p_78439_1_, f8).normal(0, 1, 0).endVertex(); - wr.pos(1.0D, f9, 0.0D).tex(p_78439_3_, f8).normal(0, 1, 0).endVertex(); - wr.pos(1.0D, f9, (0.0F - thickness)).tex(p_78439_3_, f8).normal(0, 1, 0).endVertex(); - wr.pos(0.0D, f9, (0.0F - thickness)).tex(p_78439_1_, f8).normal(0, 1, 0).endVertex(); - } + for (k = 0; k < height; ++k) + { + f7 = (float)k / (float)height; + f8 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f7 - f6; + f9 = f7 + 1.0F / height; + wr.pos(0.0D, f9, 0.0D).tex(p_78439_1_, f8).normal(0, 1, 0).endVertex(); + wr.pos(1.0D, f9, 0.0D).tex(p_78439_3_, f8).normal(0, 1, 0).endVertex(); + wr.pos(1.0D, f9, 0.0F - thickness).tex(p_78439_3_, f8).normal(0, 1, 0).endVertex(); + wr.pos(0.0D, f9, 0.0F - thickness).tex(p_78439_1_, f8).normal(0, 1, 0).endVertex(); + } - tess.draw(); - wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + tess.draw(); + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); - for (k = 0; k < height; ++k) - { - f7 = (float)k / (float)height; - f8 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f7 - f6; - wr.pos(1.0D, f7, 0.0D).tex(p_78439_3_, f8).normal(0, -1, 0).endVertex(); - wr.pos(0.0D, f7, 0.0D).tex(p_78439_1_, f8).normal(0, -1, 0).endVertex(); - wr.pos(0.0D, f7, (0.0F - thickness)).tex(p_78439_1_, f8).normal(0, -1, 0).endVertex(); - wr.pos(1.0D, f7, (0.0F - thickness)).tex(p_78439_3_, f8).normal(0, -1, 0).endVertex(); - } + for (k = 0; k < height; ++k) + { + f7 = (float)k / (float)height; + f8 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f7 - f6; + wr.pos(1.0D, f7, 0.0D).tex(p_78439_3_, f8).normal(0, -1, 0).endVertex(); + wr.pos(0.0D, f7, 0.0D).tex(p_78439_1_, f8).normal(0, -1, 0).endVertex(); + wr.pos(0.0D, f7, 0.0F - thickness).tex(p_78439_1_, f8).normal(0, -1, 0).endVertex(); + wr.pos(1.0D, f7, 0.0F - thickness).tex(p_78439_3_, f8).normal(0, -1, 0).endVertex(); + } - tess.draw(); + tess.draw(); } diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 3db962e08..db48ecb42 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 19, 2014, 5:40:38 PM (GMT)] */ package vazkii.botania.client.core.helper; +import java.util.List; +import java.util.Random; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; @@ -19,14 +24,9 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; -import java.util.List; -import java.util.Random; - public final class RenderHelper { public static void renderTooltip(int x, int y, List tooltipData) { @@ -131,10 +131,10 @@ public final class RenderHelper { public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6, float f, float f1) { Tessellator tessellator = Tessellator.getInstance(); tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - tessellator.getBuffer().pos(par1, par2 + par6, z).tex((par3) * f, (par4 + par6) * f1).endVertex(); + tessellator.getBuffer().pos(par1, par2 + par6, z).tex(par3 * f, (par4 + par6) * f1).endVertex(); tessellator.getBuffer().pos(par1 + par5, par2 + par6, z).tex((par3 + par5) * f, (par4 + par6) * f1).endVertex(); - tessellator.getBuffer().pos(par1 + par5, par2, z).tex((par3 + par5) * f, (par4) * f1).endVertex(); - tessellator.getBuffer().pos(par1, par2, z).tex((par3) * f, (par4) * f1).endVertex(); + tessellator.getBuffer().pos(par1 + par5, par2, z).tex((par3 + par5) * f, par4 * f1).endVertex(); + tessellator.getBuffer().pos(par1, par2, z).tex(par3 * f, par4 * f1).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index 309749722..332a71a22 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -2,30 +2,31 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 9, 2014, 11:20:26 PM (GMT)] */ package vazkii.botania.client.core.helper; -import net.minecraft.client.renderer.OpenGlHelper; -import org.lwjgl.opengl.ARBFragmentShader; -import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.ARBVertexShader; -import org.lwjgl.opengl.GL11; -import vazkii.botania.api.internal.ShaderCallback; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.Botania; -import vazkii.botania.common.core.handler.ConfigHandler; - import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; import java.util.stream.Collectors; +import org.lwjgl.opengl.ARBFragmentShader; +import org.lwjgl.opengl.ARBShaderObjects; +import org.lwjgl.opengl.ARBVertexShader; +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.renderer.OpenGlHelper; +import vazkii.botania.api.internal.ShaderCallback; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ConfigHandler; + public final class ShaderHelper { private static final int VERT = ARBVertexShader.GL_VERTEX_SHADER_ARB; diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index f59e91001..10803b66b 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 13, 2014, 7:46:05 PM (GMT)] */ package vazkii.botania.client.core.proxy; @@ -215,7 +215,7 @@ public class ClientProxy implements IProxy { MinecraftForge.EVENT_BUS.register(new RenderLexicon()); MinecraftForge.EVENT_BUS.register(BossBarHandler.class); MinecraftForge.EVENT_BUS.register(BergamuteEventHandler.class); - + if(ConfigHandler.useAdaptativeConfig) MinecraftForge.EVENT_BUS.register(AdaptorNotifier.class); if(ConfigHandler.versionCheckEnabled) @@ -223,7 +223,7 @@ public class ClientProxy implements IProxy { if(ConfigHandler.enableSeasonalFeatures) { LocalDateTime now = LocalDateTime.now(); - if ((now.getMonth() == Month.DECEMBER && now.getDayOfMonth() >= 16) || (now.getMonth() == Month.JANUARY && now.getDayOfMonth() <= 2)) + if (now.getMonth() == Month.DECEMBER && now.getDayOfMonth() >= 16 || now.getMonth() == Month.JANUARY && now.getDayOfMonth() <= 2) jingleTheBells = true; if(now.getMonth() == Month.OCTOBER) dootDoot = true; @@ -403,7 +403,7 @@ public class ClientProxy implements IProxy { int xp = x + i - iradius; int zp = z + j - iradius; - if((int) Math.floor(MathHelper.pointDistancePlane(xp, zp, x, z)) == (iradius - 1)) + if((int) Math.floor(MathHelper.pointDistancePlane(xp, zp, x, z)) == iradius - 1) mb.addComponent(new AnyComponent(new BlockPos(xp - x, 1, zp - z), block.getDefaultState())); } diff --git a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java index 09ee76c03..0536cdb93 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java +++ b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java @@ -2,21 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 27, 2014, 1:50:49 AM (GMT)] */ package vazkii.botania.client.core.proxy; +import java.util.Set; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.fml.client.IModGuiFactory; import vazkii.botania.client.gui.GuiBotaniaConfig; -import java.util.Set; - public class GuiFactory implements IModGuiFactory { @Override diff --git a/src/main/java/vazkii/botania/client/fx/FXLightning.java b/src/main/java/vazkii/botania/client/fx/FXLightning.java index c739d7633..edcb9c92a 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightning.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightning.java @@ -1,5 +1,11 @@ package vazkii.botania.client.fx; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Random; + import gnu.trove.map.hash.TIntIntHashMap; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -12,237 +18,231 @@ import net.minecraft.world.World; import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.common.core.helper.Vector3; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Random; - // Originally taken with permission from WRCBE - heavily modified public class FXLightning extends Particle { - private static final int fadetime = 20; - private final TIntIntHashMap splitParents = new TIntIntHashMap(); - private final double length; - private final Random rand; - private final int colorOuter; - private final int colorInner; + private static final int fadetime = 20; + private final TIntIntHashMap splitParents = new TIntIntHashMap(); + private final double length; + private final Random rand; + private final int colorOuter; + private final int colorInner; - private List segments = new ArrayList<>(); - private int segmentCount = 1; - private int splitCount; - private float speed = 1.5F; + private List segments = new ArrayList<>(); + private int segmentCount = 1; + private int splitCount; + private float speed = 1.5F; - public FXLightning(World world, Vector3 sourcevec, Vector3 targetvec, float ticksPerMeter, long seed, int colorOuter, int colorInner) { - super(world, sourcevec.x, sourcevec.y, sourcevec.z); - this.rand = new Random(seed); - this.speed = ticksPerMeter; - this.colorOuter = colorOuter; - this.colorInner = colorInner; - this.length = targetvec.subtract(sourcevec).mag(); - this.particleMaxAge = fadetime + rand.nextInt(fadetime) - fadetime / 2; - this.particleAge = -(int) (length * speed); + public FXLightning(World world, Vector3 sourcevec, Vector3 targetvec, float ticksPerMeter, long seed, int colorOuter, int colorInner) { + super(world, sourcevec.x, sourcevec.y, sourcevec.z); + rand = new Random(seed); + speed = ticksPerMeter; + this.colorOuter = colorOuter; + this.colorInner = colorInner; + length = targetvec.subtract(sourcevec).mag(); + particleMaxAge = fadetime + rand.nextInt(fadetime) - fadetime / 2; + particleAge = -(int) (length * speed); - segments.add(new FXLightningSegment(sourcevec, targetvec)); + segments.add(new FXLightningSegment(sourcevec, targetvec)); - fractal(2, length / 1.5, 0.7F, 0.7F, 45); - fractal(2, length / 4, 0.5F, 0.8F, 50); - fractal(2, length / 15, 0.5F, 0.9F, 55); - fractal(2, length / 30, 0.5F, 1.0F, 60); - fractal(2, length / 60, 0, 0, 0); - fractal(2, length / 100, 0, 0, 0); - fractal(2, length / 400, 0, 0, 0); + fractal(2, length / 1.5, 0.7F, 0.7F, 45); + fractal(2, length / 4, 0.5F, 0.8F, 50); + fractal(2, length / 15, 0.5F, 0.9F, 55); + fractal(2, length / 30, 0.5F, 1.0F, 60); + fractal(2, length / 60, 0, 0, 0); + fractal(2, length / 100, 0, 0, 0); + fractal(2, length / 400, 0, 0, 0); - calculateCollisionAndDiffs(); + calculateCollisionAndDiffs(); - Collections.sort(segments, (o1, o2) -> Float.compare(o2.light, o1.light)); - } + Collections.sort(segments, (o1, o2) -> Float.compare(o2.light, o1.light)); + } - @Override - public void renderParticle(VertexBuffer wr, Entity entity, float partialTicks, float rotX, float rotZ, float rotYZ, float rotXY, float rotXZ) { - LightningHandler.queuedLightningBolts.offer(this); - } + @Override + public void renderParticle(VertexBuffer wr, Entity entity, float partialTicks, float rotX, float rotZ, float rotYZ, float rotXY, float rotXZ) { + LightningHandler.queuedLightningBolts.offer(this); + } - public void renderBolt(int pass, boolean inner) { - ParticleRenderDispatcher.lightningCount++; - VertexBuffer wr = Tessellator.getInstance().getBuffer(); + public void renderBolt(int pass, boolean inner) { + ParticleRenderDispatcher.lightningCount++; + VertexBuffer wr = Tessellator.getInstance().getBuffer(); - float boltAge = particleAge < 0 ? 0 : (float) particleAge / (float) particleMaxAge; - float mainAlpha; - if(pass == 0) - mainAlpha = (1 - boltAge) * 0.4F; - else mainAlpha = 1 - boltAge * 0.5F; + float boltAge = particleAge < 0 ? 0 : (float) particleAge / (float) particleMaxAge; + float mainAlpha; + if(pass == 0) + mainAlpha = (1 - boltAge) * 0.4F; + else mainAlpha = 1 - boltAge * 0.5F; - int expandTime = (int) (length * speed); + int expandTime = (int) (length * speed); - int renderstart = (int) ((expandTime / 2 - particleMaxAge + particleAge) / (float) (expandTime / 2) * segmentCount); - int renderend = (int) ((particleAge + expandTime) / (float) expandTime * segmentCount); + int renderstart = (int) ((expandTime / 2 - particleMaxAge + particleAge) / (float) (expandTime / 2) * segmentCount); + int renderend = (int) ((particleAge + expandTime) / (float) expandTime * segmentCount); - for(FXLightningSegment rendersegment : segments) { - if(rendersegment.segmentNo < renderstart || rendersegment.segmentNo > renderend) - continue; + for(FXLightningSegment rendersegment : segments) { + if(rendersegment.segmentNo < renderstart || rendersegment.segmentNo > renderend) + continue; - Vector3 playerVec = getRelativeViewVector(rendersegment.startPoint.point).multiply(-1); + Vector3 playerVec = getRelativeViewVector(rendersegment.startPoint.point).multiply(-1); - double width = 0.025F * (playerVec.mag() / 5 + 1) * (1 + rendersegment.light) * 0.5F; + double width = 0.025F * (playerVec.mag() / 5 + 1) * (1 + rendersegment.light) * 0.5F; - Vector3 diff1 = playerVec.crossProduct(rendersegment.prevDiff).normalize().multiply(width / rendersegment.sinPrev); - Vector3 diff2 = playerVec.crossProduct(rendersegment.nextDiff).normalize().multiply(width / rendersegment.sinNext); + Vector3 diff1 = playerVec.crossProduct(rendersegment.prevDiff).normalize().multiply(width / rendersegment.sinPrev); + Vector3 diff2 = playerVec.crossProduct(rendersegment.nextDiff).normalize().multiply(width / rendersegment.sinNext); - Vector3 startvec = rendersegment.startPoint.point; - Vector3 endvec = rendersegment.endPoint.point; + Vector3 startvec = rendersegment.startPoint.point; + Vector3 endvec = rendersegment.endPoint.point; - int color = inner ? colorInner : colorOuter; - int r = (color & 0xFF0000) >> 16; - int g = (color & 0xFF00) >> 8; - int b = (color & 0xFF); - int a = (int) (mainAlpha * rendersegment.light * 0xFF); + int color = inner ? colorInner : colorOuter; + int r = (color & 0xFF0000) >> 16; + int g = (color & 0xFF00) >> 8; + int b = color & 0xFF; + int a = (int) (mainAlpha * rendersegment.light * 0xFF); - wr.pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - wr.pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - wr.pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - wr.pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - if(rendersegment.next == null) { - Vector3 roundend = rendersegment.endPoint.point.add(rendersegment.diff.normalize().multiply(width)); + if(rendersegment.next == null) { + Vector3 roundend = rendersegment.endPoint.point.add(rendersegment.diff.normalize().multiply(width)); - wr.pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - wr.pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - wr.pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - wr.pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - } + wr.pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + } - if(rendersegment.prev == null) { - Vector3 roundend = rendersegment.startPoint.point.subtract(rendersegment.diff.normalize().multiply(width)); + if(rendersegment.prev == null) { + Vector3 roundend = rendersegment.startPoint.point.subtract(rendersegment.diff.normalize().multiply(width)); - wr.pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - wr.pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - wr.pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - wr.pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - } - } - } + wr.pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + } + } + } - private void fractal(int splits, double amount, double splitChance, double splitLength, double splitAngle) { - List oldSegments = segments; - segments = new ArrayList<>(); + private void fractal(int splits, double amount, double splitChance, double splitLength, double splitAngle) { + List oldSegments = segments; + segments = new ArrayList<>(); - FXLightningSegment prev; + FXLightningSegment prev; - for(FXLightningSegment segment : oldSegments) { - prev = segment.prev; + for(FXLightningSegment segment : oldSegments) { + prev = segment.prev; - Vector3 subsegment = segment.diff.multiply(1F / splits); + Vector3 subsegment = segment.diff.multiply(1F / splits); - FXLightningBoltPoint[] newpoints = new FXLightningBoltPoint[splits + 1]; + FXLightningBoltPoint[] newpoints = new FXLightningBoltPoint[splits + 1]; - Vector3 startpoint = segment.startPoint.point; - newpoints[0] = segment.startPoint; - newpoints[splits] = segment.endPoint; + Vector3 startpoint = segment.startPoint.point; + newpoints[0] = segment.startPoint; + newpoints[splits] = segment.endPoint; - for(int i = 1; i < splits; i++) { - Vector3 randoff = segment.diff.perpendicular().normalize().rotate(rand.nextFloat() * 360, segment.diff); - randoff = randoff.multiply((rand.nextFloat() - 0.5F) * amount * 2); + for(int i = 1; i < splits; i++) { + Vector3 randoff = segment.diff.perpendicular().normalize().rotate(rand.nextFloat() * 360, segment.diff); + randoff = randoff.multiply((rand.nextFloat() - 0.5F) * amount * 2); - Vector3 basepoint = startpoint.add(subsegment.multiply(i)); + Vector3 basepoint = startpoint.add(subsegment.multiply(i)); - newpoints[i] = new FXLightningBoltPoint(basepoint, randoff); - } + newpoints[i] = new FXLightningBoltPoint(basepoint, randoff); + } - for(int i = 0; i < splits; i++) { - FXLightningSegment next = new FXLightningSegment(newpoints[i], newpoints[i + 1], segment.light, segment.segmentNo * splits + i, segment.splitNo); - next.prev = prev; - if (prev != null) - prev.next = next; + for(int i = 0; i < splits; i++) { + FXLightningSegment next = new FXLightningSegment(newpoints[i], newpoints[i + 1], segment.light, segment.segmentNo * splits + i, segment.splitNo); + next.prev = prev; + if (prev != null) + prev.next = next; - if(i != 0 && rand.nextFloat() < splitChance) { - Vector3 splitrot = next.diff.xCrossProduct().rotate(rand.nextFloat() * 360, next.diff); - Vector3 diff = next.diff.rotate((rand.nextFloat() * 0.66F + 0.33F) * splitAngle, splitrot).multiply(splitLength); + if(i != 0 && rand.nextFloat() < splitChance) { + Vector3 splitrot = next.diff.xCrossProduct().rotate(rand.nextFloat() * 360, next.diff); + Vector3 diff = next.diff.rotate((rand.nextFloat() * 0.66F + 0.33F) * splitAngle, splitrot).multiply(splitLength); - splitCount++; - splitParents.put(splitCount, next.splitNo); + splitCount++; + splitParents.put(splitCount, next.splitNo); - FXLightningSegment split = new FXLightningSegment(newpoints[i], new FXLightningBoltPoint(newpoints[i + 1].basepoint, newpoints[i + 1].offsetvec.add(diff)), segment.light / 2F, next.segmentNo, splitCount); - split.prev = prev; + FXLightningSegment split = new FXLightningSegment(newpoints[i], new FXLightningBoltPoint(newpoints[i + 1].basepoint, newpoints[i + 1].offsetvec.add(diff)), segment.light / 2F, next.segmentNo, splitCount); + split.prev = prev; - segments.add(split); - } + segments.add(split); + } - prev = next; - segments.add(next); - } + prev = next; + segments.add(next); + } - if(segment.next != null) - segment.next.prev = prev; - } + if(segment.next != null) + segment.next.prev = prev; + } - segmentCount *= splits; - } + segmentCount *= splits; + } - private float rayTraceResistance(Vector3 start, Vector3 end, float prevresistance) { - RayTraceResult mop = worldObj.rayTraceBlocks(start.toVec3D(), end.toVec3D()); + private float rayTraceResistance(Vector3 start, Vector3 end, float prevresistance) { + RayTraceResult mop = worldObj.rayTraceBlocks(start.toVec3D(), end.toVec3D()); - if(mop == null) - return prevresistance; + if(mop == null) + return prevresistance; - if(mop.typeOfHit == RayTraceResult.Type.BLOCK) { - Block block = worldObj.getBlockState(mop.getBlockPos()).getBlock(); + if(mop.typeOfHit == RayTraceResult.Type.BLOCK) { + Block block = worldObj.getBlockState(mop.getBlockPos()).getBlock(); - if(worldObj.isAirBlock(mop.getBlockPos())) - return prevresistance; + if(worldObj.isAirBlock(mop.getBlockPos())) + return prevresistance; - return prevresistance + block.getExplosionResistance(null) + 0.3F; - } else return prevresistance; - } + return prevresistance + block.getExplosionResistance(null) + 0.3F; + } else return prevresistance; + } - private void calculateCollisionAndDiffs() { - TIntIntHashMap lastactivesegment = new TIntIntHashMap(); + private void calculateCollisionAndDiffs() { + TIntIntHashMap lastactivesegment = new TIntIntHashMap(); - Collections.sort(segments, (o1, o2) -> { - int comp = Integer.valueOf(o1.splitNo).compareTo(o2.splitNo); - if(comp == 0) - return Integer.valueOf(o1.segmentNo).compareTo(o2.segmentNo); - else return comp; - }); + Collections.sort(segments, (o1, o2) -> { + int comp = Integer.valueOf(o1.splitNo).compareTo(o2.splitNo); + if(comp == 0) + return Integer.valueOf(o1.segmentNo).compareTo(o2.segmentNo); + else return comp; + }); - int lastSplitCalc = 0; - int lastActiveSegment = 0;// unterminated - float splitResistance = 0; + int lastSplitCalc = 0; + int lastActiveSegment = 0;// unterminated + float splitResistance = 0; - for(FXLightningSegment segment : segments) { - if(segment.splitNo > lastSplitCalc) { - lastactivesegment.put(lastSplitCalc, lastActiveSegment); - lastSplitCalc = segment.splitNo; - lastActiveSegment = lastactivesegment.get(splitParents.get(segment.splitNo)); - splitResistance = lastActiveSegment < segment.segmentNo ? 50 : 0; - } + for(FXLightningSegment segment : segments) { + if(segment.splitNo > lastSplitCalc) { + lastactivesegment.put(lastSplitCalc, lastActiveSegment); + lastSplitCalc = segment.splitNo; + lastActiveSegment = lastactivesegment.get(splitParents.get(segment.splitNo)); + splitResistance = lastActiveSegment < segment.segmentNo ? 50 : 0; + } - if(splitResistance >= 40 * segment.light) - continue; + if(splitResistance >= 40 * segment.light) + continue; - splitResistance = rayTraceResistance(segment.startPoint.point, segment.endPoint.point, splitResistance); - lastActiveSegment = segment.segmentNo; - } - lastactivesegment.put(lastSplitCalc, lastActiveSegment); + splitResistance = rayTraceResistance(segment.startPoint.point, segment.endPoint.point, splitResistance); + lastActiveSegment = segment.segmentNo; + } + lastactivesegment.put(lastSplitCalc, lastActiveSegment); - lastSplitCalc = 0; - lastActiveSegment = lastactivesegment.get(0); - for(Iterator iterator = segments.iterator(); iterator.hasNext();) { - FXLightningSegment segment = iterator.next(); - if(lastSplitCalc != segment.splitNo) { - lastSplitCalc = segment.splitNo; - lastActiveSegment = lastactivesegment.get(segment.splitNo); - } + lastSplitCalc = 0; + lastActiveSegment = lastactivesegment.get(0); + for(Iterator iterator = segments.iterator(); iterator.hasNext();) { + FXLightningSegment segment = iterator.next(); + if(lastSplitCalc != segment.splitNo) { + lastSplitCalc = segment.splitNo; + lastActiveSegment = lastactivesegment.get(segment.splitNo); + } - if(segment.segmentNo > lastActiveSegment) - iterator.remove(); - segment.calcEndDiffs(); - } - } + if(segment.segmentNo > lastActiveSegment) + iterator.remove(); + segment.calcEndDiffs(); + } + } - private static Vector3 getRelativeViewVector(Vector3 pos) { - Entity renderEntity = Minecraft.getMinecraft().getRenderViewEntity(); - return new Vector3((float) renderEntity.posX - pos.x, (float) renderEntity.posY + renderEntity.getEyeHeight() - pos.y, (float) renderEntity.posZ - pos.z); - } + private static Vector3 getRelativeViewVector(Vector3 pos) { + Entity renderEntity = Minecraft.getMinecraft().getRenderViewEntity(); + return new Vector3((float) renderEntity.posX - pos.x, (float) renderEntity.posY + renderEntity.getEyeHeight() - pos.y, (float) renderEntity.posZ - pos.z); + } } diff --git a/src/main/java/vazkii/botania/client/fx/FXLightningBoltPoint.java b/src/main/java/vazkii/botania/client/fx/FXLightningBoltPoint.java index 4c82eb3ab..7eefcc62c 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightningBoltPoint.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightningBoltPoint.java @@ -4,14 +4,14 @@ import vazkii.botania.common.core.helper.Vector3; public class FXLightningBoltPoint { - public final Vector3 point; - public final Vector3 basepoint; - public final Vector3 offsetvec; + public final Vector3 point; + public final Vector3 basepoint; + public final Vector3 offsetvec; - public FXLightningBoltPoint(Vector3 basepoint, Vector3 offsetvec) { - point = basepoint.add(offsetvec); - this.basepoint = basepoint; - this.offsetvec = offsetvec; - } + public FXLightningBoltPoint(Vector3 basepoint, Vector3 offsetvec) { + point = basepoint.add(offsetvec); + this.basepoint = basepoint; + this.offsetvec = offsetvec; + } } diff --git a/src/main/java/vazkii/botania/client/fx/FXLightningSegment.java b/src/main/java/vazkii/botania/client/fx/FXLightningSegment.java index 7f0e8750d..0a3146335 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightningSegment.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightningSegment.java @@ -4,68 +4,68 @@ import vazkii.botania.common.core.helper.Vector3; public class FXLightningSegment { - public final FXLightningBoltPoint startPoint; - public final FXLightningBoltPoint endPoint; + public final FXLightningBoltPoint startPoint; + public final FXLightningBoltPoint endPoint; - public Vector3 diff; + public Vector3 diff; - public FXLightningSegment prev; - public FXLightningSegment next; + public FXLightningSegment prev; + public FXLightningSegment next; - public Vector3 nextDiff; - public Vector3 prevDiff; + public Vector3 nextDiff; + public Vector3 prevDiff; - public float sinPrev; - public float sinNext; - public final float light; + public float sinPrev; + public float sinNext; + public final float light; - public final int segmentNo; - public final int splitNo; + public final int segmentNo; + public final int splitNo; - public FXLightningSegment(FXLightningBoltPoint start, FXLightningBoltPoint end, float light, int segmentnumber, int splitnumber) { - startPoint = start; - endPoint = end; - this.light = light; - segmentNo = segmentnumber; - splitNo = splitnumber; + public FXLightningSegment(FXLightningBoltPoint start, FXLightningBoltPoint end, float light, int segmentnumber, int splitnumber) { + startPoint = start; + endPoint = end; + this.light = light; + segmentNo = segmentnumber; + splitNo = splitnumber; - calcDiff(); - } + calcDiff(); + } - public FXLightningSegment(Vector3 start, Vector3 end) { - this(new FXLightningBoltPoint(start, new Vector3(0, 0, 0)), new FXLightningBoltPoint(end, new Vector3(0, 0, 0)), 1, 0, 0); - } + public FXLightningSegment(Vector3 start, Vector3 end) { + this(new FXLightningBoltPoint(start, new Vector3(0, 0, 0)), new FXLightningBoltPoint(end, new Vector3(0, 0, 0)), 1, 0, 0); + } - public void calcDiff() { - diff = endPoint.point.subtract(startPoint.point); - } + public void calcDiff() { + diff = endPoint.point.subtract(startPoint.point); + } - public void calcEndDiffs() { - if(prev != null) { - Vector3 prevdiffnorm = prev.diff.normalize(); - Vector3 thisdiffnorm = diff.normalize(); + public void calcEndDiffs() { + if(prev != null) { + Vector3 prevdiffnorm = prev.diff.normalize(); + Vector3 thisdiffnorm = diff.normalize(); - prevDiff = thisdiffnorm.add(prevdiffnorm).normalize(); - sinPrev = (float) Math.sin(thisdiffnorm.angle(prevdiffnorm.multiply(-1)) / 2); - } else { - prevDiff = diff.normalize(); - sinPrev = 1; - } + prevDiff = thisdiffnorm.add(prevdiffnorm).normalize(); + sinPrev = (float) Math.sin(thisdiffnorm.angle(prevdiffnorm.multiply(-1)) / 2); + } else { + prevDiff = diff.normalize(); + sinPrev = 1; + } - if(next != null) { - Vector3 nextdiffnorm = next.diff.normalize(); - Vector3 thisdiffnorm = diff.normalize(); + if(next != null) { + Vector3 nextdiffnorm = next.diff.normalize(); + Vector3 thisdiffnorm = diff.normalize(); - nextDiff = thisdiffnorm.add(nextdiffnorm).normalize(); - sinNext = (float) Math.sin(thisdiffnorm.angle(nextdiffnorm.multiply(-1)) / 2); - } else { - nextDiff = diff.normalize(); - sinNext = 1; - } - } + nextDiff = thisdiffnorm.add(nextdiffnorm).normalize(); + sinNext = (float) Math.sin(thisdiffnorm.angle(nextdiffnorm.multiply(-1)) / 2); + } else { + nextDiff = diff.normalize(); + sinNext = 1; + } + } - @Override - public String toString() { - return startPoint.point.toString() + " " + endPoint.point.toString(); - } + @Override + public String toString() { + return startPoint.point.toString() + " " + endPoint.point.toString(); + } } diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 31e4b032a..f777627a6 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -2,16 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.client.fx; +import java.util.ArrayDeque; +import java.util.Queue; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.ParticleManager; import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -22,15 +26,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibObfuscation; - -import java.util.ArrayDeque; -import java.util.Queue; public class FXSparkle extends Particle { @@ -172,9 +170,9 @@ public class FXSparkle extends Particle { private boolean wiggleAround(double x, double y, double z) { BlockPos blockpos = new BlockPos(x, y, z); - double d0 = x - (double)blockpos.getX(); - double d1 = y - (double)blockpos.getY(); - double d2 = z - (double)blockpos.getZ(); + double d0 = x - blockpos.getX(); + double d1 = y - blockpos.getY(); + double d2 = z - blockpos.getZ(); // Botania - change collision box list check to !airblock check if (!worldObj.isAirBlock(blockpos)) @@ -182,55 +180,55 @@ public class FXSparkle extends Particle { EnumFacing enumfacing = EnumFacing.UP; double d3 = Double.MAX_VALUE; - if (!this.worldObj.isBlockFullCube(blockpos.west()) && d0 < d3) + if (!worldObj.isBlockFullCube(blockpos.west()) && d0 < d3) { d3 = d0; enumfacing = EnumFacing.WEST; } - if (!this.worldObj.isBlockFullCube(blockpos.east()) && 1.0D - d0 < d3) + if (!worldObj.isBlockFullCube(blockpos.east()) && 1.0D - d0 < d3) { d3 = 1.0D - d0; enumfacing = EnumFacing.EAST; } - if (!this.worldObj.isBlockFullCube(blockpos.north()) && d2 < d3) + if (!worldObj.isBlockFullCube(blockpos.north()) && d2 < d3) { d3 = d2; enumfacing = EnumFacing.NORTH; } - if (!this.worldObj.isBlockFullCube(blockpos.south()) && 1.0D - d2 < d3) + if (!worldObj.isBlockFullCube(blockpos.south()) && 1.0D - d2 < d3) { d3 = 1.0D - d2; enumfacing = EnumFacing.SOUTH; } - if (!this.worldObj.isBlockFullCube(blockpos.up()) && 1.0D - d1 < d3) + if (!worldObj.isBlockFullCube(blockpos.up()) && 1.0D - d1 < d3) { d3 = 1.0D - d1; enumfacing = EnumFacing.UP; } - float f = this.rand.nextFloat() * 0.05F + 0.01F; // Botania - made multiplier and add both smaller - float f1 = (float)enumfacing.getAxisDirection().getOffset(); + float f = rand.nextFloat() * 0.05F + 0.01F; // Botania - made multiplier and add both smaller + float f1 = enumfacing.getAxisDirection().getOffset(); float secondary = (rand.nextFloat() - rand.nextFloat()) * 0.1F; // Botania - Make and use a secondary movement variable below if (enumfacing.getAxis() == EnumFacing.Axis.X) { - this.motionX += (double)(f1 * f); - this.motionY = this.motionZ = secondary; + motionX += f1 * f; + motionY = motionZ = secondary; } else if (enumfacing.getAxis() == EnumFacing.Axis.Y) { - this.motionY += (double)(f1 * f); - this.motionX = this.motionZ = secondary; + motionY += f1 * f; + motionX = motionZ = secondary; } else if (enumfacing.getAxis() == EnumFacing.Axis.Z) { - this.motionZ += (double)(f1 * f); - this.motionX = this.motionY = secondary; + motionZ += f1 * f; + motionX = motionY = secondary; } return true; diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 1ca8d4faa..138837f16 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -2,16 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.client.fx; +import java.util.ArrayDeque; +import java.util.Queue; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.ParticleManager; import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -21,14 +25,8 @@ import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.client.FMLClientHandler; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibObfuscation; - -import java.util.ArrayDeque; -import java.util.Queue; public class FXWisp extends Particle { diff --git a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java index 39aa887c1..ce97d23a9 100644 --- a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java +++ b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java @@ -2,20 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under a * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) - * + * * File Created @ [Jul 2, 2014, 12:12:45 AM (GMT)] */ package vazkii.botania.client.fx; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.profiler.Profiler; -import org.lwjgl.opengl.GL11; public final class ParticleRenderDispatcher { diff --git a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java index cd719d940..1ea51bbfd 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java +++ b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 3, 2015, 5:55:36 PM (GMT)] */ package vazkii.botania.client.gui; diff --git a/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java b/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java index 38f88a519..20e46ab7e 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java +++ b/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 27, 2014, 1:52:33 AM (GMT)] */ package vazkii.botania.client.gui; diff --git a/src/main/java/vazkii/botania/client/gui/SlotLocked.java b/src/main/java/vazkii/botania/client/gui/SlotLocked.java index 89d467435..4aa0c7447 100644 --- a/src/main/java/vazkii/botania/client/gui/SlotLocked.java +++ b/src/main/java/vazkii/botania/client/gui/SlotLocked.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 6, 2015, 1:11:25 AM (GMT)] */ package vazkii.botania.client.gui; diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index d27c97212..d54d8a9d7 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -2,26 +2,24 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 16, 2015, 6:42:40 PM (GMT)] */ package vazkii.botania.client.gui.bag; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ClickType; import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.client.gui.SlotLocked; -import javax.annotation.Nonnull; - public class ContainerFlowerBag extends Container { private final InventoryFlowerBag flowerBagInv; diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index fd172b4a2..e6b1b3830 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -2,19 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 16, 2015, 6:42:43 PM (GMT)] */ package vazkii.botania.client.gui.bag; +import java.util.List; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -23,8 +24,6 @@ import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; -import java.util.List; - public class GuiFlowerBag extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_FLOWER_BAG); diff --git a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java index 7451d27d0..a1038a876 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 16, 2015, 6:42:56 PM (GMT)] */ package vazkii.botania.client.gui.bag; @@ -21,7 +21,7 @@ public class InventoryFlowerBag implements IItemHandlerModifiable { public InventoryFlowerBag(ItemStack bag) { this.bag = bag; - this.bagInv = (IItemHandlerModifiable) bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + bagInv = (IItemHandlerModifiable) bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); } @Override diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index d3d722be7..74e2cc268 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [25/11/2015, 19:59:06 (GMT)] */ package vazkii.botania.client.gui.box; +import javax.annotation.Nonnull; + import baubles.api.BaubleType; import baubles.api.IBauble; import baubles.common.container.InventoryBaubles; @@ -24,8 +26,6 @@ import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.client.gui.SlotLocked; -import javax.annotation.Nonnull; - public class ContainerBaubleBox extends Container { private final InventoryBaubleBox baubleBoxInv; diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index de7e87501..f22b752d7 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [25/11/2015, 19:59:11 (GMT)] */ package vazkii.botania.client.gui.box; diff --git a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java index 3d2cca86e..847cfc367 100644 --- a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [25/11/2015, 19:59:16 (GMT)] */ package vazkii.botania.client.gui.box; @@ -21,7 +21,7 @@ public class InventoryBaubleBox implements IItemHandlerModifiable { public InventoryBaubleBox(ItemStack box) { this.box = box; - this.boxInv = (IItemHandlerModifiable) box.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + boxInv = (IItemHandlerModifiable) box.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); } @Override diff --git a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java index 8d1dd16bd..c18a8e9bb 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Dec 15, 2014, 6:02:52 PM (GMT)] */ package vazkii.botania.client.gui.crafting; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ContainerWorkbench; @@ -18,8 +20,6 @@ import net.minecraft.inventory.SlotCrafting; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.Nonnull; - public class ContainerCraftingHalo extends ContainerWorkbench { public ContainerCraftingHalo(InventoryPlayer playerInv, World world) { diff --git a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java index fdc0401d8..9f92bea27 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Dec 15, 2014, 6:02:04 PM (GMT)] */ package vazkii.botania.client.gui.crafting; diff --git a/src/main/java/vazkii/botania/client/gui/crafting/InventoryCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/InventoryCraftingHalo.java index 59e0eafd5..fcfc92a6c 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/InventoryCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/InventoryCraftingHalo.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Dec 20, 2014, 4:29:09 PM (GMT)] */ package vazkii.botania.client.gui.crafting; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index bf37e4c42..00978232d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:48:05 PM (GMT)] */ package vazkii.botania.client.gui.lexicon; @@ -36,7 +36,6 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer.EnumChatVisibility; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatAllowedCharacters; @@ -67,6 +66,7 @@ import vazkii.botania.client.gui.lexicon.button.GuiButtonOptions; import vazkii.botania.client.gui.lexicon.button.GuiButtonScaleChange; import vazkii.botania.client.gui.lexicon.button.GuiButtonUpdateWarning; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lexicon.page.PageText; @@ -104,13 +104,14 @@ public class GuiLexicon extends GuiScreen { boolean hasTutorialArrow; int tutorialArrowX, tutorialArrowY; int konamiIndex; + int konamiTime; private static final int NOTE_TWEEN_TIME = 5; public static boolean notesEnabled; static int notesMoveTime; public String note = ""; public String categoryHighlight = ""; - + List allCategories; String title; @@ -146,7 +147,7 @@ public class GuiLexicon extends GuiScreen { height = res.getScaledHeight(); mc.gameSettings.guiScale = guiScale; } - + allCategories = new ArrayList<>(BotaniaAPI.getAllCategories()); Collections.sort(allCategories); @@ -186,10 +187,10 @@ public class GuiLexicon extends GuiScreen { buttonList.add(new GuiButtonAchievement(-2, left + 33, top + guiHeight - 25)); buttonList.add(new GuiButtonChallenges(-3, left + 45, top + guiHeight - 25)); buttonList.add(new GuiButtonScaleChange(-4, left + 57, top + guiHeight - 25)); - + GuiButtonUpdateWarning button = new GuiButtonUpdateWarning(-98, left - 6, top + guiHeight - 70); buttonList.add(button); - + if(PersistentVariableHelper.lastBotaniaVersion.equals(LibMisc.VERSION)) { button.enabled = false; button.visible = false; @@ -210,24 +211,29 @@ public class GuiLexicon extends GuiScreen { notesMoveTime++; else if(!notesEnabled && notesMoveTime > 0) notesMoveTime--; + + if(konamiTime > 0) + konamiTime--; } @Override public void drawScreen(int par1, int par2, float par3) { ScaledResolution res = new ScaledResolution(mc); int guiScale = mc.gameSettings.guiScale; + + GlStateManager.pushMatrix(); if(PersistentVariableHelper.lexiconGuiScale > 0) { mc.gameSettings.guiScale = PersistentVariableHelper.lexiconGuiScale; float s = (float) PersistentVariableHelper.lexiconGuiScale / (float) res.getScaleFactor(); GlStateManager.scale(s, s, s); - - res = new ScaledResolution(this.mc); - int sw = res.getScaledWidth(); - int sh = res.getScaledHeight(); - par1 = Mouse.getX() * sw / mc.displayWidth; - par2 = sh - Mouse.getY() * sh / mc.displayHeight - 1; + + res = new ScaledResolution(mc); + int sw = res.getScaledWidth(); + int sh = res.getScaledHeight(); + par1 = Mouse.getX() * sw / mc.displayWidth; + par2 = sh - Mouse.getY() * sh / mc.displayHeight - 1; } - + float time = ClientTickHandler.ticksInGame + par3; timeDelta = time - lastTime; lastTime = time; @@ -293,8 +299,23 @@ public class GuiLexicon extends GuiScreen { drawTexturedModalRect(tutorialArrowX, tutorialArrowY, 20, 200, TUTORIAL_ARROW_WIDTH, TUTORIAL_ARROW_HEIGHT); GlStateManager.disableBlend(); } - + mc.gameSettings.guiScale = guiScale; + GlStateManager.popMatrix(); + + if(konamiTime > 0) { + String meme = I18n.format("botania.subtitle.way"); + GlStateManager.pushMatrix(); + int fullWidth = fontRendererObj.getStringWidth(meme); + int left = width; + double widthPerTick = (fullWidth + width) / 240; + double currWidth = left - widthPerTick * (240 - (konamiTime - par3)) * 3.2; + + GlStateManager.translate(currWidth, height / 2 - 10, 0); + GlStateManager.scale(4, 4, 4); + mc.fontRendererObj.drawStringWithShadow(meme, 0, 0, 0xFFFFFF); + GlStateManager.popMatrix(); + } } public void drawNotes(float part) { @@ -417,11 +438,11 @@ public class GuiLexicon extends GuiScreen { case 4: PersistentVariableHelper.lexiconGuiScale = 2; break; - default: + default: PersistentVariableHelper.lexiconGuiScale = 3; break; } - + PersistentVariableHelper.saveSafe(); mc.displayGuiScreen(new GuiLexicon()); break; @@ -575,10 +596,10 @@ public class GuiLexicon extends GuiScreen { tutorial.add(LexiconData.spreader); tutorial.add(LexiconData.generatingIntro); tutorial.add(LexiconData.endoflame); -// tutorial.add(LexiconData.passiveGen); -// tutorial.add(LexiconData.daybloom); tutorial.add(LexiconData.functionalIntro); tutorial.add(LexiconData.runicAltar); + if(Botania.gardenOfGlassLoaded) + tutorial.add(LexiconData.gardenOfGlass); MinecraftForge.EVENT_BUS.post(new BotaniaTutorialStartEvent(tutorial)); } @@ -622,11 +643,12 @@ public class GuiLexicon extends GuiScreen { mc.setIngameFocus(); } - if(par2 == KONAMI_CODE[konamiIndex]) { + if(konamiTime == 0 && par2 == KONAMI_CODE[konamiIndex]) { konamiIndex++; if(konamiIndex >= KONAMI_CODE.length) { mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(BotaniaSoundEvents.way, 1.0F)); konamiIndex = 0; + konamiTime = 240; } } else konamiIndex = 0; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java index 6cedd8e17..ce31cbef9 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 29, 2015, 5:25:06 PM (GMT)] */ package vazkii.botania.client.gui.lexicon; +import java.io.IOException; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; @@ -23,8 +25,6 @@ import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; import vazkii.botania.common.lexicon.page.PageText; -import java.io.IOException; - public class GuiLexiconChallenge extends GuiLexicon implements IParented { private static final String TAG_CHALLENGE = "challenge"; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java index 1f97ef595..16c236ecc 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 29, 2015, 4:24:07 PM (GMT)] */ package vazkii.botania.client.gui.lexicon; +import java.io.IOException; +import java.util.List; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; @@ -20,9 +23,6 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; import vazkii.botania.client.gui.lexicon.button.GuiButtonChallengeIcon; -import java.io.IOException; -import java.util.List; - public class GuiLexiconChallengesList extends GuiLexicon implements IParented { GuiLexicon parent; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 5a6591152..fad7a1e11 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -10,6 +10,13 @@ */ package vazkii.botania.client.gui.lexicon; +import java.awt.Desktop; +import java.io.IOException; +import java.net.URI; +import java.util.List; + +import org.lwjgl.input.Mouse; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -18,7 +25,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import org.lwjgl.input.Mouse; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.IAddonEntry; @@ -30,11 +36,6 @@ import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; import vazkii.botania.client.gui.lexicon.button.GuiButtonShare; import vazkii.botania.client.gui.lexicon.button.GuiButtonViewOnline; -import java.awt.*; -import java.io.IOException; -import java.net.URI; -import java.util.List; - public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IParented { private static final String TAG_ENTRY = "entry"; @@ -407,7 +408,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa @Override public GuiLexicon copy() { - GuiLexiconEntry gui = new GuiLexiconEntry(entry, this.parent); + GuiLexiconEntry gui = new GuiLexiconEntry(entry, parent); gui.page = page; gui.setTitle(); return gui; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java index 31e1e84e7..cecab22a7 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java @@ -2,22 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 2, 2015, 6:27:58 PM (GMT)] */ package vazkii.botania.client.gui.lexicon; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.client.resources.I18n; import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconEntry; -import java.util.ArrayList; -import java.util.List; - public class GuiLexiconHistory extends GuiLexiconIndex { public static final List history = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java index 6f00e5c3c..761c4b521 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -2,14 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:46:59 PM (GMT)] */ package vazkii.botania.client.gui.lexicon; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.lwjgl.input.Mouse; + import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; @@ -19,7 +26,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; -import org.lwjgl.input.Mouse; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconCategory; @@ -30,11 +36,6 @@ import vazkii.botania.client.gui.lexicon.button.GuiButtonInvisible; import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; import vazkii.botania.common.lexicon.DogLexiconEntry; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - public class GuiLexiconIndex extends GuiLexicon implements IParented { private static final String TAG_CATEGORY = "category"; @@ -128,22 +129,22 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { } Collections.sort(entriesToDisplay); } - + boolean matchesSearch(LexiconEntry e) { String search = searchField.getText().trim(); if(search.isEmpty()) return true; - + search = search.toLowerCase(); if(I18n.format(e.getUnlocalizedName()).toLowerCase().contains(search)) return true; - + for(ItemStack stack : e.getDisplayedRecipes()) { String stackName = stack.getDisplayName().toLowerCase().trim(); if(stackName.contains(search)) return true; } - + return false; } @@ -159,7 +160,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { button.displayStack = entry.getIcon(); if(entry == tutEntry) tutPage = page; - + if(entry instanceof DogLexiconEntry) button.dog = true; } else button.displayString = ""; @@ -182,7 +183,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { mc.renderEngine.bindTexture(texture); GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(left + 134, top + guiHeight - 26, 86, 180, 12, 12); - + if(entriesToDisplay.size() == 1) { boolean unicode = mc.fontRendererObj.getUnicodeFlag(); mc.fontRendererObj.setUnicodeFlag(true); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java index fe7be0c00..6e0fba021 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 3, 2015, 5:44:36 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; @@ -17,10 +22,6 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class GuiButtonAchievement extends GuiButtonLexicon { public GuiButtonAchievement(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index 0371c342e..449c710d1 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -2,24 +2,25 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 9:54:21 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; -import javax.annotation.Nonnull; -import java.util.Collections; -import java.util.List; - public class GuiButtonBack extends GuiButtonLexicon { public GuiButtonBack(int par1, int par2, int par3) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java index 291914d20..663238c2d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java @@ -2,20 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 6, 2014, 6:35:32 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.client.resources.I18n; - import java.util.Arrays; import java.util.List; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.text.TextFormatting; + public class GuiButtonBackWithShift extends GuiButtonBack { public GuiButtonBackWithShift(int par1, int par2, int par3) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index cd68ef3ee..c33aaf210 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -1,15 +1,16 @@ package vazkii.botania.client.gui.lexicon.button; -import net.minecraft.client.Minecraft; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.client.resources.I18n; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nonnull; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.text.TextFormatting; +import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.client.gui.lexicon.GuiLexicon; + public class GuiButtonBookmark extends GuiButtonLexicon { final GuiLexicon gui; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index 2bbf672f0..c6b5eec70 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -2,23 +2,26 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 18, 2014, 4:00:30 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.ARBMultitexture; +import org.lwjgl.opengl.ARBShaderObjects; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.util.ResourceLocation; import net.minecraft.client.resources.I18n; -import org.lwjgl.opengl.ARBMultitexture; -import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.GL11; +import net.minecraft.util.ResourceLocation; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.client.core.helper.RenderHelper; @@ -27,8 +30,6 @@ import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; -import javax.annotation.Nonnull; - public class GuiButtonCategory extends GuiButtonLexicon { private static final ResourceLocation fallbackResource = new ResourceLocation(LibResources.CATEGORY_INDEX); @@ -118,7 +119,7 @@ public class GuiButtonCategory extends GuiButtonLexicon { GL11.glBindTexture(GL11.GL_TEXTURE_2D, texture); OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB); } - + GlStateManager.popMatrix(); if(inside) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index ae2633e65..8485d6138 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -2,25 +2,26 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 29, 2015, 5:00:30 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.util.text.TextFormatting; import net.minecraft.client.resources.I18n; +import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.challenge.Challenge; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class GuiButtonChallengeIcon extends GuiButtonLexicon { public final Challenge challenge; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index ffbbc1176..1ec89c1a9 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -2,23 +2,24 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 29, 2015, 7:42:52 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class GuiButtonChallengeInfo extends GuiButtonLexicon { final GuiLexicon gui; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index b95445c05..d49ea716d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -2,25 +2,26 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 29, 2015, 4:16:09 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.client.resources.I18n; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nonnull; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.text.TextFormatting; +import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.client.gui.lexicon.GuiLexicon; + public class GuiButtonChallenges extends GuiButtonLexicon { public GuiButtonChallenges(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java index 8880af260..7d54432ea 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 11, 2015, 7:04:46 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; @@ -19,10 +24,6 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - // Ssssshhhhhhh // I should've done this last year public class GuiButtonDoot extends GuiButtonLexicon { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index ff9d0fb54..ad5ac14c5 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -2,24 +2,25 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 2, 2015, 6:01:26 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; -import net.minecraft.client.Minecraft; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.client.resources.I18n; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nonnull; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.text.TextFormatting; +import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.client.gui.lexicon.GuiLexicon; + public class GuiButtonHistory extends GuiButtonLexicon { final GuiLexicon gui; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index bff99eccf..bcacd6a2e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -2,21 +2,24 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 8:34:01 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.FontHelper; @@ -24,17 +27,15 @@ import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; - public class GuiButtonInvisible extends GuiButtonLexicon { private static final ResourceLocation dogResource = new ResourceLocation(LibResources.GUI_DOG); - + final GuiLexiconIndex gui; public ItemStack displayStack = null; public boolean dog = false; float timeHover = 0; - + boolean enableDog = false; double dogPos = 0; @@ -42,7 +43,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { super(par1, par2, par3, par4, par5, par6Str); this.gui = gui; } - + public void click() { enableDog = true; PersistentVariableHelper.dog = true; @@ -53,17 +54,17 @@ public class GuiButtonInvisible extends GuiButtonLexicon { public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { if(enableDog) { dogPos += ClientTickHandler.delta * 10; - + par1Minecraft.renderEngine.bindTexture(dogResource); float f = 1F / 64F; GlStateManager.translate(dogPos, 0, 0); GlStateManager.color(1F, 1F, 1F, 1F); - vazkii.botania.client.core.helper.RenderHelper.drawTexturedModalRect(0, yPosition, zLevel + 10, (dogPos % 100 < 50) ? 23 : 0, 0, 23, 19, f, f); + vazkii.botania.client.core.helper.RenderHelper.drawTexturedModalRect(0, yPosition, zLevel + 10, dogPos % 100 < 50 ? 23 : 0, 0, 23, 19, f, f); xPosition = (int) Math.max(xPosition, dogPos + 10); - + GlStateManager.translate(-dogPos, 0, 0); } - + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); boolean showStack = displayStack != null && !displayString.isEmpty(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java index 47db510fb..710c76c3c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 7, 2014, 5:53:16 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index f4ff7e83d..a6acade60 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -2,25 +2,26 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 24, 2015, 2:49:36 AM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.client.resources.I18n; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nonnull; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.text.TextFormatting; +import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.client.gui.lexicon.GuiLexicon; + public class GuiButtonNotes extends GuiButtonLexicon { final GuiLexicon parent; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index 505803292..3c527e470 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -2,25 +2,26 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 6, 2015, 1:14:05 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.client.resources.I18n; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nonnull; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.text.TextFormatting; +import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.client.gui.lexicon.GuiLexicon; + public class GuiButtonOptions extends GuiButtonLexicon { public GuiButtonOptions(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index 85b06bf25..01583cd25 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -2,23 +2,24 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 16, 2014, 4:52:06 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; +import java.util.Collections; + +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; -import javax.annotation.Nonnull; -import java.util.Collections; - public class GuiButtonPage extends GuiButtonLexicon { final boolean right; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java index 8e2aa779b..7db2c8146 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [12/09/2016, 03:17:42 (GMT)] */ package vazkii.botania.client.gui.lexicon.button; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index 9f679d365..d6ab41087 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -2,25 +2,26 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 24, 2014, 3:49:21 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.client.resources.I18n; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; +import javax.annotation.Nonnull; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.text.TextFormatting; +import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.client.gui.lexicon.GuiLexicon; + public class GuiButtonShare extends GuiButtonLexicon { public GuiButtonShare(int par1, int par2, int par3) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index 48ee68a59..30138a3ed 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -2,27 +2,28 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 25, 2015, 6:13:11 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.text.TextFormatting; import net.minecraft.client.resources.I18n; +import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class GuiButtonUpdateWarning extends GuiButtonLexicon { public GuiButtonUpdateWarning(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index 5cf07ae21..61891013c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -2,25 +2,26 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 2, 2015, 5:34:05 PM (GMT)] */ package vazkii.botania.client.gui.lexicon.button; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.client.resources.I18n; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.lexicon.GuiLexicon; - -import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; +import javax.annotation.Nonnull; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.text.TextFormatting; +import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.client.gui.lexicon.GuiLexicon; + public class GuiButtonViewOnline extends GuiButtonLexicon { public GuiButtonViewOnline(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 662c0ff3f..bcd229a02 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -8,6 +8,8 @@ */ package vazkii.botania.client.integration.jei; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModPlugin; @@ -36,8 +38,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import javax.annotation.Nonnull; - @JEIPlugin public class JEIBotaniaPlugin implements IModPlugin { @@ -55,7 +55,7 @@ public class JEIBotaniaPlugin implements IModPlugin { new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()), new ElvenTradeRecipeCategory(jeiHelpers.getGuiHelper()), new ManaPoolRecipeCategory(jeiHelpers.getGuiHelper()) - ); + ); registry.addRecipeHandlers( new BreweryRecipeHandler(), @@ -64,7 +64,7 @@ public class JEIBotaniaPlugin implements IModPlugin { new PetalApothecaryRecipeHandler(), new ElvenTradeRecipeHandler(), new ManaPoolRecipeHandler() - ); + ); registry.addRecipes(BotaniaAPI.brewRecipes); registry.addRecipes(BotaniaAPI.pureDaisyRecipes); diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index ec8828dbf..1112de100 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -8,6 +8,11 @@ */ package vazkii.botania.client.integration.jei.brewery; +import java.util.Collection; +import java.util.List; + +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableStatic; @@ -15,13 +20,9 @@ import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.client.resources.I18n; - -import javax.annotation.Nonnull; -import java.util.Collection; -import java.util.List; public class BreweryRecipeCategory implements IRecipeCategory { @@ -66,15 +67,15 @@ public class BreweryRecipeCategory implements IRecipeCategory { public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { if(!(recipeWrapper instanceof BreweryRecipeWrapper)) return; - BreweryRecipeWrapper wrapper = ((BreweryRecipeWrapper) recipeWrapper); + BreweryRecipeWrapper wrapper = (BreweryRecipeWrapper) recipeWrapper; List inputs = wrapper.getInputs(); recipeLayout.getItemStacks().init(0, true, 39, 41); if(inputs.get(0) instanceof ItemStack) { - recipeLayout.getItemStacks().set(0, ((ItemStack) inputs.get(0))); + recipeLayout.getItemStacks().set(0, (ItemStack) inputs.get(0)); } else { - recipeLayout.getItemStacks().set(0, ((Collection) inputs.get(0))); + recipeLayout.getItemStacks().set(0, (Collection) inputs.get(0)); } int index = 1, posX = 60; @@ -82,9 +83,9 @@ public class BreweryRecipeCategory implements IRecipeCategory { Object o = wrapper.getInputs().get(i); recipeLayout.getItemStacks().init(index, true, posX, 6); if(o instanceof ItemStack) { - recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + recipeLayout.getItemStacks().set(index, (ItemStack) o); } else if(o instanceof Collection) { - recipeLayout.getItemStacks().set(index, ((Collection) o)); + recipeLayout.getItemStacks().set(index, (Collection) o); } index++; posX += 18; diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java index e4ffe0bd4..3f33dd627 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java @@ -8,12 +8,12 @@ */ package vazkii.botania.client.integration.jei.brewery; +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import vazkii.botania.api.recipe.RecipeBrew; -import javax.annotation.Nonnull; - public class BreweryRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index 9604a1b5c..a33a82704 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -8,7 +8,12 @@ */ package vazkii.botania.client.integration.jei.brewery; +import java.util.List; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableList; + import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -17,9 +22,6 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; -import java.util.List; - public class BreweryRecipeWrapper implements IRecipeWrapper { private final List input; @@ -34,7 +36,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { builder.add(o); } if(o instanceof String) { - builder.add(OreDictionary.getOres(((String) o))); + builder.add(OreDictionary.getOres((String) o)); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index c0c0570a3..1651ce094 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -8,6 +8,12 @@ */ package vazkii.botania.client.integration.jei.elventrade; +import java.util.Collection; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; @@ -20,15 +26,11 @@ import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.client.resources.I18n; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.MiscellaneousIcons; -import javax.annotation.Nonnull; -import java.util.Collection; - public class ElvenTradeRecipeCategory implements IRecipeCategory { public static final String UID = "botania.elvenTrade"; @@ -92,15 +94,15 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { if(!(recipeWrapper instanceof ElvenTradeRecipeWrapper)) return; - ElvenTradeRecipeWrapper wrapper = ((ElvenTradeRecipeWrapper) recipeWrapper); + ElvenTradeRecipeWrapper wrapper = (ElvenTradeRecipeWrapper) recipeWrapper; int index = 0, posX = 42; for(Object o : wrapper.getInputs()) { recipeLayout.getItemStacks().init(index, true, posX, 0); if(o instanceof Collection) { - recipeLayout.getItemStacks().set(index, ((Collection) o)); + recipeLayout.getItemStacks().set(index, (Collection) o); } else { - recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + recipeLayout.getItemStacks().set(index, (ItemStack) o); } index++; posX += 18; @@ -108,7 +110,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { for (int i = 0; i < wrapper.getOutputs().size(); i++) { ItemStack stack = wrapper.getOutputs().get(i); - recipeLayout.getItemStacks().init(index + i, false, 93 + (i % 2 * 20), 41 + (i / 2 * 20)); + recipeLayout.getItemStacks().init(index + i, false, 93 + i % 2 * 20, 41 + i / 2 * 20); recipeLayout.getItemStacks().set(index + i, stack); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java index a791ad23a..a2514dcfc 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java @@ -8,12 +8,12 @@ */ package vazkii.botania.client.integration.jei.elventrade; +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import vazkii.botania.api.recipe.RecipeElvenTrade; -import javax.annotation.Nonnull; - public class ElvenTradeRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index b76ac1c6f..d381c879b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -8,7 +8,12 @@ */ package vazkii.botania.client.integration.jei.elventrade; +import java.util.List; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableList; + import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -16,9 +21,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipeElvenTrade; -import javax.annotation.Nonnull; -import java.util.List; - public class ElvenTradeRecipeWrapper implements IRecipeWrapper { private final List input; @@ -32,7 +34,7 @@ public class ElvenTradeRecipeWrapper implements IRecipeWrapper { builder.add(o); } if(o instanceof String) { - builder.add(OreDictionary.getOres(((String) o))); + builder.add(OreDictionary.getOres((String) o)); } } input = builder.build(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index eda67238b..e253ce18f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -8,6 +8,10 @@ */ package vazkii.botania.client.integration.jei.manapool; +import java.util.Collection; + +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; @@ -15,15 +19,12 @@ import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.client.resources.I18n; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.ItemNBTHelper; -import javax.annotation.Nonnull; -import java.util.Collection; - public class ManaPoolRecipeCategory implements IRecipeCategory { public static final String UID = "botania.manaPool"; @@ -77,14 +78,14 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { if(!(recipeWrapper instanceof ManaPoolRecipeWrapper)) return; - ManaPoolRecipeWrapper wrapper = ((ManaPoolRecipeWrapper) recipeWrapper); + ManaPoolRecipeWrapper wrapper = (ManaPoolRecipeWrapper) recipeWrapper; int index = 0; recipeLayout.getItemStacks().init(index, true, 40, 12); if(wrapper.getInputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(index, ((Collection) wrapper.getInputs().get(0))); + recipeLayout.getItemStacks().set(index, (Collection) wrapper.getInputs().get(0)); } else { - recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getInputs().get(0))); + recipeLayout.getItemStacks().set(index, (ItemStack) wrapper.getInputs().get(0)); } index++; @@ -92,7 +93,7 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { if(wrapper.getInputs().size() > 1) { // Has catalyst recipeLayout.getItemStacks().init(index, true, 20, 12); - recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getInputs().get(1))); + recipeLayout.getItemStacks().set(index, (ItemStack) wrapper.getInputs().get(1)); index++; } @@ -102,9 +103,9 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { recipeLayout.getItemStacks().init(index, false, 99, 12); if(wrapper.getOutputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(index, ((Collection) wrapper.getOutputs().get(0))); + recipeLayout.getItemStacks().set(index, (Collection) wrapper.getOutputs().get(0)); } else { - recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getOutputs().get(0))); + recipeLayout.getItemStacks().set(index, (ItemStack) wrapper.getOutputs().get(0)); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java index 4096fea8b..56d2b6682 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java @@ -8,12 +8,12 @@ */ package vazkii.botania.client.integration.jei.manapool; +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import vazkii.botania.api.recipe.RecipeManaInfusion; -import javax.annotation.Nonnull; - public class ManaPoolRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java index 4ffd3f699..bac9550b9 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java @@ -8,7 +8,13 @@ */ package vazkii.botania.client.integration.jei.manapool; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import com.google.common.collect.ImmutableList; + import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -21,10 +27,6 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.tile.mana.TilePool; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; - public class ManaPoolRecipeWrapper implements IRecipeWrapper { private final List input; @@ -37,7 +39,7 @@ public class ManaPoolRecipeWrapper implements IRecipeWrapper { if(recipe.getInput() instanceof ItemStack) { builder.add(recipe.getInput()); } else if(recipe.getInput() instanceof String) { - builder.add(OreDictionary.getOres(((String) recipe.getInput()))); + builder.add(OreDictionary.getOres((String) recipe.getInput())); } if(recipe.getCatalyst() != null) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index 198d3957f..e8b365792 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -8,6 +8,11 @@ */ package vazkii.botania.client.integration.jei.petalapothecary; +import java.awt.Point; +import java.util.Collection; + +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableStatic; @@ -16,15 +21,11 @@ import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.client.resources.I18n; import vazkii.botania.common.block.ModBlocks; -import javax.annotation.Nonnull; -import java.awt.*; -import java.util.Collection; - public class PetalApothecaryRecipeCategory implements IRecipeCategory { public static final String UID = "botania.petals"; @@ -75,7 +76,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { if(!(recipeWrapper instanceof PetalApothecaryRecipeWrapper)) return; - PetalApothecaryRecipeWrapper wrapper = ((PetalApothecaryRecipeWrapper) recipeWrapper); + PetalApothecaryRecipeWrapper wrapper = (PetalApothecaryRecipeWrapper) recipeWrapper; recipeLayout.getItemStacks().init(0, true, 64, 52); recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.altar)); @@ -87,10 +88,10 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { for(Object o : wrapper.getInputs()) { recipeLayout.getItemStacks().init(index, true, point.x, point.y); if(o instanceof Collection) { - recipeLayout.getItemStacks().set(index, ((Collection) o)); + recipeLayout.getItemStacks().set(index, (Collection) o); } if(o instanceof ItemStack) { - recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + recipeLayout.getItemStacks().set(index, (ItemStack) o); } index += 1; point = rotatePointAbout(point, center, angleBetweenEach); @@ -104,7 +105,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { double rad = degrees * Math.PI / 180.0; double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x; double newY = Math.sin(rad) * (in.x - about.x) + Math.cos(rad) * (in.y - about.y) + about.y; - return new Point(((int) newX), ((int) newY)); + return new Point((int) newX, (int) newY); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java index fe4860533..868132929 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java @@ -8,12 +8,12 @@ */ package vazkii.botania.client.integration.jei.petalapothecary; +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import vazkii.botania.api.recipe.RecipePetals; -import javax.annotation.Nonnull; - public class PetalApothecaryRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java index 82a8925c1..d24315104 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java @@ -8,7 +8,12 @@ */ package vazkii.botania.client.integration.jei.petalapothecary; +import java.util.List; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableList; + import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -16,9 +21,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipePetals; -import javax.annotation.Nonnull; -import java.util.List; - public class PetalApothecaryRecipeWrapper implements IRecipeWrapper { private final List input; @@ -31,7 +33,7 @@ public class PetalApothecaryRecipeWrapper implements IRecipeWrapper { builder.add(o); } if(o instanceof String) { - builder.add(OreDictionary.getOres(((String) o))); + builder.add(OreDictionary.getOres((String) o)); } } input = builder.build(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 1e567190e..32e7fe6c6 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -8,6 +8,10 @@ */ package vazkii.botania.client.integration.jei.puredaisy; +import java.util.Collection; + +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; @@ -15,15 +19,12 @@ import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.client.resources.I18n; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Collection; - public class PureDaisyRecipeCategory implements IRecipeCategory { public static final String UID = "botania.pureDaisy"; @@ -75,7 +76,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { if(!(recipeWrapper instanceof PureDaisyRecipeWrapper)) return; - PureDaisyRecipeWrapper wrapper = ((PureDaisyRecipeWrapper) recipeWrapper); + PureDaisyRecipeWrapper wrapper = (PureDaisyRecipeWrapper) recipeWrapper; boolean inputFluid = wrapper.getInputs().isEmpty(); boolean outputFluid = wrapper.getOutputs().isEmpty(); @@ -86,9 +87,9 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { } else { recipeLayout.getItemStacks().init(0, true, 40, 12); if(wrapper.getInputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(0, ((Collection) wrapper.getInputs().get(0))); + recipeLayout.getItemStacks().set(0, (Collection) wrapper.getInputs().get(0)); } else { - recipeLayout.getItemStacks().set(0, ((ItemStack) wrapper.getInputs().get(0))); + recipeLayout.getItemStacks().set(0, (ItemStack) wrapper.getInputs().get(0)); } } @@ -101,9 +102,9 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { } else { recipeLayout.getItemStacks().init(2, false, 99, 12); if(wrapper.getOutputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(2, ((Collection) wrapper.getOutputs().get(0))); + recipeLayout.getItemStacks().set(2, (Collection) wrapper.getOutputs().get(0)); } else { - recipeLayout.getItemStacks().set(2, ((ItemStack) wrapper.getOutputs().get(0))); + recipeLayout.getItemStacks().set(2, (ItemStack) wrapper.getOutputs().get(0)); } } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java index 9dd786723..9a3a5e82b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java @@ -8,12 +8,12 @@ */ package vazkii.botania.client.integration.jei.puredaisy; +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import vazkii.botania.api.recipe.RecipePureDaisy; -import javax.annotation.Nonnull; - public class PureDaisyRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java index 560245cb8..d93ac7b13 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java @@ -8,7 +8,12 @@ */ package vazkii.botania.client.integration.jei.puredaisy; +import java.util.List; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableList; + import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -18,9 +23,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipePureDaisy; -import javax.annotation.Nonnull; -import java.util.List; - public class PureDaisyRecipeWrapper implements IRecipeWrapper { private List inputs = ImmutableList.of(); @@ -30,9 +32,9 @@ public class PureDaisyRecipeWrapper implements IRecipeWrapper { public PureDaisyRecipeWrapper(RecipePureDaisy recipe) { if(recipe.getInput() instanceof String) { - inputs = ImmutableList.of(OreDictionary.getOres(((String) recipe.getInput()))); + inputs = ImmutableList.of(OreDictionary.getOres((String) recipe.getInput())); } else if(recipe.getInput() instanceof Block) { - Block b = ((Block) recipe.getInput()); + Block b = (Block) recipe.getInput(); if(FluidRegistry.lookupFluidForBlock(b) != null) { fluidInputs = ImmutableList.of(new FluidStack(FluidRegistry.lookupFluidForBlock(b), 1000)); } else { diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java index 0040afefc..9346ed178 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -8,6 +8,11 @@ */ package vazkii.botania.client.integration.jei.runicaltar; +import java.awt.Point; +import java.util.Collection; + +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; @@ -20,10 +25,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.block.ModBlocks; -import javax.annotation.Nonnull; -import java.awt.*; -import java.util.Collection; - public class RunicAltarRecipeCategory implements IRecipeCategory { public static final String UID = "botania.runicAltar"; @@ -74,7 +75,7 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { if(!(recipeWrapper instanceof RunicAltarRecipeWrapper)) return; - RunicAltarRecipeWrapper wrapper = ((RunicAltarRecipeWrapper) recipeWrapper); + RunicAltarRecipeWrapper wrapper = (RunicAltarRecipeWrapper) recipeWrapper; recipeLayout.getItemStacks().init(0, true, 64, 52); recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.runeAltar)); @@ -86,10 +87,10 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { for(Object o : wrapper.getInputs()) { recipeLayout.getItemStacks().init(index, true, point.x, point.y); if(o instanceof Collection) { - recipeLayout.getItemStacks().set(index, ((Collection) o)); + recipeLayout.getItemStacks().set(index, (Collection) o); } if(o instanceof ItemStack) { - recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + recipeLayout.getItemStacks().set(index, (ItemStack) o); } index += 1; point = rotatePointAbout(point, center, angleBetweenEach); @@ -103,7 +104,7 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { double rad = degrees * Math.PI / 180.0; double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x; double newY = Math.sin(rad) * (in.x - about.x) + Math.cos(rad) * (in.y - about.y) + about.y; - return new Point(((int) newX), ((int) newY)); + return new Point((int) newX, (int) newY); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java index 2c4c17fb6..f729656a9 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java @@ -8,12 +8,12 @@ */ package vazkii.botania.client.integration.jei.runicaltar; +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import vazkii.botania.api.recipe.RecipeRuneAltar; -import javax.annotation.Nonnull; - public class RunicAltarRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java index 12deaf4e3..dba09702d 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java @@ -8,7 +8,12 @@ */ package vazkii.botania.client.integration.jei.runicaltar; +import java.util.List; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableList; + import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -19,9 +24,6 @@ import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.tile.mana.TilePool; -import javax.annotation.Nonnull; -import java.util.List; - public class RunicAltarRecipeWrapper implements IRecipeWrapper { private final List input; @@ -36,7 +38,7 @@ public class RunicAltarRecipeWrapper implements IRecipeWrapper { builder.add(o); } if(o instanceof String) { - builder.add(OreDictionary.getOres(((String) o))); + builder.add(OreDictionary.getOres((String) o)); } } input = builder.build(); diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 8b099de13..a909148b4 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 5:29:31 PM (GMT)] */ package vazkii.botania.client.lib; diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index e16c57f3f..93acae8b0 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -8,9 +8,22 @@ */ package vazkii.botania.client.model; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.Nonnull; +import javax.vecmath.Matrix4f; +import javax.vecmath.Vector3f; +import javax.vecmath.Vector4f; + +import org.apache.commons.lang3.tuple.Pair; + import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Table; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -34,25 +47,13 @@ import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.client.model.pipeline.VertexTransformer; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; -import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import javax.annotation.Nonnull; -import javax.vecmath.Matrix4f; -import javax.vecmath.Vector3f; -import javax.vecmath.Vector4f; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - public class FloatingFlowerModel implements IBakedModel { private static final String MUNDANE_PREFIX = "botania:shimmeringFlower_"; @@ -65,18 +66,18 @@ public class FloatingFlowerModel implements IBakedModel { public void put(int element, float... data) { VertexFormatElement formatElement = DefaultVertexFormats.ITEM.getElement(element); switch(formatElement.getUsage()) { - case POSITION: { - float[] newData = new float[4]; - Vector4f vec = new Vector4f(data); - transform.getMatrix().transform(vec); - vec.get(newData); - parent.put(element, newData); - break; - } - default: { - parent.put(element, data); - break; - } + case POSITION: { + float[] newData = new float[4]; + Vector4f vec = new Vector4f(data); + transform.getMatrix().transform(vec); + vec.get(newData); + parent.put(element, newData); + break; + } + default: { + parent.put(element, data); + break; + } } } }; @@ -89,7 +90,7 @@ public class FloatingFlowerModel implements IBakedModel { public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.floatingSpecialFlower && state.getBlock() != ModBlocks.floatingFlower) return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); - IExtendedBlockState realState = ((IExtendedBlockState) state); + IExtendedBlockState realState = (IExtendedBlockState) state; IFloatingFlower.IslandType islandType = realState.getValue(BotaniaStateProps.ISLAND_TYPE); String identifier; @@ -224,7 +225,7 @@ public class FloatingFlowerModel implements IBakedModel { if(Block.getBlockFromItem(stack.getItem()) == ModBlocks.floatingSpecialFlower) { // Magic flower - identifier = ItemBlockFloatingSpecialFlower.getType(stack); + identifier = ItemBlockSpecialFlower.getType(stack); } else { // Mundane flower identifier = MUNDANE_PREFIX + stack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index 0e0140c25..b78a3bbe3 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -1,40 +1,5 @@ package vazkii.botania.client.model; -import com.google.common.base.Preconditions; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.google.common.collect.ImmutableList; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemOverrideList; -import net.minecraft.client.renderer.block.model.ModelManager; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.renderer.vertex.VertexFormatElement; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; -import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.client.model.pipeline.IVertexConsumer; -import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; -import net.minecraftforge.client.model.pipeline.VertexTransformer; -import net.minecraftforge.common.model.TRSRTransformation; -import org.apache.commons.lang3.tuple.Pair; -import vazkii.botania.common.Botania; -import vazkii.botania.common.item.ItemManaGun; -import vazkii.botania.common.item.ModItems; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.vecmath.Matrix4f; -import javax.vecmath.Vector3f; -import javax.vecmath.Vector4f; import java.util.ArrayList; import java.util.EnumMap; import java.util.IdentityHashMap; @@ -42,130 +7,161 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import javax.vecmath.Matrix4f; +import javax.vecmath.Vector3f; +import javax.vecmath.Vector4f; + +import org.apache.commons.lang3.tuple.Pair; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormatElement; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; +import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.client.model.pipeline.IVertexConsumer; +import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; +import net.minecraftforge.client.model.pipeline.VertexTransformer; +import net.minecraftforge.common.model.TRSRTransformation; +import vazkii.botania.common.item.ItemManaGun; + public class GunModel implements IBakedModel { - - private final IBakedModel originalModel; - - public GunModel(IBakedModel originalModel) { - this.originalModel = Preconditions.checkNotNull(originalModel); - } - private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { - @Nonnull - @Override - public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase entity) { - ItemStack lens = ItemManaGun.getLens(stack); - if(lens != null) { - IBakedModel lensModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(lens); - return GunModel.this.getModel(lensModel); - } - else return GunModel.this; - } - }; + private final IBakedModel originalModel; - @Nonnull - @Override - public ItemOverrideList getOverrides() { - return itemHandler; - } - - @Nonnull @Override public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { return originalModel.getQuads(state, side, rand); } - @Override public boolean isAmbientOcclusion() { return originalModel.isAmbientOcclusion(); } - @Override public boolean isGui3d() { return originalModel.isGui3d(); } - @Override public boolean isBuiltInRenderer() { return originalModel.isBuiltInRenderer(); } - @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return originalModel.getParticleTexture(); } - @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return originalModel.getItemCameraTransforms(); } + public GunModel(IBakedModel originalModel) { + this.originalModel = Preconditions.checkNotNull(originalModel); + } - private final IdentityHashMap cache = new IdentityHashMap<>(); + private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + @Nonnull + @Override + public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase entity) { + ItemStack lens = ItemManaGun.getLens(stack); + if(lens != null) { + IBakedModel lensModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(lens); + return GunModel.this.getModel(lensModel); + } + else return GunModel.this; + } + }; - private CompositeBakedModel getModel(IBakedModel lens) { - CompositeBakedModel model = cache.get(lens); - if(model == null) { - model = new CompositeBakedModel(lens, originalModel); - cache.put(lens, model); - } - return model; - } + @Nonnull + @Override + public ItemOverrideList getOverrides() { + return itemHandler; + } - protected static BakedQuad transform(BakedQuad quad, final TRSRTransformation transform) { - UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(DefaultVertexFormats.ITEM); - final IVertexConsumer consumer = new VertexTransformer(builder) { - @Override - public void put(int element, float... data) { - VertexFormatElement formatElement = DefaultVertexFormats.ITEM.getElement(element); - switch(formatElement.getUsage()) { - case POSITION: { - float[] newData = new float[4]; - Vector4f vec = new Vector4f(data); - transform.getMatrix().transform(vec); - vec.get(newData); - parent.put(element, newData); - break; - } - default: { - parent.put(element, data); - break; - } - } - } - }; - quad.pipe(consumer); - return builder.build(); - } + @Nonnull @Override public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { return originalModel.getQuads(state, side, rand); } + @Override public boolean isAmbientOcclusion() { return originalModel.isAmbientOcclusion(); } + @Override public boolean isGui3d() { return originalModel.isGui3d(); } + @Override public boolean isBuiltInRenderer() { return originalModel.isBuiltInRenderer(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return originalModel.getParticleTexture(); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return originalModel.getItemCameraTransforms(); } - private static class CompositeBakedModel implements IPerspectiveAwareModel { + private final IdentityHashMap cache = new IdentityHashMap<>(); - private final IBakedModel gun; - private final List genQuads; - private final Map> faceQuads = new EnumMap<>(EnumFacing.class); + private CompositeBakedModel getModel(IBakedModel lens) { + CompositeBakedModel model = cache.get(lens); + if(model == null) { + model = new CompositeBakedModel(lens, originalModel); + cache.put(lens, model); + } + return model; + } - CompositeBakedModel(IBakedModel lens, IBakedModel gun) { - this.gun = gun; + protected static BakedQuad transform(BakedQuad quad, final TRSRTransformation transform) { + UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(DefaultVertexFormats.ITEM); + final IVertexConsumer consumer = new VertexTransformer(builder) { + @Override + public void put(int element, float... data) { + VertexFormatElement formatElement = DefaultVertexFormats.ITEM.getElement(element); + switch(formatElement.getUsage()) { + case POSITION: { + float[] newData = new float[4]; + Vector4f vec = new Vector4f(data); + transform.getMatrix().transform(vec); + vec.get(newData); + parent.put(element, newData); + break; + } + default: { + parent.put(element, data); + break; + } + } + } + }; + quad.pipe(consumer); + return builder.build(); + } - ImmutableList.Builder genBuilder = ImmutableList.builder(); - final TRSRTransformation transform = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(-0.4F, 0.25F, 0), null, new Vector3f(0.625F, 0.625F, 0.625F), TRSRTransformation.quatFromXYZ(0, (float) Math.PI / 2, 0))); + private static class CompositeBakedModel implements IPerspectiveAwareModel { - for(EnumFacing e : EnumFacing.VALUES) - faceQuads.put(e, new ArrayList<>()); + private final IBakedModel gun; + private final List genQuads; + private final Map> faceQuads = new EnumMap<>(EnumFacing.class); - // Add lens quads, scaled and translated - for(BakedQuad quad : lens.getQuads(null, null, 0)) { - genBuilder.add(transform(quad, transform)); - } + CompositeBakedModel(IBakedModel lens, IBakedModel gun) { + this.gun = gun; - for(EnumFacing e : EnumFacing.VALUES) { - faceQuads.get(e).addAll(lens.getQuads(null, e, 0).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); - } + ImmutableList.Builder genBuilder = ImmutableList.builder(); + final TRSRTransformation transform = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(-0.4F, 0.25F, 0), null, new Vector3f(0.625F, 0.625F, 0.625F), TRSRTransformation.quatFromXYZ(0, (float) Math.PI / 2, 0))); - // Add gun quads - genBuilder.addAll(gun.getQuads(null, null, 0)); - for(EnumFacing e : EnumFacing.VALUES) { - faceQuads.get(e).addAll(gun.getQuads(null, e, 0)); - } + for(EnumFacing e : EnumFacing.VALUES) + faceQuads.put(e, new ArrayList<>()); - genQuads = genBuilder.build(); + // Add lens quads, scaled and translated + for(BakedQuad quad : lens.getQuads(null, null, 0)) { + genBuilder.add(transform(quad, transform)); + } - } + for(EnumFacing e : EnumFacing.VALUES) { + faceQuads.get(e).addAll(lens.getQuads(null, e, 0).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); + } - @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return face == null ? genQuads : faceQuads.get(face); } - - // Forward all to gun model - @Override public boolean isAmbientOcclusion() { return gun.isAmbientOcclusion(); } - @Override public boolean isGui3d() { return gun.isGui3d(); } - @Override public boolean isBuiltInRenderer() { return gun.isBuiltInRenderer(); } - @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return gun.getParticleTexture();} - @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return gun.getItemCameraTransforms(); } - @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + // Add gun quads + genBuilder.addAll(gun.getQuads(null, null, 0)); + for(EnumFacing e : EnumFacing.VALUES) { + faceQuads.get(e).addAll(gun.getQuads(null, e, 0)); + } - @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - if(gun instanceof IPerspectiveAwareModel) { - Pair pair = ((IPerspectiveAwareModel) gun).handlePerspective(cameraTransformType); - if(pair != null && pair.getRight() != null) - return Pair.of(this, pair.getRight()); - } - return Pair.of(this, TRSRTransformation.identity().getMatrix()); - } - } + genQuads = genBuilder.build(); + + } + + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return face == null ? genQuads : faceQuads.get(face); } + + // Forward all to gun model + @Override public boolean isAmbientOcclusion() { return gun.isAmbientOcclusion(); } + @Override public boolean isGui3d() { return gun.isGui3d(); } + @Override public boolean isBuiltInRenderer() { return gun.isBuiltInRenderer(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return gun.getParticleTexture();} + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return gun.getItemCameraTransforms(); } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + if(gun instanceof IPerspectiveAwareModel) { + Pair pair = ((IPerspectiveAwareModel) gun).handlePerspective(cameraTransformType); + if(pair != null && pair.getRight() != null) + return Pair.of(this, pair.getRight()); + } + return Pair.of(this, TRSRTransformation.identity().getMatrix()); + } + } } diff --git a/src/main/java/vazkii/botania/client/model/IPylonModel.java b/src/main/java/vazkii/botania/client/model/IPylonModel.java index 1b0801004..a25c9c123 100644 --- a/src/main/java/vazkii/botania/client/model/IPylonModel.java +++ b/src/main/java/vazkii/botania/client/model/IPylonModel.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 1, 2014, 6:23:24 PM (GMT)] */ package vazkii.botania.client.model; diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 66489d7a3..85976aed3 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -1,6 +1,14 @@ package vazkii.botania.client.model; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.vecmath.Matrix4f; + +import org.apache.commons.lang3.tuple.Pair; + import com.google.common.collect.ImmutableList; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -11,33 +19,28 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; import net.minecraftforge.client.model.IPerspectiveAwareModel; -import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.common.core.handler.ConfigHandler; -import javax.annotation.Nonnull; -import javax.vecmath.Matrix4f; -import java.util.List; - @SuppressWarnings("deprecation") public class LexiconModel implements IPerspectiveAwareModel { - private static final ModelResourceLocation path = new ModelResourceLocation("botania:lexicon_default", "inventory"); + private static final ModelResourceLocation path = new ModelResourceLocation("botania:lexicon_default", "inventory"); - @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - IBakedModel original = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); - if((cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND - || cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND) - && ConfigHandler.lexicon3dModel) - return Pair.of(this, null); - return ((IPerspectiveAwareModel) original).handlePerspective(cameraTransformType); - } + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + IBakedModel original = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); + if((cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND + || cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND) + && ConfigHandler.lexicon3dModel) + return Pair.of(this, null); + return ((IPerspectiveAwareModel) original).handlePerspective(cameraTransformType); + } - @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { return ImmutableList.of(); } - @Override public boolean isAmbientOcclusion() { return false; } - @Override public boolean isGui3d() { return false; } - @Override public boolean isBuiltInRenderer() { return false; } - @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:items/lexicon"); } - @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } - @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { return ImmutableList.of(); } + @Override public boolean isAmbientOcclusion() { return false; } + @Override public boolean isGui3d() { return false; } + @Override public boolean isBuiltInRenderer() { return false; } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:items/lexicon"); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } diff --git a/src/main/java/vazkii/botania/client/model/ModelAvatar.java b/src/main/java/vazkii/botania/client/model/ModelAvatar.java index a3805d704..88ea37114 100644 --- a/src/main/java/vazkii/botania/client/model/ModelAvatar.java +++ b/src/main/java/vazkii/botania/client/model/ModelAvatar.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.client.model; diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index 528518b05..08c251547 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 28, 2015, 5:16:17 PM (GMT)] */ package vazkii.botania.client.model; diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index 5dfd81659..8c5db4d0b 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 31, 2014, 4:33:55 PM (GMT)] */ package vazkii.botania.client.model; diff --git a/src/main/java/vazkii/botania/client/model/ModelCloak.java b/src/main/java/vazkii/botania/client/model/ModelCloak.java index fc223a47e..ab5d5021b 100644 --- a/src/main/java/vazkii/botania/client/model/ModelCloak.java +++ b/src/main/java/vazkii/botania/client/model/ModelCloak.java @@ -2,45 +2,44 @@ package vazkii.botania.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; /** * armor_cloak - wiiv * Created using Tabula 4.1.1 */ public class ModelCloak extends ModelBase { - - public ModelRenderer armRpauldron; - public ModelRenderer armLpauldron; - public ModelRenderer helm; - public ModelCloak() { - textureWidth = 64; - textureHeight = 64; - armLpauldron = new ModelRenderer(this, 0, 15); - armLpauldron.mirror = true; - armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); - armLpauldron.addBox(-1.0F, 0.0F, -5.0F, 9, 20, 9, 0.0F); - setRotateAngle(armLpauldron, 0.08726646259971647F, -0.2617993877991494F, -0.17453292519943295F); - armRpauldron = new ModelRenderer(this, 0, 15); - armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - armRpauldron.addBox(-8.0F, 0.0F, -5.0F, 9, 20, 9, 0.0F); - setRotateAngle(armRpauldron, 0.08726646259971647F, 0.2617993877991494F, 0.17453292519943295F); - helm = new ModelRenderer(this, 0, 0); - helm.setRotationPoint(0.0F, 0.0F, 0.0F); - helm.addBox(-4.5F, -3.0F, -5.5F, 9, 4, 11, 0.0F); - setRotateAngle(helm, 0.2617993877991494F, 0.0F, 0.0F); - } + public ModelRenderer armRpauldron; + public ModelRenderer armLpauldron; + public ModelRenderer helm; - public void render(float f5) { - armLpauldron.render(f5); - armRpauldron.render(f5); - helm.render(f5); - } + public ModelCloak() { + textureWidth = 64; + textureHeight = 64; + armLpauldron = new ModelRenderer(this, 0, 15); + armLpauldron.mirror = true; + armLpauldron.setRotationPoint(0.0F, 0.0F, -0.0F); + armLpauldron.addBox(-1.0F, 0.0F, -5.0F, 9, 20, 9, 0.0F); + setRotateAngle(armLpauldron, 0.08726646259971647F, -0.2617993877991494F, -0.17453292519943295F); + armRpauldron = new ModelRenderer(this, 0, 15); + armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); + armRpauldron.addBox(-8.0F, 0.0F, -5.0F, 9, 20, 9, 0.0F); + setRotateAngle(armRpauldron, 0.08726646259971647F, 0.2617993877991494F, 0.17453292519943295F); + helm = new ModelRenderer(this, 0, 0); + helm.setRotationPoint(0.0F, 0.0F, 0.0F); + helm.addBox(-4.5F, -3.0F, -5.5F, 9, 4, 11, 0.0F); + setRotateAngle(helm, 0.2617993877991494F, 0.0F, 0.0F); + } - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } + public void render(float f5) { + armLpauldron.render(f5); + armRpauldron.render(f5); + helm.render(f5); + } + + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } } diff --git a/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java b/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java index d2d1c582e..ad9e1df7c 100644 --- a/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java +++ b/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.client.model; diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index 4782dc857..4d48f834d 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -2,20 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.client.model; +import java.awt.Color; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; -import org.lwjgl.opengl.GL11; - -import java.awt.*; public class ModelHourglass extends ModelBase { @@ -66,11 +67,11 @@ public class ModelHourglass extends ModelBase { base2.render(f); Color c = new Color(color); GL11.glColor3ub((byte) c.getRed(), (byte) c.getGreen(), (byte) c.getBlue()); - + GL11.glPushAttrib(GL11.GL_TRANSFORM_BIT); GlStateManager.disableRescaleNormal(); GlStateManager.enableNormalize(); - + if(fract1 > 0) { GlStateManager.pushMatrix(); if(flip) @@ -96,14 +97,14 @@ public class ModelHourglass extends ModelBase { GlStateManager.scale(1F, fract2, 1F); - + sand2.render(f); GlStateManager.popMatrix(); } - + GlStateManager.popAttrib(); - GL11.glColor3ub(((byte) 255), ((byte) 255), ((byte) 255)); + GL11.glColor3ub((byte) 255, (byte) 255, (byte) 255); glass1.render(f); glass2.render(f); } diff --git a/src/main/java/vazkii/botania/client/model/ModelPixie.java b/src/main/java/vazkii/botania/client/model/ModelPixie.java index a4d2ddde4..00a608151 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPixie.java +++ b/src/main/java/vazkii/botania/client/model/ModelPixie.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.client.model; diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 4b788d586..2be5ca4dc 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -10,16 +10,20 @@ */ package vazkii.botania.client.model; +import java.util.ArrayList; +import java.util.List; + +import org.lwjgl.opengl.GL11; + import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import net.minecraft.client.Minecraft; + import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.crash.CrashReport; @@ -31,17 +35,11 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.client.model.pipeline.LightUtil; -import net.minecraftforge.common.model.IModelPart; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.Models; import net.minecraftforge.common.model.TRSRTransformation; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.enums.PylonVariant; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Function; - public class ModelPylon implements IPylonModel { private IBakedModel manaCrystal; @@ -57,7 +55,7 @@ public class ModelPylon implements IPylonModel { public ModelPylon() { try { // Load the OBJ - OBJModel model = ((OBJModel) OBJLoader.INSTANCE.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); + OBJModel model = (OBJModel) OBJLoader.INSTANCE.loadModel(new ResourceLocation("botania:models/block/pylon.obj")); // Apply the texture and flip the v's of the model IModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon"))).process(ImmutableMap.of("flip-v", "true")); @@ -89,15 +87,15 @@ public class ModelPylon implements IPylonModel { @Override public void renderCrystal(PylonVariant variant) { switch(variant) { - case MANA: - renderModel(manaCrystal); - break; - case NATURA: - renderModel(naturaCrystal); - break; - case GAIA: - renderModel(gaiaCrystal); - break; + case MANA: + renderModel(manaCrystal); + break; + case NATURA: + renderModel(naturaCrystal); + break; + case GAIA: + renderModel(gaiaCrystal); + break; } } @@ -105,15 +103,15 @@ public class ModelPylon implements IPylonModel { public void renderRing(PylonVariant variant) { GlStateManager.disableLighting(); switch(variant) { - case MANA: - renderModel(manaRingsAndPanes); - break; - case NATURA: - renderModel(naturaRingsAndPanes); - break; - case GAIA: - renderModel(gaiaRingsAndPanes); - break; + case MANA: + renderModel(manaRingsAndPanes); + break; + case NATURA: + renderModel(naturaRingsAndPanes); + break; + case GAIA: + renderModel(gaiaRingsAndPanes); + break; } GlStateManager.enableLighting(); } @@ -122,15 +120,15 @@ public class ModelPylon implements IPylonModel { public void renderGems(PylonVariant variant) { GlStateManager.disableLighting(); switch(variant) { - case MANA: - renderModel(manaGems); - break; - case NATURA: - renderModel(naturaGems); - break; - case GAIA: - renderModel(gaiaGems); - break; + case MANA: + renderModel(manaGems); + break; + case NATURA: + renderModel(naturaGems); + break; + case GAIA: + renderModel(gaiaGems); + break; } GlStateManager.enableLighting(); } @@ -147,19 +145,19 @@ public class ModelPylon implements IPylonModel { private IModelState hideGroups(List groups) { return part -> { - if (part.isPresent()) { - List parts = new ArrayList<>(); - Models.getParts(part.get()).forEachRemaining(parts::add); + if (part.isPresent()) { + List parts = new ArrayList<>(); + Models.getParts(part.get()).forEachRemaining(parts::add); for (String s : parts) { if (groups.contains(s)) { // Hide it return Optional.of(TRSRTransformation.identity()); } } - } + } - return Optional.absent(); - }; + return Optional.absent(); + }; } } diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java index ad615f98d..697342ba2 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 18, 2014, 10:05:39 PM (GMT)] */ package vazkii.botania.client.model; diff --git a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java index 0fa96db73..75d473597 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java @@ -2,19 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 2, 2014, 6:37:00 PM (GMT)] */ package vazkii.botania.client.model; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; public class ModelSpinningCubes extends ModelBase { diff --git a/src/main/java/vazkii/botania/client/model/ModelSpreader.java b/src/main/java/vazkii/botania/client/model/ModelSpreader.java index dc52e7f91..1fdb43acc 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpreader.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpreader.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 25, 2014, 1:55:05 PM (GMT)] */ package vazkii.botania.client.model; diff --git a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java index 374ef7bfe..a53331925 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.client.model; diff --git a/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java b/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java index cfeba1f5a..ed63fbc13 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java +++ b/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 18, 2014, 7:55:34 PM (GMT)] */ package vazkii.botania.client.model; diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 49764605b..f9fdaee48 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -8,7 +8,12 @@ */ package vazkii.botania.client.model; +import java.util.List; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableList; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -32,9 +37,6 @@ import vazkii.botania.common.block.BlockCamo; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCamo; -import javax.annotation.Nonnull; -import java.util.List; - public class PlatformModel implements IBakedModel { @Nonnull diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 2387dbed1..748752668 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -8,6 +8,17 @@ */ package vazkii.botania.client.model; +import java.io.IOException; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import javax.annotation.Nonnull; +import javax.vecmath.Matrix4f; + +import org.apache.commons.lang3.tuple.Pair; + import com.google.common.base.Function; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; @@ -17,6 +28,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.gson.JsonElement; import com.google.gson.JsonParser; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -44,21 +56,12 @@ import net.minecraftforge.client.model.SimpleModelState; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; -import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import javax.annotation.Nonnull; -import javax.vecmath.Matrix4f; -import java.io.IOException; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Optional; - public class SpecialFlowerModel implements IModelCustomData { // SpecialFlowerModel for when there are no blockModels registered for a subtile @@ -68,7 +71,7 @@ public class SpecialFlowerModel implements IModelCustomData { private final ImmutableMap, ModelResourceLocation> itemModels; public SpecialFlowerModel(ImmutableMap, ModelResourceLocation> blockModels, - ImmutableMap, ModelResourceLocation> itemModels) { + ImmutableMap, ModelResourceLocation> itemModels) { this.blockModels = blockModels; this.itemModels = itemModels; } @@ -145,8 +148,8 @@ public class SpecialFlowerModel implements IModelCustomData { public boolean accepts(ResourceLocation modelLocation) { return modelLocation.getResourceDomain().equals("botania_special") && ( modelLocation.getResourcePath().equals("specialFlower") || - modelLocation.getResourcePath().equals("models/block/specialFlower") || - modelLocation.getResourcePath().equals("models/item/specialFlower")); + modelLocation.getResourcePath().equals("models/block/specialFlower") || + modelLocation.getResourcePath().equals("models/item/specialFlower")); } @Override @@ -168,18 +171,18 @@ public class SpecialFlowerModel implements IModelCustomData { private final LoadingCache> bakedItemModels; SpecialFlowerBakedModel(ImmutableMap, ModelResourceLocation> blockModels, - ImmutableMap, ModelResourceLocation> itemModels, ImmutableMap cameraTransforms) { + ImmutableMap, ModelResourceLocation> itemModels, ImmutableMap cameraTransforms) { this.blockModels = blockModels; this.itemModels = itemModels; - this.transforms = cameraTransforms; + transforms = cameraTransforms; ModelResourceLocation baseModelPath = blockModels.getOrDefault(Optional.empty(), new ModelResourceLocation("builtin/missing", "missing")); - this.baseModel = ModelLoaderRegistry.getModelOrMissing(baseModelPath) + baseModel = ModelLoaderRegistry.getModelOrMissing(baseModelPath) .bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); - this.bakedBlockModels = CacheBuilder.newBuilder().build(new Loader(true)); - this.bakedItemModels = CacheBuilder.newBuilder().build(new Loader(false)); + bakedBlockModels = CacheBuilder.newBuilder().build(new Loader(true)); + bakedItemModels = CacheBuilder.newBuilder().build(new Loader(false)); } private class Loader extends CacheLoader> { @@ -187,7 +190,7 @@ public class SpecialFlowerModel implements IModelCustomData { private final boolean loadBlocks; Loader(boolean blocks) { - this.loadBlocks = blocks; + loadBlocks = blocks; } @Override @@ -214,7 +217,7 @@ public class SpecialFlowerModel implements IModelCustomData { return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); } - IExtendedBlockState extendedState = ((IExtendedBlockState) state); + IExtendedBlockState extendedState = (IExtendedBlockState) state; String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); IBakedModel ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); @@ -244,7 +247,7 @@ public class SpecialFlowerModel implements IModelCustomData { return item.isPresent() ? item.get() - : Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(roseFallback); + : Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(roseFallback); } }; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 50270c5dd..30075a380 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -2,25 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.client.model.armor; +import javax.annotation.Nonnull; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.EnumAction; -import net.minecraft.util.EnumHandSide; -import vazkii.botania.common.Botania; - -import javax.annotation.Nonnull; public class ModelArmorElementium extends ModelBiped { diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index 8330de21e..ada5da866 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -2,24 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.client.model.armor; +import javax.annotation.Nonnull; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.EnumAction; -import net.minecraft.util.EnumHandSide; - -import javax.annotation.Nonnull; public class ModelArmorManasteel extends ModelBiped { diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index cc2625eda..9aa4876c3 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -2,24 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.client.model.armor; +import javax.annotation.Nonnull; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.EnumAction; -import net.minecraft.util.EnumHandSide; - -import javax.annotation.Nonnull; public class ModelArmorManaweave extends ModelBiped { diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index f11e94d81..bfe4a97c2 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -2,24 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.client.model.armor; +import javax.annotation.Nonnull; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.EnumAction; -import net.minecraft.util.EnumHandSide; - -import javax.annotation.Nonnull; public class ModelArmorTerrasteel extends ModelBiped { diff --git a/src/main/java/vazkii/botania/client/render/IModelRegister.java b/src/main/java/vazkii/botania/client/render/IModelRegister.java index 358074074..1cb0a8495 100644 --- a/src/main/java/vazkii/botania/client/render/IModelRegister.java +++ b/src/main/java/vazkii/botania/client/render/IModelRegister.java @@ -4,11 +4,11 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public interface IModelRegister { - /** - * Do whatever needs to be done to register models - * For Blocks, statemapper registration needs to be done BEFORE itemblock registration - * Exceptions to that rule are noted - */ - @SideOnly(Side.CLIENT) - void registerModels(); + /** + * Do whatever needs to be done to register models + * For Blocks, statemapper registration needs to be done BEFORE itemblock registration + * Exceptions to that rule are noted + */ + @SideOnly(Side.CLIENT) + void registerModels(); } diff --git a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java index 8db3e0532..97dbaece8 100644 --- a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java @@ -1,5 +1,7 @@ package vazkii.botania.client.render.entity; +import javax.annotation.Nonnull; + import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.layers.LayerRenderer; @@ -14,32 +16,30 @@ import vazkii.botania.client.render.tile.RenderTileGaiaHead; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; - public class LayerGaiaHead implements LayerRenderer { - private final ModelRenderer modelRenderer; + private final ModelRenderer modelRenderer; - public LayerGaiaHead(ModelRenderer modelRenderer) - { - this.modelRenderer = modelRenderer; - } + public LayerGaiaHead(ModelRenderer modelRenderer) + { + this.modelRenderer = modelRenderer; + } - // Copied from LayerCustomHead, edits noted - @Override - public void doRenderLayer(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - ItemStack itemstack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); + // Copied from LayerCustomHead, edits noted + @Override + public void doRenderLayer(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + ItemStack itemstack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); - if (itemstack != null && itemstack.getItem() == ModItems.gaiaHead) // Botania - check for head - { - GlStateManager.pushMatrix(); + if (itemstack != null && itemstack.getItem() == ModItems.gaiaHead) // Botania - check for head + { + GlStateManager.pushMatrix(); - if (player.isSneaking()) - { - GlStateManager.translate(0.0F, 0.2F, 0.0F); - } + if (player.isSneaking()) + { + GlStateManager.translate(0.0F, 0.2F, 0.0F); + } - /*boolean flag = player instanceof EntityVillager || player instanceof EntityZombie && ((EntityZombie)player).isVillager(); + /*boolean flag = player instanceof EntityVillager || player instanceof EntityZombie && ((EntityZombie)player).isVillager(); if (player.isChild() && !(player instanceof EntityVillager)) { @@ -50,20 +50,20 @@ public class LayerGaiaHead implements LayerRenderer { GlStateManager.translate(0.0F, 16.0F * scale, 0.0F); } Botania - N/A */ - this.modelRenderer.postRender(0.0625F); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + modelRenderer.postRender(0.0625F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - float f2 = 1.1875F; - GlStateManager.scale(f2, -f2, -f2); + float f2 = 1.1875F; + GlStateManager.scale(f2, -f2, -f2); - // Botania - remove if check for skull and else branch. Check done above. + // Botania - remove if check for skull and else branch. Check done above. - /*if (flag) + /*if (flag) { GlStateManager.translate(0.0F, 0.0625F, 0.0F); } Botania - N/A */ - /*GameProfile gameprofile = null; + /*GameProfile gameprofile = null; if (itemstack.hasTagCompound()) { @@ -85,18 +85,18 @@ public class LayerGaiaHead implements LayerRenderer { } } Botania - Don't do skin stuff */ - // Botania - use gaia TESR - ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); - ((RenderTileGaiaHead) (TileEntitySpecialRenderer) TileEntityRendererDispatcher.instance.getSpecialRendererByClass(TileGaiaHead.class)) - .renderSkull(-0.5F, 0.0F, -0.5F, EnumFacing.UP, 180.0F, itemstack.getMetadata(), null, -1, limbSwing); - ShaderHelper.releaseShader(); + // Botania - use gaia TESR + ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); + ((RenderTileGaiaHead) (TileEntitySpecialRenderer) TileEntityRendererDispatcher.instance.getSpecialRendererByClass(TileGaiaHead.class)) + .renderSkull(-0.5F, 0.0F, -0.5F, EnumFacing.UP, 180.0F, itemstack.getMetadata(), null, -1, limbSwing); + ShaderHelper.releaseShader(); - GlStateManager.popMatrix(); - } - } + GlStateManager.popMatrix(); + } + } - @Override - public boolean shouldCombineTextures() { - return false; - } + @Override + public boolean shouldCombineTextures() { + return false; + } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java index 801d3e138..f0d46d8eb 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 16, 2015, 6:42:09 PM (GMT)] */ package vazkii.botania.client.render.entity; +import java.util.Random; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -20,16 +26,12 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityBabylonWeapon; -import javax.annotation.Nonnull; -import java.util.Random; - public class RenderBabylonWeapon extends Render { private static final ResourceLocation babylon = new ResourceLocation(LibResources.MISC_BABYLON); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index a307f797a..87ef9febd 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -2,24 +2,24 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 14, 2015, 1:04:34 AM (GMT)] */ package vazkii.botania.client.render.entity; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.network.datasync.DataParameter; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.entity.EntityCorporeaSpark; @@ -30,6 +30,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { super(manager); } + @Override protected DataParameter getInvisibilityParam() { return EntityCorporeaSpark.INVISIBILITY; } @@ -44,7 +45,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { int hex = entity.getNetwork().getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; - int b = (hex & 0xFF); + int b = hex & 0xFF; GlStateManager.color(r / 255F, g / 255F, b / 255F, a); } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 551c0a10e..fde3f4a57 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -2,15 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 12, 2014, 4:07:26 PM (GMT)] */ package vazkii.botania.client.render.entity; +import java.util.Map; +import java.util.UUID; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.ARBShaderObjects; + import com.mojang.authlib.minecraft.MinecraftProfileTexture; + import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelPlayer; import net.minecraft.client.renderer.entity.RenderBiped; @@ -18,15 +26,10 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.ARBShaderObjects; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.entity.EntityDoppleganger; -import javax.annotation.Nonnull; -import java.util.Map; -import java.util.UUID; - public class RenderDoppleganger extends RenderBiped { public static final float DEFAULT_GRAIN_INTENSITY = 0.05F; @@ -36,24 +39,24 @@ public class RenderDoppleganger extends RenderBiped { public static float disfiguration = DEFAULT_DISFIGURATION; public static final ShaderCallback callback = shader -> { - // Frag Uniforms - int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); - ARBShaderObjects.glUniform1fARB(disfigurationUniform, disfiguration); + // Frag Uniforms + int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); + ARBShaderObjects.glUniform1fARB(disfigurationUniform, disfiguration); - // Vert Uniforms - int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); - ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity); - }; + // Vert Uniforms + int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); + ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity); + }; public static final ShaderCallback defaultCallback = shader -> { - // Frag Uniforms - int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); - ARBShaderObjects.glUniform1fARB(disfigurationUniform, DEFAULT_DISFIGURATION); + // Frag Uniforms + int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); + ARBShaderObjects.glUniform1fARB(disfigurationUniform, DEFAULT_DISFIGURATION); - // Vert Uniforms - int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); - ARBShaderObjects.glUniform1fARB(grainIntensityUniform, DEFAULT_GRAIN_INTENSITY); - }; + // Vert Uniforms + int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); + ARBShaderObjects.glUniform1fARB(grainIntensityUniform, DEFAULT_GRAIN_INTENSITY); + }; public RenderDoppleganger(RenderManager renderManager) { super(renderManager, new ModelPlayer(0.0F, false), 0F); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java index cfa912b81..3d33811a8 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 25, 2015, 2:32:31 AM (GMT)] */ package vazkii.botania.client.render.entity; +import javax.annotation.Nonnull; + import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; @@ -18,8 +20,6 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntityManaStorm; -import javax.annotation.Nonnull; - public class RenderManaStorm extends Render { public RenderManaStorm(RenderManager renderManager) { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index b98cdf83e..200e3f128 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -2,22 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 25, 2015, 5:55:59 PM (GMT)] */ package vazkii.botania.client.render.entity; +import javax.annotation.Nonnull; + import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderWither; import net.minecraft.entity.boss.EntityWither; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; -import javax.annotation.Nonnull; - public class RenderPinkWither extends RenderWither { private static final ResourceLocation resource = new ResourceLocation(LibResources.MODEL_PINK_WITHER); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 6e994257a..d8174bf8c 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -2,40 +2,41 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.client.render.entity; +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.ARBShaderObjects; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPixie; import vazkii.botania.common.entity.EntityPixie; -import javax.annotation.Nonnull; - public class RenderPixie extends RenderLiving { final ShaderCallback callback = shader -> { - // Frag Uniforms - int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); - ARBShaderObjects.glUniform1fARB(disfigurationUniform, 0.025F); + // Frag Uniforms + int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); + ARBShaderObjects.glUniform1fARB(disfigurationUniform, 0.025F); - // Vert Uniforms - int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); - ARBShaderObjects.glUniform1fARB(grainIntensityUniform, 0.05F); - }; + // Vert Uniforms + int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); + ARBShaderObjects.glUniform1fARB(grainIntensityUniform, 0.05F); + }; public RenderPixie(RenderManager renderManager) { super(renderManager, new ModelPixie(), 0.25F); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java index 230086138..5856600ee 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 17, 2015, 11:17:48 PM (GMT)] */ package vazkii.botania.client.render.entity; +import javax.annotation.Nonnull; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderMinecart; @@ -20,8 +22,6 @@ import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.entity.EntityPoolMinecart; -import javax.annotation.Nonnull; - public class RenderPoolMinecart extends RenderMinecart { public RenderPoolMinecart(RenderManager manager) { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java index 6e9f1500e..a6b4f4713 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java @@ -8,6 +8,10 @@ */ package vazkii.botania.client.render.entity; +import java.util.function.Function; + +import javax.annotation.Nonnull; + import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderSnowball; @@ -15,23 +19,20 @@ import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import javax.annotation.Nonnull; -import java.util.function.Function; - // Same as RenderSnowball, but ItemStack sensitive public class RenderSnowballStack extends RenderSnowball { - private final Function stackGetter; + private final Function stackGetter; - public RenderSnowballStack(RenderManager renderManagerIn, Item item, RenderItem render, Function stackGetter) { - super(renderManagerIn, item, render); - this.stackGetter = stackGetter; - } + public RenderSnowballStack(RenderManager renderManagerIn, Item item, RenderItem render, Function stackGetter) { + super(renderManagerIn, item, render); + this.stackGetter = stackGetter; + } - @Nonnull - @Override - public ItemStack getStackToRender(T entity) { - return stackGetter.apply(entity); - } + @Nonnull + @Override + public ItemStack getStackToRender(T entity) { + return stackGetter.apply(entity); + } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index 4adc42fc7..d2d86bed7 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 14, 2015, 1:03:11 AM (GMT)] */ package vazkii.botania.client.render.entity; @@ -22,6 +22,7 @@ public class RenderSpark extends RenderSparkBase { super(renderManager); } + @Override protected DataParameter getInvisibilityParam() { return EntitySpark.INVISIBILITY; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 78dd27620..2a0ebb0d2 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 21, 2014, 5:53:22 PM (GMT)] */ package vazkii.botania.client.render.entity; +import java.util.Random; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; @@ -20,13 +26,9 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.network.datasync.DataParameter; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; -import javax.annotation.Nonnull; -import java.util.Random; - public abstract class RenderSparkBase extends Render { public RenderSparkBase(RenderManager manager) { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java index 6e3e4e21c..3680e5dd1 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -2,28 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 27, 2015, 10:02:12 PM (GMT)] */ package vazkii.botania.client.render.entity; -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderSnowball; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import vazkii.botania.common.entity.EntityThornChakram; import vazkii.botania.common.item.ModItems; @@ -36,7 +26,7 @@ public class RenderThornChakram extends RenderSnowball { @Override public ItemStack getStackToRender(EntityThornChakram entityIn) { - return new ItemStack(ModItems.thornChakram, 1, entityIn.isFire() ? 1 : 0); + return new ItemStack(ModItems.thornChakram, 1, entityIn.isFire() ? 1 : 0); } - + } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index 76ce37640..3a466f6db 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 9, 2014, 9:55:07 PM (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -17,7 +21,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -25,8 +28,6 @@ import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; -import javax.annotation.Nonnull; - public class RenderTileAlfPortal extends TileEntitySpecialRenderer { @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 8f384ceed..ea2c2c074 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 21, 2014, 7:55:47 PM (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -22,13 +26,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAltar; -import javax.annotation.Nonnull; - public class RenderTileAltar extends TileEntitySpecialRenderer { @Override @@ -136,7 +137,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { Tessellator tessellator = Tessellator.getInstance(); tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); //if(brightness != -1) - //tessellator.getBuffer().putBrightness4(brightness, brightness, brightness, brightness); + //tessellator.getBuffer().putBrightness4(brightness, brightness, brightness, brightness); tessellator.getBuffer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); tessellator.getBuffer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); tessellator.getBuffer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java index 7333fd00d..b584651d0 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [28/09/2016, 17:55:36 (GMT)] */ package vazkii.botania.client.render.tile; @@ -28,7 +28,7 @@ public class RenderTileAnimatedTorch extends TileEntitySpecialRenderer. It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 24, 2015, 3:51:35 PM (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -19,7 +23,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -28,12 +31,10 @@ import vazkii.botania.client.model.ModelAvatar; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAvatar; -import javax.annotation.Nonnull; - public class RenderTileAvatar extends TileEntitySpecialRenderer { private static final float[] ROTATIONS = new float[] { - 180F, 0F, 90F, 270F + 180F, 0F, 90F, 270F }; private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_AVATAR); @@ -54,54 +55,54 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(texture); EnumFacing facing = avatar != null && avatar.getWorld() != null ? avatar.getWorld().getBlockState(avatar.getPos()).getValue(BotaniaStateProps.CARDINALS) - : EnumFacing.SOUTH; + : EnumFacing.SOUTH; - GlStateManager.translate(0.5F, 1.6F, 0.5F); - GlStateManager.scale(1F, -1F, -1F); - GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)], 0F, 1F, 0F); - model.render(); + GlStateManager.translate(0.5F, 1.6F, 0.5F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)], 0F, 1F, 0F); + model.render(); - if (avatar == null) { - GlStateManager.color(1F, 1F, 1F); - GlStateManager.scale(1F, -1F, -1F); - GlStateManager.enableRescaleNormal(); - GlStateManager.popMatrix(); - return; - } + if (avatar == null) { + GlStateManager.color(1F, 1F, 1F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.enableRescaleNormal(); + GlStateManager.popMatrix(); + return; + } - ItemStack stack = avatar.getItemHandler().getStackInSlot(0); - if(stack != null) { - GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - float s = 0.6F; - GlStateManager.scale(s, s, s); - GlStateManager.translate(-0.5F, 2F, -0.25F); - GlStateManager.rotate(-70, 1, 0, 0); - Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); - GlStateManager.popMatrix(); + ItemStack stack = avatar.getItemHandler().getStackInSlot(0); + if(stack != null) { + GlStateManager.pushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + float s = 0.6F; + GlStateManager.scale(s, s, s); + GlStateManager.translate(-0.5F, 2F, -0.25F); + GlStateManager.rotate(-70, 1, 0, 0); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); + GlStateManager.popMatrix(); - IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); - Minecraft.getMinecraft().renderEngine.bindTexture(wieldable.getOverlayResource(avatar, stack)); - s = 1.01F; + IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); + Minecraft.getMinecraft().renderEngine.bindTexture(wieldable.getOverlayResource(avatar, stack)); + s = 1.01F; - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.scale(s, s, s); - GlStateManager.translate(0F, -0.01F, 0F); - int light = 15728880; - int lightmapX = light % 65536; - int lightmapY = light / 65536; - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); - float alpha = (float) Math.sin(ClientTickHandler.ticksInGame / 20D) / 2F + 0.5F; - GlStateManager.color(1F, 1F, 1F, alpha + 0.183F); - model.render(); - GlStateManager.popMatrix(); - } - GlStateManager.color(1F, 1F, 1F); - GlStateManager.scale(1F, -1F, -1F); - GlStateManager.enableRescaleNormal(); - GlStateManager.popMatrix(); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.scale(s, s, s); + GlStateManager.translate(0F, -0.01F, 0F); + int light = 15728880; + int lightmapX = light % 65536; + int lightmapY = light / 65536; + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); + float alpha = (float) Math.sin(ClientTickHandler.ticksInGame / 20D) / 2F + 0.5F; + GlStateManager.color(1F, 1F, 1F, alpha + 0.183F); + model.render(); + GlStateManager.popMatrix(); + } + GlStateManager.color(1F, 1F, 1F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.enableRescaleNormal(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index b1284eb67..91b85653d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 28, 2015, 5:30:41 PM (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -19,12 +21,10 @@ import vazkii.botania.client.model.ModelBellows; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileBellows; -import javax.annotation.Nonnull; - public class RenderTileBellows extends TileEntitySpecialRenderer { private static final float[] ROTATIONS = new float[] { - 180F, 0F, 90F, 270F + 180F, 0F, 90F, 270F }; private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BELLOWS); @@ -36,7 +36,7 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { if (!bellows.getWorld().isBlockLoaded(bellows.getPos(), false) || bellows.getWorld().getBlockState(bellows.getPos()).getBlock() != ModBlocks.bellows) return; - + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); @@ -48,7 +48,7 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { GlStateManager.translate(0.5F, 1.5F, 0.5F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F); - model.render(Math.max(0.1F, 1F - (bellows == null ? 0 : (bellows.movePos + bellows.moving * f + 0.1F)))); + model.render(Math.max(0.1F, 1F - (bellows == null ? 0 : bellows.movePos + bellows.moving * f + 0.1F))); GlStateManager.color(1F, 1F, 1F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index dc918cd54..4e9fe7b4d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 31, 2014, 4:53:15 PM (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -22,8 +24,6 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBrewery; import vazkii.botania.common.block.tile.TileBrewery; -import javax.annotation.Nonnull; - public class RenderTileBrewery extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java index 51b884e39..9e7215e81 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -2,25 +2,26 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 8, 2015, 4:44:23 PM (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.TileCocoon; -import javax.annotation.Nonnull; - public class RenderTileCocoon extends TileEntitySpecialRenderer { @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index a84aae581..02da83533 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 30, 2015, 4:10:14 PM (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; + +import org.apache.commons.lang3.tuple.Pair; +import org.lwjgl.opengl.GL11; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; @@ -35,14 +40,10 @@ import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.animation.CapabilityAnimation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.Properties; -import org.apache.commons.lang3.tuple.Pair; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.core.handler.MethodHandles; -import javax.annotation.Nonnull; - public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { private EntityItem entity = null; @@ -53,15 +54,15 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer. It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 15, 2015, 12:54:49 AM (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelEnderCrystal; import net.minecraft.client.renderer.GlStateManager; @@ -19,8 +21,6 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -import javax.annotation.Nonnull; - public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index 351dde8b2..0d17a3700 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 15, 2014, 5:04:42 PM (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -20,15 +24,12 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.item.EntityItem; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.core.handler.MethodHandles; -import javax.annotation.Nonnull; - public class RenderTileEnchanter extends TileEntitySpecialRenderer { private EntityItem item; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 53b3132a3..6b4478542 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 8, 2014, 10:58:46 PM (GMT)] */ package vazkii.botania.client.render.tile; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; @@ -22,9 +26,6 @@ import net.minecraft.tileentity.TileEntity; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.handler.ConfigHandler; -import javax.annotation.Nonnull; -import java.util.Random; - public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { @Override @@ -42,7 +43,7 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.translate(d0, d1, d2); - double worldTime = (double) (ClientTickHandler.ticksInGame + t); + double worldTime = ClientTickHandler.ticksInGame + t; if(tile.getWorld() != null) worldTime += new Random(tile.getPos().hashCode()).nextInt(1000); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java index d5de22f41..e20f50c05 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java @@ -2,15 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import com.mojang.authlib.GameProfile; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; @@ -26,10 +30,6 @@ import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.EnumFacing; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.render.entity.RenderDoppleganger; -import vazkii.botania.common.Botania; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; public class RenderTileGaiaHead extends TileEntitySkullRenderer { @Override @@ -37,17 +37,17 @@ public class RenderTileGaiaHead extends TileEntitySkullRenderer { ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); // Null-safe copy of super - this.renderSkull((float)x, (float)y, (float)z, + renderSkull((float)x, (float)y, (float)z, skull == null ? EnumFacing.NORTH : EnumFacing.getFront(skull.getBlockMetadata() & 7), - skull == null ? 0 : skull.getSkullRotation() * 360 / 16.0F, - 3, null, digProgress, partialTicks); + skull == null ? 0 : skull.getSkullRotation() * 360 / 16.0F, + 3, null, digProgress, partialTicks); ShaderHelper.releaseShader(); } @Override public void setRendererDispatcher(@Nonnull TileEntityRendererDispatcher dispatcher) { - this.rendererDispatcher = dispatcher; + rendererDispatcher = dispatcher; // Do not set `instance` to us, interferes with vanilla skulls } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index 68b612189..f908161a6 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -2,28 +2,30 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 29, 2015, 8:19:32 PM (GMT)] */ package vazkii.botania.client.render.tile; +import java.util.Random; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelHourglass; import vazkii.botania.common.block.tile.TileHourglass; -import javax.annotation.Nonnull; -import java.util.Random; - public class RenderTileHourglass extends TileEntitySpecialRenderer { final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 1f16393e0..f989c56e2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -2,15 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 15, 2015, 4:27:27 PM (GMT)] */ package vazkii.botania.client.render.tile; +import java.util.Map; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableMap; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -22,9 +27,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileIncensePlate; -import javax.annotation.Nonnull; -import java.util.Map; - public class RenderTileIncensePlate extends TileEntitySpecialRenderer { private static final Map ROTATIONS = ImmutableMap.of(EnumFacing.NORTH, 180, EnumFacing.SOUTH, 0, EnumFacing.WEST, 270, EnumFacing.EAST, 90); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index c052bd440..73eec3bdb 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 16, 2015, 5:03:57 PM (GMT)] */ package vazkii.botania.client.render.tile; @@ -35,12 +35,12 @@ import vazkii.botania.common.block.tile.TileLightRelay; public class RenderTileLightRelay extends TileEntitySpecialRenderer { private static Map sprites = new HashMap(); - + @Override public void renderTileEntityAt(@Nonnull TileLightRelay tile, double x, double y, double z, float pticks, int digProgress) { if(!tile.getWorld().isBlockLoaded(tile.getPos(), false) || tile.getWorld().getBlockState(tile.getPos()).getBlock() != ModBlocks.lightRelay) return; - + Minecraft mc = Minecraft.getMinecraft(); if(sprites.isEmpty()) { sprites.put(LuminizerVariant.DEFAULT, MiscellaneousIcons.INSTANCE.lightRelayWorldIcon); @@ -48,7 +48,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer. It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 26, 2014, 12:25:11 AM (GMT)] */ package vazkii.botania.client.render.tile; +import java.awt.Color; +import java.util.Random; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -19,8 +26,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.math.MathHelper; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; @@ -31,10 +36,6 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; -import javax.annotation.Nonnull; -import java.awt.*; -import java.util.Random; - public class RenderTilePool extends TileEntitySpecialRenderer { // Overrides for when we call this TESR without an actual pool @@ -75,7 +76,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { if (fab || forceManaNumber > -1) { int red = (color & 0xFF0000) >> 16; int green = (color & 0xFF00) >> 8; - int blue = (color & 0xFF); + int blue = color & 0xFF; IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool == null ? ModBlocks.pool.getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, forceVariant) : pool.getWorld().getBlockState(pool.getPos())); Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(model, 1.0F, red / 255F, green / 255F, blue / 255F); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index a30fb6c32..5ccd012cf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 17, 2015, 8:05:07 PM (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -20,8 +22,6 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.mana.TilePrism; -import javax.annotation.Nonnull; - //import vazkii.botania.client.render.item.RenderLens; public class RenderTilePrism extends TileEntitySpecialRenderer { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index be5f880cc..c51c5fb2f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -2,21 +2,26 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 18, 2014, 10:18:36 PM (GMT)] */ package vazkii.botania.client.render.tile; +import java.util.Random; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -30,9 +35,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.core.handler.ConfigHandler; -import javax.annotation.Nonnull; -import java.util.Random; - public class RenderTilePylon extends TileEntitySpecialRenderer { private static final ResourceLocation textureOld = new ResourceLocation(LibResources.MODEL_PYLON_OLD); @@ -48,7 +50,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { if(!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || pylon.getWorld().getBlockState(pylon.getPos()).getBlock() != ModBlocks.pylon) return; - + if(model == null) model = ConfigHandler.oldPylonModel ? new ModelPylonOld() : new ModelPylon(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java index ea5edf03e..cac0a5d04 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 14, 2014, 6:52:09 PM (GMT)] */ package vazkii.botania.client.render.tile; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index de0936cbd..bbdedfe8f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 2, 2014, 6:34:45 PM (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -21,8 +23,6 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.model.ModelSpinningCubes; import vazkii.botania.common.block.tile.TileRuneAltar; -import javax.annotation.Nonnull; - public class RenderTileRuneAltar extends TileEntitySpecialRenderer { final ModelSpinningCubes cubes = new ModelSpinningCubes(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index dce4694cf..ece2d2cdf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 28, 2015, 10:19:20 PM (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -18,8 +20,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.tile.TileSparkChanger; -import javax.annotation.Nonnull; - public class RenderTileSparkChanger extends TileEntitySpecialRenderer { @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 7900f9e15..5812a3e58 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 25, 2014, 9:42:31 PM (GMT)] */ package vazkii.botania.client.render.tile; +import java.awt.Color; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.BlockCarpet; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -21,7 +26,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; @@ -29,10 +33,6 @@ import vazkii.botania.client.model.ModelSpreader; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileSpreader; -import javax.annotation.Nonnull; -import java.awt.*; -import java.util.Random; - public class RenderTileSpreader extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_SPREADER); @@ -50,7 +50,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer if(!spreader.getWorld().isBlockLoaded(spreader.getPos(), false) || spreader.getWorld().getBlockState(spreader.getPos()).getBlock() != ModBlocks.spreader) return; - + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); @@ -89,7 +89,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer if(stack != null) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - ILens lens = (ILens) stack.getItem(); + stack.getItem(); GlStateManager.pushMatrix(); GlStateManager.translate(-0.0F, -1F, -0.4375F); GlStateManager.scale(0.8F, 0.8F, 0.8F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index c475a28c7..db0dd8032 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 8, 2014, 2:38:15 PM (GMT)] */ package vazkii.botania.client.render.tile; +import java.awt.Color; +import java.nio.FloatBuffer; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.GLAllocation; @@ -21,11 +27,6 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.block.tile.TileStarfield; -import javax.annotation.Nonnull; -import java.awt.*; -import java.nio.FloatBuffer; -import java.util.Random; - // This is copied from the vanilla end portal TESR, relevant edits are commented public class RenderTileStarfield extends TileEntitySpecialRenderer { @@ -34,11 +35,12 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer= 1) { - this.bindTexture(END_PORTAL_TEXTURE); + bindTexture(END_PORTAL_TEXTURE); } if (i == 1) @@ -72,20 +74,20 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer. It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 8, 2014, 7:20:26 PM (GMT)] */ package vazkii.botania.client.render.tile; +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -18,14 +22,11 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.tile.TileTerraPlate; -import javax.annotation.Nonnull; - public class RenderTileTerraPlate extends TileEntitySpecialRenderer { @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index 27e65e6d6..15f9c00d6 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -2,28 +2,30 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 1, 2015, 9:02:30 PM (GMT)] */ package vazkii.botania.client.render.tile; +import java.util.Random; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelTeruTeruBozu; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileTeruTeruBozu; -import javax.annotation.Nonnull; -import java.util.Random; - public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU); @@ -48,7 +50,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer. It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 18, 2014, 10:48:46 PM (GMT)] */ package vazkii.botania.client.render.tile; @@ -120,21 +120,21 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer. It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [18/12/2015, 02:19:53 (GMT)] */ package vazkii.botania.client.render.world; @@ -27,5 +27,5 @@ public final class SkyblockRenderEvents { world.provider.setSkyRenderer(new SkyblockSkyRenderer()); } } - + } diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index d90e4fef8..ff6046b9a 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -2,19 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [18/12/2015, 02:06:56 (GMT)] */ package vazkii.botania.client.render.world; +import java.util.Random; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; @@ -23,14 +26,9 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraftforge.client.IRenderHandler; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientMethodHandles; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.lib.LibObfuscation; - -import java.util.Random; public class SkyblockSkyRenderer extends IRenderHandler { @@ -39,12 +37,12 @@ public class SkyblockSkyRenderer extends IRenderHandler { private static final ResourceLocation MOON_PHASES_TEXTURES = new ResourceLocation("textures/environment/moon_phases.png"); private static final ResourceLocation SUN_TEXTURES = new ResourceLocation("textures/environment/sun.png"); private static final ResourceLocation[] planetTextures = new ResourceLocation[] { - new ResourceLocation(LibResources.MISC_PLANET + "0.png"), - new ResourceLocation(LibResources.MISC_PLANET + "1.png"), - new ResourceLocation(LibResources.MISC_PLANET + "2.png"), - new ResourceLocation(LibResources.MISC_PLANET + "3.png"), - new ResourceLocation(LibResources.MISC_PLANET + "4.png"), - new ResourceLocation(LibResources.MISC_PLANET + "5.png") + new ResourceLocation(LibResources.MISC_PLANET + "0.png"), + new ResourceLocation(LibResources.MISC_PLANET + "1.png"), + new ResourceLocation(LibResources.MISC_PLANET + "2.png"), + new ResourceLocation(LibResources.MISC_PLANET + "3.png"), + new ResourceLocation(LibResources.MISC_PLANET + "4.png"), + new ResourceLocation(LibResources.MISC_PLANET + "5.png") }; // Copy of overworld section of RenderGlobal.renderSky(), heavily modified @@ -65,7 +63,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { float f = (float)vec3d.xCoord; float f1 = (float)vec3d.yCoord; float f2 = (float)vec3d.zCoord; - + // Botania - darken when in void float insideVoid = 0; if(mc.thePlayer.posY <= -2) @@ -137,14 +135,12 @@ public class SkyblockSkyRenderer extends IRenderHandler { vertexbuffer.begin(6, DefaultVertexFormats.POSITION_COLOR); vertexbuffer.pos(0.0D, 100.0D, 0.0D).color(f6, f7, f8, afloat[3] * (1F - insideVoid)).endVertex(); // Botania - darken in void - int j = 16; - for (int l = 0; l <= 16; ++l) { - float f21 = (float)l * ((float)Math.PI * 2F) / 16.0F; + float f21 = l * ((float)Math.PI * 2F) / 16.0F; float f12 = MathHelper.sin(f21); float f13 = MathHelper.cos(f21); - vertexbuffer.pos((double)(f12 * 120.0F), (double)(f13 * 120.0F), (double)(-f13 * 40.0F * afloat[3])).color(afloat[0], afloat[1], afloat[2], 0.0F).endVertex(); + vertexbuffer.pos(f12 * 120.0F, f13 * 120.0F, -f13 * 40.0F * afloat[3]).color(afloat[0], afloat[1], afloat[2], 0.0F).endVertex(); } tessellator.draw(); @@ -158,9 +154,9 @@ public class SkyblockSkyRenderer extends IRenderHandler { float f16 = 1.0F - world.getRainStrength(partialTicks); GlStateManager.color(1.0F, 1.0F, 1.0F, f16); GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F); - + float f17; // Botania - move declaration up from below "extra stuff" - + // Botania - Begin extra stuff float celAng = world.getCelestialAngle(partialTicks); float effCelAng = celAng; @@ -174,7 +170,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.pushMatrix(); - GlStateManager.color(1F, 1F, 1F, (a * 4) * (1F - insideVoid)); + GlStateManager.color(1F, 1F, 1F, a * 4 * (1F - insideVoid)); GlStateManager.rotate(90F, 0.5F, 0.5F, 0.0F); for(int p = 0; p < planetTextures.length; p++) { mc.renderEngine.bindTexture(planetTextures[p]); @@ -186,25 +182,25 @@ public class SkyblockSkyRenderer extends IRenderHandler { tessellator.draw(); switch(p) { - case 0: - GlStateManager.rotate(70F, 1F, 0F, 0F); - f17 = 12F; - break; - case 1: - GlStateManager.rotate(120F, 0F, 0F, 1F); - f17 = 15F; - break; - case 2: - GlStateManager.rotate(80F, 1F, 0F, 1F); - f17 = 25F; - break; - case 3: - GlStateManager.rotate(100F, 0F, 0F, 1F); - f17 = 10F; - break; - case 4: - GlStateManager.rotate(-60F, 1F, 0F, 0.5F); - f17 = 40F; + case 0: + GlStateManager.rotate(70F, 1F, 0F, 0F); + f17 = 12F; + break; + case 1: + GlStateManager.rotate(120F, 0F, 0F, 1F); + f17 = 15F; + break; + case 2: + GlStateManager.rotate(80F, 1F, 0F, 1F); + f17 = 25F; + break; + case 3: + GlStateManager.rotate(100F, 0F, 0F, 1F); + f17 = 10F; + break; + case 4: + GlStateManager.rotate(-60F, 1F, 0F, 0.5F); + f17 = 40F; } } GlStateManager.color(1F, 1F, 1F, 1F); @@ -221,13 +217,11 @@ public class SkyblockSkyRenderer extends IRenderHandler { GlStateManager.rotate(220F, 1F, 0F, 0F); GlStateManager.color(1F, 1F, 1F, a); int angles = 90; - float s = 3F; - float m = 1F; float y = 2F; float y0 = 0F; float uPer = 1F / 360F; float anglePer = 360F / angles; - double fuzzPer = (Math.PI * 10) / angles; + double fuzzPer = Math.PI * 10 / angles; float rotSpeed = 1F; float rotSpeedMod = 0.4F; @@ -259,18 +253,18 @@ public class SkyblockSkyRenderer extends IRenderHandler { tessellator.draw(); switch(p) { - case 0: - GlStateManager.rotate(20F, 1F, 0F, 0F); - GlStateManager.color(1F, 0.4F, 0.4F, a); - fuzzPer = (Math.PI * 14) / angles; - rotSpeed = 0.2F; - break; - case 1: - GlStateManager.rotate(50F, 1F, 0F, 0F); - GlStateManager.color(0.4F, 1F, 0.7F, a); - fuzzPer = (Math.PI * 6) / angles; - rotSpeed = 2F; - break; + case 0: + GlStateManager.rotate(20F, 1F, 0F, 0F); + GlStateManager.color(1F, 0.4F, 0.4F, a); + fuzzPer = Math.PI * 14 / angles; + rotSpeed = 0.2F; + break; + case 1: + GlStateManager.rotate(50F, 1F, 0F, 0F); + GlStateManager.color(0.4F, 1F, 0.7F, a); + fuzzPer = Math.PI * 6 / angles; + rotSpeed = 2F; + break; } } GlStateManager.popMatrix(); @@ -320,31 +314,31 @@ public class SkyblockSkyRenderer extends IRenderHandler { GlStateManager.color(1F, 1F, 1F, 1F - insideVoid); GlStateManager.tryBlendFuncSeparate(770, 1, 1, 0); // Botania - End extra stuff - - + + GlStateManager.rotate(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); /*float*/ f17 = 60.0F; // Botania - 30 -> 60 and move declaration above "extra stuff" mc.renderEngine.bindTexture(SUN_TEXTURES); vertexbuffer.begin(7, DefaultVertexFormats.POSITION_TEX); - vertexbuffer.pos((double)(-f17), 100.0D, (double)(-f17)).tex(0.0D, 0.0D).endVertex(); - vertexbuffer.pos((double)f17, 100.0D, (double)(-f17)).tex(1.0D, 0.0D).endVertex(); - vertexbuffer.pos((double)f17, 100.0D, (double)f17).tex(1.0D, 1.0D).endVertex(); - vertexbuffer.pos((double)(-f17), 100.0D, (double)f17).tex(0.0D, 1.0D).endVertex(); + vertexbuffer.pos(-f17, 100.0D, -f17).tex(0.0D, 0.0D).endVertex(); + vertexbuffer.pos(f17, 100.0D, -f17).tex(1.0D, 0.0D).endVertex(); + vertexbuffer.pos(f17, 100.0D, f17).tex(1.0D, 1.0D).endVertex(); + vertexbuffer.pos(-f17, 100.0D, f17).tex(0.0D, 1.0D).endVertex(); tessellator.draw(); f17 = 60.0F; // Botania - 20 -> 60 mc.renderEngine.bindTexture(MOON_PHASES_TEXTURES); int i = world.getMoonPhase(); int k = i % 4; int i1 = i / 4 % 2; - float f22 = (float)(k + 0) / 4.0F; - float f23 = (float)(i1 + 0) / 2.0F; - float f24 = (float)(k + 1) / 4.0F; - float f14 = (float)(i1 + 1) / 2.0F; + float f22 = (k + 0) / 4.0F; + float f23 = (i1 + 0) / 2.0F; + float f24 = (k + 1) / 4.0F; + float f14 = (i1 + 1) / 2.0F; vertexbuffer.begin(7, DefaultVertexFormats.POSITION_TEX); - vertexbuffer.pos((double)(-f17), -100.0D, (double)f17).tex((double)f24, (double)f14).endVertex(); - vertexbuffer.pos((double)f17, -100.0D, (double)f17).tex((double)f22, (double)f14).endVertex(); - vertexbuffer.pos((double)f17, -100.0D, (double)(-f17)).tex((double)f22, (double)f23).endVertex(); - vertexbuffer.pos((double)(-f17), -100.0D, (double)(-f17)).tex((double)f24, (double)f23).endVertex(); + vertexbuffer.pos(-f17, -100.0D, f17).tex(f24, f14).endVertex(); + vertexbuffer.pos(f17, -100.0D, f17).tex(f22, f14).endVertex(); + vertexbuffer.pos(f17, -100.0D, -f17).tex(f22, f23).endVertex(); + vertexbuffer.pos(-f17, -100.0D, -f17).tex(f24, f23).endVertex(); tessellator.draw(); GlStateManager.disableTexture2D(); // Botania - Custom star rendering @@ -372,7 +366,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { GlStateManager.callList(this.starGLCallList); } }*/ - + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.disableBlend(); GlStateManager.enableAlpha(); @@ -446,7 +440,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { GlStateManager.enableTexture2D(); GlStateManager.depthMask(true); } - + private void renderStars(Minecraft mc, float alpha, float partialTicks) { int starGLCallList; net.minecraft.client.renderer.vertex.VertexBuffer starVBO; @@ -455,7 +449,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { starGLCallList = (int) ClientMethodHandles.starGLCallList_getter.invokeExact(mc.renderGlobal); starVBO = (net.minecraft.client.renderer.vertex.VertexBuffer) ClientMethodHandles.starVBO_getter.invokeExact(mc.renderGlobal); } catch (Throwable t) { return; } - + float t = (ClientTickHandler.ticksInGame + partialTicks + 2000) * 0.005F; GlStateManager.pushMatrix(); @@ -497,7 +491,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { GlStateManager.popMatrix(); } - + // Excised from many occurences in RenderGlobal private void drawVboOrList(net.minecraft.client.renderer.vertex.VertexBuffer vbo, int displayList) { if (OpenGlHelper.useVbo()) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 17e03594d..fb374ab3c 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 13, 2014, 6:32:39 PM (GMT)] */ package vazkii.botania.common; diff --git a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java index 22c740eec..6f67c4016 100644 --- a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java +++ b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java @@ -2,23 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 28, 2015, 4:41:43 PM (GMT)] */ package vazkii.botania.common.achievement; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import vazkii.botania.api.item.IRelic; -import java.util.ArrayList; -import java.util.List; - public class AchievementMod extends Achievement { public static final List achievements = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java b/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java index 3605f7159..8399a1bcd 100644 --- a/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java +++ b/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 28, 2015, 5:57:07 PM (GMT)] */ package vazkii.botania.common.achievement; diff --git a/src/main/java/vazkii/botania/common/achievement/ICraftAchievement.java b/src/main/java/vazkii/botania/common/achievement/ICraftAchievement.java index 279fb06db..6acd2b6b7 100644 --- a/src/main/java/vazkii/botania/common/achievement/ICraftAchievement.java +++ b/src/main/java/vazkii/botania/common/achievement/ICraftAchievement.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 28, 2015, 5:59:07 PM (GMT)] */ package vazkii.botania.common.achievement; diff --git a/src/main/java/vazkii/botania/common/achievement/IPickupAchievement.java b/src/main/java/vazkii/botania/common/achievement/IPickupAchievement.java index 2276c2f1c..b12c46070 100644 --- a/src/main/java/vazkii/botania/common/achievement/IPickupAchievement.java +++ b/src/main/java/vazkii/botania/common/achievement/IPickupAchievement.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 28, 2015, 5:59:03 PM (GMT)] */ package vazkii.botania.common.achievement; diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 19ad2851c..ad344f75b 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 28, 2015, 4:27:39 PM (GMT)] */ package vazkii.botania.common.achievement; @@ -30,7 +30,7 @@ public final class ModAchievements { public static Achievement flowerPickup; public static Achievement lexiconUse; - public static Achievement daybloomPickup; + public static Achievement daybloomPickup; public static Achievement cacophoniumCraft; public static Achievement manaPoolPickup; diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 32240b26a..0c69a0b4a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 9, 2014, 7:17:46 PM (GMT)] */ package vazkii.botania.common.block; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -31,8 +33,6 @@ import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable { public BlockAlfPortal() { diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 1a491ecef..2e5efd835 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [17/11/2015, 18:33:30 (GMT)] */ package vazkii.botania.common.block; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.BlockDirt; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -41,10 +46,6 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Random; - public class BlockAltGrass extends BlockMod implements ILexiconable { public BlockAltGrass() { @@ -99,19 +100,19 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { AltGrassVariant variant = state.getValue(BotaniaStateProps.ALTGRASS_VARIANT); for(int l = 0; l < 4; ++l) { BlockPos pos1 = pos.add(rand.nextInt(3) - 1, rand.nextInt(5) - 3, rand.nextInt(3) - 1); - + world.getBlockState(pos1.up()).getBlock(); if(world.getBlockState(pos1).getBlock() == Blocks.DIRT && world.getBlockState(pos1).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && world.getLight(pos1.up()) >= 4 && world.getBlockLightOpacity(pos1.up()) <= 2) - world.setBlockState(pos1, this.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, variant), 1 | 2); + world.setBlockState(pos1, getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, variant), 1 | 2); } } } @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Blocks.DIRT.getItemDropped(state, rand, fortune); - } + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + return Blocks.DIRT.getItemDropped(state, rand, fortune); + } @Nonnull @Override @@ -137,15 +138,15 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { case GOLDEN: break; case VIVID: - break; + break; case SCORCHED: if(r.nextInt(80) == 0) - world.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + r.nextFloat(), pos.getY() + 1.1, pos.getZ() + r.nextFloat(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + r.nextFloat(), pos.getY() + 1.1, pos.getZ() + r.nextFloat(), 0, 0, 0); break; case INFUSED: if(r.nextInt(100) == 0) Botania.proxy.sparkleFX(pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 0F, 1F, 1F, r.nextFloat() * 0.2F + 1F, 5); - break; + break; case MUTATED: if(r.nextInt(100) == 0) { if(r.nextInt(100) > 25) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 1443a32de..7953b5cbd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 21, 2014, 7:48:54 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -54,9 +58,6 @@ import vazkii.botania.common.item.rod.ItemWaterRod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockAltar extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0.125, 0.125, 0.875, 20.0/16, 0.875); @@ -104,7 +105,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { TileEntity te = worldIn.getTileEntity(pos); if (te instanceof TileAltar) { - TileAltar altar = ((TileAltar) te); + TileAltar altar = (TileAltar) te; if (altar.isMossy) { state = state.withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.MOSSY); @@ -146,7 +147,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); TileAltar tile = (TileAltar) world.getTileEntity(pos); - return (tile != null && tile.hasLava) ? 15 : 0; + return tile != null && tile.hasLava ? 15 : 0; } @Override @@ -238,7 +239,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { private void drain(Fluid fluid, ItemStack stack) { stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null) - .drain(new FluidStack(fluid, Fluid.BUCKET_VOLUME), true); + .drain(new FluidStack(fluid, Fluid.BUCKET_VOLUME), true); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index e89f40563..a627c2fde 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [28/09/2016, 16:14:04 (GMT)] */ package vazkii.botania.common.block; @@ -40,28 +40,28 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrigger, IHourglassTrigger, IWandHUD, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1); - + public BlockAnimatedTorch() { super(Material.CIRCUITS, LibBlockNames.ANIMATED_TORCH); setLightLevel(0.5F); } - + @Override public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if(hand == EnumHand.MAIN_HAND && playerIn.isSneaking() && playerIn.getHeldItem(hand) == null) { ((TileAnimatedTorch) worldIn.getTileEntity(pos)).handRotate(); return true; } - + return false; } - + @Override public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(!burst.isFake()) ((TileAnimatedTorch) world.getTileEntity(pos)).toggle(); } - + @Override public void onTriggeredByHourglass(World world, BlockPos pos, TileEntity hourglass) { ((TileAnimatedTorch) world.getTileEntity(pos)).toggle(); @@ -70,63 +70,63 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { ((TileAnimatedTorch) world.getTileEntity(pos)).onWanded(); - return true; + return true; } - + @Override @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileAnimatedTorch) world.getTileEntity(pos)).renderHUD(mc, res); } - + @Override public boolean canProvidePower(IBlockState state) { return true; } - + @Override public int getStrongPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { return getWeakPower(blockState, blockAccess, pos, side); } - + @Override public int getWeakPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { TileAnimatedTorch tile = (TileAnimatedTorch) blockAccess.getTileEntity(pos); if(tile.rotating) return 0; - + if(TileAnimatedTorch.SIDES[tile.side] == side) return 15; - + return 0; } - + @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - @Override - public boolean isFullCube(IBlockState state) { - return false; - } - + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } + + @Override + public boolean isFullCube(IBlockState state) { + return false; + } + @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } - + @Override public TileEntity createTileEntity(World world, IBlockState state) { return new TileAnimatedTorch(); } - + @Override public boolean hasTileEntity(IBlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index cb4ca3e8b..79c8eaeb8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -2,25 +2,25 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 24, 2015, 3:15:11 PM (GMT)] */ package vazkii.botania.common.block; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; @@ -44,9 +44,6 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockAvatar extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(.3125, 0, .21875, 1-.3125, 17/16.0, 1-.21875); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 4838ec0b2..fc36f3504 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 20, 2014, 8:23:17 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -23,7 +27,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -33,9 +36,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockBifrost extends BlockMod implements ILexiconable { public BlockBifrost() { diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 7f143668f..64fef203b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 28, 2015, 10:46:20 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -28,9 +32,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockBifrostPerm extends BlockMod implements ILexiconable { public BlockBifrostPerm() { @@ -46,7 +47,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { public boolean isOpaqueCube(IBlockState state) { return false; } - + @Override public boolean isFullBlock(IBlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index dcb1f43b4..edd838db3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 23, 2015, 7:23:26 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -25,10 +30,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class BlockCacophonium extends BlockMod { protected BlockCacophonium() { diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 4a0e58452..2360fd1af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 7, 2014, 2:20:51 PM (GMT)] */ package vazkii.botania.common.block; diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 85a105d1d..183667e66 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 6, 2015, 4:03:56 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -25,10 +30,6 @@ import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class BlockCell extends BlockMod implements ILexiconable { public BlockCell() { diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 99599bee6..826604e58 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 8, 2015, 4:29:01 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -30,10 +35,6 @@ import vazkii.botania.common.block.tile.TileCocoon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class BlockCocoon extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 13.0/16, 0.875, 13.0/16);; diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index d45fd01b6..442a8b517 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 26, 2015, 6:08:29 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -28,9 +32,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockEnchantedSoil extends BlockMod implements ILexiconable { public BlockEnchantedSoil() { diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 7edc3f342..82209fec7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 30, 2014, 1:05:07 PM (GMT)] */ package vazkii.botania.common.block; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -28,8 +30,6 @@ import vazkii.botania.common.block.tile.TileEnderEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockEnderEye extends BlockMod implements ILexiconable { protected BlockEnderEye() { diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 109256a9d..b0d6db7d0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -2,15 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 10, 2015, 10:22:38 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableList; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -27,10 +33,6 @@ import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileFakeAir; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Random; - public class BlockFakeAir extends BlockMod { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0); diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 58c706509..e41b7ab23 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 7, 2015, 7:59:10 PM (GMT)] */ package vazkii.botania.common.block; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -36,8 +38,6 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockFelPumpkin extends BlockMod implements ILexiconable { private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned"; diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index ab7655cb1..bd4311a17 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 17, 2014, 5:31:53 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -18,7 +24,6 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -37,7 +42,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -52,11 +56,6 @@ import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { public BlockFloatingSpecialFlower() { diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index cb72976e5..4b54a5101 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 9, 2014, 10:55:17 PM (GMT)] */ package vazkii.botania.common.block; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -26,8 +28,6 @@ import vazkii.botania.common.block.tile.TileForestEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockForestEye extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index dd484b7c6..2a497f50a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 23, 2015, 11:44:35 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; @@ -33,11 +39,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - public class BlockGaiaHead extends BlockSkull implements IModelRegister { public BlockGaiaHead() { @@ -53,27 +54,27 @@ public class BlockGaiaHead extends BlockSkull implements IModelRegister { return new ItemStack(ModItems.gaiaHead); } - @Nonnull + @Nonnull @Override - public List getDrops(@Nonnull IBlockAccess world, @Nonnull BlockPos pos, IBlockState state, int fortune) { - ArrayList ret = new ArrayList<>(); - - if(!state.getValue(NODROP)) { - ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1); - TileEntitySkull tileentityskull = (TileEntitySkull)world.getTileEntity(pos); + public List getDrops(@Nonnull IBlockAccess world, @Nonnull BlockPos pos, IBlockState state, int fortune) { + ArrayList ret = new ArrayList<>(); - if(tileentityskull == null) - return ret; + if(!state.getValue(NODROP)) { + ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1); + TileEntitySkull tileentityskull = (TileEntitySkull)world.getTileEntity(pos); + + if(tileentityskull == null) + return ret; + + ret.add(itemstack); + } + return ret; + } - ret.add(itemstack); - } - return ret; - } - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return ModItems.gaiaHead; - } + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + return ModItems.gaiaHead; + } @Override public int damageDropped(IBlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 7ff6cb92c..1a248b1ae 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 9, 2015, 12:48:18 AM (GMT)] */ package vazkii.botania.common.block; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.BlockRailBase; import net.minecraft.block.BlockRailPowered; @@ -38,8 +40,6 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; - public class BlockGhostRail extends BlockRailBase implements ILexiconable, IModelRegister { private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 07d0ee379..3345015de 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 29, 2015, 8:17:08 PM (GMT)] */ package vazkii.botania.common.block; diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 9554ff0fe..4404cb456 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 15, 2015, 4:07:09 PM (GMT)] */ package vazkii.botania.common.block; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -33,8 +35,6 @@ import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockIncensePlate extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(0.375, 0, 0.125, 0.625, 1/16.0, 0.875); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index d5a5cb6f9..e4dc1accd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 17, 2015, 4:08:58 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -33,10 +38,6 @@ import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class BlockLightLauncher extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index a853432d7..6bb0fa870 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -2,21 +2,25 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 15, 2015, 8:31:13 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; 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; @@ -36,16 +40,11 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Random; - public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(5.0/16, 5.0/16, 5.0/16, 11.0/16, 11.0/16, 11.0/16); @@ -127,16 +126,16 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable public int tickRate(World world) { return 2; } - + @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn) { - if(!worldIn.isRemote && state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.TOGGLE) { - if(state.getValue(BotaniaStateProps.POWERED) && !worldIn.isBlockPowered(pos)) - worldIn.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false)); - else if(!state.getValue(BotaniaStateProps.POWERED) && worldIn.isBlockPowered(pos)) - worldIn.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, true)); - } - } + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn) { + if(!worldIn.isRemote && state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.TOGGLE) { + if(state.getValue(BotaniaStateProps.POWERED) && !worldIn.isBlockPowered(pos)) + worldIn.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false)); + else if(!state.getValue(BotaniaStateProps.POWERED) && worldIn.isBlockPowered(pos)) + worldIn.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, true)); + } + } @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index ba4efbef5..04b586b96 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 25, 2014, 10:03:04 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -33,9 +37,6 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockLivingrock extends BlockMod implements ILexiconable { public BlockLivingrock() { diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 5177ca109..caf7731e6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 25, 2014, 10:04:25 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -34,9 +38,6 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockLivingwood extends BlockMod implements ILexiconable { public BlockLivingwood() { diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index d0e0bdebe..2c7378280 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 25, 2015, 12:24:10 AM (GMT)] */ package vazkii.botania.common.block; @@ -40,7 +40,7 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl @Override public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(!burst.isFake() && !world.isRemote) { - world.playEvent(2001, pos, Block.getStateId(this.getDefaultState())); + world.playEvent(2001, pos, Block.getStateId(getDefaultState())); world.setBlockToAir(pos); EntityManaStorm storm = new EntityManaStorm(world); storm.setPosition(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 905800fa7..b53c98072 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 5:31:15 PM (GMT)] */ package vazkii.botania.common.block; diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 7338dd666..d0dcf174c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -2,15 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 22, 2015, 7:46:55 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableList; + import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.SoundType; @@ -47,11 +54,6 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable, IModelRegister { private static final int COUNT = 8; @@ -59,8 +61,8 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I public BlockModDoubleFlower(boolean second) { this.second = second; - this.setHardness(0.0F); - this.setSoundType(SoundType.PLANT); + setHardness(0.0F); + setSoundType(SoundType.PLANT); String name = LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1); setDefaultState(pickDefaultState()); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); @@ -119,7 +121,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I // BlockDoublePlant.EnumPlantType blockdoubleplant$enumplanttype = (BlockDoublePlant.EnumPlantType) iblockstate.getValue(VARIANT); //if (blockdoubleplant$enumplanttype != BlockDoublePlant.EnumPlantType.FERN && blockdoubleplant$enumplanttype != BlockDoublePlant.EnumPlantType.GRASS) { - // worldIn.destroyBlock(pos.down(), true); + // worldIn.destroyBlock(pos.down(), true); //} else if (!world.isRemote) { // if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.SHEARS) { // this.onHarvest(worldIn, pos, iblockstate, player); @@ -128,7 +130,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I // world.destroyBlock(pos.down(), true); // } //} else { - world.setBlockToAir(pos.down()); + world.setBlockToAir(pos.down()); //} } else { world.setBlockToAir(pos.down()); @@ -190,7 +192,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I int hex = state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; - int b = (hex & 0xFF); + int b = hex & 0xFF; if(rand.nextDouble() < ConfigHandler.flowerParticleFrequency) Botania.proxy.sparkleFX(pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); @@ -228,7 +230,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.FACING).build()); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.FACING).build()); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index f2f0f7c50..9c52d6f1e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -1,5 +1,7 @@ package vazkii.botania.common.block; +import javax.annotation.Nonnull; + import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -10,50 +12,48 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; -import javax.annotation.Nonnull; - // White to Gray public class BlockModDoubleFlower1 extends BlockModDoubleFlower { - public BlockModDoubleFlower1() { - super(false); - } + public BlockModDoubleFlower1() { + super(false); + } - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); - } + @Nonnull + @Override + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); + } - @Override - protected IBlockState pickDefaultState() { - return blockState.getBaseState() - .withProperty(FACING, EnumFacing.SOUTH) - .withProperty(VARIANT, EnumPlantType.SUNFLOWER) - .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) - .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE); - } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState() + .withProperty(FACING, EnumFacing.SOUTH) + .withProperty(VARIANT, EnumPlantType.SUNFLOWER) + .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) + .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE); + } - @Override - public int getMetaFromState(IBlockState state) { - int meta = state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMetadata(); - if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { - meta |= 8; - } - return meta; - } + @Override + public int getMetaFromState(IBlockState state) { + int meta = state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMetadata(); + if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { + meta |= 8; + } + return meta; + } - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; - meta &= -9; - return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.byMetadata(meta)); - } + @Nonnull + @Override + public IBlockState getStateFromMeta(int meta) { + BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; + meta &= -9; + return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.byMetadata(meta)); + } - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - super.registerModels(); - ModelHandler.registerCustomItemblock(this, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i).getName()); - } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelHandler.registerCustomItemblock(this, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i).getName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index 25d866a4d..0325e0a38 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -1,5 +1,7 @@ package vazkii.botania.common.block; +import javax.annotation.Nonnull; + import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -10,51 +12,49 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; -import javax.annotation.Nonnull; - // Silver to black public class BlockModDoubleFlower2 extends BlockModDoubleFlower { - public BlockModDoubleFlower2() { - super(true); - } + public BlockModDoubleFlower2() { + super(true); + } - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); - } + @Nonnull + @Override + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); + } - @Override - protected IBlockState pickDefaultState() { - return blockState.getBaseState() - .withProperty(FACING, EnumFacing.SOUTH) - .withProperty(VARIANT, EnumPlantType.SUNFLOWER) - .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) - .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER); - } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState() + .withProperty(FACING, EnumFacing.SOUTH) + .withProperty(VARIANT, EnumPlantType.SUNFLOWER) + .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) + .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER); + } - @Override - public int getMetaFromState(IBlockState state) { - int meta = state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2).getMetadata() - 8; - if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { - meta |= 8; - } - return meta; - } + @Override + public int getMetaFromState(IBlockState state) { + int meta = state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2).getMetadata() - 8; + if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { + meta |= 8; + } + return meta; + } - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; - meta &= -9; - return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.byMetadata(meta + 8)); - } + @Nonnull + @Override + public IBlockState getStateFromMeta(int meta) { + BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; + meta &= -9; + return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.byMetadata(meta + 8)); + } - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - super.registerModels(); - ModelHandler.registerCustomItemblock(this, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i + 8).getName()); - } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelHandler.registerCustomItemblock(this, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i + 8).getName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 2188dd856..fe6bf9316 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 16, 2014, 5:50:31 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; @@ -49,10 +54,6 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Random; - public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable, IModelRegister { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); @@ -137,7 +138,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; - int b = (hex & 0xFF); + int b = hex & 0xFF; if(rand.nextDouble() < ConfigHandler.flowerParticleFrequency) Botania.proxy.sparkleFX(pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); @@ -177,7 +178,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(getTypeProperty()).build()); ModelHandler.registerCustomItemblock(this, EnumDyeColor.values().length, i -> "flower_" + EnumDyeColor.byMetadata(i).getName()); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 353d14612..c68ede2b3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 4, 2014, 12:29:56 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -19,11 +23,9 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -48,10 +50,6 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Random; - public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, IWandHUD { public BlockOpenCrate() { @@ -91,7 +89,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { if (world.getTileEntity(pos) instanceof TileCraftCrate) { - TileCraftCrate tile = ((TileCraftCrate) world.getTileEntity(pos)); + TileCraftCrate tile = (TileCraftCrate) world.getTileEntity(pos); state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.values()[tile.pattern + 1]); } else { state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE); diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 8013548a4..9c5ffee66 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -2,14 +2,24 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 20, 2014, 4:57:36 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.UUID; + +import javax.annotation.Nonnull; + import gnu.trove.map.hash.TObjectIntHashMap; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonExtension; @@ -46,15 +56,6 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Random; -import java.util.Set; -import java.util.UUID; - public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconable { // Currently active binding attempts @@ -158,7 +159,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl @Override public void readFromNBT(@Nonnull NBTTagCompound nbttagcompound) { - ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.clear(); + ((BlockPistonRelay) ModBlocks.pistonRelay).mappedPositions.clear(); Collection tags = nbttagcompound.getKeySet(); for(String key : tags) { @@ -166,7 +167,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl if(tag instanceof NBTTagString) { String value = ((NBTTagString) tag).getString(); - ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.put(DimWithPos.fromString(key), DimWithPos.fromString(value)); + ((BlockPistonRelay) ModBlocks.pistonRelay).mappedPositions.put(DimWithPos.fromString(key), DimWithPos.fromString(value)); } } } @@ -174,8 +175,8 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl @Nonnull @Override public NBTTagCompound writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { - for(DimWithPos s : ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.keySet()) - nbttagcompound.setString(s.toString(), ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.get(s).toString()); + for(DimWithPos s : ((BlockPistonRelay) ModBlocks.pistonRelay).mappedPositions.keySet()) + nbttagcompound.setString(s.toString(), ((BlockPistonRelay) ModBlocks.pistonRelay).mappedPositions.get(s).toString()); return nbttagcompound; } @@ -280,7 +281,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl public DimWithPos(int dim, BlockPos pos) { this.dim = dim; - this.blockPos = pos; + blockPos = pos; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index f5ed414a5..6073e62f6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 7, 2014, 2:25:22 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -48,9 +52,6 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, IManaCollisionGhost { public BlockPlatform() { @@ -93,7 +94,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, .withProperty(BotaniaStateProps.HELD_POS, pos); if (world.getTileEntity(pos) instanceof TileCamo) { - TileCamo tile = ((TileCamo) world.getTileEntity(pos)); + TileCamo tile = (TileCamo) world.getTileEntity(pos); return ((IExtendedBlockState) state).withProperty(BotaniaStateProps.HELD_STATE, tile.camoState); } else { return state; diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 91445d0bc..3519b628f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 18, 2014, 10:13:02 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -40,9 +44,6 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabiliser { diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index f825b95bb..2712253d1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 7, 2015, 4:27:47 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -25,9 +29,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockRoot extends BlockMod implements ILexiconable { public BlockRoot() { diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 0080e3acc..4be08e0c7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 26, 2014, 11:31:51 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.BlockVine; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; @@ -29,9 +33,6 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockSolidVines extends BlockVine implements ILexiconable { public BlockSolidVines() { diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index f84460779..e80781cfb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -2,23 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 28, 2015, 10:01:01 PM (GMT)] */ package vazkii.botania.common.block; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -36,9 +36,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockSparkChanger extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 3.0/16, 1); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 314a969fd..a9255933b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 22, 2014, 7:06:38 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.BlockFlower; import net.minecraft.block.SoundType; import net.minecraft.block.properties.IProperty; @@ -52,7 +58,6 @@ import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; @@ -60,11 +65,6 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD, IModelRegister { static { @@ -151,7 +151,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I String id = BotaniaAPI.getSubTileStringMapping(clazz); return ((IExtendedBlockState) state).withProperty(BotaniaStateProps.SUBTILE_ID, id); } else { - return ((IExtendedBlockState) state); + return (IExtendedBlockState) state; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index bbffed6e0..1100263d9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 14, 2014, 8:37:26 PM (GMT)] */ package vazkii.botania.common.block; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -33,9 +37,6 @@ import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockStorage extends BlockMod implements ILexiconable { public BlockStorage() { diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index c26b5d130..284865ee7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 1, 2015, 1:11:26 PM (GMT)] */ package vazkii.botania.common.block; +import javax.annotation.Nonnull; + import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -36,8 +38,6 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.01, 0.25, 0.75, 0.99, 0.75); @@ -57,7 +57,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { if(!world.isRemote && e instanceof EntityItem) { EntityItem item = (EntityItem) e; ItemStack stack = item.getEntityItem(); - if((isSunflower(stack) && removeRain(world)) || (isBlueOrchid(stack) && startRain(world))) { + if(isSunflower(stack) && removeRain(world) || isBlueOrchid(stack) && startRain(world)) { stack.stackSize--; if(stack.stackSize == 0) e.setDead(); diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 8decb0596..6f74a5c9d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 1, 2014, 3:49:12 PM (GMT)] */ package vazkii.botania.common.block; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -27,8 +29,6 @@ import vazkii.botania.common.block.tile.TileTinyPlanet; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaCollisionGhost { private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 3.0/16, 3.0/16, 13.0/16, 13.0/16, 13.0/16); diff --git a/src/main/java/vazkii/botania/common/block/ModBanners.java b/src/main/java/vazkii/botania/common/block/ModBanners.java index 0e5a137c1..cc1e9a64a 100644 --- a/src/main/java/vazkii/botania/common/block/ModBanners.java +++ b/src/main/java/vazkii/botania/common/block/ModBanners.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 25, 2015, 7:11:35 PM (GMT)] */ package vazkii.botania.common.block; diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 49936a559..855bcd171 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 5:17:55 PM (GMT)] */ package vazkii.botania.common.block; @@ -21,7 +21,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.corporea.BlockCorporeaCrystalCube; @@ -339,7 +338,7 @@ public final class ModBlocks { avatar = new BlockAvatar(); altGrass = new BlockAltGrass(); animatedTorch = new BlockAnimatedTorch(); - + ModFluffBlocks.init(); for(int i = 0; i < 16; i++) @@ -375,7 +374,7 @@ public final class ModBlocks { BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.twigWand, new BehaviourWand()); BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.poolMinecart, new BehaviourPoolMinecart()); BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Item.getItemFromBlock(ModBlocks.felPumpkin), new BehaviourFelPumpkin()); - + SeedBehaviours.init(); } diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 82c9618a7..8951039c4 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 2:35:08 PM (GMT)] */ package vazkii.botania.common.block; @@ -62,7 +62,7 @@ import vazkii.botania.common.lib.LibBlockNames; public final class ModFluffBlocks { public static List slabsToRegister = new ArrayList(); - + public static Block livingwoodStairs; public static Block livingwoodSlab; public static Block livingwoodSlabFull; @@ -236,7 +236,7 @@ public final class ModFluffBlocks { managlassPane = new BlockManaglassPane(); alfglassPane = new BlockAlfglassPane(); bifrostPane = new BlockBifrostPane(); - + for(Block b : slabsToRegister) GameRegistry.register(new ItemBlockModSlab(b), b.getRegistryName()); } diff --git a/src/main/java/vazkii/botania/common/block/ModMultiblocks.java b/src/main/java/vazkii/botania/common/block/ModMultiblocks.java index 26e531e5e..efbac8842 100644 --- a/src/main/java/vazkii/botania/common/block/ModMultiblocks.java +++ b/src/main/java/vazkii/botania/common/block/ModMultiblocks.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 27, 2015, 3:11:36 PM (GMT)] */ package vazkii.botania.common.block; diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index d67e812d6..254db35da 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -2,21 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 15, 2015, 12:23:33 AM (GMT)] */ package vazkii.botania.common.block.corporea; +import javax.annotation.Nonnull; + import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.Achievement; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -26,9 +26,6 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; -import javax.annotation.Nonnull; -import java.util.Random; - public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchievement { public BlockCorporeaBase(Material material, String name) { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index cfc1c2e75..5b830aaca 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 30, 2015, 3:56:19 PM (GMT)] */ package vazkii.botania.common.block.corporea; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -26,7 +28,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.common.property.ExtendedBlockState; -import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; import net.minecraftforge.fml.relauncher.Side; @@ -39,8 +40,6 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 13.0/16, 1, 13.0/16); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index d9e6bdd2a..9802d6ba8 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 16, 2015, 2:17:05 PM (GMT)] */ package vazkii.botania.common.block.corporea; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -27,8 +29,6 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaFunnel() { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index 1b19b8d79..381ade470 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 15, 2015, 12:49:58 AM (GMT)] */ package vazkii.botania.common.block.corporea; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -38,8 +40,6 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaIndex() { @@ -78,8 +78,8 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl @Override public boolean addLandingEffects(IBlockState state, net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles ) { - float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); - double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); + float f = MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); + double d0 = Math.min(0.2F + f / 15.0F, 10.0F); if (d0 > 2.5D) { d0 = 2.5D; } @@ -98,10 +98,10 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl for (int j = 0; j < i; ++j) { for (int k = 0; k < i; ++k) { for (int l = 0; l < i; ++l) { - double d0 = (double)pos.getX() + ((double)j + 0.5D) / (double)i; - double d1 = (double)pos.getY() + ((double)k + 0.5D) / (double)i; - double d2 = (double)pos.getZ() + ((double)l + 0.5D) / (double)i; - effectRenderer.addEffect(factory.getEntityFX(-1, world, d0, d1, d2, d0 - (double)pos.getX() - 0.5D, d1 - (double)pos.getY() - 0.5D, d2 - (double)pos.getZ() - 0.5D, Block.getStateId(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM)))); + double d0 = pos.getX() + (j + 0.5D) / i; + double d1 = pos.getY() + (k + 0.5D) / i; + double d2 = pos.getZ() + (l + 0.5D) / i; + effectRenderer.addEffect(factory.getEntityFX(-1, world, d0, d1, d2, d0 - pos.getX() - 0.5D, d1 - pos.getY() - 0.5D, d2 - pos.getZ() - 0.5D, Block.getStateId(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM)))); } } } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index af72aefbe..c3f568469 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 19, 2015, 6:18:03 PM (GMT)] */ package vazkii.botania.common.block.corporea; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -28,9 +32,6 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaInterceptor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaInterceptor() { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index dcae55067..2531da856 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 28, 2015, 11:53:13 AM (GMT)] */ package vazkii.botania.common.block.corporea; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -32,8 +34,6 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaRetainer; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICraftAchievement { public BlockCorporeaRetainer() { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java index ec455d41e..60cfb49a3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 17, 2015, 7:55:33 PM (GMT)] */ package vazkii.botania.common.block.decor; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index e8950b55f..7215a946f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 28, 2014, 6:43:33 PM (GMT)] */ package vazkii.botania.common.block.decor; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.item.EnumDyeColor; @@ -28,9 +32,6 @@ import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockBuriedPetals extends BlockModFlower { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.1, 1); @@ -53,7 +54,7 @@ public class BlockBuriedPetals extends BlockModFlower { int hex = color.getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; - int b = (hex & 0xFF); + int b = hex & 0xFF; Botania.proxy.setSparkleFXNoClip(true); Botania.proxy.sparkleFX(pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.1 + rand.nextFloat() * 0.1, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); @@ -83,7 +84,7 @@ public class BlockBuriedPetals extends BlockModFlower { @SideOnly(Side.CLIENT) @Override public final void registerModels() { - ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(getTypeProperty()).build()); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index bd67cbae9..367342339 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 28, 2014, 9:51:48 PM (GMT)] */ package vazkii.botania.common.block.decor; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -34,9 +38,6 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockCustomBrick extends BlockMod implements ILexiconable { public BlockCustomBrick() { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java index 220797e50..4adc6bbeb 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 8, 2014, 6:40:17 PM (GMT)] */ package vazkii.botania.common.block.decor; @@ -31,7 +31,7 @@ public class BlockElfGlass extends BlockManaGlass implements IElvenItem, ILexico public boolean isElvenItem(ItemStack stack) { return true; } - + @Override public boolean isFullBlock(IBlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index df2e7aa0f..c6fe1bd7b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 8, 2014, 10:16:53 PM (GMT)] */ package vazkii.botania.common.block.decor; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -57,10 +62,6 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Random; - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfusionStabiliser { @@ -115,7 +116,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EnumDyeColor.values().length) { - meta = 0; + meta = 0; } return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } @@ -144,7 +145,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; - int b = (hex & 0xFF); + int b = hex & 0xFF; if(rand.nextDouble() < ConfigHandler.flowerParticleFrequency) Botania.proxy.sparkleFX(pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); 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 feb059682..b97159aa3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -2,15 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Dec 21, 2014, 12:28:06 AM (GMT)] */ package vazkii.botania.common.block.decor; +import java.util.List; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableList; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -36,9 +41,6 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.world.WorldTypeSkyblock; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockManaFlame extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index d861082f8..80e45f348 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 6:09:29 PM (GMT)] */ package vazkii.botania.common.block.decor; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -29,8 +31,6 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockManaGlass extends BlockMod implements ILexiconable { public BlockManaGlass() { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index ec614ba82..df075f4c6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 23, 2015, 4:24:08 PM (GMT)] */ package vazkii.botania.common.block.decor; @@ -128,7 +128,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; - int b = (hex & 0xFF); + int b = hex & 0xFF; if(rand.nextDouble() < ConfigHandler.flowerParticleFrequency * 0.25F) Botania.proxy.sparkleFX(pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index 49768b283..91131c6c8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 1, 2015, 6:35:06 PM (GMT)] */ package vazkii.botania.common.block.decor; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -31,9 +35,6 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockPavement extends BlockMod { public static final int TYPES = 6; @@ -59,13 +60,13 @@ public class BlockPavement extends BlockMod { @Override public int getMetaFromState(IBlockState state) { switch (state.getValue(BotaniaStateProps.PAVEMENT_COLOR)) { - case GREEN: return 5; - case YELLOW: return 4; - case RED: return 3; - case BLUE: return 2; - case BLACK: return 1; - case WHITE: - default: return 0; + case GREEN: return 5; + case YELLOW: return 4; + case RED: return 3; + case BLUE: return 2; + case BLACK: return 1; + case WHITE: + default: return 0; } } @@ -78,13 +79,13 @@ public class BlockPavement extends BlockMod { EnumDyeColor color; switch (meta) { - case 5: color = EnumDyeColor.GREEN; break; - case 4: color = EnumDyeColor.YELLOW; break; - case 3: color = EnumDyeColor.RED; break; - case 2: color = EnumDyeColor.BLUE; break; - case 1: color = EnumDyeColor.BLACK; break; - case 0: - default: color = EnumDyeColor.WHITE; break; + case 5: color = EnumDyeColor.GREEN; break; + case 4: color = EnumDyeColor.YELLOW; break; + case 3: color = EnumDyeColor.RED; break; + case 2: color = EnumDyeColor.BLUE; break; + case 1: color = EnumDyeColor.BLACK; break; + case 0: + default: color = EnumDyeColor.WHITE; break; } return getDefaultState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, color); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 1721e9c59..d2839fc31 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 9, 2015, 5:17:17 PM (GMT)] */ package vazkii.botania.common.block.decor; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -35,9 +39,6 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockPetalBlock extends BlockMod implements ILexiconable { public BlockPetalBlock() { @@ -96,7 +97,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); ModelHandler.registerBlockToState(this, EnumDyeColor.values().length); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java index 04b990213..100bfc33e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 10, 2015, 10:29:22 PM (GMT)] */ package vazkii.botania.common.block.decor; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java index 3d6372d7a..9b7d31eaa 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 11, 2015, 3:08:09 PM (GMT)] */ package vazkii.botania.common.block.decor; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 4fc9d2a21..c6c3c7a24 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -2,21 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 2, 2014, 8:15:49 PM (GMT)] */ package vazkii.botania.common.block.decor; +import javax.annotation.Nonnull; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Optional; @@ -31,8 +32,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockShinyFlower extends BlockModFlower implements IInfusionStabiliser, IHornHarvestable { @@ -72,7 +71,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(getTypeProperty()).build()); ModelHandler.registerCustomItemblock(this, EnumDyeColor.values().length, i -> "glimmering_flower_" + EnumDyeColor.byMetadata(i).getName()); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index f2ae2f945..f11cd5ccd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 7, 2014, 6:36:37 PM (GMT)] */ package vazkii.botania.common.block.decor; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -32,8 +34,6 @@ import vazkii.botania.common.block.tile.TileStarfield; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockStarfield extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index a859f5361..bfe44a15c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 18, 2014, 7:58:08 PM (GMT)] */ package vazkii.botania.common.block.decor; @@ -67,12 +67,12 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { switch (state.getValue(BotaniaStateProps.CARDINALS)) { - case NORTH: return 0; - case WEST: return 3; - case EAST: return 1; - case SOUTH: - default: - return 2; // wai vazkii senpai + case NORTH: return 0; + case WEST: return 3; + case EAST: return 1; + case SOUTH: + default: + return 2; // wai vazkii senpai } } @@ -81,16 +81,16 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { public IBlockState getStateFromMeta(int meta) { EnumFacing side; switch (meta) { - case 3: side = EnumFacing.WEST; break; - case 0: side = EnumFacing.NORTH; break; - case 1: side = EnumFacing.EAST; break; - case 2: - default: - side = EnumFacing.SOUTH; break; + case 3: side = EnumFacing.WEST; break; + case 0: side = EnumFacing.NORTH; break; + case 1: side = EnumFacing.EAST; break; + case 2: + default: + side = EnumFacing.SOUTH; break; } return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, side); } - + @Override public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index 8be058bce..eca5f2060 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 29, 2015, 6:54:20 PM (GMT)] */ package vazkii.botania.common.block.decor.biomestone; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -29,9 +33,6 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockBiomeStone extends BlockMod implements ILexiconable { public BlockBiomeStone(String name) { diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java index 179d975ab..141aee2b1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 29, 2015, 7:17:35 PM (GMT)] */ package vazkii.botania.common.block.decor.biomestone; +import javax.annotation.Nonnull; + import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraftforge.fml.relauncher.Side; @@ -19,8 +21,6 @@ import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockBiomeStoneA extends BlockBiomeStone { public BlockBiomeStoneA() { diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index 4a814dd72..79696dc1a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 29, 2015, 7:17:41 PM (GMT)] */ package vazkii.botania.common.block.decor.biomestone; +import javax.annotation.Nonnull; + import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraftforge.fml.relauncher.Side; @@ -19,8 +21,6 @@ import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockBiomeStoneB extends BlockBiomeStone { public BlockBiomeStoneB() { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java index c5286035d..671fe5d7f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java @@ -2,22 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 30, 2015, 10:17:02 PM (GMT)] */ package vazkii.botania.common.block.decor.panes; +import javax.annotation.Nonnull; + import net.minecraft.util.BlockRenderLayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; -import javax.annotation.Nonnull; - public class BlockAlfglassPane extends BlockModPane { public BlockAlfglassPane() { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index d5d42dd65..a2942f8fe 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -2,22 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 30, 2015, 10:18:50 PM (GMT)] */ package vazkii.botania.common.block.decor.panes; +import javax.annotation.Nonnull; + import net.minecraft.util.BlockRenderLayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; -import javax.annotation.Nonnull; - public class BlockBifrostPane extends BlockModPane { public BlockBifrostPane() { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java index 09e2d4a16..46b4b7b20 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java @@ -2,22 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 30, 2015, 10:16:46 PM (GMT)] */ package vazkii.botania.common.block.decor.panes; +import javax.annotation.Nonnull; + import net.minecraft.util.BlockRenderLayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; -import javax.annotation.Nonnull; - public class BlockManaglassPane extends BlockModPane { public BlockManaglassPane() { 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 a77c0cead..7a34590e1 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 @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 30, 2015, 10:01:17 PM (GMT)] */ package vazkii.botania.common.block.decor.panes; diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index 9bff35bb7..2ff571e9c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 11, 2014, 1:05:32 AM (GMT)] */ package vazkii.botania.common.block.decor.quartz; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -34,9 +38,6 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; import vazkii.botania.common.lexicon.LexiconData; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockSpecialQuartz extends BlockMod implements ILexiconable { public final String type; diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java index 1b2db8806..9ecb9c682 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 11, 2014, 1:08:28 AM (GMT)] */ package vazkii.botania.common.block.decor.quartz; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; @@ -25,9 +29,6 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.lexicon.LexiconData; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockSpecialQuartzSlab extends BlockModSlab { final Block source; diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java index 5e7db0c1c..a01a86d70 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 11, 2014, 1:12:50 AM (GMT)] */ package vazkii.botania.common.block.decor.quartz; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java index 5045d53c2..4b2a7b07f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 29, 2015, 7:34:16 PM (GMT)] */ package vazkii.botania.common.block.decor.slabs; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java index 5d8878350..611148ea6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java @@ -9,7 +9,7 @@ public abstract class BlockLivingSlab extends BlockModSlab { public BlockLivingSlab(boolean full, IBlockState state) { super(full, state.getMaterial(), state.getBlock().getUnlocalizedName().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Slab" + (full ? "Full" : "")); setSoundType(state.getBlock().getSoundType()); - this.sourceState = state; + sourceState = state; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 02eb93811..b57242572 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -30,7 +30,6 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -133,10 +132,10 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM @Override public void registerModels() { if(!doubleSlab) { - ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BlockModSlab.DUMMY).build()); ModelHandler.registerBlockToState(this, 0, getDefaultState()); } else { - ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java index 43eaefc78..9d0515992 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 1, 2015, 7:17:45 PM (GMT)] */ package vazkii.botania.common.block.decor.slabs; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java index c78dc76dc..46b8432a1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 11, 2015, 3:47:24 PM (GMT)] */ package vazkii.botania.common.block.decor.slabs.living; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java index 1b1816f24..f510bea6c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 11, 2015, 3:47:47 PM (GMT)] */ package vazkii.botania.common.block.decor.slabs.living; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java index 8fbdc7f63..240ffb067 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 29, 2015, 10:39:38 PM (GMT)] */ package vazkii.botania.common.block.decor.stairs; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java index 0294eddda..037864461 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 1, 2015, 7:16:53 PM (GMT)] */ package vazkii.botania.common.block.decor.stairs; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerrockStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerrockStairs.java index fbc9b1c4a..ce3d0bc90 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerrockStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerrockStairs.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 11, 2015, 3:46:12 PM (GMT)] */ package vazkii.botania.common.block.decor.stairs.living; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerwoodPlankStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerwoodPlankStairs.java index 25c221d9f..aa32027d3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerwoodPlankStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerwoodPlankStairs.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 11, 2015, 3:45:02 PM (GMT)] */ package vazkii.botania.common.block.decor.stairs.living; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 7aa85b348..d9c345290 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 18, 2015, 8:31:47 PM (GMT)] */ package vazkii.botania.common.block.decor.walls; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.BlockWall; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -18,7 +22,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; @@ -32,10 +35,6 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nonnull; -import java.util.List; public class BlockBiomeStoneWall extends BlockModWall { @@ -92,8 +91,8 @@ public class BlockBiomeStoneWall extends BlockModWall { @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, - (new StateMap.Builder()).withName(BotaniaStateProps.BIOMESTONEWALL_VARIANT) - .ignore(BlockWall.VARIANT).withSuffix("_wall").build()); + new StateMap.Builder().withName(BotaniaStateProps.BIOMESTONEWALL_VARIANT) + .ignore(BlockWall.VARIANT).withSuffix("_wall").build()); ModelHandler.registerCustomItemblock(this, 8, i -> BiomeStoneVariant.values()[i + 8].getName() + "_wall"); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index a72c7da83..15914c726 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 18, 2015, 8:15:36 PM (GMT)] */ package vazkii.botania.common.block.decor.walls; @@ -112,7 +112,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BlockWall.VARIANT).build()); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java index 638ff1ee2..813633e12 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 18, 2015, 8:29:16 PM (GMT)] */ package vazkii.botania.common.block.decor.walls.living; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java index 9445b0d15..a0a0f1c30 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 18, 2015, 8:25:54 PM (GMT)] */ package vazkii.botania.common.block.decor.walls.living; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java index 57e96e141..38a88e915 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 18, 2015, 8:28:06 PM (GMT)] */ package vazkii.botania.common.block.decor.walls.living; diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java index c656da252..ad7b67a1c 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [21/09/2016, 21:08:41 (GMT)] */ package vazkii.botania.common.block.dispenser; diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java index 52b1f3381..bf2859d13 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java @@ -1,5 +1,7 @@ package vazkii.botania.common.block.dispenser; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; @@ -11,49 +13,47 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; -import javax.annotation.Nonnull; - // Taken from vanilla pumpkin dispense behaviour public class BehaviourFelPumpkin extends BehaviorDefaultDispenseItem { - private boolean field_179241_b = true; + private boolean field_179241_b = true; - @Nonnull - @Override - protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) - { - World world = source.getWorld(); - EnumFacing facing = world.getBlockState(source.getBlockPos()).getValue(BlockDispenser.FACING); - BlockPos blockpos = source.getBlockPos().offset(facing); - Block blockpumpkin = ModBlocks.felPumpkin; + @Nonnull + @Override + protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) + { + World world = source.getWorld(); + EnumFacing facing = world.getBlockState(source.getBlockPos()).getValue(BlockDispenser.FACING); + BlockPos blockpos = source.getBlockPos().offset(facing); + Block blockpumpkin = ModBlocks.felPumpkin; - if (world.isAirBlock(blockpos) && world.getBlockState(blockpos.down()).getBlock() == Blocks.IRON_BARS - && world.getBlockState(blockpos.down(2)).getBlock() == Blocks.IRON_BARS) // Botania - Check for iron bars - { - if (!world.isRemote) - { - world.setBlockState(blockpos, blockpumpkin.getDefaultState(), 3); - } + if (world.isAirBlock(blockpos) && world.getBlockState(blockpos.down()).getBlock() == Blocks.IRON_BARS + && world.getBlockState(blockpos.down(2)).getBlock() == Blocks.IRON_BARS) // Botania - Check for iron bars + { + if (!world.isRemote) + { + world.setBlockState(blockpos, blockpumpkin.getDefaultState(), 3); + } - --stack.stackSize; - } - else - { - this.field_179241_b = false; - } + --stack.stackSize; + } + else + { + field_179241_b = false; + } - return stack; - } + return stack; + } - @Override - protected void playDispenseSound(IBlockSource source) - { - if (this.field_179241_b) - { - source.getWorld().playEvent(1000, source.getBlockPos(), 0); - } - else - { - source.getWorld().playEvent(1001, source.getBlockPos(), 0); - } - } + @Override + protected void playDispenseSound(IBlockSource source) + { + if (field_179241_b) + { + source.getWorld().playEvent(1000, source.getBlockPos(), 0); + } + else + { + source.getWorld().playEvent(1001, source.getBlockPos(), 0); + } + } } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java index 62f67508b..1ed122a0d 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 18, 2015, 12:22:58 AM (GMT)] */ package vazkii.botania.common.block.dispenser; +import javax.annotation.Nonnull; + import net.minecraft.block.BlockDispenser; import net.minecraft.block.BlockRailBase; import net.minecraft.block.material.Material; @@ -23,8 +25,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.entity.EntityPoolMinecart; -import javax.annotation.Nonnull; - public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index ea47d1be1..83472686a 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [21/09/2016, 21:08:33 (GMT)] */ package vazkii.botania.common.block.dispenser; diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java index 506849d73..1915f49d7 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 16, 2014, 11:11:31 PM (GMT)] */ package vazkii.botania.common.block.dispenser; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; @@ -20,8 +22,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.wand.IWandable; -import javax.annotation.Nonnull; - public class BehaviourWand extends BehaviorDefaultDispenseItem { @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/dispenser/SeedBehaviours.java b/src/main/java/vazkii/botania/common/block/dispenser/SeedBehaviours.java index 467f58faa..5cc126550 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/SeedBehaviours.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/SeedBehaviours.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [21/09/2016, 21:06:43 (GMT)] */ package vazkii.botania.common.block.dispenser; @@ -19,7 +19,7 @@ public class SeedBehaviours { // This entire class is a copy from Quark, for the seed planting feature // Quark's own feature disables itself if Botania is present - + public static void init() { BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Items.WHEAT_SEEDS, new BehaviourSeeds(Blocks.WHEAT)); BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Items.POTATO, new BehaviourSeeds(Blocks.POTATOES)); @@ -32,5 +32,5 @@ public class SeedBehaviours { BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Items.DYE, new BehaviourCocoaBeans(BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.getObject(Items.DYE))); } - + } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java index a23d16a86..bd085e2c6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 2, 2014, 7:18:49 PM (GMT)] */ package vazkii.botania.common.block.mana; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index 555924322..4c1e464f0 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 28, 2015, 5:18:13 PM (GMT)] */ package vazkii.botania.common.block.mana; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -41,8 +43,6 @@ import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockBellows extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.1875, 0, 0.1875, 1-0.1875, 10.0 / 16, 1-0.1875); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 85f71d81d..46bafc256 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 31, 2014, 4:37:29 PM (GMT)] */ package vazkii.botania.common.block.mana; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -17,11 +19,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.block.statemap.StateMap; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; @@ -46,9 +46,6 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.375, 0.05, 0.375, 0.625, 0.95, 0.625); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java index d5f030960..478516f9c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 20, 2014, 1:27:14 AM (GMT)] */ package vazkii.botania.common.block.mana; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index ac0bc76c6..4d78036f4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 3, 2014, 1:44:29 AM (GMT)] */ package vazkii.botania.common.block.mana; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -25,8 +27,6 @@ import vazkii.botania.common.block.tile.mana.TileDistributor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockDistributor extends BlockMod implements ILexiconable { public BlockDistributor() { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 29bbf50bc..85b7ca055 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 15, 2014, 4:08:26 PM (GMT)] */ package vazkii.botania.common.block.mana; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -22,12 +26,10 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -38,16 +40,12 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, IWandHUD { private final Random random = new Random(); @@ -74,9 +72,9 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, @Override public int getMetaFromState(IBlockState state) { switch (state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION)) { - case Z: return 1; - case X: - default: return 0; + case Z: return 1; + case X: + default: return 0; } } @@ -163,7 +161,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, entityitem.motionZ = (float)random.nextGaussian() * f3 * 0.5; if (itemstack.hasTagCompound()) - entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); + entityitem.getEntityItem().setTagCompound(itemstack.getTagCompound().copy()); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 5a2baf649..d4267d3b2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 16, 2014, 7:34:37 PM (GMT)] */ package vazkii.botania.common.block.mana; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -46,11 +52,6 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(3/16.0, 0, 3/16.0, 13/16.0, 14/16.0, 13/16.0); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index 23696983e..03187396b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 10, 2014, 7:57:38 PM (GMT)] */ package vazkii.botania.common.block.mana; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -33,9 +37,6 @@ import vazkii.botania.common.block.tile.mana.TileManaDetector; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCollisionGhost { public BlockManaDetector() { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index 034b3a04a..50ba2e3a3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 5, 2014, 12:55:47 AM (GMT)] */ package vazkii.botania.common.block.mana; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -30,8 +32,6 @@ import vazkii.botania.common.block.tile.mana.TileManaVoid; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverlayProvider { public BlockManaVoid() { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 7dc4ed154..6f112b1dd 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 26, 2014, 12:22:58 AM (GMT)] */ package vazkii.botania.common.block.mana; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -54,10 +59,6 @@ import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexiconable, ICraftAchievement { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.5, 1); @@ -251,7 +252,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); ModelHandler.registerBlockToState(this, PoolVariant.values().length); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index a5b179e92..c71e126ab 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -2,23 +2,25 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 17, 2015, 7:16:48 PM (GMT)] */ package vazkii.botania.common.block.mana; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; @@ -43,9 +45,6 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, IManaCollisionGhost { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 1, 0.75); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index b7c991353..383ab55ec 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 17, 2015, 9:46:53 PM (GMT)] */ package vazkii.botania.common.block.mana; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -38,8 +40,6 @@ import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockPump extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(0, 0, 0.25, 1, 0.5, 0.75); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index 1231ccf6f..2e3e00861 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 29, 2014, 9:51:58 PM (GMT)] */ package vazkii.botania.common.block.mana; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -27,8 +29,6 @@ import vazkii.botania.common.block.tile.mana.TileRFGenerator; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockRFGenerator extends BlockMod implements ILexiconable { public BlockRFGenerator() { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 246a0a43a..e15d8383f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -2,21 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 2, 2014, 2:10:14 PM (GMT)] */ package vazkii.botania.common.block.mana; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -36,9 +36,6 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.75, 1); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index 02b3a1286..abb670f14 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 23, 2014, 5:28:55 PM (GMT)] */ package vazkii.botania.common.block.mana; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -29,9 +33,6 @@ import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockSpawnerClaw extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0, 0.125, 0.875, 1/16.0, 0.875); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 92f43e538..d7029f563 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 25, 2014, 9:38:23 PM (GMT)] */ package vazkii.botania.common.block.mana; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.BlockPistonBase; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -50,9 +54,6 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.List; - public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { public BlockSpreader() { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index d78dbe3e4..4dff71a15 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 8, 2014, 5:25:12 PM (GMT)] */ package vazkii.botania.common.block.mana; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -32,8 +34,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockTerraPlate extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 3.0/16, 1); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index b7f42b3c0..737902a3a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 16, 2014, 10:08:14 PM (GMT)] */ package vazkii.botania.common.block.mana; +import javax.annotation.Nonnull; + import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -32,8 +34,6 @@ import vazkii.botania.common.block.tile.mana.TileTurntable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILexiconable { public BlockTurntable() { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index 353babb9b..c5d3af1a8 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 14, 2014, 4:43:14 PM (GMT)] */ package vazkii.botania.common.block.string; +import javax.annotation.Nonnull; + import net.minecraft.block.BlockPistonBase; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -30,8 +32,6 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; -import javax.annotation.Nonnull; - public abstract class BlockRedString extends BlockMod implements ILexiconable { public BlockRedString(String name) { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index bef2d8406..2c62fb0e3 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 16, 2014, 10:19:28 PM (GMT)] */ package vazkii.botania.common.block.string; +import javax.annotation.Nonnull; + import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -19,8 +21,6 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringComparator; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockRedStringComparator extends BlockRedString { public BlockRedStringComparator() { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java index 2aa4b362a..d6297f63c 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 14, 2014, 5:29:56 PM (GMT)] */ package vazkii.botania.common.block.string; +import javax.annotation.Nonnull; + import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -18,8 +20,6 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringContainer; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockRedStringContainer extends BlockRedString { public BlockRedStringContainer() { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java index 2ff8578f6..1f2b26b4b 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 14, 2014, 10:59:20 PM (GMT)] */ package vazkii.botania.common.block.string; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -25,8 +27,6 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringDispenser; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockRedStringDispenser extends BlockRedString { public BlockRedStringDispenser() { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java index da5bfa762..8ebaa55d2 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 16, 2014, 7:10:46 PM (GMT)] */ package vazkii.botania.common.block.string; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.IGrowable; import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; @@ -20,9 +24,6 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockRedStringFertilizer extends BlockRedString implements IGrowable { public BlockRedStringFertilizer() { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index ee8fd3bd3..1ae23e0fb 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 21, 2015, 4:56:52 PM (GMT)] */ package vazkii.botania.common.block.string; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; @@ -28,9 +32,6 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class BlockRedStringInterceptor extends BlockRedString { public BlockRedStringInterceptor() { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java index 973d60ef5..a0d4c5bcb 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 16, 2014, 10:46:48 PM (GMT)] */ package vazkii.botania.common.block.string; +import javax.annotation.Nonnull; + import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -18,8 +20,6 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockRedStringRelay extends BlockRedString { public BlockRedStringRelay() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java index d7919afea..b53e4a9d0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 6, 2014, 9:57:19 PM (GMT)] */ package vazkii.botania.common.block.subtile; diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java index 5b961ac54..ccff86a80 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 28, 2014, 9:09:39 PM (GMT)] */ package vazkii.botania.common.block.subtile; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index ebcad5145..1fa952700 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -1,5 +1,11 @@ package vazkii.botania.common.block.subtile.functional; +import java.awt.Color; +import java.util.Random; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.ITickableSound; import net.minecraft.client.audio.MovingSound; @@ -16,90 +22,85 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.block.tile.mana.TilePool; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.awt.Color; -import java.util.Random; - @SideOnly(Side.CLIENT) public class BergamuteEventHandler { - private BergamuteEventHandler() {} + private BergamuteEventHandler() {} - private static final Random RAND = new Random(); - private static final float MULTIPLIER = 0.15F; + private static final Random RAND = new Random(); + private static final float MULTIPLIER = 0.15F; - @SubscribeEvent(priority = EventPriority.LOWEST) - public static void onSoundEvent(PlaySoundEvent evt) { - ISound sound = evt.getResultSound(); + @SubscribeEvent(priority = EventPriority.LOWEST) + public static void onSoundEvent(PlaySoundEvent evt) { + ISound sound = evt.getResultSound(); - if (sound != null && shouldSilence(sound)) { - if(sound instanceof ITickableSound) { - evt.setResultSound(new WrappedTickableSound((ITickableSound) sound, MULTIPLIER)); - } else { - SubTileBergamute berg = SubTileBergamute.getBergamuteNearby(sound.getXPosF(), sound.getYPosF(), sound.getZPosF()); + if (sound != null && shouldSilence(sound)) { + if(sound instanceof ITickableSound) { + evt.setResultSound(new WrappedTickableSound((ITickableSound) sound, MULTIPLIER)); + } else { + SubTileBergamute berg = SubTileBergamute.getBergamuteNearby(sound.getXPosF(), sound.getYPosF(), sound.getZPosF()); - if (berg != null) { - evt.setResultSound(new WrappedSound(sound, MULTIPLIER)); + if (berg != null) { + evt.setResultSound(new WrappedSound(sound, MULTIPLIER)); - if (RAND.nextBoolean()) { - Color color = TilePool.PARTICLE_COLOR; - BotaniaAPI.internalHandler.sparkleFX(berg.getWorld(), berg.getPos().getX() + 0.3 + Math.random() * 0.5, berg.getPos().getY() + 0.5 + Math.random() * 0.5, berg.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); - } - } - } - } - } + if (RAND.nextBoolean()) { + Color color = TilePool.PARTICLE_COLOR; + BotaniaAPI.internalHandler.sparkleFX(berg.getWorld(), berg.getPos().getX() + 0.3 + Math.random() * 0.5, berg.getPos().getY() + 0.5 + Math.random() * 0.5, berg.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); + } + } + } + } + } - private static boolean shouldSilence(ISound sound) { - return sound.getCategory() != SoundCategory.VOICE - && sound.getCategory() != SoundCategory.MUSIC - && sound.getClass().getName().startsWith("net.minecraft.client.audio"); - } + private static boolean shouldSilence(ISound sound) { + return sound.getCategory() != SoundCategory.VOICE + && sound.getCategory() != SoundCategory.MUSIC + && sound.getClass().getName().startsWith("net.minecraft.client.audio"); + } - @SideOnly(Side.CLIENT) - private static class WrappedSound implements ISound { + @SideOnly(Side.CLIENT) + private static class WrappedSound implements ISound { - private final ISound compose; - private final float volMult; - private final boolean recheck; + private final ISound compose; + private final float volMult; + private final boolean recheck; - private WrappedSound(ISound toWrap, float volMult) { - this.compose = toWrap; - this.volMult = volMult; - this.recheck = toWrap instanceof MovingSound; - } + private WrappedSound(ISound toWrap, float volMult) { + compose = toWrap; + this.volMult = volMult; + recheck = toWrap instanceof MovingSound; + } - @Override - public float getVolume() { - float mult = recheck && SubTileBergamute.getBergamuteNearby(getXPosF(), getYPosF(), getZPosF()) == null ? 1F : volMult; - return compose.getVolume() * mult; - } + @Override + public float getVolume() { + float mult = recheck && SubTileBergamute.getBergamuteNearby(getXPosF(), getYPosF(), getZPosF()) == null ? 1F : volMult; + return compose.getVolume() * mult; + } - @Nonnull @Override public ResourceLocation getSoundLocation() { return compose.getSoundLocation(); } - @Nullable @Override public SoundEventAccessor createAccessor(@Nonnull SoundHandler handler) { return compose.createAccessor(handler); } - @Nonnull @Override public Sound getSound() { return compose.getSound(); } - @Nonnull @Override public SoundCategory getCategory() { return compose.getCategory(); } - @Override public boolean canRepeat() { return compose.canRepeat(); } - @Override public int getRepeatDelay() { return compose.getRepeatDelay(); } - @Override public float getPitch() { return compose.getPitch(); } - @Override public float getXPosF() { return compose.getXPosF(); } - @Override public float getYPosF() { return compose.getYPosF(); } - @Override public float getZPosF() { return compose.getZPosF(); } - @Nonnull @Override public AttenuationType getAttenuationType() { return compose.getAttenuationType(); } - } + @Nonnull @Override public ResourceLocation getSoundLocation() { return compose.getSoundLocation(); } + @Nullable @Override public SoundEventAccessor createAccessor(@Nonnull SoundHandler handler) { return compose.createAccessor(handler); } + @Nonnull @Override public Sound getSound() { return compose.getSound(); } + @Nonnull @Override public SoundCategory getCategory() { return compose.getCategory(); } + @Override public boolean canRepeat() { return compose.canRepeat(); } + @Override public int getRepeatDelay() { return compose.getRepeatDelay(); } + @Override public float getPitch() { return compose.getPitch(); } + @Override public float getXPosF() { return compose.getXPosF(); } + @Override public float getYPosF() { return compose.getYPosF(); } + @Override public float getZPosF() { return compose.getZPosF(); } + @Nonnull @Override public AttenuationType getAttenuationType() { return compose.getAttenuationType(); } + } - @SideOnly(Side.CLIENT) - private static class WrappedTickableSound extends WrappedSound implements ITickableSound { + @SideOnly(Side.CLIENT) + private static class WrappedTickableSound extends WrappedSound implements ITickableSound { - private final ITickableSound compose; + private final ITickableSound compose; - private WrappedTickableSound(ITickableSound toWrap, float volMult) { - super(toWrap, volMult); - this.compose = toWrap; - } + private WrappedTickableSound(ITickableSound toWrap, float volMult) { + super(toWrap, volMult); + compose = toWrap; + } - @Override public boolean isDonePlaying() { return compose.isDonePlaying(); } - @Override public void update() { compose.update(); } - } + @Override public boolean isDonePlaying() { return compose.isDonePlaying(); } + @Override public void update() { compose.update(); } + } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java index bb6b8acc8..d5afac738 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 19, 2014, 10:16:53 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index 13dedb072..fb9b6d160 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 27, 2014, 2:47:40 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.List; +import java.util.function.Predicate; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityWitch; @@ -21,9 +24,6 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; -import java.util.function.Predicate; - public class SubTileBellethorn extends SubTileFunctional { public static final int RANGE = 6; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java index 69b374ad7..d3c7dfa77 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java @@ -1,61 +1,61 @@ package vazkii.botania.common.block.subtile.functional; +import java.util.Collections; +import java.util.Set; +import java.util.WeakHashMap; + import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; -import java.util.Collections; -import java.util.Set; -import java.util.WeakHashMap; - public class SubTileBergamute extends SubTileFunctional { - private static final int RANGE = 4; - private static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); + private static final int RANGE = 4; + private static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); - @Override - public void onUpdate() { - super.onUpdate(); + @Override + public void onUpdate() { + super.onUpdate(); - if (supertile.getWorld().isRemote) { - if(!existingFlowers.contains(this)) { - existingFlowers.add(this); - } - } - } + if (supertile.getWorld().isRemote) { + if(!existingFlowers.contains(this)) { + existingFlowers.add(this); + } + } + } - // todo seems expensive when we have lots of sounds cache maybe? - protected static SubTileBergamute getBergamuteNearby(float x, float y, float z) { - return existingFlowers.stream() - .filter(f -> f.redstoneSignal == 0) - .filter(f -> f.supertile.getWorld().getTileEntity(f.supertile.getPos()) == f.supertile) - .filter(f -> f.supertile.getDistanceSq(x, y, z) <= RANGE * RANGE) - .findAny().orElse(null); - } + // todo seems expensive when we have lots of sounds cache maybe? + protected static SubTileBergamute getBergamuteNearby(float x, float y, float z) { + return existingFlowers.stream() + .filter(f -> f.redstoneSignal == 0) + .filter(f -> f.supertile.getWorld().getTileEntity(f.supertile.getPos()) == f.supertile) + .filter(f -> f.supertile.getDistanceSq(x, y, z) <= RANGE * RANGE) + .findAny().orElse(null); + } - @Override - public boolean acceptsRedstone() { - return true; - } + @Override + public boolean acceptsRedstone() { + return true; + } - @Override - public int getMaxMana() { - return 1; - } + @Override + public int getMaxMana() { + return 1; + } - @Override - public int getColor() { - return 0xF46C6C; - } + @Override + public int getColor() { + return 0xF46C6C; + } - @Override - public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(toBlockPos(), RANGE); - } + @Override + public RadiusDescriptor getRadius() { + return new RadiusDescriptor.Circle(toBlockPos(), RANGE); + } - @Override - public LexiconEntry getEntry() { - return LexiconData.bergamute; - } + @Override + public LexiconEntry getEntry() { + return LexiconData.bergamute; + } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java index 4447776d2..ca4c0cc48 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 10, 2015, 10:28:42 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; @@ -22,7 +22,6 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileFakeAir; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; public class SubTileBubbell extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java index 8d77a9568..03e2e6f94 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 17, 2014, 12:05:37 AM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; @@ -22,15 +25,12 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; -import java.util.ArrayList; -import java.util.List; - public class SubTileClayconia extends SubTileFunctional { private static final int COST = 80; private static final int RANGE = 5; private static final int RANGE_Y = 3; - + private static final int RANGE_MINI = 2; private static final int RANGE_Y_MINI = 1; @@ -58,7 +58,7 @@ public class SubTileClayconia extends SubTileFunctional { int range = getRange(); int rangeY = getRangeY(); - + for(int i = -range; i < range + 1; i++) for(int j = -rangeY; j < rangeY + 1; j++) for(int k = -range; k < range + 1; k++) { @@ -85,7 +85,7 @@ public class SubTileClayconia extends SubTileFunctional { public int getRangeY() { return RANGE_Y; } - + @Override public int getColor() { return 0x7B8792; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 031836661..123ecc4e8 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 20, 2014, 11:43:02 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.List; + import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,8 +25,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileDaffomill extends SubTileFunctional { private static final String TAG_ORIENTATION = "orientation"; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java index 36583a36e..89fe0ed18 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java @@ -2,21 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 15, 2014, 4:25:24 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.function.Predicate; + import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityAnimal; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; -import java.util.function.Predicate; - public class SubTileDreadthorn extends SubTileBellethorn { @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java index f2cd743c9..d3094eaef 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 19, 2014, 3:42:32 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java index 9d60f87ab..297c5f102 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 14, 2014, 8:54:11 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; @@ -19,8 +21,6 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileFallenKanade extends SubTileFunctional { private static final int RANGE = 2; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index d3ccd248d..3b1c756b6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -2,15 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 16, 2014, 12:37:40 AM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.ArrayList; +import java.util.List; + import com.google.common.base.Predicates; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -26,9 +30,6 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import java.util.ArrayList; -import java.util.List; - public class SubTileHeiseiDream extends SubTileFunctional { private static final int RANGE = 5; @@ -43,7 +44,7 @@ public class SubTileHeiseiDream extends SubTileFunctional { final int cost = 100; @SuppressWarnings("unchecked") - List mobs = (List) (List) supertile.getWorld().getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)), Predicates.instanceOf(IMob.class)); + List mobs = (List) supertile.getWorld().getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)), Predicates.instanceOf(IMob.class)); if(mobs.size() > 1 && mana >= cost) for(IMob mob : mobs) { 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 c267a428e..1dd8b35e1 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 @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 20, 2014, 5:54:39 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.ArrayList; +import java.util.List; + +import org.lwjgl.opengl.GL11; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -29,7 +34,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; @@ -39,9 +43,6 @@ import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; -import java.util.ArrayList; -import java.util.List; - public class SubTileHopperhock extends SubTileFunctional { private static final String TAG_FILTER_TYPE = "filterType"; @@ -67,7 +68,7 @@ public class SubTileHopperhock extends SubTileFunctional { List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))); int slowdown = getSlowdownFactor(); - + for(EntityItem item : items) { int age; try { @@ -76,12 +77,11 @@ public class SubTileHopperhock extends SubTileFunctional { continue; } - if(age < (60 + slowdown) || age >= 105 && age < 110 || item.isDead) + if(age < 60 + slowdown || age >= 105 && age < 110 || item.isDead) continue; ItemStack stack = item.getEntityItem(); IItemHandler invToPutItemIn = null; - EnumFacing sideToPutItemIn = null; boolean priorityInv = false; int amountToPutIn = 0; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java index 85801c327..6e61b5aef 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 15, 2014, 4:47:41 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.entity.player.EntityPlayer; @@ -21,8 +23,6 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileHyacidus extends SubTileFunctional { private static final int RANGE = 6; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java index 71fab2cba..cc52bfff1 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 3, 2014, 10:31:29 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; @@ -37,11 +37,11 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { if(ticksExisted % 30 == 0 && mana >= COST) { BlockPos pos = new BlockPos( - supertile.getPos().getX() - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1), - supertile.getPos().getY() + RANGE, - supertile.getPos().getZ() - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1) - ); - + supertile.getPos().getX() - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1), + supertile.getPos().getY() + RANGE, + supertile.getPos().getZ() - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1) + ); + BlockPos up = pos.up(); for(int i = 0; i < RANGE * 2; i++) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java index da2b4a75d..6e60e7939 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 14, 2014, 11:40:51 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index 8b289be3f..94fbe9e0e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 31, 2014, 7:49:43 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.List; +import java.util.Random; + import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -22,9 +25,6 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; -import java.util.Random; - public class SubTileLoonuim extends SubTileFunctional { private static final int COST = 35000; @@ -41,7 +41,7 @@ public class SubTileLoonuim extends SubTileFunctional { ItemStack stack; do { - List stacks = supertile.getWorld().getLootTableManager().getLootTableFromLocation(lootTable).generateLootForPools(rand, new LootContext.Builder(((WorldServer) supertile.getWorld())).build()); + List stacks = supertile.getWorld().getLootTableManager().getLootTableFromLocation(lootTable).generateLootForPools(rand, new LootContext.Builder((WorldServer) supertile.getWorld()).build()); if (stacks.isEmpty()) return; else stack = stacks.get(0); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java index 9fbde0921..03d6f1bdd 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 29, 2015, 8:17:55 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import gnu.trove.list.array.TIntArrayList; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -26,10 +30,6 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - public class SubTileMarimorphosis extends SubTileFunctional { private static final int COST = 12; @@ -40,14 +40,14 @@ public class SubTileMarimorphosis extends SubTileFunctional { private static final int RANGE_Y_MINI = 1; private static final Type[] TYPES = new Type[] { - Type.FOREST, - Type.PLAINS, - Type.MOUNTAIN, - Type.MUSHROOM, - Type.SWAMP, - Type.SANDY, - Type.COLD, - Type.MESA + Type.FOREST, + Type.PLAINS, + Type.MOUNTAIN, + Type.MUSHROOM, + Type.SWAMP, + Type.SANDY, + Type.COLD, + Type.MESA }; @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java index 876e64ffb..affbbf366 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 27, 2015, 7:33:17 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; @@ -20,8 +22,6 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileMedumone extends SubTileFunctional { private static final int RANGE = 6; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index 322519a6f..782a01781 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 11, 2014, 5:40:55 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; @@ -29,10 +33,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - public class SubTileOrechid extends SubTileFunctional { private static final int COST = 17500; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java index 018e4f5f0..3a606bead 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java @@ -2,22 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 30, 2015, 3:27:20 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.Map; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; -import java.util.Map; - public class SubTileOrechidIgnem extends SubTileOrechid { private static final int COST = 20000; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 49d189e0f..d3b856ce1 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 15, 2014, 5:56:47 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.List; + import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; @@ -22,8 +24,6 @@ import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import java.util.List; - public class SubTilePollidisiac extends SubTileFunctional { private static final int RANGE = 6; @@ -52,7 +52,7 @@ public class SubTilePollidisiac extends SubTileFunctional { continue; } - if(age < (60 + slowdown) || item.isDead) + if(age < 60 + slowdown || item.isDead) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 4e8220288..a9b29f9f8 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 1, 2014, 6:08:25 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.ArrayList; +import java.util.List; + +import org.lwjgl.opengl.GL11; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -29,7 +34,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.item.IFlowerPlaceable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -43,9 +47,6 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import java.util.ArrayList; -import java.util.List; - public class SubTileRannuncarpus extends SubTileFunctional { private static final int RANGE = 2; @@ -75,7 +76,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { int rangePlaceY = getRangeY(); BlockPos pos = supertile.getPos(); - + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE_Y, -RANGE), supertile.getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); int slowdown = getSlowdownFactor(); for(EntityItem item : items) { @@ -86,7 +87,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { continue; } - if(age < (60 + slowdown) || item.isDead) + if(age < 60 + slowdown || item.isDead) continue; ItemStack stack = item.getEntityItem(); @@ -99,7 +100,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { BlockPos up = pos_.up(); if(filter == supertile.getWorld().getBlockState(pos_) && (blockAbove.isAir(stateAbove, supertile.getWorld(), up) - || blockAbove.isReplaceable(supertile.getWorld(), up))) + || blockAbove.isReplaceable(supertile.getWorld(), up))) validPositions.add(up); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 232d0b234..26c21b11f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -2,25 +2,25 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 11, 2015, 4:53:35 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.Collections; +import java.util.Set; + import com.google.common.collect.MapMaker; + import net.minecraft.entity.Entity; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; -import java.util.Collections; -import java.util.Set; -import java.util.WeakHashMap; - public class SubTileSolegnolia extends SubTileFunctional { private static final double RANGE = 5; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 70a14decd..32f499c05 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 27, 2015, 4:06:58 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -26,13 +28,10 @@ import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.MethodHandles; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; -import java.util.List; - public class SubTileSpectranthemum extends SubTileFunctional { private static final String TAG_BIND_X = "bindX"; @@ -58,7 +57,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(-RANGE, -RANGE, -RANGE), pos.add(RANGE + 1, RANGE + 1, RANGE + 1))); int slowdown = getSlowdownFactor(); - + for(EntityItem item : items) { int age; try { @@ -67,7 +66,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { continue; } - if(age < (60 + slowdown) || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) + if(age < 60 + slowdown || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) continue; ItemStack stack = item.getEntityItem(); @@ -116,10 +115,10 @@ public class SubTileSpectranthemum extends SubTileFunctional { public void readFromPacketNBT(NBTTagCompound cmp) { super.readFromPacketNBT(cmp); bindPos = new BlockPos( - cmp.getInteger(TAG_BIND_X), - cmp.getInteger(TAG_BIND_Y), - cmp.getInteger(TAG_BIND_Z) - ); + cmp.getInteger(TAG_BIND_X), + cmp.getInteger(TAG_BIND_Y), + cmp.getInteger(TAG_BIND_Z) + ); } @Override @@ -141,7 +140,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { boolean bound = super.bindTo(player, wand, pos, side); - if(!bound && !pos.equals(bindPos) && pos.distanceSq(supertile.getPos()) <= BIND_RANGE * BIND_RANGE && !(pos.equals(supertile.getPos()))) { + if(!bound && !pos.equals(bindPos) && pos.distanceSq(supertile.getPos()) <= BIND_RANGE * BIND_RANGE && !pos.equals(supertile.getPos())) { bindPos = pos; sync(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index bc19f9532..5418677c1 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 14, 2014, 11:40:59 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; @@ -21,8 +23,6 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileTangleberrie extends SubTileFunctional { @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index 03ae75762..f0ffca66e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 16, 2014, 3:36:26 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.entity.EntityLiving; import net.minecraft.entity.ai.EntityAIAvoidEntity; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; @@ -26,9 +29,6 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import java.util.ArrayList; -import java.util.List; - public class SubTileTigerseye extends SubTileFunctional { private static final int RANGE = 10; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index a622e8b96..0f60132ea 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 15, 2014, 4:30:08 PM (GMT)] */ package vazkii.botania.common.block.subtile.functional; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.WeakHashMap; + import net.minecraft.entity.monster.EntityEnderman; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.EnderTeleportEvent; @@ -20,12 +26,6 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.WeakHashMap; - public class SubTileVinculotus extends SubTileFunctional { public static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index b2e97e1b9..845dd5e5b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 18, 2014, 8:45:25 PM (GMT)] */ package vazkii.botania.common.block.subtile.generating; @@ -39,14 +39,14 @@ public class SubTileArcaneRose extends SubTileGenerating { mana += 50; return; } - + List orbs = supertile.getWorld().getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityXPOrb orb : orbs) { mana += orb.getXpValue() * 35; orb.setDead(); return; } - + } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index 99764bb30..e38665f7e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 6, 2015, 3:46:10 PM (GMT)] */ package vazkii.botania.common.block.subtile.generating; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; @@ -22,9 +25,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; -import java.util.ArrayList; -import java.util.List; - public class SubTileDandelifeon extends SubTileGenerating { private static final int RANGE = 12; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 13254e612..ac24c082c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 15, 2014, 9:47:56 PM (GMT)] */ package vazkii.botania.common.block.subtile.generating; +import java.util.List; + import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -26,8 +28,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileEndoflame extends SubTileGenerating { private static final String TAG_BURN_TIME = "burnTime"; @@ -56,7 +56,7 @@ public class SubTileEndoflame extends SubTileGenerating { continue; } - if(age >= (59 + slowdown) && !item.isDead) { + if(age >= 59 + slowdown && !item.isDead) { ItemStack stack = item.getEntityItem(); if(stack.getItem().hasContainerItem(stack)) continue; @@ -74,8 +74,8 @@ public class SubTileEndoflame extends SubTileGenerating { didSomething = true; } else { - item.worldObj.spawnParticle(EnumParticleTypes.SMOKE_LARGE, item.posX, item.posY + 0.1, item.posZ, 0.0D, 0.0D, 0.0D); - item.worldObj.spawnParticle(EnumParticleTypes.FLAME, item.posX, item.posY, item.posZ, 0.0D, 0.0D, 0.0D); + item.worldObj.spawnParticle(EnumParticleTypes.SMOKE_LARGE, item.posX, item.posY + 0.1, item.posZ, 0.0D, 0.0D, 0.0D); + item.worldObj.spawnParticle(EnumParticleTypes.FLAME, item.posX, item.posY, item.posZ, 0.0D, 0.0D, 0.0D); } @@ -89,7 +89,7 @@ public class SubTileEndoflame extends SubTileGenerating { } } else { if(supertile.getWorld().rand.nextInt(10) == 0) - supertile.getWorld().spawnParticle(EnumParticleTypes.FLAME, supertile.getPos().getX() + 0.4 + Math.random() * 0.2, supertile.getPos().getY() + 0.65, supertile.getPos().getZ() + 0.4 + Math.random() * 0.2, 0.0D, 0.0D, 0.0D); + supertile.getWorld().spawnParticle(EnumParticleTypes.FLAME, supertile.getPos().getX() + 0.4 + Math.random() * 0.2, supertile.getPos().getY() + 0.65, supertile.getPos().getZ() + 0.4 + Math.random() * 0.2, 0.0D, 0.0D, 0.0D); burnTime--; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java index 58bcaf92d..56bf1b7d1 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java @@ -2,29 +2,27 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 7, 2014, 10:59:44 PM (GMT)] */ package vazkii.botania.common.block.subtile.generating; +import java.util.List; + import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.init.SoundEvents; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; -import java.util.List; - public class SubTileEntropinnyum extends SubTileGenerating { private static final int RANGE = 12; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 0e478e2cf..9c75af2a3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 26, 2014, 1:42:17 PM (GMT)] */ package vazkii.botania.common.block.subtile.generating; +import java.util.List; + import net.minecraft.entity.item.EntityItem; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; @@ -25,8 +27,6 @@ import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileGourmaryllis extends SubTileGenerating { private static final String TAG_COOLDOWN = "cooldown"; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java index c0e8014a1..29ad75ab9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 8, 2014, 6:26:37 PM (GMT)] */ package vazkii.botania.common.block.subtile.generating; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java index 312ae7522..ddfe7b6d5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 15, 2014, 7:25:47 PM (GMT)] */ package vazkii.botania.common.block.subtile.generating; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -26,10 +30,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - public class SubTileMunchdew extends SubTileGenerating { private static final String TAG_COOLDOWN = "cooldown"; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index b7d4f18d7..7ad7b66e4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 29, 2015, 10:43:54 PM (GMT)] */ package vazkii.botania.common.block.subtile.generating; +import java.util.List; + import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.SoundEvents; import net.minecraft.util.EnumParticleTypes; @@ -26,8 +28,6 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileNarslimmus extends SubTileGenerating { public static final String TAG_WORLD_SPAWNED = "Botania:WorldSpawned"; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java index ad8821697..a80477fcb 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 11, 2015, 5:05:05 PM (GMT)] */ package vazkii.botania.common.block.subtile.generating; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -26,8 +28,6 @@ import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileRafflowsia extends SubTileGenerating { private static final String TAG_LAST_FLOWER = "lastFlower"; @@ -49,7 +49,7 @@ public class SubTileRafflowsia extends SubTileGenerating { for(int j = 0; j < RANGE * 2 + 1; j++) for(int k = 0; k < RANGE * 2 + 1; k++) { BlockPos pos = supertile.getPos().add(i - RANGE, j - RANGE, k - RANGE); - Block block = supertile.getWorld().getBlockState(pos).getBlock(); + supertile.getWorld().getBlockState(pos).getBlock(); TileEntity tile = supertile.getWorld().getTileEntity(pos); if(tile instanceof ISubTileContainer) { SubTileEntity stile = ((ISubTileContainer) tile).getSubTile(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index f9b55b9bd..14d4d61f1 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 30, 2015, 1:37:26 PM (GMT)] */ package vazkii.botania.common.block.subtile.generating; +import java.awt.Color; +import java.util.List; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -23,16 +28,12 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; -import java.awt.*; -import java.util.List; - public class SubTileSpectrolus extends SubTileGenerating { private static final String TAG_NEXT_COLOR = "nextColor"; @@ -69,7 +70,7 @@ public class SubTileSpectrolus extends SubTileGenerating { nextColor = nextColor == 15 ? 0 : nextColor + 1; sync(); } - + for(int i = 0; i < 10; i++) { float m = 0.2F; float mx = (float) (Math.random() - 0.5) * m; @@ -78,7 +79,7 @@ public class SubTileSpectrolus extends SubTileGenerating { supertile.getWorld().spawnParticle(EnumParticleTypes.ITEM_CRACK, item.posX, item.posY, item.posZ, mx, my, mz, Item.getIdFromItem(stack.getItem()), stack.getItemDamage()); } } - + if(!remote) item.setDead(); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index becef208f..52b1390bf 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 10, 2014, 9:44:02 PM (GMT)] */ package vazkii.botania.common.block.subtile.generating; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index dce1aa347..734f98c26 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 9, 2014, 8:51:55 PM (GMT)] */ package vazkii.botania.common.block.tile; @@ -361,7 +361,7 @@ public class TileAlfPortal extends TileMod { tile = worldObj.getTileEntity(getPos().add(pos).down()); if(tile instanceof TilePool) { TilePool pool = (TilePool) tile; - + if(pool.getCurrentMana() < costPer) { closeNow = closeNow || close; return false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 46f06a7a1..2f020c975 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 21, 2014, 7:51:36 PM (GMT)] */ package vazkii.botania.common.block.tile; +import java.awt.Color; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -46,11 +51,6 @@ import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Pattern; - public class TileAltar extends TileSimpleInventory implements IPetalApothecary { private static final Pattern SEED_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)seed)|(?:(?:[a-z-_.:]|^)Seed))(?:[sA-Z-_.:]|$)"); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java index 287b0253f..5125aeaf6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java @@ -2,16 +2,14 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [28/09/2016, 17:21:24 (GMT)] */ package vazkii.botania.common.block.tile; -import java.util.function.Function; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.init.Blocks; @@ -89,7 +87,7 @@ public class TileAnimatedTorch extends TileMod { currentRandomRotation = nextRandomRotation; int finalRotation = side * 90; - double diff = (finalRotation - (rotation % 360)) % 360; + double diff = (finalRotation - rotation % 360) % 360; if(diff < 0) diff = 360 + diff; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 528dcbd75..dd7877dd2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 24, 2015, 3:17:44 PM (GMT)] */ package vazkii.botania.common.block.tile; @@ -111,7 +111,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile { public EnumFacing getAvatarFacing() { return worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS); } - + @Override public int getElapsedFunctionalTicks() { return ticksElapsed; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java index d15d53aef..10f90eac1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -2,19 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 20, 2014, 8:35:27 PM (GMT)] */ package vazkii.botania.common.block.tile; +import javax.annotation.Nonnull; + import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.common.Botania; -import javax.annotation.Nonnull; - public class TileBifrost extends TileMod { private static final String TAG_TICKS = "ticks"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index e2c0950b0..245f19bac 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 31, 2014, 4:42:36 PM (GMT)] */ package vazkii.botania.common.block.tile; +import java.awt.Color; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; @@ -31,11 +37,6 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.awt.*; -import java.util.List; - // This is mostly copypasta from TileRuneAltar public class TileBrewery extends TileSimpleInventory implements IManaReceiver { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java index 4e8259c3e..78328b463 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 23, 2015, 7:25:38 PM (GMT)] */ package vazkii.botania.common.block.tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java index 7ccdfeb93..9ef0f7720 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 7, 2014, 2:21:28 PM (GMT)] */ package vazkii.botania.common.block.tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCell.java b/src/main/java/vazkii/botania/common/block/tile/TileCell.java index 97d4b9c1e..dc86cc8e9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCell.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCell.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 6, 2015, 4:07:16 PM (GMT)] */ package vazkii.botania.common.block.tile; @@ -34,7 +34,7 @@ public class TileCell extends TileMod { generation = gen; if(!ticked) { flowerCoords = flower.getPos(); - validCoords = this.getPos(); + validCoords = getPos(); ticked = true; } else if(!matchCoords(validCoords, this) || !matchCoords(flowerCoords, flower)) worldObj.setBlockToAir(pos); @@ -43,7 +43,7 @@ public class TileCell extends TileMod { public boolean isSameFlower(TileEntity flower) { return matchCoords(validCoords, this) && matchCoords(flowerCoords, flower); } - + private boolean matchCoords(BlockPos coords, TileEntity tile) { return coords.equals(tile.getPos()); } @@ -72,15 +72,15 @@ public class TileCell extends TileMod { ticked = cmp.getBoolean(TAG_TICKED); if(ticked) { flowerCoords = new BlockPos( - cmp.getInteger(TAG_FLOWER_X), - cmp.getInteger(TAG_FLOWER_Y), - cmp.getInteger(TAG_FLOWER_Z) - ); + cmp.getInteger(TAG_FLOWER_X), + cmp.getInteger(TAG_FLOWER_Y), + cmp.getInteger(TAG_FLOWER_Z) + ); validCoords = new BlockPos( cmp.getInteger(TAG_VALID_X), cmp.getInteger(TAG_VALID_Y), cmp.getInteger(TAG_VALID_Z) - ); + ); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java index 831045fca..121d45766 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 8, 2015, 4:32:34 PM (GMT)] */ package vazkii.botania.common.block.tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 7008c600b..2544e49d8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 26, 2014, 4:50:20 PM (GMT)] */ package vazkii.botania.common.block.tile; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; @@ -23,9 +27,6 @@ import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; -import java.util.List; - public class TileCraftCrate extends TileOpenCrate { public static final boolean[][] PATTERNS = new boolean[][] { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 5bc66294b..6fbccb4d4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -10,10 +10,17 @@ */ package vazkii.botania.common.block.tile; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import javax.annotation.Nonnull; + import com.google.common.base.Predicates; -import net.minecraft.block.Block; + import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentData; @@ -44,19 +51,10 @@ import vazkii.botania.api.mana.spark.SparkHelper; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - public class TileEnchanter extends TileMod implements ISparkAttachable { private static final String TAG_STAGE = "stage"; @@ -79,12 +77,12 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { private final List enchants = new ArrayList<>(); private static final BlockPos[] OBSIDIAN_LOCATIONS = { - new BlockPos(0, -1, 0), - new BlockPos(0, -1, 1), new BlockPos(0, -1, -1), new BlockPos(1, -1, 0), new BlockPos(-1, -1, 0), - new BlockPos(0, -1, 2), new BlockPos(-1, -1, 2), new BlockPos(1, -1, 2), - new BlockPos(0, -1, -2), new BlockPos(-1, -1, -2), new BlockPos(1, -1, -2), - new BlockPos(2, -1, 0), new BlockPos(2, -1, 1), new BlockPos(2, -1, -1 ), - new BlockPos(-2, -1, 0), new BlockPos(-2, -1, 1), new BlockPos(-2, -1, -1) + new BlockPos(0, -1, 0), + new BlockPos(0, -1, 1), new BlockPos(0, -1, -1), new BlockPos(1, -1, 0), new BlockPos(-1, -1, 0), + new BlockPos(0, -1, 2), new BlockPos(-1, -1, 2), new BlockPos(1, -1, 2), + new BlockPos(0, -1, -2), new BlockPos(-1, -1, -2), new BlockPos(1, -1, -2), + new BlockPos(2, -1, 0), new BlockPos(2, -1, 1), new BlockPos(2, -1, -1 ), + new BlockPos(-2, -1, 0), new BlockPos(-2, -1, 1), new BlockPos(-2, -1, -1) }; private static final Map PYLON_LOCATIONS = new EnumMap<>(EnumFacing.Axis.class); @@ -95,7 +93,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } private static final BlockPos[] FLOWER_LOCATIONS = { - new BlockPos(-1, 0, -1), new BlockPos(1, 0, -1), new BlockPos(-1, 0, 1), new BlockPos(1, 0, 1) + new BlockPos(-1, 0, -1), new BlockPos(1, 0, -1), new BlockPos(-1, 0, 1), new BlockPos(1, 0, 1) }; public static MultiblockSet makeMultiblockSet() { @@ -148,136 +146,136 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) { TileEntity tile = worldObj.getTileEntity(pos.add(pylon)); if(tile != null && tile instanceof TilePylon) { - ((TilePylon) tile).activated = stage == State.GATHER_MANA; - if(stage == State.GATHER_MANA) - ((TilePylon) tile).centerPos = pos; - } + ((TilePylon) tile).activated = stage == State.GATHER_MANA; + if(stage == State.GATHER_MANA) + ((TilePylon) tile).centerPos = pos; + } } - if(stage != State.IDLE) - stageTicks++; + if(stage != State.IDLE) + stageTicks++; - if(worldObj.isRemote) - return; + if(worldObj.isRemote) + return; if(!canEnchanterExist(worldObj, pos, axis)) { worldObj.setBlockState(pos, Blocks.LAPIS_BLOCK.getDefaultState(), 1 | 2); - PacketHandler.sendToNearby(worldObj, pos, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ENCHANTER_DESTROY, - pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5)); + PacketHandler.sendToNearby(worldObj, pos, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ENCHANTER_DESTROY, + pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5)); worldObj.playSound(null, pos, BotaniaSoundEvents.enchanterFade, SoundCategory.BLOCKS, 0.5F, 10F); } switch(stage) { - case GATHER_ENCHANTS : { // Get books - if(stageTicks % 20 == 0) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); - int count = items.size(); - boolean addedEnch = false; + case GATHER_ENCHANTS : { // Get books + if(stageTicks % 20 == 0) { + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); + int count = items.size(); + boolean addedEnch = false; - if(count > 0 && !worldObj.isRemote) { - for(EntityItem entity : items) { - ItemStack item = entity.getEntityItem(); - if(item.getItem() == Items.ENCHANTED_BOOK) { - NBTTagList enchants = Items.ENCHANTED_BOOK.getEnchantments(item); - if(enchants != null && enchants.tagCount() > 0) { - NBTTagCompound enchant = enchants.getCompoundTagAt(0); - short enchantId = enchant.getShort("id"); - short enchantLvl = enchant.getShort("lvl"); - Enchantment ench = Enchantment.getEnchantmentByID(enchantId); - if(!hasEnchantAlready(ench) && isEnchantmentValid(ench)) { - this.enchants.add(new EnchantmentData(ench, enchantLvl)); - worldObj.playSound(null, pos, BotaniaSoundEvents.ding, SoundCategory.BLOCKS, 1F, 1F); - addedEnch = true; - break; - } - } - } - } - } + if(count > 0 && !worldObj.isRemote) { + for(EntityItem entity : items) { + ItemStack item = entity.getEntityItem(); + if(item.getItem() == Items.ENCHANTED_BOOK) { + NBTTagList enchants = Items.ENCHANTED_BOOK.getEnchantments(item); + if(enchants != null && enchants.tagCount() > 0) { + NBTTagCompound enchant = enchants.getCompoundTagAt(0); + short enchantId = enchant.getShort("id"); + short enchantLvl = enchant.getShort("lvl"); + Enchantment ench = Enchantment.getEnchantmentByID(enchantId); + if(!hasEnchantAlready(ench) && isEnchantmentValid(ench)) { + this.enchants.add(new EnchantmentData(ench, enchantLvl)); + worldObj.playSound(null, pos, BotaniaSoundEvents.ding, SoundCategory.BLOCKS, 1F, 1F); + addedEnch = true; + break; + } + } + } + } + } - if(!addedEnch) { - if(enchants.isEmpty()) - stage = State.IDLE; - else advanceStage(); - } - } - break; - } - case GATHER_MANA : { // Get Mana - if(manaRequired == -1) { - manaRequired = 0; - for(EnchantmentData data : enchants) { - manaRequired += (int) - (5000F * ((15 - Math.min(15, data.enchantmentobj.getRarity().getWeight())) - * 1.05F) - * ((3F + data.enchantmentLevel * data.enchantmentLevel) * 0.25F) - * (0.9F + enchants.size() * 0.05F) - * (data.enchantmentobj.isTreasureEnchantment() ? 1.25F : 1F)); - } - } else if(mana >= manaRequired) { - manaRequired = 0; - for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) - ((TilePylon) worldObj.getTileEntity(pos.add(pylon))).activated = false; - - advanceStage(); - } else { - ISparkEntity spark = getAttachedSpark(); - if(spark != null) { - List sparkEntities = SparkHelper.getSparksAround(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - for(ISparkEntity otherSpark : sparkEntities) { - if(spark == otherSpark) - continue; - - if(otherSpark.getAttachedTile() != null && otherSpark.getAttachedTile() instanceof IManaPool) - otherSpark.registerTransfer(spark); - } - } - if(stageTicks % 5 == 0) - sync(); - } - - break; - } - case DO_ENCHANT : { // Enchant - if(stageTicks >= 100) { - for(EnchantmentData data : enchants) - if(EnchantmentHelper.getEnchantmentLevel(data.enchantmentobj, itemToEnchant) == 0) - itemToEnchant.addEnchantment(data.enchantmentobj, data.enchantmentLevel); - - enchants.clear(); - manaRequired = -1; - mana = 0; - - craftingFanciness(); - advanceStage(); - } - break; - } - case RESET: { // Reset - if(stageTicks >= 20) - advanceStage(); - - break; + if(!addedEnch) { + if(enchants.isEmpty()) + stage = State.IDLE; + else advanceStage(); + } } - default: break; + break; + } + case GATHER_MANA : { // Get Mana + if(manaRequired == -1) { + manaRequired = 0; + for(EnchantmentData data : enchants) { + manaRequired += (int) + (5000F * ((15 - Math.min(15, data.enchantmentobj.getRarity().getWeight())) + * 1.05F) + * ((3F + data.enchantmentLevel * data.enchantmentLevel) * 0.25F) + * (0.9F + enchants.size() * 0.05F) + * (data.enchantmentobj.isTreasureEnchantment() ? 1.25F : 1F)); + } + } else if(mana >= manaRequired) { + manaRequired = 0; + for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) + ((TilePylon) worldObj.getTileEntity(pos.add(pylon))).activated = false; + + advanceStage(); + } else { + ISparkEntity spark = getAttachedSpark(); + if(spark != null) { + List sparkEntities = SparkHelper.getSparksAround(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + for(ISparkEntity otherSpark : sparkEntities) { + if(spark == otherSpark) + continue; + + if(otherSpark.getAttachedTile() != null && otherSpark.getAttachedTile() instanceof IManaPool) + otherSpark.registerTransfer(spark); + } + } + if(stageTicks % 5 == 0) + sync(); + } + + break; + } + case DO_ENCHANT : { // Enchant + if(stageTicks >= 100) { + for(EnchantmentData data : enchants) + if(EnchantmentHelper.getEnchantmentLevel(data.enchantmentobj, itemToEnchant) == 0) + itemToEnchant.addEnchantment(data.enchantmentobj, data.enchantmentLevel); + + enchants.clear(); + manaRequired = -1; + mana = 0; + + craftingFanciness(); + advanceStage(); + } + break; + } + case RESET: { // Reset + if(stageTicks >= 20) + advanceStage(); + + break; + } + default: break; } } private void advanceStage() { switch(stage) { - case IDLE: stage = State.GATHER_ENCHANTS; break; - case GATHER_ENCHANTS: stage = State.GATHER_MANA; break; - case GATHER_MANA: stage = State.DO_ENCHANT; break; - case DO_ENCHANT: { - stage = State.RESET; - stage3EndTicks = stageTicks; - break; - } - case RESET: { - stage = State.IDLE; - stage3EndTicks = 0; - break; - } + case IDLE: stage = State.GATHER_ENCHANTS; break; + case GATHER_ENCHANTS: stage = State.GATHER_MANA; break; + case GATHER_MANA: stage = State.DO_ENCHANT; break; + case DO_ENCHANT: { + stage = State.RESET; + stage3EndTicks = stageTicks; + break; + } + case RESET: { + stage = State.IDLE; + stage3EndTicks = 0; + break; + } } stageTicks = 0; @@ -286,8 +284,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { private void craftingFanciness() { worldObj.playSound(null, pos, BotaniaSoundEvents.enchanterEnchant, SoundCategory.BLOCKS, 1F, 1F); - PacketHandler.sendToNearby(worldObj, pos, - new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ENCHANTER_CRAFT, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5)); + PacketHandler.sendToNearby(worldObj, pos, + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ENCHANTER_CRAFT, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5)); } @Nonnull @@ -334,8 +332,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { cmp.setTag(TAG_ITEM, itemCmp); String enchStr = enchants.stream() - .map(e -> Enchantment.REGISTRY.getNameForObject(e.enchantmentobj) + "=" + e.enchantmentLevel) - .collect(Collectors.joining(",")); + .map(e -> Enchantment.REGISTRY.getNameForObject(e.enchantmentobj) + "=" + e.enchantmentLevel) + .collect(Collectors.joining(",")); cmp.setString(TAG_ENCHANTS, enchStr); } @@ -355,7 +353,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { if(!enchStr.isEmpty()) { String[] enchTokens = enchStr.split(","); for(String token : enchTokens) { - String[] entryTokens = token.split("="); + String[] entryTokens = token.split("="); Enchantment ench = Enchantment.getEnchantmentByLocation(entryTokens[0]); int lvl = Integer.parseInt(entryTokens[1]); enchants.add(new EnchantmentData(ench, lvl)); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index fbc3c557c..20b52028b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 30, 2014, 1:10:34 PM (GMT)] */ package vazkii.botania.common.block.tile; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.EntityEquipmentSlot; @@ -22,8 +24,6 @@ import net.minecraft.world.WorldServer; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.item.equipment.tool.ToolCommons; -import java.util.List; - public class TileEnderEye extends TileMod { @Override @@ -50,7 +50,7 @@ public class TileEnderEye extends TileMod { if(looking != wasLooking && !worldObj.isRemote) worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, looking), 1 | 2); - + if(looking) { double x = getPos().getX() - 0.1 + Math.random() * 1.2; double y = getPos().getY() - 0.1 + Math.random() * 1.2; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java index 25700314b..51116c706 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -2,21 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 10, 2015, 10:24:48 PM (GMT)] */ package vazkii.botania.common.block.tile; +import javax.annotation.Nonnull; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import vazkii.botania.common.block.subtile.functional.SubTileBubbell; -import javax.annotation.Nonnull; - public class TileFakeAir extends TileMod { private static final String TAG_FLOWER_X = "flowerX"; @@ -47,10 +47,10 @@ public class TileFakeAir extends TileMod { public void readFromNBT(NBTTagCompound par1nbtTagCompound) { super.readFromNBT(par1nbtTagCompound); flowerPos = new BlockPos( - par1nbtTagCompound.getInteger(TAG_FLOWER_X), - par1nbtTagCompound.getInteger(TAG_FLOWER_Y), - par1nbtTagCompound.getInteger(TAG_FLOWER_Z) - ); + par1nbtTagCompound.getInteger(TAG_FLOWER_X), + par1nbtTagCompound.getInteger(TAG_FLOWER_Y), + par1nbtTagCompound.getInteger(TAG_FLOWER_Z) + ); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index fa8aa6382..eedaa0ce8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 8, 2014, 10:17:28 PM (GMT)] */ package vazkii.botania.common.block.tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java index b8cb635bf..fbe247919 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 17, 2014, 5:41:58 PM (GMT)] */ package vazkii.botania.common.block.tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index 2927a6179..a5bea103e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 10, 2014, 5:50:01 PM (GMT)] */ package vazkii.botania.common.block.tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java b/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java index 3759f8574..737684cb3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 23, 2015, 11:47:40 PM (GMT)] */ package vazkii.botania.common.block.tile; @@ -13,7 +13,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.tileentity.TileEntitySkull; public class TileGaiaHead extends TileEntitySkull { - public TileGaiaHead() { - setType(3); - } + public TileGaiaHead() { + setType(3); + } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index e8ee1d4a2..24d023697 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 29, 2015, 8:21:17 PM (GMT)] */ package vazkii.botania.common.block.tile; @@ -57,7 +57,7 @@ public class TileHourglass extends TileSimpleInventory { if(totalTime > 0 || dust) { if(move && !dust) time++; - + if(time >= totalTime) { time = 0; flip = !flip; @@ -75,7 +75,7 @@ public class TileHourglass extends TileSimpleInventory { ((IHourglassTrigger) state.getBlock()).onTriggeredByHourglass(worldObj, pos, this); } } - + lastFraction = timeFraction; timeFraction = (float) time / (float) totalTime; } else { @@ -87,7 +87,7 @@ public class TileHourglass extends TileSimpleInventory { if(flipTicks > 0) flipTicks--; } - + public void onManaCollide() { if(!worldObj.isRemote) { if(dust) @@ -127,7 +127,7 @@ public class TileHourglass extends TileSimpleInventory { return 0x5A412f; if(stack.getItem() == ModItems.manaResource) return 0x03abff; - + return 0; } @@ -136,7 +136,7 @@ public class TileHourglass extends TileSimpleInventory { return new SimpleItemStackHandler(this, true) { @Override public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { - if(stack != null && (stack.getItem() == Item.getItemFromBlock(Blocks.SAND) || stack.getItem() == Item.getItemFromBlock(Blocks.SOUL_SAND)) || (stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 23)) + if(stack != null && (stack.getItem() == Item.getItemFromBlock(Blocks.SAND) || stack.getItem() == Item.getItemFromBlock(Blocks.SOUL_SAND)) || stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 23) return super.insertItem(slot, stack, simulate); else return stack; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index ad849febf..74fdc6341 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 15, 2015, 4:09:07 PM (GMT)] */ package vazkii.botania.common.block.tile; +import java.awt.Color; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; @@ -25,9 +28,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; -import java.awt.*; -import java.util.List; - public class TileIncensePlate extends TileSimpleInventory { private static final String TAG_TIME_LEFT = "timeLeft"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 304c2ffb0..e35c06452 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 15, 2015, 8:32:04 PM (GMT)] */ package vazkii.botania.common.block.tile; @@ -109,7 +109,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { endpoint.getX() + pearl.posX - pos.getX(), endpoint.getY() + pearl.posY - pos.getY(), endpoint.getZ() + pearl.posZ - pos.getZ() - ); + ); } } } @@ -120,11 +120,11 @@ public class TileLightRelay extends TileMod implements IWandBindable { BlockPos nextDest = getNextDestination(); if(nextDest == null) return false; - + Block block = worldObj.getBlockState(nextDest).getBlock(); return block == ModBlocks.lightRelay; } - + private BlockPos getEndpoint() { List pointsPassed = new ArrayList<>(); TileLightRelay relay = this; @@ -136,11 +136,11 @@ public class TileLightRelay extends TileMod implements IWandBindable { if(pointsPassed.contains(relay)) return null; // Circular path pointsPassed.add(relay); - + BlockPos coords = relay.getNextDestination(); if(coords == null) return lastCoords; - + TileEntity tile = worldObj.getTileEntity(coords); if(tile != null && tile instanceof TileLightRelay) relay = (TileLightRelay) tile; @@ -156,7 +156,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { BlockPos dest = getNextDestination(); if(dest == null) return null; - + return new Vector3(dest.getX() - pos.getX(), dest.getY() - pos.getY(), dest.getZ() - pos.getZ()); } @@ -164,7 +164,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { public BlockPos getBinding() { return bindPos; } - + public BlockPos getNextDestination() { IBlockState state = worldObj.getBlockState(pos); if(state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.TOGGLE && state.getValue(BotaniaStateProps.POWERED)) @@ -173,14 +173,14 @@ public class TileLightRelay extends TileMod implements IWandBindable { BlockPos torchPos = null; for(int i = -2; i < 3; i++) { BlockPos testPos = pos.add(0, i, 0); - + IBlockState testState = worldObj.getBlockState(testPos); if(testState.getBlock() == ModBlocks.animatedTorch) { torchPos = testPos; break; } } - + if(torchPos != null) { TileAnimatedTorch torch = (TileAnimatedTorch) worldObj.getTileEntity(torchPos); EnumFacing side = TileAnimatedTorch.SIDES[torch.side].getOpposite(); @@ -192,7 +192,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { } } } - + return getBinding(); } @@ -213,10 +213,10 @@ public class TileLightRelay extends TileMod implements IWandBindable { @Override public void readPacketNBT(NBTTagCompound cmp) { bindPos = new BlockPos( - cmp.getInteger(TAG_BIND_X), - cmp.getInteger(TAG_BIND_Y), - cmp.getInteger(TAG_BIND_Z) - ); + cmp.getInteger(TAG_BIND_X), + cmp.getInteger(TAG_BIND_Y), + cmp.getInteger(TAG_BIND_Z) + ); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index dc64dbac6..2bc859ada 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Dec 21, 2014, 12:33:12 AM (GMT)] */ package vazkii.botania.common.block.tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileMod.java b/src/main/java/vazkii/botania/common/block/tile/TileMod.java index 14952b522..0e789b717 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 21, 2014, 9:18:28 PM (GMT)] */ package vazkii.botania.common.block.tile; +import javax.annotation.Nonnull; + import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -19,8 +21,6 @@ import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.Nonnull; - public class TileMod extends TileEntity implements ITickable { @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 5d788a80a..7bd995f85 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 4, 2014, 12:51:05 PM (GMT)] */ package vazkii.botania.common.block.tile; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -22,23 +24,21 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.MethodHandles; -import javax.annotation.Nonnull; - public class TileOpenCrate extends TileSimpleInventory { @Override public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) { if(oldState.getBlock() != newState.getBlock()) return true; - if(oldState.getBlock() != ModBlocks.openCrate || newState.getBlock() != ModBlocks.openCrate) - return true; - return oldState.getValue(BotaniaStateProps.CRATE_VARIANT) != newState.getValue(BotaniaStateProps.CRATE_VARIANT); - } + if(oldState.getBlock() != ModBlocks.openCrate || newState.getBlock() != ModBlocks.openCrate) + return true; + return oldState.getValue(BotaniaStateProps.CRATE_VARIANT) != newState.getValue(BotaniaStateProps.CRATE_VARIANT); + } - @Override - public int getSizeInventory() { - return 1; - } + @Override + public int getSizeInventory() { + return 1; + } @Override public void update() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java index 3c4f81190..d93df2794 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 7, 2014, 2:24:51 PM (GMT)] */ package vazkii.botania.common.block.tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index a6f504693..e31b9ebe9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 18, 2014, 10:15:50 PM (GMT)] */ package vazkii.botania.common.block.tile; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ITickable; @@ -22,8 +24,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; -import java.util.Random; - public class TilePylon extends TileEntity implements ITickable { boolean activated = false; @@ -41,11 +41,11 @@ public class TilePylon extends TileEntity implements ITickable { if(activated && worldObj.isRemote) { if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() - || (variant == PylonVariant.NATURA && (portalOff() || worldObj.getBlockState(getPos().down()).getBlock() != ModBlocks.pool))) { + || variant == PylonVariant.NATURA && (portalOff() || worldObj.getBlockState(getPos().down()).getBlock() != ModBlocks.pool)) { activated = false; return; } - + Vector3 centerBlock = new Vector3(centerPos.getX() + 0.5, centerPos.getY() + 0.75 + (Math.random() - 0.5 * 0.25), centerPos.getZ() + 0.5); if(variant == PylonVariant.NATURA) { @@ -75,7 +75,7 @@ public class TilePylon extends TileEntity implements ITickable { int hex = worldObj.getBlockState(pos.down()).getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; - int b = (hex & 0xFF); + int b = hex & 0xFF; if(worldObj.rand.nextInt(4) == 0) Botania.proxy.sparkleFX(centerBlock.x + (Math.random() - 0.5) * 0.5, centerBlock.y, centerBlock.z + (Math.random() - 0.5) * 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random(), 8); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 27d27fc2a..6337b26b6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -2,14 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 2, 2014, 6:31:19 PM (GMT)] */ package vazkii.botania.common.block.tile; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -22,7 +30,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaReceiver; @@ -35,11 +42,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; - public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver { private static final String TAG_MANA = "mana"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index 715ad134d..4417dc316 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 21, 2014, 9:56:24 PM (GMT)] */ package vazkii.botania.common.block.tile; +import javax.annotation.Nonnull; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; @@ -18,8 +20,6 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; -import javax.annotation.Nonnull; - public abstract class TileSimpleInventory extends TileMod { protected SimpleItemStackHandler itemHandler = createItemHandler(); @@ -68,7 +68,7 @@ public abstract class TileSimpleInventory extends TileMod { public SimpleItemStackHandler(TileSimpleInventory inv, boolean allowWrite) { super(inv.getSizeInventory()); this.allowWrite = allowWrite; - this.tile = inv; + tile = inv; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 8f5954c67..5d62ad505 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 28, 2015, 10:02:11 PM (GMT)] */ package vazkii.botania.common.block.tile; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -19,10 +23,6 @@ import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.common.item.ModItems; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - public class TileSparkChanger extends TileSimpleInventory { public void doSwap() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index f30d31e19..5de9611c7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.block.tile; +import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; @@ -27,8 +29,6 @@ import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.MethodHandles; -import java.util.List; - public class TileSpawnerClaw extends TileMod implements IManaReceiver { private static final String TAG_MANA = "mana"; @@ -45,23 +45,23 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { try { // Directly drawn from MobSpawnerBaseLogic, with inverted isActivated check and mana consumption if(!((boolean) MethodHandles.isActivated.invokeExact(logic))) { - if(!worldObj.isRemote) - mana -= 6; + if(!worldObj.isRemote) + mana -= 6; - if(logic.getSpawnerWorld().isRemote) { - int delay = ((int) MethodHandles.spawnDelay_getter.invokeExact(logic)); - if(delay > 0) + if(logic.getSpawnerWorld().isRemote) { + int delay = (int) MethodHandles.spawnDelay_getter.invokeExact(logic); + if(delay > 0) MethodHandles.spawnDelay_setter.invokeExact(logic, delay - 1); - if(Math.random() > 0.5) - Botania.proxy.wispFX(getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() - 0.3 + Math.random() * 0.25, getPos().getZ() + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F); + if(Math.random() > 0.5) + Botania.proxy.wispFX(getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() - 0.3 + Math.random() * 0.25, getPos().getZ() + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F); MethodHandles.prevMobRotation_setter.invokeExact(logic, logic.getMobRotation()); - MethodHandles.mobRotation_setter.invokeExact(logic, (logic.getMobRotation() + 1000.0F / (((int) MethodHandles.spawnDelay_getter.invokeExact(logic)) + 200.0F)) % 360.0D); - } else { - if(((int) MethodHandles.spawnDelay_getter.invokeExact(logic)) == -1) + MethodHandles.mobRotation_setter.invokeExact(logic, (logic.getMobRotation() + 1000.0F / ((int) MethodHandles.spawnDelay_getter.invokeExact(logic) + 200.0F)) % 360.0D); + } else { + if((int) MethodHandles.spawnDelay_getter.invokeExact(logic) == -1) resetTimer(logic); - int delay = ((int) MethodHandles.spawnDelay_getter.invokeExact(logic)); + int delay = (int) MethodHandles.spawnDelay_getter.invokeExact(logic); if(delay > 0) { MethodHandles.spawnDelay_setter.invokeExact(logic, delay - 1); return; @@ -72,10 +72,10 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { boolean flag = false; - int spawnCount = ((int) MethodHandles.spawnCount_getter.invokeExact(logic)); - int spawnRange = ((int) MethodHandles.spawnRange_getter.invokeExact(logic)); - int maxNearbyEntities = ((int) MethodHandles.maxNearbyEntities_getter.invokeExact(logic)); - WeightedSpawnerEntity randomEntity = ((WeightedSpawnerEntity) MethodHandles.randomEntity_getter.invokeExact(logic)); + int spawnCount = (int) MethodHandles.spawnCount_getter.invokeExact(logic); + int spawnRange = (int) MethodHandles.spawnRange_getter.invokeExact(logic); + int maxNearbyEntities = (int) MethodHandles.maxNearbyEntities_getter.invokeExact(logic); + WeightedSpawnerEntity randomEntity = (WeightedSpawnerEntity) MethodHandles.randomEntity_getter.invokeExact(logic); BlockPos blockpos = logic.getSpawnerPosition(); for(int i = 0; i < spawnCount; ++i) { @@ -83,9 +83,9 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { NBTTagList nbttaglist = nbttagcompound.getTagList("Pos", 6); World world = logic.getSpawnerWorld(); int j = nbttaglist.tagCount(); - double d0 = j >= 1 ? nbttaglist.getDoubleAt(0) : (double)blockpos.getX() + (world.rand.nextDouble() - world.rand.nextDouble()) * (double)spawnRange + 0.5D; + double d0 = j >= 1 ? nbttaglist.getDoubleAt(0) : blockpos.getX() + (world.rand.nextDouble() - world.rand.nextDouble()) * spawnRange + 0.5D; double d1 = j >= 2 ? nbttaglist.getDoubleAt(1) : (double)(blockpos.getY() + world.rand.nextInt(3) - 1); - double d2 = j >= 3 ? nbttaglist.getDoubleAt(2) : (double)blockpos.getZ() + (world.rand.nextDouble() - world.rand.nextDouble()) * (double)spawnRange + 0.5D; + double d2 = j >= 3 ? nbttaglist.getDoubleAt(2) : blockpos.getZ() + (world.rand.nextDouble() - world.rand.nextDouble()) * spawnRange + 0.5D; Entity entity = AnvilChunkLoader.readWorldEntityPos(nbttagcompound, world, d0, d1, d2, false); if (entity == null) @@ -93,11 +93,11 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { return; } - int k = world.getEntitiesWithinAABB(entity.getClass(), (new AxisAlignedBB((double)blockpos.getX(), (double)blockpos.getY(), (double)blockpos.getZ(), (double)(blockpos.getX() + 1), (double)(blockpos.getY() + 1), (double)(blockpos.getZ() + 1))).expandXyz((double)spawnRange)).size(); + int k = world.getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(blockpos.getX(), blockpos.getY(), blockpos.getZ(), blockpos.getX() + 1, blockpos.getY() + 1, blockpos.getZ() + 1).expandXyz(spawnRange)).size(); if (k >= maxNearbyEntities) { - this.resetTimer(logic); + resetTimer(logic); return; } @@ -128,7 +128,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { } - } + } } catch (Throwable t) { t.printStackTrace(); } @@ -137,9 +137,9 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { // Direct copy of MobSpawnerBaseLogic.resetTimer() private void resetTimer(MobSpawnerBaseLogic logic) throws Throwable { - int maxSpawnDelay = ((int) MethodHandles.maxSpawnDelay_getter.invokeExact(logic)); - int minSpawnDelay = ((int) MethodHandles.minSpawnDelay_getter.invokeExact(logic)); - List potentialEntitySpawns = ((List) MethodHandles.potentialSpawns_getter.invokeExact(logic)); + int maxSpawnDelay = (int) MethodHandles.maxSpawnDelay_getter.invokeExact(logic); + int minSpawnDelay = (int) MethodHandles.minSpawnDelay_getter.invokeExact(logic); + List potentialEntitySpawns = (List) MethodHandles.potentialSpawns_getter.invokeExact(logic); if(maxSpawnDelay <= minSpawnDelay) MethodHandles.spawnDelay_setter.invokeExact(logic, minSpawnDelay); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index 893b8aba7..f2dd5eb49 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 22, 2014, 7:21:51 PM (GMT)] */ package vazkii.botania.common.block.tile; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.state.IBlockState; @@ -35,8 +37,6 @@ import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.string.TileRedStringRelay; -import java.util.List; - public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileSlowableContainer { private static final String TAG_SUBTILE_NAME = "subTileName"; @@ -217,13 +217,13 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil Block below = worldObj.getBlockState(getPos().down()).getBlock(); if(below == Blocks.MYCELIUM) return SLOWDOWN_FACTOR_MYCEL; - + if(below == Blocks.DIRT) { BlockDirt.DirtType type = worldObj.getBlockState(getPos().down()).getValue(BlockDirt.VARIANT); if(type == BlockDirt.DirtType.PODZOL) return SLOWDOWN_FACTOR_PODZOL; } - + return 0; } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java index 6ea40d788..650c4762b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 1, 2014, 1:55:57 PM (GMT)] */ package vazkii.botania.common.block.tile; @@ -21,12 +21,12 @@ public class TileSpiritShrine extends TileMod { if(worldObj.isRemote) { if(ticks >= 40) { float[][] colors = new float[][] { - { 0F, 0.25F, 1F }, - { 1F, 0F, 0.2F }, - { 0F, 1F, 0.25F }, - { 1F, 1F, 0.25F }, - { 1F, 0.25F, 1F }, - { 0.25F, 1F, 1F } + { 0F, 0.25F, 1F }, + { 1F, 0F, 0.2F }, + { 0F, 1F, 0.25F }, + { 1F, 1F, 0.25F }, + { 1F, 0.25F, 1F }, + { 0.25F, 1F, 1F } }; int totalSpiritCount = 6; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 188ac2965..14dcc1971 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 7, 2014, 6:42:33 PM (GMT)] */ package vazkii.botania.common.block.tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 3c1fa96a3..6a8bbd0fe 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -2,15 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 8, 2014, 5:25:32 PM (GMT)] */ package vazkii.botania.common.block.tile; +import java.util.List; + import com.google.common.base.Predicates; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -33,21 +36,19 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.ModItems; -import java.util.List; - public class TileTerraPlate extends TileMod implements ISparkAttachable { public static final int MAX_MANA = TilePool.MAX_MANA / 2; private static final BlockPos[] LAPIS_BLOCKS = { - new BlockPos(1, 0, 0), new BlockPos(-1, 0, 0), - new BlockPos(0, 0, 1), new BlockPos(0, 0, -1) + new BlockPos(1, 0, 0), new BlockPos(-1, 0, 0), + new BlockPos(0, 0, 1), new BlockPos(0, 0, -1) }; private static final BlockPos[] LIVINGROCK_BLOCKS = { - new BlockPos(0, 0, 0), new BlockPos(1, 0, 1), - new BlockPos(1, 0, -1), new BlockPos(-1, 0, 1), - new BlockPos(-1, 0, -1) + new BlockPos(0, 0, 0), new BlockPos(1, 0, 1), + new BlockPos(1, 0, -1), new BlockPos(-1, 0, 1), + new BlockPos(-1, 0, -1) }; private static final String TAG_MANA = "mana"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index a0414cd4a..9af15778c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 1, 2015, 1:11:44 PM (GMT)] */ package vazkii.botania.common.block.tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index b034e32fa..23b1731a0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 1, 2014, 3:49:53 PM (GMT)] */ package vazkii.botania.common.block.tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index e5bad096c..4303262c2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 18, 2014, 8:05:08 PM (GMT)] */ package vazkii.botania.common.block.tile; @@ -17,7 +17,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import vazkii.botania.api.sound.BotaniaSoundEvents; -import vazkii.botania.api.state.BotaniaStateProps; public class TileTinyPotato extends TileSimpleInventory { @@ -38,7 +37,7 @@ public class TileTinyPotato extends TileSimpleInventory { ItemStack copy = stack.copy(); copy.stackSize = 1; stack.stackSize--; - + if(stack.stackSize == 0) player.setHeldItem(hand, stackAt); else if(stackAt != null) { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java index 3a3d175ea..303823611 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 15, 2015, 12:25:19 AM (GMT)] */ package vazkii.botania.common.block.tile.corporea; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 715ebb432..267f04f80 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -2,15 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 30, 2015, 3:57:57 PM (GMT)] */ package vazkii.botania.common.block.tile.corporea; +import java.util.List; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableMap; + import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -27,9 +32,6 @@ import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import javax.annotation.Nonnull; -import java.util.List; - public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor { private static final String TAG_REQUEST_TARGET = "requestTarget"; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 84a9226ad..6abdbb3e7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 16, 2015, 2:18:30 PM (GMT)] */ package vazkii.botania.common.block.tile.corporea; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.item.ItemStack; @@ -23,9 +26,6 @@ import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.core.helper.InventoryHelper; -import java.util.ArrayList; -import java.util.List; - public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaRequestor { public void doRequest() { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index c2c5dc628..d8f1d7c5d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -2,14 +2,26 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 15, 2015, 12:42:29 AM (GMT)] */ package vazkii.botania.common.block.tile.corporea; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.lang3.text.WordUtils; + import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -23,7 +35,6 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.text.WordUtils; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaAutoCompleteController; import vazkii.botania.api.corporea.ICorporeaRequestor; @@ -31,16 +42,6 @@ import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.MathHelper; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor { public static final double RADIUS = 2.5; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 743826e9b..af7972e0e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 19, 2015, 6:21:08 PM (GMT)] */ package vazkii.botania.common.block.tile.corporea; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -21,9 +24,6 @@ import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.state.BotaniaStateProps; -import java.util.ArrayList; -import java.util.List; - public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorporeaInterceptor { @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index 22013761e..8b5bf8829 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 28, 2015, 11:55:56 AM (GMT)] */ package vazkii.botania.common.block.tile.corporea; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java index 2e2910137..1c543d2e4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 28, 2015, 5:27:43 PM (GMT)] */ package vazkii.botania.common.block.tile.mana; @@ -70,30 +70,30 @@ public class TileBellows extends TileMod { if(furnace.hasWorldObj() && furnace.getBlockType() == Blocks.LIT_FURNACE) { // Copypasta from BlockFurnace EnumFacing enumfacing = worldObj.getBlockState(furnace.getPos()).getValue(BlockFurnace.FACING); - double d0 = (double)pos.getX() + 0.5D; - double d1 = (double)pos.getY() + worldObj.rand.nextDouble() * 6.0D / 16.0D; - double d2 = (double)pos.getZ() + 0.5D; + double d0 = pos.getX() + 0.5D; + double d1 = pos.getY() + worldObj.rand.nextDouble() * 6.0D / 16.0D; + double d2 = pos.getZ() + 0.5D; double d3 = 0.52D; double d4 = worldObj.rand.nextDouble() * 0.6D - 0.3D; switch (enumfacing) { - case WEST: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); - break; - case EAST: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); - break; - case NORTH: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); - break; - case SOUTH: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); - default: break; + case WEST: + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + break; + case EAST: + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + break; + case NORTH: + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); + break; + case SOUTH: + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); + default: break; } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index ae11b8d8b..6f8855365 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 3, 2014, 1:51:34 AM (GMT)] */ package vazkii.botania.common.block.tile.mana; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -17,9 +20,6 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileMod; -import java.util.ArrayList; -import java.util.List; - public class TileDistributor extends TileMod implements IManaReceiver { final List validPools = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index b9184d21c..70184a0f1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -2,15 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 10, 2014, 7:55:12 PM (GMT)] */ package vazkii.botania.common.block.tile.mana; import com.google.common.base.Predicates; + import net.minecraft.entity.Entity; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java index e739294d3..28db295a7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 5, 2014, 12:59:27 AM (GMT)] */ package vazkii.botania.common.block.tile.mana; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 845cb6a15..facc86b53 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -2,15 +2,24 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 26, 2014, 12:23:55 AM (GMT)] */ package vazkii.botania.common.block.tile.mana; +import java.awt.Color; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import com.google.common.base.Predicates; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -33,7 +42,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IManaDissolvable; @@ -62,11 +70,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; -import javax.annotation.Nonnull; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; - public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAttachable, IThrottledPacket { public static final Color PARTICLE_COLOR = new Color(0x00C6FF); @@ -153,7 +156,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt // Recipes with matching catalyst take priority above recipes with no catalyst specified return !matchingCatRecipes.isEmpty() ? matchingCatRecipes.get(0) : - !matchingNonCatRecipes.isEmpty() ? matchingNonCatRecipes.get(0) : + !matchingNonCatRecipes.isEmpty() ? matchingNonCatRecipes.get(0) : null; } @@ -171,7 +174,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt int age; try { - age = ((int) MethodHandles.itemAge_getter.invokeExact(item)); + age = (int) MethodHandles.itemAge_getter.invokeExact(item); } catch (Throwable throwable) { return false; } if(age > 100 && age < 130) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index f8b790512..3f2fe71b7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 17, 2015, 7:27:04 PM (GMT)] */ package vazkii.botania.common.block.tile.mana; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 57ffa9bb3..ea71dbb86 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -2,15 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 18, 2015, 3:16:57 PM (GMT)] */ package vazkii.botania.common.block.tile.mana; +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableMap; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -25,8 +28,6 @@ import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -import javax.annotation.Nonnull; - public class TilePump extends TileMod { private static final String TAG_ACTIVE = "active"; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 18ef60515..fa3a580fa 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 29, 2014, 10:01:32 PM (GMT)] */ package vazkii.botania.common.block.tile.mana; +import java.util.EnumMap; +import java.util.Map; + import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyReceiver; import net.minecraft.nbt.NBTTagCompound; @@ -21,9 +24,6 @@ import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; -import java.util.EnumMap; -import java.util.Map; - @Optional.Interface(iface = "cofh.api.energy.IEnergyConnection", modid = "CoFHAPI|energy") public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index f12e82f0f..b06212a5d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -2,15 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 25, 2014, 9:40:57 PM (GMT)] */ package vazkii.botania.common.block.tile.mana; +import java.util.List; +import java.util.UUID; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import com.google.common.base.Predicates; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -35,7 +43,6 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.BurstProperties; @@ -64,10 +71,6 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.UUID; - public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IDirectioned, ITickable { private static final int MAX_MANA = 1000; @@ -226,7 +229,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, List bursts = worldObj.getEntitiesWithinAABB(Entity.class, aabb, Predicates.instanceOf(IManaBurst.class)); IManaBurst found = null; UUID identity = getIdentifier(); - for(IManaBurst burst : ((List) bursts)) + for(IManaBurst burst : (List) bursts) if(burst != null && identity.equals(burst.getShooterUUID())) { found = burst; break; @@ -484,7 +487,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, else this.receiver = null; lastTentativeBurst = fakeBurst.propsList; } - + @Override public IManaBurst runBurstSimulation() { EntityManaBurst fakeBurst = getBurst(true); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 3634200a3..ed540806e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 16, 2014, 10:15:05 PM (GMT)] */ package vazkii.botania.common.block.tile.mana; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -19,7 +21,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.TextFormatting; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index 7b3f869ce..93d16b398 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 14, 2014, 5:04:22 PM (GMT)] */ package vazkii.botania.common.block.tile.string; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; @@ -21,8 +23,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.common.block.tile.TileMod; -import javax.annotation.Nonnull; - public abstract class TileRedString extends TileMod implements ITileBound { private BlockPos binding; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index cb606bd48..4b046786b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -2,16 +2,15 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 16, 2014, 10:22:01 PM (GMT)] */ package vazkii.botania.common.block.tile.string; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; public class TileRedStringComparator extends TileRedString { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index eca80dc41..58c548082 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -2,23 +2,24 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 14, 2014, 5:26:39 PM (GMT)] */ package vazkii.botania.common.block.tile.string; +import java.util.Arrays; + +import javax.annotation.Nonnull; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; -import javax.annotation.Nonnull; -import java.util.Arrays; - public class TileRedStringContainer extends TileRedString { @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java index 609579ef3..426da9629 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 14, 2014, 11:00:16 PM (GMT)] */ package vazkii.botania.common.block.tile.string; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java index c030fe615..df15d1ace 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -2,21 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 16, 2014, 7:17:16 PM (GMT)] */ package vazkii.botania.common.block.tile.string; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.IGrowable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.Random; - public class TileRedStringFertilizer extends TileRedString { public boolean canGrow(World world, boolean isClient) { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java index b8dd24d5f..ee656a1a5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 21, 2015, 4:58:20 PM (GMT)] */ package vazkii.botania.common.block.tile.string; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -19,11 +24,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - public class TileRedStringInterceptor extends TileRedString { private static final Set interceptors = new HashSet<>(); diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java index 253ffea0b..189c4ef37 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 16, 2014, 10:52:21 PM (GMT)] */ package vazkii.botania.common.block.tile.string; diff --git a/src/main/java/vazkii/botania/common/brew/BrewMod.java b/src/main/java/vazkii/botania/common/brew/BrewMod.java index 07770128f..ca6749366 100644 --- a/src/main/java/vazkii/botania/common/brew/BrewMod.java +++ b/src/main/java/vazkii/botania/common/brew/BrewMod.java @@ -2,21 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 7:02:29 PM (GMT)] */ package vazkii.botania.common.brew; +import java.util.Arrays; + import net.minecraft.potion.PotionEffect; import net.minecraft.potion.PotionUtils; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; -import java.util.Arrays; - public class BrewMod extends Brew { public BrewMod(String key, int color, int cost, PotionEffect... effects) { diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index e9eb90564..5444c175d 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 7:00:33 PM (GMT)] */ package vazkii.botania.common.brew; diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index ae0e1e013..7d8811b11 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 7:00:29 PM (GMT)] */ package vazkii.botania.common.brew; diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java index 0a055ddd5..02e76141b 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -2,24 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 3, 2014, 12:15:09 AM (GMT)] */ package vazkii.botania.common.brew.potion; +import javax.annotation.Nonnull; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityFishHook; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.lib.LibPotionNames; -import javax.annotation.Nonnull; - public class PotionAllure extends PotionMod { public PotionAllure() { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java index 0be6a938b..eb0ef323c 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 3, 2014, 12:13:09 AM (GMT)] */ package vazkii.botania.common.brew.potion; diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java index 219cf3496..6ffc14967 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java @@ -2,22 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 25, 2015, 6:08:52 PM (GMT)] */ package vazkii.botania.common.brew.potion; +import javax.annotation.Nonnull; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.common.lib.LibPotionNames; -import javax.annotation.Nonnull; - public class PotionClear extends PotionMod { public PotionClear() { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java index 5c781c845..96f3da316 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 3, 2014, 12:12:36 AM (GMT)] */ package vazkii.botania.common.brew.potion; diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java index 28ca98c01..d0567e07a 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -2,22 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 3, 2014, 12:12:04 AM (GMT)] */ package vazkii.botania.common.brew.potion; -import net.minecraft.entity.EntityLivingBase; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import vazkii.botania.common.lib.LibPotionNames; - import javax.annotation.Nonnull; +import net.minecraft.entity.EntityLivingBase; +import vazkii.botania.common.lib.LibPotionNames; + public class PotionFeatherfeet extends PotionMod { public PotionFeatherfeet() { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index 0eef0873e..ad43c5765 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 2, 2014, 10:12:45 PM (GMT)] */ package vazkii.botania.common.brew.potion; diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java index 23b4cc7fe..652693406 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 2, 2014, 10:31:48 PM (GMT)] */ package vazkii.botania.common.brew.potion; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 96b1c13a6..eb2b65a55 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -2,17 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 5:20:53 PM (GMT)] */ package vazkii.botania.common.core; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.client.lib.LibResources; @@ -23,9 +26,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.List; - public final class BotaniaCreativeTab extends CreativeTabs { public static final BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); @@ -375,8 +375,4 @@ public final class BotaniaCreativeTab extends CreativeTabs { block.getSubBlocks(stack.getItem(), this, list); } - private void addStack(ItemStack stack) { - list.add(stack); - } - } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java index c0b19fa53..e02d29f40 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 31, 2014, 11:43:13 PM (GMT)] */ package vazkii.botania.common.core.command; +import javax.annotation.Nonnull; + import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; @@ -19,8 +21,6 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.core.version.ThreadDownloadMod; import vazkii.botania.common.core.version.VersionChecker; -import javax.annotation.Nonnull; - public class CommandDownloadLatest extends CommandBase { private static final boolean ENABLED = true; diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index c0f142445..415f5f88d 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 23, 2014, 9:50:14 PM (GMT)] */ package vazkii.botania.common.core.command; +import javax.annotation.Nonnull; + import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -21,8 +23,6 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemLexicon; -import javax.annotation.Nonnull; - public class CommandOpen extends CommandBase { @Nonnull diff --git a/src/main/java/vazkii/botania/common/core/command/CommandShare.java b/src/main/java/vazkii/botania/common/core/command/CommandShare.java index 10b187f99..19abcac5c 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandShare.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandShare.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.core.command; +import javax.annotation.Nonnull; + import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -17,8 +19,6 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.translation.I18n; -import javax.annotation.Nonnull; - public class CommandShare extends CommandBase { @Nonnull diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index c4d89764e..b3158f6f9 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 17, 2015, 5:13:06 PM (GMT)] */ package vazkii.botania.common.core.command; +import javax.annotation.Nonnull; + import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; @@ -20,8 +22,6 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.world.SkyblockWorldEvents; -import javax.annotation.Nonnull; - public class CommandSkyblockSpread extends CommandBase { @Nonnull diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index 989921d6e..8b2eaf254 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 19, 2014, 10:16:49 PM (GMT)] */ package vazkii.botania.common.core.handler; diff --git a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java index f816b37f8..6e481d903 100644 --- a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 14, 2014, 5:10:16 PM (GMT)] */ package vazkii.botania.common.core.handler; diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index e44892d86..f6bf48856 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 13, 2014, 9:01:32 PM (GMT)] */ package vazkii.botania.common.core.handler; +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentString; @@ -23,12 +29,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibMisc; -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public final class ConfigHandler { public static Configuration config; @@ -58,7 +58,7 @@ public final class ConfigHandler { public static boolean enableArmorModels = true; public static boolean enableFancySkybox = true; public static boolean enableFancySkyboxInNormalWorlds = false; - + public static int manaBarHeight = 29; public static int flightBarHeight = 49; public static int flightBarBreathHeight = 59; @@ -82,7 +82,7 @@ public final class ConfigHandler { public static boolean ringOfOdinFireResist = true; public static boolean invertMagnetRing = false; public static boolean enableThaumcraftStablizers = true; - + public static int harvestLevelWeight = 2; public static int harvestLevelBore = 3; @@ -168,10 +168,10 @@ public final class ConfigHandler { desc = "Set this to false to disable the fancy skybox in Garden of Glass."; enableFancySkybox = loadPropBool("fancySkybox.enable", desc, enableFancySkybox); - + desc = "Set this to true to enable the fancy skybox in non Garden of Glass worlds. (Does not require Garden of Glass loaded to use, needs 'fancySkybox.enable' to be true as well)"; enableFancySkyboxInNormalWorlds = loadPropBool("fancySkybox.normalWorlds", desc, enableFancySkyboxInNormalWorlds); - + desc = "The height of the mana display bar in above the XP bar. You can change this if you have a mod that changes where the XP bar is."; manaBarHeight = loadPropInt("manaBar.height", desc, manaBarHeight); @@ -180,7 +180,7 @@ public final class ConfigHandler { desc = "The height of the Flugel Tiara flight bar if your breath bar is shown. You can change this if you have a mod that adds a bar in that spot."; flightBarBreathHeight = loadPropInt("flightBarBreath.height", desc, flightBarBreathHeight); - + desc = "The GL Texture Unit to use for the secondary sampler passed in to the Lexica Botania's category button shader. DO NOT TOUCH THIS IF YOU DON'T KNOW WHAT YOU'RE DOING"; glSecondaryTextureUnit = loadPropInt("shaders.secondaryUnit", desc, glSecondaryTextureUnit); @@ -228,13 +228,13 @@ public final class ConfigHandler { desc = "Set this to false to disable Thaumcraft Infusion Stabilizing in botania blocks"; enableThaumcraftStablizers = loadPropBool("thaumraftStabilizers.enabled", desc, enableThaumcraftStablizers); - + desc = "The harvest level of the Mana Lens: Weight. 3 is diamond level. Defaults to 2 (iron level)"; harvestLevelWeight = loadPropInt("harvestLevel.weightLens", desc, harvestLevelWeight); desc = "The harvest level of the Mana Lens: Bore. 3 is diamond level. Defaults to 3"; harvestLevelBore = loadPropInt("harvestLevel.boreLens", desc, harvestLevelBore); - + desc = "The quantity of Botania flower patches to generate in the world, defaults to 2, the lower the number the less patches generate."; flowerQuantity = loadPropInt("worldgen.flower.quantity", desc, flowerQuantity); @@ -342,7 +342,7 @@ public final class ConfigHandler { if(bestValue != null) { T expected = bestValue.value; T def = (T) prop.getDefault(); - + if(areEqualNumbers(val, expected) && !areEqualNumbers(val, def)) { prop.setValue(def.toString()); changes.add(" " + prop.getName() + ": " + val + " -> " + def); @@ -362,12 +362,12 @@ public final class ConfigHandler { List list = adaptableValues.get(key); list.add(adapt); } - + public boolean areEqualNumbers(Object v1, Object v2) { double epsilon = 1.0E-6; float v1f = ((Number) v1).floatValue(); float v2f; - + if(v2 instanceof String) v2f = Float.parseFloat((String) v2); else v2f = ((Number) v2).floatValue(); diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java index c8f289e8b..b45986a71 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -1,6 +1,7 @@ package vazkii.botania.common.core.handler; import com.google.common.collect.ImmutableList; + import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; import vazkii.botania.common.lib.LibMisc; diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index f1780852f..0001cf3fd 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:44:59 PM (GMT)] */ package vazkii.botania.common.core.handler; @@ -232,7 +232,7 @@ public class InternalMethodHandler extends DummyMethodHandler { public int getPassiveFlowerDecay() { return LibMisc.PASSIVE_FLOWER_DECAY; } - + @Override @Optional.Method(modid = "BuildCraft|Transport") public boolean isBuildcraftPipe(TileEntity tile) { @@ -265,7 +265,7 @@ public class InternalMethodHandler extends DummyMethodHandler { if(player instanceof EntityPlayerMP) PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, slot), (EntityPlayerMP) player); } - + @Override public List wrapInventory(List inventories) { diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index 7628fd202..fd9255c3f 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -2,14 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 22, 2014, 5:35:10 PM (GMT)] */ package vazkii.botania.common.core.handler; +import java.util.Comparator; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; +import java.util.function.BinaryOperator; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -20,13 +27,6 @@ import vazkii.botania.api.mana.ManaNetworkEvent.Action; import vazkii.botania.api.mana.ManaNetworkEvent.ManaBlockType; import vazkii.botania.api.mana.TileSignature; -import java.util.Comparator; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; -import java.util.function.BinaryOperator; - public final class ManaNetworkHandler implements IManaNetwork { public static final ManaNetworkHandler instance = new ManaNetworkHandler(); diff --git a/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java index fec57d0b4..8bf7700a6 100644 --- a/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java +++ b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java @@ -1,95 +1,95 @@ package vazkii.botania.common.core.handler; +import static java.lang.invoke.MethodHandles.publicLookup; + +import java.lang.invoke.MethodHandle; +import java.lang.reflect.Field; +import java.lang.reflect.Method; + import com.google.common.base.Throwables; -import net.minecraft.block.SoundType; + import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibObfuscation; -import java.lang.invoke.MethodHandle; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -import static java.lang.invoke.MethodHandles.publicLookup; - // MethodHandles for frequently reflected fields and methods. // Handles suffixed with _getter and _setter are for fields, while those without suffixes are normal methods. public final class MethodHandles { - public static final MethodHandle - itemAge_getter, itemAge_setter, pickupDelay_getter, // EntityItem, pickup delay already has setter in vanilla - spawnRange_getter, spawnCount_getter, maxNearbyEntities_getter, - maxSpawnDelay_getter, minSpawnDelay_getter, - spawnDelay_getter, spawnDelay_setter, prevMobRotation_setter, mobRotation_setter, potentialSpawns_getter, - randomEntity_getter, isActivated; // MobSpawnerBaseLogic + public static final MethodHandle + itemAge_getter, itemAge_setter, pickupDelay_getter, // EntityItem, pickup delay already has setter in vanilla + spawnRange_getter, spawnCount_getter, maxNearbyEntities_getter, + maxSpawnDelay_getter, minSpawnDelay_getter, + spawnDelay_getter, spawnDelay_setter, prevMobRotation_setter, mobRotation_setter, potentialSpawns_getter, + randomEntity_getter, isActivated; // MobSpawnerBaseLogic - static { - try { - Field f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.AGE); - f.setAccessible(true); - itemAge_getter = publicLookup().unreflectGetter(f); - itemAge_setter = publicLookup().unreflectSetter(f); + static { + try { + Field f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.AGE); + f.setAccessible(true); + itemAge_getter = publicLookup().unreflectGetter(f); + itemAge_setter = publicLookup().unreflectSetter(f); - f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.PICKUP_DELAY); - f.setAccessible(true); - pickupDelay_getter = publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.PICKUP_DELAY); + f.setAccessible(true); + pickupDelay_getter = publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_RANGE); - f.setAccessible(true); - spawnRange_getter = publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_RANGE); + f.setAccessible(true); + spawnRange_getter = publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_COUNT); - f.setAccessible(true); - spawnCount_getter = publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_COUNT); + f.setAccessible(true); + spawnCount_getter = publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MAX_NEARBY_ENTITIES); - f.setAccessible(true); - maxNearbyEntities_getter = publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MAX_NEARBY_ENTITIES); + f.setAccessible(true); + maxNearbyEntities_getter = publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MAX_SPAWN_DELAY); - f.setAccessible(true); - maxSpawnDelay_getter = publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MAX_SPAWN_DELAY); + f.setAccessible(true); + maxSpawnDelay_getter = publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MIN_SPAWN_DELAY); - f.setAccessible(true); - minSpawnDelay_getter = publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MIN_SPAWN_DELAY); + f.setAccessible(true); + minSpawnDelay_getter = publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_DELAY); - f.setAccessible(true); - spawnDelay_getter = publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_DELAY); + f.setAccessible(true); + spawnDelay_getter = publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_DELAY); - f.setAccessible(true); - spawnDelay_setter = publicLookup().unreflectSetter(f); + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_DELAY); + f.setAccessible(true); + spawnDelay_setter = publicLookup().unreflectSetter(f); - f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.PREV_MOB_ROTATION); - f.setAccessible(true); - prevMobRotation_setter = publicLookup().unreflectSetter(f); + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.PREV_MOB_ROTATION); + f.setAccessible(true); + prevMobRotation_setter = publicLookup().unreflectSetter(f); - f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MOB_ROTATION); - f.setAccessible(true); - mobRotation_setter = publicLookup().unreflectSetter(f); + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MOB_ROTATION); + f.setAccessible(true); + mobRotation_setter = publicLookup().unreflectSetter(f); - f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.POTENTIAL_ENTITY_SPAWNS); - f.setAccessible(true); - potentialSpawns_getter = publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.POTENTIAL_ENTITY_SPAWNS); + f.setAccessible(true); + potentialSpawns_getter = publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.RANDOM_ENTITY); - f.setAccessible(true); - randomEntity_getter = publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.RANDOM_ENTITY); + f.setAccessible(true); + randomEntity_getter = publicLookup().unreflectGetter(f); - Method m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.IS_ACTIVATED); - m.setAccessible(true); - isActivated = publicLookup().unreflect(m); - } catch (Throwable t) { - Botania.LOGGER.fatal("Couldn't initialize methodhandles! Things will be broken!"); - t.printStackTrace(); - throw Throwables.propagate(t); - } - } + Method m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.IS_ACTIVATED); + m.setAccessible(true); + isActivated = publicLookup().unreflect(m); + } catch (Throwable t) { + Botania.LOGGER.fatal("Couldn't initialize methodhandles! Things will be broken!"); + t.printStackTrace(); + throw Throwables.propagate(t); + } + } - private MethodHandles() {} + private MethodHandles() {} } diff --git a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java index 311be693d..4bc8d3738 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -6,59 +6,59 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public final class ModSounds { - public static void init() { - String[] sounds = { - "botania:airRod", - "botania:agricarnation", - "botania:altarCraft", - "botania:babylonAttack", - "botania:babylonSpawn", - "botania:bellows", - "botania:bifrostRod", - "botania:blackLotus", - "botania:dash", - "botania:ding", - "botania:divaCharm", - "botania:divinationRod", - "botania:doit", - "botania:enchanterForm", - "botania:enchanterFade", - "botania:enchanterEnchant", - "botania:endoflame", - "botania:equipBauble", - "botania:gaiaTrap", - "botania:goldenLaurel", - "botania:holyCloak", - "botania:laputaStart", - "botania:lexiconOpen", - "botania:lexiconPage", - "botania:lightRelay", - "botania:manaBlaster", - "botania:manaPoolCraft", - "botania:missile", - "botania:orechid", - "botania:potionCreate", - "botania:runeAltarCraft", - "botania:runeAltarStart", - "botania:spreaderFire", - "botania:starcaller", - "botania:terraBlade", - "botania:terraformRod", - "botania:terraPickMode", - "botania:terrasteelCraft", - "botania:thermalily", - "botania:unholyCloak", - "botania:way", - "botania:music.gaia1", - "botania:music.gaia2" - }; - - for (String s : sounds) { - ResourceLocation loc = new ResourceLocation(s); - GameRegistry.register(new SoundEvent(loc), loc); - } - } + public static void init() { + String[] sounds = { + "botania:airRod", + "botania:agricarnation", + "botania:altarCraft", + "botania:babylonAttack", + "botania:babylonSpawn", + "botania:bellows", + "botania:bifrostRod", + "botania:blackLotus", + "botania:dash", + "botania:ding", + "botania:divaCharm", + "botania:divinationRod", + "botania:doit", + "botania:enchanterForm", + "botania:enchanterFade", + "botania:enchanterEnchant", + "botania:endoflame", + "botania:equipBauble", + "botania:gaiaTrap", + "botania:goldenLaurel", + "botania:holyCloak", + "botania:laputaStart", + "botania:lexiconOpen", + "botania:lexiconPage", + "botania:lightRelay", + "botania:manaBlaster", + "botania:manaPoolCraft", + "botania:missile", + "botania:orechid", + "botania:potionCreate", + "botania:runeAltarCraft", + "botania:runeAltarStart", + "botania:spreaderFire", + "botania:starcaller", + "botania:terraBlade", + "botania:terraformRod", + "botania:terraPickMode", + "botania:terrasteelCraft", + "botania:thermalily", + "botania:unholyCloak", + "botania:way", + "botania:music.gaia1", + "botania:music.gaia2" + }; - private ModSounds() {} + for (String s : sounds) { + ResourceLocation loc = new ResourceLocation(s); + GameRegistry.register(new SoundEvent(loc), loc); + } + } + + private ModSounds() {} } diff --git a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java index f083392fd..1b1a7d5e1 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -2,26 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 4, 2014, 10:38:50 PM (GMT)] */ package vazkii.botania.common.core.handler; +import java.util.ArrayList; +import java.util.List; +import java.util.Map.Entry; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.monster.EntityGhast; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.EntitySlime; -import net.minecraft.entity.monster.EntitySpider; -import net.minecraft.entity.passive.EntityChicken; -import net.minecraft.entity.passive.EntitySquid; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -32,10 +27,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lexicon.page.PageShedding; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; - public final class SheddingHandler { private SheddingHandler() {} @@ -80,14 +71,14 @@ public final class SheddingHandler { } public static void loadFromConfig(Configuration config) { -// defaultPatterns.add(new ShedPattern(EntityChicken.class, new ItemStack(Items.FEATHER), 26000, 20)); -// defaultPatterns.add(new ShedPattern(EntitySquid.class, new ItemStack(Items.DYE), 18000, 20)); -// defaultPatterns.add(new ShedPattern(EntityVillager.class, new ItemStack(Items.EMERALD), 226000, 40)); -// defaultPatterns.add(new ShedPattern(EntitySpider.class, new ItemStack(Items.STRING), 12000, 40)); -// defaultPatterns.add(new ShedPattern(EntityBlaze.class, new ItemStack(Items.BLAZE_POWDER), 8000, 40)); -// defaultPatterns.add(new ShedPattern(EntityGhast.class, new ItemStack(Items.GHAST_TEAR), 9001, 30)); -// defaultPatterns.add(new ShedPattern(EntitySkeleton.class, new ItemStack(Items.BONE), 36000, 40)); -// defaultPatterns.add(new ShedPattern(EntitySlime.class, new ItemStack(Items.SLIME_BALL), 21000, 40)); + // defaultPatterns.add(new ShedPattern(EntityChicken.class, new ItemStack(Items.FEATHER), 26000, 20)); + // defaultPatterns.add(new ShedPattern(EntitySquid.class, new ItemStack(Items.DYE), 18000, 20)); + // defaultPatterns.add(new ShedPattern(EntityVillager.class, new ItemStack(Items.EMERALD), 226000, 40)); + // defaultPatterns.add(new ShedPattern(EntitySpider.class, new ItemStack(Items.STRING), 12000, 40)); + // defaultPatterns.add(new ShedPattern(EntityBlaze.class, new ItemStack(Items.BLAZE_POWDER), 8000, 40)); + // defaultPatterns.add(new ShedPattern(EntityGhast.class, new ItemStack(Items.GHAST_TEAR), 9001, 30)); + // defaultPatterns.add(new ShedPattern(EntitySkeleton.class, new ItemStack(Items.BONE), 36000, 40)); + // defaultPatterns.add(new ShedPattern(EntitySlime.class, new ItemStack(Items.SLIME_BALL), 21000, 40)); ArrayList defaultNames = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/common/core/helper/ExperienceHelper.java b/src/main/java/vazkii/botania/common/core/helper/ExperienceHelper.java index 7e04748a9..599db4bd6 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ExperienceHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ExperienceHelper.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.common.core.helper; diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 6205bdb8a..fa7c52dfd 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -2,29 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.common.core.helper; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; @@ -33,33 +25,23 @@ import net.minecraftforge.items.VanillaDoubleChestItemHandler; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.block.tile.TileSimpleInventory; -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Random; -import java.util.Spliterator; -import java.util.Spliterators; -import java.util.stream.Stream; -import java.util.stream.StreamSupport; - public class InventoryHelper { public static InvWithLocation getInventoryWithLocation(World world, BlockPos pos, EnumFacing side) { - IItemHandler ret = getInventory(world, pos, side); - if(ret == null) - return null; - else return new InvWithLocation(ret, world, pos); - } + IItemHandler ret = getInventory(world, pos, side); + if(ret == null) + return null; + else return new InvWithLocation(ret, world, pos); + } public static IItemHandler getInventory(World world, BlockPos pos, EnumFacing side) { - TileEntity te = world.getTileEntity(pos); + TileEntity te = world.getTileEntity(pos); - if(te == null) - return null; + if(te == null) + return null; if(te instanceof TileEntityChest) { - IItemHandler doubleChest = VanillaDoubleChestItemHandler.get(((TileEntityChest) te)); + IItemHandler doubleChest = VanillaDoubleChestItemHandler.get((TileEntityChest) te); if(doubleChest != VanillaDoubleChestItemHandler.NO_ADJACENT_CHESTS_INSTANCE) return doubleChest; } @@ -67,11 +49,11 @@ public class InventoryHelper { IItemHandler ret = te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) ? te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) : null; - if(ret == null && te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) - ret = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + if(ret == null && te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) + ret = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); - return ret; - } + return ret; + } public static void dropInventory(TileSimpleInventory inv, World world, IBlockState state, BlockPos pos) { if(inv != null) { diff --git a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java index f7f7a1474..ddd6a6970 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -2,16 +2,15 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 22, 2014, 5:49:50 PM (GMT)] */ package vazkii.botania.common.core.helper; import net.minecraft.entity.Entity; -import net.minecraft.util.math.BlockPos; import vazkii.botania.api.internal.VanillaPacketDispatcher; public final class MathHelper { @@ -38,7 +37,7 @@ public final class MathHelper { public static long[] intArrayToLongArray(int[] ints) { long[] ret = new long[ints.length / 2]; for (int i = 0; i < ints.length; i += 2) { - ret[i / 2] = ((long) ints[i]) << 32 | ints[i + 1]; + ret[i / 2] = (long) ints[i] << 32 | ints[i + 1]; } return ret; } @@ -46,7 +45,7 @@ public final class MathHelper { public static double[] intArrayToDoubleArray(int[] ints) { double[] ret = new double[ints.length / 2]; for (int i = 0; i < ints.length; i += 2) { - long l = ((long) ints[i]) << 32 | ints[i + 1]; + long l = (long) ints[i] << 32 | ints[i + 1]; ret[i / 2] = Double.longBitsToDouble(l); } return ret; diff --git a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java index 51ab904cf..e7e32f23b 100644 --- a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java @@ -1,104 +1,104 @@ package vazkii.botania.common.core.helper; +import java.util.function.Predicate; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; -import java.util.function.Predicate; - public final class PlayerHelper { - // Checks if either of the player's hands has an item. - public static boolean hasAnyHeldItem(EntityPlayer player) { - return player.getHeldItemMainhand() != null || player.getHeldItemOffhand() != null; - } + // Checks if either of the player's hands has an item. + public static boolean hasAnyHeldItem(EntityPlayer player) { + return player.getHeldItemMainhand() != null || player.getHeldItemOffhand() != null; + } - // Checks main hand, then off hand for this item. - public static boolean hasHeldItem(EntityPlayer player, Item item) { - return (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() == item) - || (player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() == item); - } + // Checks main hand, then off hand for this item. + public static boolean hasHeldItem(EntityPlayer player, Item item) { + return player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() == item + || player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() == item; + } - // Checks main hand, then off hand for this item class. - public static boolean hasHeldItemClass(EntityPlayer player, Item template) { - return hasHeldItemClass(player, template.getClass()); - } + // Checks main hand, then off hand for this item class. + public static boolean hasHeldItemClass(EntityPlayer player, Item template) { + return hasHeldItemClass(player, template.getClass()); + } - // Checks main hand, then off hand for this item class. - public static boolean hasHeldItemClass(EntityPlayer player, Class template) { - return (player.getHeldItemMainhand() != null && template.isAssignableFrom(player.getHeldItemMainhand().getItem().getClass())) - || (player.getHeldItemOffhand() != null && template.isAssignableFrom(player.getHeldItemOffhand().getItem().getClass())); - } + // Checks main hand, then off hand for this item class. + public static boolean hasHeldItemClass(EntityPlayer player, Class template) { + return player.getHeldItemMainhand() != null && template.isAssignableFrom(player.getHeldItemMainhand().getItem().getClass()) + || player.getHeldItemOffhand() != null && template.isAssignableFrom(player.getHeldItemOffhand().getItem().getClass()); + } - // Checks main hand, then off hand for this item. Null otherwise. - public static ItemStack getFirstHeldItem(EntityPlayer player, Item item) { - ItemStack main = player.getHeldItemMainhand(); - ItemStack offhand = player.getHeldItemOffhand(); - if(main != null && item == main.getItem()) { - return main; - } else if(offhand != null && item == offhand.getItem()) { - return offhand; - } else return null; - } + // Checks main hand, then off hand for this item. Null otherwise. + public static ItemStack getFirstHeldItem(EntityPlayer player, Item item) { + ItemStack main = player.getHeldItemMainhand(); + ItemStack offhand = player.getHeldItemOffhand(); + if(main != null && item == main.getItem()) { + return main; + } else if(offhand != null && item == offhand.getItem()) { + return offhand; + } else return null; + } - // Checks main hand, then off hand for this item class. Null otherwise. - public static ItemStack getFirstHeldItemClass(EntityPlayer player, Class template) { - ItemStack main = player.getHeldItemMainhand(); - ItemStack offhand = player.getHeldItemOffhand(); - if(main != null && template.isAssignableFrom(main.getItem().getClass())) { - return main; - } else if(offhand != null && template.isAssignableFrom(offhand.getItem().getClass())) { - return offhand; - } else return null; - } + // Checks main hand, then off hand for this item class. Null otherwise. + public static ItemStack getFirstHeldItemClass(EntityPlayer player, Class template) { + ItemStack main = player.getHeldItemMainhand(); + ItemStack offhand = player.getHeldItemOffhand(); + if(main != null && template.isAssignableFrom(main.getItem().getClass())) { + return main; + } else if(offhand != null && template.isAssignableFrom(offhand.getItem().getClass())) { + return offhand; + } else return null; + } - public static ItemStack getAmmo(EntityPlayer player, Predicate ammoFunc) { - // Mainly from ItemBow.findAmmo - if (ammoFunc.test(player.getHeldItem(EnumHand.OFF_HAND))) - { - return player.getHeldItem(EnumHand.OFF_HAND); - } - else if (ammoFunc.test(player.getHeldItem(EnumHand.MAIN_HAND))) - { - return player.getHeldItem(EnumHand.MAIN_HAND); - } - else - { - for (int i = 0; i < player.inventory.getSizeInventory(); ++i) - { - ItemStack itemstack = player.inventory.getStackInSlot(i); + public static ItemStack getAmmo(EntityPlayer player, Predicate ammoFunc) { + // Mainly from ItemBow.findAmmo + if (ammoFunc.test(player.getHeldItem(EnumHand.OFF_HAND))) + { + return player.getHeldItem(EnumHand.OFF_HAND); + } + else if (ammoFunc.test(player.getHeldItem(EnumHand.MAIN_HAND))) + { + return player.getHeldItem(EnumHand.MAIN_HAND); + } + else + { + for (int i = 0; i < player.inventory.getSizeInventory(); ++i) + { + ItemStack itemstack = player.inventory.getStackInSlot(i); - if (ammoFunc.test(itemstack)) - { - return itemstack; - } - } + if (ammoFunc.test(itemstack)) + { + return itemstack; + } + } - return null; - } - } + return null; + } + } - public static boolean hasAmmo(EntityPlayer player, Predicate ammoFunc) { - return getAmmo(player, ammoFunc) != null; - } + public static boolean hasAmmo(EntityPlayer player, Predicate ammoFunc) { + return getAmmo(player, ammoFunc) != null; + } - public static void consumeAmmo(EntityPlayer player, Predicate ammoFunc) { - ItemStack ammo = getAmmo(player, ammoFunc); - if(ammo != null) { - ammo.stackSize--; - if(ammo.stackSize == 0) - player.inventory.deleteStack(ammo); - } - } + public static void consumeAmmo(EntityPlayer player, Predicate ammoFunc) { + ItemStack ammo = getAmmo(player, ammoFunc); + if(ammo != null) { + ammo.stackSize--; + if(ammo.stackSize == 0) + player.inventory.deleteStack(ammo); + } + } - public static boolean hasItem(EntityPlayer player, Predicate itemFunc) { - for (int i = 0; i < player.inventory.getSizeInventory(); i++) { - if (itemFunc.test(player.inventory.getStackInSlot(i))) - return true; - } - return false; - } + public static boolean hasItem(EntityPlayer player, Predicate itemFunc) { + for (int i = 0; i < player.inventory.getSizeInventory(); i++) { + if (itemFunc.test(player.inventory.getStackInSlot(i))) + return true; + } + return false; + } - private PlayerHelper() {} + private PlayerHelper() {} } diff --git a/src/main/java/vazkii/botania/common/core/helper/Quat.java b/src/main/java/vazkii/botania/common/core/helper/Quat.java index d6d246815..9daeae36b 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Quat.java +++ b/src/main/java/vazkii/botania/common/core/helper/Quat.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.common.core.helper; @@ -13,7 +13,6 @@ package vazkii.botania.common.core.helper; import java.util.Arrays; import java.util.Formatter; import java.util.Locale; -import java.util.Objects; public final class Quat { @@ -29,7 +28,7 @@ public final class Quat { y = d2; z = d3; s = d; - this.hashCode = Arrays.hashCode(new double[] { d, d1, d2, d3 } ); + hashCode = Arrays.hashCode(new double[] { d, d1, d2, d3 } ); } public static Quat aroundAxis(double ax, double ay, double az, double angle) { @@ -89,10 +88,10 @@ public final class Quat { @Override public boolean equals(Object o) { return o instanceof Quat - && ((Quat) o).x == this.x - && ((Quat) o).y == this.y - && ((Quat) o).z == this.z - && ((Quat) o).s == this.s; + && ((Quat) o).x == x + && ((Quat) o).y == y + && ((Quat) o).z == z + && ((Quat) o).s == s; } @Override diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index c5eb1cf4d..9cb5d02f7 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -2,14 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.common.core.helper; +import java.math.BigDecimal; +import java.math.MathContext; +import java.math.RoundingMode; +import java.util.Objects; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.vector.Vector3f; +import org.lwjgl.util.vector.Vector4f; + import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; @@ -17,15 +26,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; -import org.lwjgl.util.vector.Vector3f; -import org.lwjgl.util.vector.Vector4f; - -import java.math.BigDecimal; -import java.math.MathContext; -import java.math.RoundingMode; -import java.util.Arrays; -import java.util.Objects; public class Vector3 { diff --git a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java index 5afbfeb31..3df3d5f1d 100644 --- a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java +++ b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java @@ -1,8 +1,13 @@ package vazkii.botania.common.core.loot; +import java.util.Random; + +import javax.annotation.Nonnull; + import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; + import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.LootContext; @@ -12,38 +17,35 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemRelic; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.Random; - public class BindUuid extends LootFunction { - protected BindUuid(LootCondition[] conditionsIn) { - super(conditionsIn); - } + protected BindUuid(LootCondition[] conditionsIn) { + super(conditionsIn); + } - @Nonnull - @Override - public ItemStack apply(@Nonnull ItemStack stack, @Nonnull Random rand, @Nonnull LootContext context) { - if (context.getKillerPlayer() != null) { - ((ItemRelic) ModItems.dice).bindToUUID(context.getKillerPlayer().getUniqueID(), stack); - } + @Nonnull + @Override + public ItemStack apply(@Nonnull ItemStack stack, @Nonnull Random rand, @Nonnull LootContext context) { + if (context.getKillerPlayer() != null) { + ((ItemRelic) ModItems.dice).bindToUUID(context.getKillerPlayer().getUniqueID(), stack); + } - return stack; - } + return stack; + } - public static class Serializer extends LootFunction.Serializer { - protected Serializer() { - super(new ResourceLocation(LibMisc.MOD_ID, "bind_uuid"), BindUuid.class); - } + public static class Serializer extends LootFunction.Serializer { + protected Serializer() { + super(new ResourceLocation(LibMisc.MOD_ID, "bind_uuid"), BindUuid.class); + } - @Override - public void serialize(@Nonnull JsonObject object, @Nonnull BindUuid functionClazz, @Nonnull JsonSerializationContext serializationContext) {} + @Override + public void serialize(@Nonnull JsonObject object, @Nonnull BindUuid functionClazz, @Nonnull JsonSerializationContext serializationContext) {} - @Nonnull - @Override - public BindUuid deserialize(@Nonnull JsonObject object, @Nonnull JsonDeserializationContext deserializationContext, @Nonnull LootCondition[] conditionsIn) { - return new BindUuid(conditionsIn); - } - } + @Nonnull + @Override + public BindUuid deserialize(@Nonnull JsonObject object, @Nonnull JsonDeserializationContext deserializationContext, @Nonnull LootCondition[] conditionsIn) { + return new BindUuid(conditionsIn); + } + } } diff --git a/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java index 2dc8b3ba7..5865da957 100644 --- a/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java +++ b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java @@ -1,37 +1,39 @@ package vazkii.botania.common.core.loot; +import java.util.Random; + +import javax.annotation.Nonnull; + import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; + import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.storage.loot.conditions.LootCondition; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.Random; - public class EnableRelics implements LootCondition { - @Override - public boolean testCondition(@Nonnull Random rand, @Nonnull LootContext context) { - return ConfigHandler.relicsEnabled; - } + @Override + public boolean testCondition(@Nonnull Random rand, @Nonnull LootContext context) { + return ConfigHandler.relicsEnabled; + } - public static class Serializer extends LootCondition.Serializer { - protected Serializer() { - super(new ResourceLocation(LibMisc.MOD_ID, "enable_relics"), EnableRelics.class); - } + public static class Serializer extends LootCondition.Serializer { + protected Serializer() { + super(new ResourceLocation(LibMisc.MOD_ID, "enable_relics"), EnableRelics.class); + } - @Override - public void serialize(@Nonnull JsonObject json, @Nonnull EnableRelics value, @Nonnull JsonSerializationContext context) {} + @Override + public void serialize(@Nonnull JsonObject json, @Nonnull EnableRelics value, @Nonnull JsonSerializationContext context) {} - @Nonnull - @Override - public EnableRelics deserialize(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { - return new EnableRelics(); - } - } + @Nonnull + @Override + public EnableRelics deserialize(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { + return new EnableRelics(); + } + } } diff --git a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java index 2e341947d..4c1e7b73e 100644 --- a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java +++ b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java @@ -1,7 +1,9 @@ package vazkii.botania.common.core.loot; +import java.util.List; + import com.google.common.collect.ImmutableList; -import net.minecraft.entity.item.EntityMinecartChest; + import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.LootEntry; import net.minecraft.world.storage.loot.LootEntryTable; @@ -12,58 +14,55 @@ import net.minecraft.world.storage.loot.conditions.LootCondition; import net.minecraft.world.storage.loot.conditions.LootConditionManager; import net.minecraft.world.storage.loot.functions.LootFunctionManager; import net.minecraftforge.event.LootTableLoadEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.lib.LibMisc; -import java.util.List; - public final class LootHandler { - private static final List TABLES = ImmutableList.of( - "gaia_guardian", "gaia_guardian_2", - "inject/abandoned_mineshaft", "inject/desert_pyramid", - "inject/jungle_temple", "inject/simple_dungeon", - "inject/spawn_bonus_chest", "inject/stronghold_corridor", - "inject/village_blacksmith" - ); + private static final List TABLES = ImmutableList.of( + "gaia_guardian", "gaia_guardian_2", + "inject/abandoned_mineshaft", "inject/desert_pyramid", + "inject/jungle_temple", "inject/simple_dungeon", + "inject/spawn_bonus_chest", "inject/stronghold_corridor", + "inject/village_blacksmith" + ); - public LootHandler() { - for (String s : TABLES) { - LootTableList.register(new ResourceLocation(LibMisc.MOD_ID, s)); - } + public LootHandler() { + for (String s : TABLES) { + LootTableList.register(new ResourceLocation(LibMisc.MOD_ID, s)); + } - LootConditionManager.registerCondition(new TrueGuardianKiller.Serializer()); - LootConditionManager.registerCondition(new EnableRelics.Serializer()); - LootFunctionManager.registerFunction(new BindUuid.Serializer()); - } + LootConditionManager.registerCondition(new TrueGuardianKiller.Serializer()); + LootConditionManager.registerCondition(new EnableRelics.Serializer()); + LootFunctionManager.registerFunction(new BindUuid.Serializer()); + } - @SubscribeEvent - public void lootLoad(LootTableLoadEvent evt) { - String prefix = "minecraft:chests/"; - String name = evt.getName().toString(); + @SubscribeEvent + public void lootLoad(LootTableLoadEvent evt) { + String prefix = "minecraft:chests/"; + String name = evt.getName().toString(); - if (name.startsWith(prefix)) { - String file = name.substring(name.indexOf(prefix) + prefix.length()); - switch (file) { - case "abandoned_mineshaft": - case "desert_pyramid": - case "jungle_temple": - case "simple_dungeon": - case "spawn_bonus_chest": - case "stronghold_corridor": - case "village_blacksmith": evt.getTable().addPool(getInjectPool(file)); break; - default: break; - } - } - } + if (name.startsWith(prefix)) { + String file = name.substring(name.indexOf(prefix) + prefix.length()); + switch (file) { + case "abandoned_mineshaft": + case "desert_pyramid": + case "jungle_temple": + case "simple_dungeon": + case "spawn_bonus_chest": + case "stronghold_corridor": + case "village_blacksmith": evt.getTable().addPool(getInjectPool(file)); break; + default: break; + } + } + } - private LootPool getInjectPool(String entryName) { - return new LootPool(new LootEntry[] { getInjectEntry(entryName, 1) }, new LootCondition[0], new RandomValueRange(1), new RandomValueRange(0, 1), "botania_inject_pool"); - } + private LootPool getInjectPool(String entryName) { + return new LootPool(new LootEntry[] { getInjectEntry(entryName, 1) }, new LootCondition[0], new RandomValueRange(1), new RandomValueRange(0, 1), "botania_inject_pool"); + } - private LootEntryTable getInjectEntry(String name, int weight) { - return new LootEntryTable(new ResourceLocation(LibMisc.MOD_ID, "inject/" + name), weight, 0, new LootCondition[0], "botania_inject_entry"); - } + private LootEntryTable getInjectEntry(String name, int weight) { + return new LootEntryTable(new ResourceLocation(LibMisc.MOD_ID, "inject/" + name), weight, 0, new LootCondition[0], "botania_inject_entry"); + } } diff --git a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java index 6279fc2bb..24fcf96d6 100644 --- a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java +++ b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java @@ -1,38 +1,40 @@ package vazkii.botania.common.core.loot; +import java.util.Random; + +import javax.annotation.Nonnull; + import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; + import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.storage.loot.conditions.LootCondition; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.Random; - public class TrueGuardianKiller implements LootCondition { - @Override - public boolean testCondition(@Nonnull Random rand, @Nonnull LootContext context) { - return context.getLootedEntity() instanceof EntityDoppleganger - && context.getKillerPlayer() == ((EntityDoppleganger) context.getLootedEntity()).trueKiller; - } + @Override + public boolean testCondition(@Nonnull Random rand, @Nonnull LootContext context) { + return context.getLootedEntity() instanceof EntityDoppleganger + && context.getKillerPlayer() == ((EntityDoppleganger) context.getLootedEntity()).trueKiller; + } - public static class Serializer extends LootCondition.Serializer { - protected Serializer() { - super(new ResourceLocation(LibMisc.MOD_ID, "true_guardian_killer"), TrueGuardianKiller.class); - } + public static class Serializer extends LootCondition.Serializer { + protected Serializer() { + super(new ResourceLocation(LibMisc.MOD_ID, "true_guardian_killer"), TrueGuardianKiller.class); + } - @Override - public void serialize(@Nonnull JsonObject json, @Nonnull TrueGuardianKiller value, @Nonnull JsonSerializationContext context) {} + @Override + public void serialize(@Nonnull JsonObject json, @Nonnull TrueGuardianKiller value, @Nonnull JsonSerializationContext context) {} - @Nonnull - @Override - public TrueGuardianKiller deserialize(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { - return new TrueGuardianKiller(); - } - } + @Nonnull + @Override + public TrueGuardianKiller deserialize(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { + return new TrueGuardianKiller(); + } + } } diff --git a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java index 1ef11ecac..417ea8c55 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java @@ -16,81 +16,81 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.helper.Vector3; public interface IProxy { - void preInit(FMLPreInitializationEvent event); + void preInit(FMLPreInitializationEvent event); - void init(FMLInitializationEvent event); + void init(FMLInitializationEvent event); - void postInit(FMLPostInitializationEvent event); + void postInit(FMLPostInitializationEvent event); - void setEntryToOpen(LexiconEntry entry); + void setEntryToOpen(LexiconEntry entry); - void setToTutorialIfFirstLaunch(); + void setToTutorialIfFirstLaunch(); - void setLexiconStack(ItemStack stack); + void setLexiconStack(ItemStack stack); - boolean isTheClientPlayer(EntityLivingBase entity); + boolean isTheClientPlayer(EntityLivingBase entity); - EntityPlayer getClientPlayer(); + EntityPlayer getClientPlayer(); - boolean isClientPlayerWearingMonocle(); + boolean isClientPlayerWearingMonocle(); - String getLastVersion(); + String getLastVersion(); - void setExtraReach(EntityLivingBase entity, float reach); + void setExtraReach(EntityLivingBase entity, float reach); - boolean openWikiPage(World world, Block block, RayTraceResult pos); + boolean openWikiPage(World world, Block block, RayTraceResult pos); - void playRecordClientSided(World world, BlockPos pos, ItemRecord record); + void playRecordClientSided(World world, BlockPos pos, ItemRecord record); - void setMultiblock(World world, int x, int y, int z, double radius, Block block); + void setMultiblock(World world, int x, int y, int z, double radius, Block block); - void removeSextantMultiblock(); + void removeSextantMultiblock(); - long getWorldElapsedTicks(); + long getWorldElapsedTicks(); - void setSparkleFXNoClip(boolean noclip); + void setSparkleFXNoClip(boolean noclip); - void setSparkleFXCorrupt(boolean corrupt); + void setSparkleFXCorrupt(boolean corrupt); - default void sparkleFX(double x, double y, double z, float r, float g, float b, float size, int m) { - sparkleFX(x, y, z, r, g, b, size, m, false); - } + default void sparkleFX(double x, double y, double z, float r, float g, float b, float size, int m) { + sparkleFX(x, y, z, r, g, b, size, m, false); + } - void sparkleFX(double x, double y, double z, float r, float g, float b, float size, int m, boolean fake); + void sparkleFX(double x, double y, double z, float r, float g, float b, float size, int m, boolean fake); - void setWispFXDistanceLimit(boolean limit); + void setWispFXDistanceLimit(boolean limit); - void setWispFXDepthTest(boolean depth); + void setWispFXDepthTest(boolean depth); - default void wispFX(double x, double y, double z, float r, float g, float b, float size) { - wispFX(x, y, z, r, g, b, size, 0F); - } + default void wispFX(double x, double y, double z, float r, float g, float b, float size) { + wispFX(x, y, z, r, g, b, size, 0F); + } - default void wispFX(double x, double y, double z, float r, float g, float b, float size, float gravity) { - wispFX(x, y, z, r, g, b, size, gravity, 1F); - } + default void wispFX(double x, double y, double z, float r, float g, float b, float size, float gravity) { + wispFX(x, y, z, r, g, b, size, gravity, 1F); + } - default void wispFX(double x, double y, double z, float r, float g, float b, float size, float gravity, float maxAgeMul) { - wispFX(x, y, z, r, g, b, size, 0, -gravity, 0, maxAgeMul); - } + default void wispFX(double x, double y, double z, float r, float g, float b, float size, float gravity, float maxAgeMul) { + wispFX(x, y, z, r, g, b, size, 0, -gravity, 0, maxAgeMul); + } - default void wispFX(double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz) { - wispFX(x, y, z, r, g, b, size, motionx, motiony, motionz, 1F); - } + default void wispFX(double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz) { + wispFX(x, y, z, r, g, b, size, motionx, motiony, motionz, 1F); + } - void wispFX(double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul); + void wispFX(double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul); - default void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, int colorOuter, int colorInner) { - lightningFX(vectorStart, vectorEnd, ticksPerMeter, System.nanoTime(), colorOuter, colorInner); - } + default void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, int colorOuter, int colorInner) { + lightningFX(vectorStart, vectorEnd, ticksPerMeter, System.nanoTime(), colorOuter, colorInner); + } - void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner); + void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner); - void addBoss(IBotaniaBoss boss); + void addBoss(IBotaniaBoss boss); - void removeBoss(IBotaniaBoss boss); + void removeBoss(IBotaniaBoss boss); - int getClientRenderDistance(); + int getClientRenderDistance(); - Object getEmptyModelBiped(); + Object getEmptyModelBiped(); } diff --git a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java index ca406f7f7..1b7bab0ea 100644 --- a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java +++ b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [05/12/2015, 15:31:51 (GMT)] */ package vazkii.botania.common.core.version; diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index 9029c4c6a..b03374e0e 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -2,14 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 31, 2014, 10:22:44 PM (GMT)] */ package vazkii.botania.common.core.version; +import java.awt.Desktop; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; + import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.ITextComponent; @@ -17,20 +24,12 @@ import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import java.awt.*; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; - public class ThreadDownloadMod extends Thread { private final String fileName; private byte[] buffer = new byte[10240]; - private int totalBytesDownloaded; private int bytesJustDownloaded; private InputStream webReader; @@ -72,7 +71,6 @@ public class ThreadDownloadMod extends Thread { while((bytesJustDownloaded = webReader.read(buffer)) > 0) { outputStream.write(buffer, 0, bytesJustDownloaded); buffer = new byte[10240]; - totalBytesDownloaded += bytesJustDownloaded; } outputStream.close(); webReader.close(); diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java index 703e1a6f8..6a061b631 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 31, 2014, 10:31:46 PM (GMT)] */ package vazkii.botania.common.core.version; diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 2becc21e6..ff58015a5 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 31, 2014, 9:58:26 PM (GMT)] */ package vazkii.botania.common.core.version; diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index 138f05d6f..e7e817659 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 9:15:15 PM (GMT)] */ package vazkii.botania.common.crafting; diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index a70728f9e..ff91f92ba 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 19, 2014, 3:54:48 PM (GMT)] */ package vazkii.botania.common.crafting; @@ -299,7 +299,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeAnimatedTorch; public static IRecipe recipeForkLuminizer; public static IRecipe recipeToggleLuminizer; - + // Garden of Glass public static IRecipe recipeRootToSapling; public static IRecipe recipeRootToFertilizer; @@ -1133,11 +1133,11 @@ public final class ModCraftingRecipes { 'P', new ItemStack(Items.PAPER), 'L', new ItemStack(ModItems.lens)); recipeLensMessenger = BotaniaAPI.getLatestAddedRecipe(); - + // Tripwire Lens Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 23), new ItemStack(ModItems.lens), new ItemStack(Blocks.TRIPWIRE_HOOK), LibOreDict.ELEMENTIUM); recipeLensTripwire = BotaniaAPI.getLatestAddedRecipe(); - + // Mini Island for(int i = 0; i < 16; i++) GameRegistry.addRecipe(new ItemStack(ModBlocks.floatingFlower, 1, i), @@ -1999,20 +1999,20 @@ public final class ModCraftingRecipes { recipeBaubleCase = BotaniaAPI.getLatestAddedRecipe(); // Ring of Dexterous Motion Recipe - addOreDictRecipe(new ItemStack(ModItems.dodgeRing), + addOreDictRecipe(new ItemStack(ModItems.dodgeRing), "EM ", "M M", " MR", 'E', "gemEmerald", 'M', LibOreDict.MANA_STEEL, 'R', LibOreDict.RUNE[3]); recipeDodgeRing = BotaniaAPI.getLatestAddedRecipe(); - + // Animated Torch Recipe - addOreDictRecipe(new ItemStack(ModBlocks.animatedTorch), + addOreDictRecipe(new ItemStack(ModBlocks.animatedTorch), "D", "T", 'D', LibOreDict.MANA_POWDER, 'T', new ItemStack(Blocks.REDSTONE_TORCH)); recipeAnimatedTorch = BotaniaAPI.getLatestAddedRecipe(); - + // Fork Luminizer Recipe addShapelessOreDictRecipe(new ItemStack(ModBlocks.lightRelay, 1, 2), new ItemStack(ModBlocks.lightRelay), new ItemStack(Blocks.REDSTONE_TORCH)); recipeForkLuminizer = BotaniaAPI.getLatestAddedRecipe(); @@ -2020,7 +2020,7 @@ public final class ModCraftingRecipes { // TOGGLE Luminizer Recipe addShapelessOreDictRecipe(new ItemStack(ModBlocks.lightRelay, 1, 3), new ItemStack(ModBlocks.lightRelay), new ItemStack(Blocks.LEVER)); recipeToggleLuminizer = BotaniaAPI.getLatestAddedRecipe(); - + /////////////////////////////////////////////////////////////////////////////////////////////////////////// // Storage Block/Nugget Recipes @@ -2151,34 +2151,12 @@ 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)); - } - 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/ModElvenTradeRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java index 88cde7916..ef72d5e2b 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java @@ -1,5 +1,8 @@ package vazkii.botania.common.crafting; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -9,9 +12,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibOreDict; -import java.util.ArrayList; -import java.util.List; - public class ModElvenTradeRecipes { public static RecipeElvenTrade dreamwoodRecipe; diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 59b7823cc..6b4b7513a 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 2, 2014, 7:50:07 PM (GMT)] */ package vazkii.botania.common.crafting; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -21,9 +24,6 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; -import java.util.ArrayList; -import java.util.List; - public final class ModManaAlchemyRecipes { public static RecipeManaInfusion leatherRecipe; diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java index fcbce4a27..f0a23f2a5 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 20, 2014, 3:57:02 PM (GMT)] */ package vazkii.botania.common.crafting; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -17,9 +20,6 @@ import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; -import java.util.ArrayList; -import java.util.List; - public class ModManaConjurationRecipes { public static RecipeManaInfusion redstoneRecipe; diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 1e1d95c22..0db0e63f7 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 30, 2014, 6:10:48 PM (GMT)] */ package vazkii.botania.common.crafting; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -21,9 +24,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; -import java.util.ArrayList; -import java.util.List; - public final class ModManaInfusionRecipes { public static List manasteelRecipes; diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java index 2c83807c3..6f20ecac8 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java @@ -10,11 +10,11 @@ import vazkii.botania.common.item.ModItems; */ public final class ModMigrationRecipes { - public static void init() { - // Prismarine -> vanilla - GameRegistry.addShapelessRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(ModItems.manaResource, 1, 10)); - } + public static void init() { + // Prismarine -> vanilla + GameRegistry.addShapelessRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(ModItems.manaResource, 1, 10)); + } - private ModMigrationRecipes() {} + private ModMigrationRecipes() {} } diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java index bf97ea7c8..528266844 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 22], 2014], 2:22:21 PM (GMT)] */ package vazkii.botania.common.crafting; +import java.util.Arrays; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; @@ -21,8 +23,6 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; -import java.util.Arrays; - public final class ModPetalRecipes { public static final String white = LibOreDict.PETAL[0], orange = LibOreDict.PETAL[1], magenta = LibOreDict.PETAL[2], lightBlue = LibOreDict.PETAL[3], yellow = LibOreDict.PETAL[4], lime = LibOreDict.PETAL[5], pink = LibOreDict.PETAL[6], gray = LibOreDict.PETAL[7], lightGray = LibOreDict.PETAL[8], cyan = LibOreDict.PETAL[9], purple = LibOreDict.PETAL[10], blue = LibOreDict.PETAL[11], brown = LibOreDict.PETAL[12], green = LibOreDict.PETAL[13], red = LibOreDict.PETAL[14], black = LibOreDict.PETAL[15]; diff --git a/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java index 0c2f02505..d32fdad19 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 17, 2015, 5:18:06 PM (GMT)] */ package vazkii.botania.common.crafting; diff --git a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java index 276cc75bb..c0b18a215 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 6, 2014, 5:59:28 PM (GMT)] */ package vazkii.botania.common.crafting; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -20,9 +23,6 @@ import vazkii.botania.common.crafting.recipe.HeadRecipe; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibOreDict; -import java.util.ArrayList; -import java.util.List; - public final class ModRuneRecipes { public static RecipeRuneAltar recipeWaterRune; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index d332d4154..af8d876ae 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 31, 2015, 10:39:58 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import java.util.UUID; + +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -18,9 +22,6 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; -import java.util.UUID; - public class AesirRingRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java index 4164646c2..7b8e5224e 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 30, 2015, 11:24:08 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -18,8 +20,6 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; - public class AncientWillRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java index 98a9a70d5..cc4ce7a43 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java @@ -19,23 +19,23 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; public class ArmorUpgradeRecipe extends ShapedOreRecipe { - public ArmorUpgradeRecipe(ItemStack output, Object... inputs) { - super(output, inputs); - } + public ArmorUpgradeRecipe(ItemStack output, Object... inputs) { + super(output, inputs); + } - @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { - ItemStack out = output.copy(); - for (int i = 0; i < var1.getSizeInventory(); i++) { - ItemStack stack = var1.getStackInSlot(i); - if (stack != null && stack.getItem() instanceof ItemArmor && stack.hasTagCompound()) { - EnchantmentHelper.setEnchantments(EnchantmentHelper.getEnchantments(stack), out); - byte runicHardening = ItemNBTHelper.getByte(stack, "RS.HARDEN", (byte)0); - if (runicHardening != 0) - ItemNBTHelper.setByte(out, "RS.HARDEN", runicHardening); - break; - } - } - return out; - } + @Override + public ItemStack getCraftingResult(InventoryCrafting var1) { + ItemStack out = output.copy(); + for (int i = 0; i < var1.getSizeInventory(); i++) { + ItemStack stack = var1.getStackInSlot(i); + if (stack != null && stack.getItem() instanceof ItemArmor && stack.hasTagCompound()) { + EnchantmentHelper.setEnchantments(EnchantmentHelper.getEnchantments(stack), out); + byte runicHardening = ItemNBTHelper.getByte(stack, "RS.HARDEN", (byte)0); + if (runicHardening != 0) + ItemNBTHelper.setByte(out, "RS.HARDEN", runicHardening); + break; + } + } + return out; + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java index ef86d804e..7fda8ca86 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 9, 2015, 7:48:00 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -19,8 +21,6 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemBlackHoleTalisman; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; - public class BlackHoleTalismanExtractRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java index 3b84a0a64..c7b7ad423 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 17, 2014, 8:30:41 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.init.Items; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -20,8 +22,6 @@ import vazkii.botania.api.mana.ICompositableLens; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.lens.ItemLens; -import javax.annotation.Nonnull; - public class CompositeLensRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java index 44a305842..d51a0365a 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 22, 2015, 8:49:53 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -18,8 +20,6 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; -import javax.annotation.Nonnull; - public class CosmeticAttachRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java index 1bc4b2c85..bfa000f2f 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 22, 2015, 8:55:03 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -18,8 +20,6 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; -import javax.annotation.Nonnull; - public class CosmeticRemoveRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java index 75318f07f..38f733185 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 23, 2014, 3:02:17 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java index 2ec883464..539539f16 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 6, 2015, 9:45:56 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -21,8 +23,6 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; - public class HelmRevealingRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java index 295660da9..5d4611664 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 31, 2015, 9:23:22 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -19,8 +21,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; - public class KeepIvyRecipe implements IRecipe { @Override 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 6ee297ea1..b5cb9453b 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 23, 2015, 4:10:24 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -20,10 +25,6 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.common.item.lens.ItemLens; import vazkii.botania.common.lib.LibOreDict; -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.List; - public class LensDyeingRecipe implements IRecipe { private static final List DYES = Arrays.asList("dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", "dyeYellow", "dyeLime", "dyePink", "dyeGray", "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack", LibOreDict.MANA_PEARL); diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java index 15b5d050d..a15173940 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 8:37:33 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -18,8 +20,6 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; - public class ManaGunClipRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java index b6722e3d5..8547457d9 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 13, 2014, 8:01:14 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -19,8 +21,6 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ILensControl; import vazkii.botania.common.item.ItemManaGun; -import javax.annotation.Nonnull; - public class ManaGunLensRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java index 1730be1e3..54852cc57 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 6, 2014, 5:56:24 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -17,8 +19,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemManaGun; -import javax.annotation.Nonnull; - public class ManaGunRemoveLensRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java index b34cbd3bd..7ae17d6f2 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java @@ -16,29 +16,29 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import vazkii.botania.api.mana.IManaItem; public class ManaUpgradeRecipe extends ShapedOreRecipe { - public ManaUpgradeRecipe(ItemStack output, Object... inputs) { - super(output, inputs); - } + public ManaUpgradeRecipe(ItemStack output, Object... inputs) { + super(output, inputs); + } - public static ItemStack output(ItemStack output, InventoryCrafting var1) { - ItemStack out = output.copy(); - if (!(out.getItem() instanceof IManaItem)) - return out; - IManaItem outItem = (IManaItem) out.getItem(); - for (int i = 0; i < var1.getSizeInventory(); i++) { - ItemStack stack = var1.getStackInSlot(i); - if (stack != null) { - if (stack.getItem() instanceof IManaItem) { - IManaItem item = (IManaItem) stack.getItem(); - outItem.addMana(out, item.getMana(stack)); - } - } - } - return out; - } + public static ItemStack output(ItemStack output, InventoryCrafting var1) { + ItemStack out = output.copy(); + if (!(out.getItem() instanceof IManaItem)) + return out; + IManaItem outItem = (IManaItem) out.getItem(); + for (int i = 0; i < var1.getSizeInventory(); i++) { + ItemStack stack = var1.getStackInSlot(i); + if (stack != null) { + if (stack.getItem() instanceof IManaItem) { + IManaItem item = (IManaItem) stack.getItem(); + outItem.addMana(out, item.getMana(stack)); + } + } + } + return out; + } - @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { - return output(output, var1); - } + @Override + public ItemStack getCraftingResult(InventoryCrafting var1) { + return output(output, var1); + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java index 68c5d8889..107bb23d0 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 17, 2015, 5:21:07 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -18,8 +20,6 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; - public class PhantomInkRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java index 0ed3c7fdd..7030aa442 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java @@ -15,12 +15,12 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapelessOreRecipe; public class ShapelessManaUpgradeRecipe extends ShapelessOreRecipe { - public ShapelessManaUpgradeRecipe(ItemStack output, Object... inputs) { - super(output, inputs); - } + public ShapelessManaUpgradeRecipe(ItemStack output, Object... inputs) { + super(output, inputs); + } - @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { - return ManaUpgradeRecipe.output(output, var1); - } + @Override + public ItemStack getCraftingResult(InventoryCrafting var1) { + return ManaUpgradeRecipe.output(output, var1); + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java index 57e1265ab..bab7926d8 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 17, 2014, 6:34:36 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -19,8 +21,6 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import javax.annotation.Nonnull; - public class SpecialFloatingFlowerRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java index 95ac205d4..d1d38a0d3 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 25, 2015, 6:16:13 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -18,8 +20,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; - public class SpellClothRecipe implements IRecipe { @Override @@ -57,7 +57,7 @@ public class SpellClothRecipe implements IRecipe { if(stackToDisenchant == null) return null; - NBTTagCompound cmp = (NBTTagCompound) stackToDisenchant.getTagCompound().copy(); + NBTTagCompound cmp = stackToDisenchant.getTagCompound().copy(); cmp.removeTag("ench"); // Remove enchantments stackToDisenchant.setTagCompound(cmp); diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java index 5eebc1e8e..d24d75119 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 22, 2014, 7:45:56 PM (GMT)] */ package vazkii.botania.common.crafting.recipe; +import javax.annotation.Nonnull; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -18,8 +20,6 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; -import javax.annotation.Nonnull; - public class TerraPickTippingRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index d4ad4bad2..15c41592a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 16, 2015, 3:56:14 PM (GMT)] */ package vazkii.botania.common.entity; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -30,9 +34,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.relic.ItemKingKey; -import javax.annotation.Nonnull; -import java.util.List; - public class EntityBabylonWeapon extends EntityThrowableCopy { private static final String TAG_CHARGING = "charging"; diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index d8737843c..83643234f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -2,16 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 13, 2015, 10:52:40 PM (GMT)] */ package vazkii.botania.common.entity; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import com.google.common.base.Optional; import com.google.common.base.Predicates; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; @@ -32,10 +38,6 @@ import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { private static final int SCAN_RANGE = 8; @@ -146,7 +148,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { private List getNearbySparks() { List ret = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(posX - SCAN_RANGE, posY - SCAN_RANGE, posZ - SCAN_RANGE, posX + SCAN_RANGE, posY + SCAN_RANGE, posZ + SCAN_RANGE), Predicates.instanceOf(ICorporeaSpark.class)); - return ((List) ret); + return ret; } private void restartNetwork() { diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 0c372d019..52d0e0f6b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -2,15 +2,28 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 12, 2014, 3:47:45 PM (GMT)] */ package vazkii.botania.common.entity; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.ARBShaderObjects; + import com.google.common.base.Optional; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -41,7 +54,6 @@ import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.network.play.server.SPacketRemoveEntityEffect; -import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; @@ -64,7 +76,6 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.ARBShaderObjects; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.api.lexicon.multiblock.Multiblock; @@ -84,15 +95,6 @@ import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; -import javax.annotation.Nonnull; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { public static final float ARENA_RANGE = 12F; @@ -122,10 +124,10 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { private static final DataParameter> BOSSINFO_ID = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.OPTIONAL_UNIQUE_ID); private static final BlockPos[] PYLON_LOCATIONS = { - new BlockPos(4, 1, 4), - new BlockPos(4, 1, -4), - new BlockPos(-4, 1, 4), - new BlockPos(-4, 1, -4) + new BlockPos(4, 1, 4), + new BlockPos(4, 1, -4), + new BlockPos(-4, 1, 4), + new BlockPos(-4, 1, -4) }; private static final List CHEATY_BLOCKS = Arrays.asList("OpenBlocks:beartrap", @@ -140,7 +142,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { private int tpDelay = 0; private int mobSpawnTicks = 0; private final List playersWhoAttacked = new ArrayList<>(); - private final BossInfoServer bossInfo = (BossInfoServer) (new BossInfoServer(this.getDisplayName(), BossInfo.Color.PINK, BossInfo.Overlay.PROGRESS)).setCreateFog(true); + private final BossInfoServer bossInfo = (BossInfoServer) new BossInfoServer(getDisplayName(), BossInfo.Color.PINK, BossInfo.Overlay.PROGRESS).setCreateFog(true); public EntityPlayer trueKiller = null; public EntityDoppleganger(World world) { @@ -202,7 +204,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { if(world.isRemote) return true; - + stack.stackSize--; EntityDoppleganger e = new EntityDoppleganger(world); @@ -230,7 +232,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { private static boolean hasProperArena(World world, BlockPos startPos) { List trippedPositions = new ArrayList(); boolean tripped = false; - + int heightCheck = 3; int heightMin = 2; int range = (int) Math.ceil(ARENA_RANGE); @@ -260,19 +262,19 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { air = 0; } } - + if(trippedColumn == 0) trippedPositions.add(pos); tripped = true; } } - + if(tripped) { Botania.proxy.setWispFXDepthTest(false); for(BlockPos pos : trippedPositions) { System.out.println(world.isRemote); - Botania.proxy.wispFX(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 1F, 0.2F, 0.2F, 0.5F, 0F, 8); + Botania.proxy.wispFX(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 1F, 0.2F, 0.2F, 0.5F, 0F, 8); } Botania.proxy.setWispFXDepthTest(true); @@ -368,7 +370,10 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { if(!playersWhoAttacked.contains(player.getUniqueID())) playersWhoAttacked.add(player.getUniqueID()); - boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(MobEffects.BLINDNESS) && !player.isRiding(); + player.isOnLadder(); + player.isInWater(); + player.isPotionActive(MobEffects.BLINDNESS); + player.isRiding(); int cap = 25; return super.attackEntityFrom(source, Math.min(cap, par2)); @@ -420,7 +425,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { ((EntityPlayer) entitylivingbase).addStat(ModAchievements.gaiaGuardianNoArmor, 1); } - this.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 20F, (1F + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2F) * 0.7F); + playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 20F, (1F + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2F) * 0.7F); worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, posX, posY, posZ, 1D, 0D, 0D); } @@ -448,14 +453,14 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { // Save true killer, they get extra loot if ("player".equals(source.getDamageType()) && source.getEntity() instanceof EntityPlayer) { - this.trueKiller = ((EntityPlayer) source.getEntity()); + trueKiller = (EntityPlayer) source.getEntity(); } // Drop equipment and clear it so multiple calls to super don't do it again super.dropEquipment(wasRecentlyHit, lootingModifier); for (EntityEquipmentSlot e : EntityEquipmentSlot.values()) { - this.setItemStackToSlot(e, null); + setItemStackToSlot(e, null); } // Generate loot table for every single attacking player @@ -464,7 +469,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { if (player == null) continue; - EntityPlayer saveLastAttacker = this.attackingPlayer; + EntityPlayer saveLastAttacker = attackingPlayer; double savePosX = posX; double savePosY = posY; double savePosZ = posZ; @@ -561,7 +566,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { bossInfo.setPercent(getHealth() / getMaxHealth()); if(!getPassengers().isEmpty()) - this.dismountRidingEntity(); + dismountRidingEntity(); if(worldObj.getDifficulty() == EnumDifficulty.PEACEFUL) setDead(); @@ -728,7 +733,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { } } - + if(!players.isEmpty()) for(int pl = 0; pl < playerCount; pl++) for(int i = 0; i < (spawnPixies ? worldObj.rand.nextInt(hard ? 6 : 3) : 1); i++) { @@ -738,7 +743,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { worldObj.spawnEntityInWorld(pixie); } - tpDelay = hard ? (dying ? 35 : 45) : (dying ? 40 : 60); + tpDelay = hard ? dying ? 35 : 45 : dying ? 40 : 60; spawnLandmines = true; spawnPixies = false; } @@ -765,14 +770,14 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { public void addTrackingPlayer(EntityPlayerMP player) { super.addTrackingPlayer(player); - this.bossInfo.addPlayer(player); + bossInfo.addPlayer(player); } @Override public void removeTrackingPlayer(EntityPlayerMP player) { super.removeTrackingPlayer(player); - this.bossInfo.removePlayer(player); + bossInfo.removePlayer(player); } @Override @@ -790,7 +795,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { EntityMagicMissile missile = new EntityMagicMissile(this, true); missile.setPosition(posX + (Math.random() - 0.5 * 0.1), posY + 2.4 + (Math.random() - 0.5 * 0.1), posZ + (Math.random() - 0.5 * 0.1)); if(missile.getTarget()) { - this.playSound(BotaniaSoundEvents.missile, 0.6F, 0.8F + (float) Math.random() * 0.2F); + playSound(BotaniaSoundEvents.missile, 0.6F, 0.8F + (float) Math.random() * 0.2F); worldObj.spawnEntityInWorld(missile); } } @@ -962,7 +967,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { ARBShaderObjects.glUniform1fARB(hpFractUniform, getHealth() / getMaxHealth()); }; - return background ? null : shaderCallback; + return background ? null : shaderCallback; } private static class BeaconComponent extends MultiblockComponent { diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 71add9d03..88cffdf11 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -2,14 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 16, 2015, 5:15:31 PM (GMT)] */ package vazkii.botania.common.entity; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; @@ -20,12 +27,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - public class EntityEnderAirBottle extends EntityThrowable { public EntityEnderAirBottle(World world) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index 5808bd112..7fe7b9e0e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 17, 2015, 4:19:52 PM (GMT)] */ package vazkii.botania.common.entity; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -21,8 +23,6 @@ import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; -import java.util.List; - public class EntityFallingStar extends EntityThrowableCopy { public EntityFallingStar(World world) { @@ -81,7 +81,7 @@ public class EntityFallingStar extends EntityThrowableCopy { if (pos.getBlockPos() != null) { IBlockState state = worldObj.getBlockState(pos.getBlockPos()); if(ConfigHandler.blockBreakParticles && !state.getBlock().isAir(state, worldObj, pos.getBlockPos())) - worldObj.playEvent(2001, pos.getBlockPos(), Block.getStateId(state)); + worldObj.playEvent(2001, pos.getBlockPos(), Block.getStateId(state)); } setDead(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 023c72b66..9e1fae442 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -2,15 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 26, 2014, 12:31:10 AM (GMT)] */ package vazkii.botania.common.entity; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.SoundEvents; @@ -22,9 +26,6 @@ import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; -import javax.annotation.Nonnull; -import java.util.List; - public class EntityFlameRing extends Entity { diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index 6b9e25e9f..c197c9135 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 12, 2014, 7:59:00 PM (GMT)] */ package vazkii.botania.common.entity; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; @@ -22,9 +26,6 @@ import net.minecraft.world.World; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; -import javax.annotation.Nonnull; -import java.util.List; - public class EntityMagicLandmine extends Entity { public EntityDoppleganger summoner; diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 20f3a5ce0..179c6536d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -2,15 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 24, 2014, 5:58:22 PM (GMT)] */ package vazkii.botania.common.entity; +import java.util.List; + +import javax.annotation.Nonnull; + import com.google.common.base.Predicates; + import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockLeaves; @@ -32,9 +37,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibObfuscation; -import javax.annotation.Nonnull; -import java.util.List; - public class EntityMagicMissile extends EntityThrowable { private static final String TAG_TIME = "time"; @@ -137,7 +139,7 @@ public class EntityMagicMissile extends EntityThrowable { EntityPlayer player = thrower instanceof EntityPlayer ? (EntityPlayer) thrower : null; target.attackEntityFrom(player == null ? DamageSource.causeMobDamage(thrower) : DamageSource.causePlayerDamage(player), evil ? 12 : 7); } else target.attackEntityFrom(DamageSource.generic, evil ? 12 : 7); - + setDead(); } @@ -188,21 +190,21 @@ public class EntityMagicMissile extends EntityThrowable { @Override protected void onImpact(@Nonnull RayTraceResult pos) { switch (pos.typeOfHit) { - case BLOCK: { - Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); - if(!(block instanceof BlockBush) && !(block instanceof BlockLeaves)) - setDead(); - break; - } - case ENTITY: { - if (pos.entityHit == getTargetEntity()) - setDead(); - break; - } - default: { + case BLOCK: { + Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); + if(!(block instanceof BlockBush) && !(block instanceof BlockLeaves)) setDead(); - break; - } + break; + } + case ENTITY: { + if (pos.entityHit == getTargetEntity()) + setDead(); + break; + } + default: { + setDead(); + break; + } } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index e5c88aeec..e1d5ac3f5 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -2,15 +2,27 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 26, 2014, 5:09:12 PM (GMT)] */ package vazkii.botania.common.entity; +import java.awt.Color; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Random; +import java.util.Set; +import java.util.UUID; + +import javax.annotation.Nonnull; + import com.google.common.base.Optional; + import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockLeaves; @@ -51,16 +63,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -import javax.annotation.Nonnull; -import java.awt.*; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Random; -import java.util.Set; -import java.util.UUID; - public class EntityManaBurst extends EntityThrowable implements IManaBurst { private static final String TAG_TICKS_EXISTED = "ticksExisted"; @@ -132,7 +134,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { float f = 0.4F; double mx = MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f / 2D; double mz = -(MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f) / 2D; - double my = MathHelper.sin((rotationPitch) / 180.0F * (float) Math.PI) * f / 2D; + double my = MathHelper.sin(rotationPitch / 180.0F * (float) Math.PI) * f / 2D; setMotion(mx, my, mz); } @@ -150,37 +152,37 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { float f = 0.4F; double mx = MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f / 2D; double mz = -(MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f) / 2D; - double my = MathHelper.sin((rotationPitch) / 180.0F * (float) Math.PI) * f / 2D; + double my = MathHelper.sin(rotationPitch / 180.0F * (float) Math.PI) * f / 2D; setMotion(mx, my, mz); } // Copy of EntityThrowable.onUpdate. Relevant edits indicated. private void superUpdate() { - this.lastTickPosX = this.posX; - this.lastTickPosY = this.posY; - this.lastTickPosZ = this.posZ; + lastTickPosX = posX; + lastTickPosY = posY; + lastTickPosZ = posZ; // super.onUpdate(); Botania - inline supersuperclass's onUpdate { - if (!this.worldObj.isRemote) + if (!worldObj.isRemote) { - this.setFlag(6, this.isGlowing()); + setFlag(6, isGlowing()); } - this.onEntityUpdate(); + onEntityUpdate(); } - if (this.throwableShake > 0) + if (throwableShake > 0) { - --this.throwableShake; + --throwableShake; } // Botania - remove inGround check and its else branch. Bursts are never inGround. - Vec3d vec3d = new Vec3d(this.posX, this.posY, this.posZ); - Vec3d vec3d1 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - RayTraceResult raytraceresult = this.worldObj.rayTraceBlocks(vec3d, vec3d1); - vec3d = new Vec3d(this.posX, this.posY, this.posZ); - vec3d1 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3d vec3d = new Vec3d(posX, posY, posZ); + Vec3d vec3d1 = new Vec3d(posX + motionX, posY + motionY, posZ + motionZ); + RayTraceResult raytraceresult = worldObj.rayTraceBlocks(vec3d, vec3d1); + vec3d = new Vec3d(posX, posY, posZ); + vec3d1 = new Vec3d(posX + motionX, posY + motionY, posZ + motionZ); if (raytraceresult != null) { @@ -189,28 +191,23 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(!worldObj.isRemote) { // Botania - only do entity colliding on server Entity entity = null; - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.getEntityBoundingBox().addCoord(this.motionX, this.motionY, this.motionZ).expandXyz(1.0D)); + List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expandXyz(1.0D)); double d0 = 0.0D; - boolean flag = false; - for (int i = 0; i < list.size(); ++i) { - Entity entity1 = (Entity)list.get(i); + Entity entity1 = list.get(i); if (entity1.canBeCollidedWith()) { - if (entity1 == this.ignoreEntity) + if (entity1 == ignoreEntity) { - flag = true; } - else if (this.ticksExisted < 2 && this.ignoreEntity == null) + else if (ticksExisted < 2 && ignoreEntity == null) { - this.ignoreEntity = entity1; - flag = true; + ignoreEntity = entity1; } else { - flag = false; AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expandXyz(0.30000001192092896D); RayTraceResult raytraceresult1 = axisalignedbb.calculateIntercept(vec3d, vec3d1); @@ -228,7 +225,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } } - if (this.ignoreEntity != null) + if (ignoreEntity != null) { /*if (flag) { @@ -248,64 +245,61 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if (raytraceresult != null) { - if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && this.worldObj.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.PORTAL) + if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && worldObj.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.PORTAL) { - this.setPortal(raytraceresult.getBlockPos()); + setPortal(raytraceresult.getBlockPos()); } else { - this.onImpact(raytraceresult); + onImpact(raytraceresult); } } - this.posX += this.motionX; - this.posY += this.motionY; - this.posZ += this.motionZ; - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float)(MathHelper.atan2(this.motionX, this.motionZ) * (180D / Math.PI)); + posX += motionX; + posY += motionY; + posZ += motionZ; + float f = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ); + rotationYaw = (float)(MathHelper.atan2(motionX, motionZ) * (180D / Math.PI)); - for (this.rotationPitch = (float)(MathHelper.atan2(this.motionY, (double)f) * (180D / Math.PI)); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (rotationPitch = (float)(MathHelper.atan2(motionY, f) * (180D / Math.PI)); rotationPitch - prevRotationPitch < -180.0F; prevRotationPitch -= 360.0F) { ; } - while (this.rotationPitch - this.prevRotationPitch >= 180.0F) + while (rotationPitch - prevRotationPitch >= 180.0F) { - this.prevRotationPitch += 360.0F; + prevRotationPitch += 360.0F; } - while (this.rotationYaw - this.prevRotationYaw < -180.0F) + while (rotationYaw - prevRotationYaw < -180.0F) { - this.prevRotationYaw -= 360.0F; + prevRotationYaw -= 360.0F; } - while (this.rotationYaw - this.prevRotationYaw >= 180.0F) + while (rotationYaw - prevRotationYaw >= 180.0F) { - this.prevRotationYaw += 360.0F; + prevRotationYaw += 360.0F; } - this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; - this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; - float f1 = 0.99F; - float f2 = this.getGravityVelocity(); + rotationPitch = prevRotationPitch + (rotationPitch - prevRotationPitch) * 0.2F; + rotationYaw = prevRotationYaw + (rotationYaw - prevRotationYaw) * 0.2F; + float f2 = getGravityVelocity(); - if (this.isInWater()) + if (isInWater()) { for (int j = 0; j < 4; ++j) { float f3 = 0.25F; - this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX - this.motionX * (double)f3, this.posY - this.motionY * (double)f3, this.posZ - this.motionZ * (double)f3, this.motionX, this.motionY, this.motionZ, new int[0]); + worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX - motionX * f3, posY - motionY * f3, posZ - motionZ * f3, motionX, motionY, motionZ, new int[0]); } - - f1 = 0.8F; } // Botania - don't apply drag // this.motionX *= (double)f1; // this.motionY *= (double)f1; // this.motionZ *= (double)f1; - this.motionY -= (double)f2; - this.setPosition(this.posX, this.posY, this.posZ); + motionY -= f2; + setPosition(posX, posY, posZ); } @Override @@ -784,7 +778,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { return tile != null && tile instanceof IManaSpreader && (getMana() != getStartingMana() && fullManaLastTick - || Math.abs(((IManaSpreader) tile).getBurstParticleTick() - getTicksExisted()) < 4); + || Math.abs(((IManaSpreader) tile).getBurstParticleTick() - getTicksExisted()) < 4); } private void incrementFakeParticleTick() { @@ -829,7 +823,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { return false; } - return world.getBlockState(coords) == this.state; + return world.getBlockState(coords) == state; } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java index 4049ae21e..a98efc94a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 25, 2015, 12:35:51 AM (GMT)] */ package vazkii.botania.common.entity; +import javax.annotation.Nonnull; + import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -18,8 +20,6 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.lens.ItemLens; -import javax.annotation.Nonnull; - public class EntityManaStorm extends Entity { private static final String TAG_TIME = "time"; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index fd10c6256..66b1624d6 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -2,18 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 25, 2015, 5:49:28 PM (GMT)] */ package vazkii.botania.common.entity; +import javax.annotation.Nonnull; + import net.minecraft.entity.ai.EntityAIAttackRanged; import net.minecraft.entity.ai.EntityAIHurtByTarget; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; -import net.minecraft.entity.ai.EntityAITasks; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -23,17 +24,14 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import java.util.Iterator; - public class EntityPinkWither extends EntityWither { public EntityPinkWither(World world) { super(world); - this.tasks.taskEntries.removeIf(entry -> entry.action instanceof EntityAIAttackRanged); // Remove firing wither skulls + tasks.taskEntries.removeIf(entry -> entry.action instanceof EntityAIAttackRanged); // Remove firing wither skulls - this.targetTasks.taskEntries.removeIf(entry -> entry.action instanceof EntityAIHurtByTarget + targetTasks.taskEntries.removeIf(entry -> entry.action instanceof EntityAIHurtByTarget || entry.action instanceof EntityAINearestAttackableTarget); // Remove revenge and aggro } @@ -52,8 +50,8 @@ public class EntityPinkWither extends EntityWither { @Override public void updateAITasks() { - if(this.ticksExisted % 20 == 0) - this.heal(1.0F); + if(ticksExisted % 20 == 0) + heal(1.0F); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 7d6dabf12..405c201cf 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.common.entity; +import javax.annotation.Nonnull; + import net.minecraft.entity.EntityFlying; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -22,8 +24,6 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import vazkii.botania.common.Botania; -import javax.annotation.Nonnull; - public class EntityPixie extends EntityFlying { private static final DataParameter TYPE = EntityDataManager.createKey(EntityPixie.class, DataSerializers.VARINT); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 5387c8850..eb763213c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 17, 2015, 6:36:43 PM (GMT)] */ package vazkii.botania.common.entity; +import java.awt.Color; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityMinecart; @@ -35,9 +39,6 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; -import java.awt.*; - public class EntityPoolMinecart extends EntityMinecart { private static final int TRANSFER_RATE = 10000; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index b3620bcea..b765ac273 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 3, 2014, 7:10:32 PM (GMT)] */ package vazkii.botania.common.entity; +import javax.annotation.Nonnull; + import net.minecraft.entity.Entity; import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumDyeColor; @@ -20,8 +22,6 @@ import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.world.World; import vazkii.botania.common.Botania; -import javax.annotation.Nonnull; - public class EntitySignalFlare extends Entity { private static final String COLOR_TAG = "color"; @@ -55,7 +55,7 @@ public class EntitySignalFlare extends Entity { int hex = EnumDyeColor.byMetadata(color).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; - int b = (hex & 0xFF); + int b = hex & 0xFF; Botania.proxy.setWispFXDistanceLimit(false); for(int i = 0; i < 3; i++) diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 562a45cc1..07cd42193 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -2,17 +2,29 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 21, 2014, 5:43:44 PM (GMT)] */ package vazkii.botania.common.entity; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; + +import javax.annotation.Nonnull; + import baubles.common.lib.PlayerHandler; import gnu.trove.map.hash.TObjectIntHashMap; -import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -33,24 +45,10 @@ import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkHelper; import vazkii.botania.api.mana.spark.SparkUpgradeType; -import vazkii.botania.common.Botania; -import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; - public class EntitySpark extends Entity implements ISparkEntity { private static final int TRANSFER_RATE = 1000; @@ -102,85 +100,85 @@ public class EntitySpark extends Entity implements ISparkEntity { Collection transfers = getTransfers(); switch(upgrade) { - case DISPERSIVE : { - List players = SparkHelper.getEntitiesAround(EntityPlayer.class, worldObj, posX, posY, posZ); + case DISPERSIVE : { + List players = SparkHelper.getEntitiesAround(EntityPlayer.class, worldObj, posX, posY, posZ); - Map> receivingPlayers = new HashMap<>(); + Map> receivingPlayers = new HashMap<>(); - ItemStack input = new ItemStack(ModItems.spark); - for(EntityPlayer player : players) { - List stacks = new ArrayList<>(); - stacks.addAll(Arrays.asList(player.inventory.mainInventory)); - stacks.addAll(Arrays.asList(player.inventory.armorInventory)); - stacks.addAll(Arrays.asList(PlayerHandler.getPlayerBaubles(player).stackList)); + ItemStack input = new ItemStack(ModItems.spark); + for(EntityPlayer player : players) { + List stacks = new ArrayList<>(); + stacks.addAll(Arrays.asList(player.inventory.mainInventory)); + stacks.addAll(Arrays.asList(player.inventory.armorInventory)); + stacks.addAll(Arrays.asList(PlayerHandler.getPlayerBaubles(player).stackList)); - for(ItemStack stack : stacks) { - if(stack == null || !(stack.getItem() instanceof IManaItem)) - continue; + for(ItemStack stack : stacks) { + if(stack == null || !(stack.getItem() instanceof IManaItem)) + continue; - IManaItem manaItem = (IManaItem) stack.getItem(); - if(manaItem.canReceiveManaFromItem(stack, input)) { - TObjectIntHashMap receivingStacks; - boolean add = false; - if(!receivingPlayers.containsKey(player)) { - add = true; - receivingStacks = new TObjectIntHashMap<>(); - } else receivingStacks = receivingPlayers.get(player); + IManaItem manaItem = (IManaItem) stack.getItem(); + if(manaItem.canReceiveManaFromItem(stack, input)) { + TObjectIntHashMap receivingStacks; + boolean add = false; + if(!receivingPlayers.containsKey(player)) { + add = true; + receivingStacks = new TObjectIntHashMap<>(); + } else receivingStacks = receivingPlayers.get(player); - int recv = Math.min(getAttachedTile().getCurrentMana(), Math.min(TRANSFER_RATE, manaItem.getMaxMana(stack) - manaItem.getMana(stack))); - if(recv > 0) { - receivingStacks.put(stack, recv); - if(add) - receivingPlayers.put(player, receivingStacks); - } + int recv = Math.min(getAttachedTile().getCurrentMana(), Math.min(TRANSFER_RATE, manaItem.getMaxMana(stack) - manaItem.getMana(stack))); + if(recv > 0) { + receivingStacks.put(stack, recv); + if(add) + receivingPlayers.put(player, receivingStacks); } } } - - if(!receivingPlayers.isEmpty()) { - List keys = new ArrayList<>(receivingPlayers.keySet()); - Collections.shuffle(keys); - EntityPlayer player = keys.iterator().next(); - - TObjectIntHashMap items = receivingPlayers.get(player); - ItemStack stack = items.keySet().iterator().next(); - int cost = items.get(stack); - int manaToPut = Math.min(getAttachedTile().getCurrentMana(), cost); - ((IManaItem) stack.getItem()).addMana(stack, manaToPut); - getAttachedTile().recieveMana(-manaToPut); - particlesTowards(player); - } - - break; } - case DOMINANT : { - List validSparks = new ArrayList<>(); - for(ISparkEntity spark : allSparks) { - if(spark == this) - continue; - SparkUpgradeType upgrade_ = spark.getUpgrade(); - if(upgrade_ == SparkUpgradeType.NONE && spark.getAttachedTile() instanceof IManaPool) - validSparks.add(spark); - } - if(validSparks.size() > 0) - validSparks.get(worldObj.rand.nextInt(validSparks.size())).registerTransfer(this); + if(!receivingPlayers.isEmpty()) { + List keys = new ArrayList<>(receivingPlayers.keySet()); + Collections.shuffle(keys); + EntityPlayer player = keys.iterator().next(); - break; + TObjectIntHashMap items = receivingPlayers.get(player); + ItemStack stack = items.keySet().iterator().next(); + int cost = items.get(stack); + int manaToPut = Math.min(getAttachedTile().getCurrentMana(), cost); + ((IManaItem) stack.getItem()).addMana(stack, manaToPut); + getAttachedTile().recieveMana(-manaToPut); + particlesTowards(player); } - case RECESSIVE : { - for(ISparkEntity spark : allSparks) { - if(spark == this) - continue; - SparkUpgradeType upgrade_ = spark.getUpgrade(); - if(upgrade_ != SparkUpgradeType.DOMINANT && upgrade_ != SparkUpgradeType.RECESSIVE && upgrade_ != SparkUpgradeType.ISOLATED) - transfers.add(spark); - } - break; + break; + } + case DOMINANT : { + List validSparks = new ArrayList<>(); + for(ISparkEntity spark : allSparks) { + if(spark == this) + continue; + + SparkUpgradeType upgrade_ = spark.getUpgrade(); + if(upgrade_ == SparkUpgradeType.NONE && spark.getAttachedTile() instanceof IManaPool) + validSparks.add(spark); } - case NONE: - default: break; + if(validSparks.size() > 0) + validSparks.get(worldObj.rand.nextInt(validSparks.size())).registerTransfer(this); + + break; + } + case RECESSIVE : { + for(ISparkEntity spark : allSparks) { + if(spark == this) + continue; + + SparkUpgradeType upgrade_ = spark.getUpgrade(); + if(upgrade_ != SparkUpgradeType.DOMINANT && upgrade_ != SparkUpgradeType.RECESSIVE && upgrade_ != SparkUpgradeType.ISOLATED) + transfers.add(spark); + } + break; + } + case NONE: + default: break; } if(!transfers.isEmpty()) { @@ -219,7 +217,7 @@ public class EntitySpark extends Entity implements ISparkEntity { public static void particleBeam(EntityPlayer player, Entity e1, Entity e2) { if(e1 != null && e2 != null && !e1.worldObj.isRemote) { - PacketHandler.sendTo(((EntityPlayerMP) player), + PacketHandler.sendTo((EntityPlayerMP) player, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.SPARK_NET_INDICATOR, e1.posX, e1.posY, e1.posZ, e1.getEntityId(), e2.getEntityId())); } @@ -243,7 +241,7 @@ public class EntitySpark extends Entity implements ISparkEntity { if(stack != null) { if(worldObj.isRemote) return stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.sparkUpgrade - || stack.getItem() == ModItems.phantomInk; + || stack.getItem() == ModItems.phantomInk; SparkUpgradeType upgrade = getUpgrade(); if(stack.getItem() == ModItems.twigWand) { @@ -351,7 +349,7 @@ public class EntitySpark extends Entity implements ISparkEntity { ISparkAttachable tile = getAttachedTile(); if(tile instanceof IManaPool) return removeTransferants > 0; - return tile != null && tile.areIncomingTranfersDone(); + return tile != null && tile.areIncomingTranfersDone(); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 53e0fea98..2dc7df6ac 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 25, 2015, 6:47:35 PM (GMT)] */ package vazkii.botania.common.entity; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockLeaves; @@ -33,8 +35,6 @@ import net.minecraft.world.World; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; - public class EntityThornChakram extends EntityThrowable { private static final DataParameter BOUNCES = EntityDataManager.createKey(EntityThornChakram.class, DataSerializers.VARINT); @@ -126,42 +126,42 @@ public class EntityThornChakram extends EntityThrowable { return; switch (pos.typeOfHit) { - case BLOCK: { - Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); - if(block instanceof BlockBush || block instanceof BlockLeaves) - return; + case BLOCK: { + Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); + if(block instanceof BlockBush || block instanceof BlockLeaves) + return; - int bounces = getTimesBounced(); - if(bounces < MAX_BOUNCES) { - Vector3 currentMovementVec = new Vector3(motionX, motionY, motionZ); - EnumFacing dir = pos.sideHit; - Vector3 normalVector = new Vector3(dir.getFrontOffsetX(), dir.getFrontOffsetY(), dir.getFrontOffsetZ()).normalize(); - Vector3 movementVec = normalVector.multiply(-2 * currentMovementVec.dotProduct(normalVector)).add(currentMovementVec); + int bounces = getTimesBounced(); + if(bounces < MAX_BOUNCES) { + Vector3 currentMovementVec = new Vector3(motionX, motionY, motionZ); + EnumFacing dir = pos.sideHit; + Vector3 normalVector = new Vector3(dir.getFrontOffsetX(), dir.getFrontOffsetY(), dir.getFrontOffsetZ()).normalize(); + Vector3 movementVec = normalVector.multiply(-2 * currentMovementVec.dotProduct(normalVector)).add(currentMovementVec); - motionX = movementVec.x; - motionY = movementVec.y; - motionZ = movementVec.z; - bounced = true; + motionX = movementVec.x; + motionY = movementVec.y; + motionZ = movementVec.z; + bounced = true; - if(!worldObj.isRemote) - setTimesBounced(getTimesBounced() + 1); - } - - break; + if(!worldObj.isRemote) + setTimesBounced(getTimesBounced() + 1); } - case ENTITY: { - if(!worldObj.isRemote && pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != getThrower()) { - EntityLivingBase thrower = getThrower(); - pos.entityHit.attackEntityFrom(thrower != null ? thrower instanceof EntityPlayer ? DamageSource.causeThrownDamage(this, thrower) : DamageSource.causeMobDamage(thrower) : DamageSource.generic, 12); - if(isFire()) - pos.entityHit.setFire(5); - else if(worldObj.rand.nextInt(3) == 0) - ((EntityLivingBase) pos.entityHit).addPotionEffect(new PotionEffect(MobEffects.POISON, 60, 0)); - } - break; + break; + } + case ENTITY: { + if(!worldObj.isRemote && pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != getThrower()) { + EntityLivingBase thrower = getThrower(); + pos.entityHit.attackEntityFrom(thrower != null ? thrower instanceof EntityPlayer ? DamageSource.causeThrownDamage(this, thrower) : DamageSource.causeMobDamage(thrower) : DamageSource.generic, 12); + if(isFire()) + pos.entityHit.setFire(5); + else if(worldObj.rand.nextInt(3) == 0) + ((EntityLivingBase) pos.entityHit).addPotionEffect(new PotionEffect(MobEffects.POISON, 60, 0)); } - default: break; + + break; + } + default: break; } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 3a73143c7..fc6b9a174 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 16, 2015, 4:01:43 PM (GMT)] */ package vazkii.botania.common.entity; +import java.util.List; +import java.util.UUID; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -29,10 +34,6 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.UUID; - // A copy of the vanilla EntityThrowable class // Doing this because if I didn't do this it'd be an EntityThrowable // And we all know how much mods like deflecting EntityThrowables @@ -48,31 +49,31 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile private EntityLivingBase thrower; private String throwerName; private int ticksInGround; - private int ticksInAir; public Entity field_184539_c; private int field_184540_av; public EntityThrowableCopy(World worldIn) { super(worldIn); - this.xTile = -1; - this.yTile = -1; - this.zTile = -1; - this.setSize(0.25F, 0.25F); + xTile = -1; + yTile = -1; + zTile = -1; + setSize(0.25F, 0.25F); } public EntityThrowableCopy(World worldIn, double x, double y, double z) { this(worldIn); - this.setPosition(x, y, z); + setPosition(x, y, z); } public EntityThrowableCopy(World worldIn, EntityLivingBase throwerIn) { - this(worldIn, throwerIn.posX, throwerIn.posY + (double)throwerIn.getEyeHeight() - 0.10000000149011612D, throwerIn.posZ); - this.thrower = throwerIn; + this(worldIn, throwerIn.posX, throwerIn.posY + throwerIn.getEyeHeight() - 0.10000000149011612D, throwerIn.posZ); + thrower = throwerIn; } + @Override protected void entityInit() { } @@ -81,10 +82,11 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile * Checks if the entity is in range to render by using the past in distance and comparing it to its average edge * length * 64 * renderDistanceWeight Args: distance */ + @Override @SideOnly(Side.CLIENT) public boolean isInRangeToRenderDist(double distance) { - double d0 = this.getEntityBoundingBox().getAverageEdgeLength() * 4.0D; + double d0 = getEntityBoundingBox().getAverageEdgeLength() * 4.0D; if (Double.isNaN(d0)) { @@ -100,104 +102,105 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile float f = -MathHelper.sin(p_184538_3_ * 0.017453292F) * MathHelper.cos(p_184538_2_ * 0.017453292F); float f1 = -MathHelper.sin((p_184538_2_ + p_184538_4_) * 0.017453292F); float f2 = MathHelper.cos(p_184538_3_ * 0.017453292F) * MathHelper.cos(p_184538_2_ * 0.017453292F); - this.setThrowableHeading((double)f, (double)f1, (double)f2, p_184538_5_, p_184538_6_); - this.motionX += p_184538_1_.motionX; - this.motionZ += p_184538_1_.motionZ; + setThrowableHeading(f, f1, f2, p_184538_5_, p_184538_6_); + motionX += p_184538_1_.motionX; + motionZ += p_184538_1_.motionZ; if (!p_184538_1_.onGround) { - this.motionY += p_184538_1_.motionY; + motionY += p_184538_1_.motionY; } } /** * Similar to setArrowHeading, it's point the throwable entity to a x, y, z direction. */ + @Override public void setThrowableHeading(double x, double y, double z, float velocity, float inaccuracy) { float f = MathHelper.sqrt_double(x * x + y * y + z * z); - x = x / (double)f; - y = y / (double)f; - z = z / (double)f; - x = x + this.rand.nextGaussian() * 0.007499999832361937D * (double)inaccuracy; - y = y + this.rand.nextGaussian() * 0.007499999832361937D * (double)inaccuracy; - z = z + this.rand.nextGaussian() * 0.007499999832361937D * (double)inaccuracy; - x = x * (double)velocity; - y = y * (double)velocity; - z = z * (double)velocity; - this.motionX = x; - this.motionY = y; - this.motionZ = z; + x = x / f; + y = y / f; + z = z / f; + x = x + rand.nextGaussian() * 0.007499999832361937D * inaccuracy; + y = y + rand.nextGaussian() * 0.007499999832361937D * inaccuracy; + z = z + rand.nextGaussian() * 0.007499999832361937D * inaccuracy; + x = x * velocity; + y = y * velocity; + z = z * velocity; + motionX = x; + motionY = y; + motionZ = z; float f1 = MathHelper.sqrt_double(x * x + z * z); - this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.atan2(x, z) * (180D / Math.PI)); - this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.atan2(y, (double)f1) * (180D / Math.PI)); - this.ticksInGround = 0; + prevRotationYaw = rotationYaw = (float)(MathHelper.atan2(x, z) * (180D / Math.PI)); + prevRotationPitch = rotationPitch = (float)(MathHelper.atan2(y, f1) * (180D / Math.PI)); + ticksInGround = 0; } /** * Updates the velocity of the entity to a new value. */ + @Override @SideOnly(Side.CLIENT) public void setVelocity(double x, double y, double z) { - this.motionX = x; - this.motionY = y; - this.motionZ = z; + motionX = x; + motionY = y; + motionZ = z; - if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) + if (prevRotationPitch == 0.0F && prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(x * x + z * z); - this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.atan2(x, z) * (180D / Math.PI)); - this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.atan2(y, (double)f) * (180D / Math.PI)); + prevRotationYaw = rotationYaw = (float)(MathHelper.atan2(x, z) * (180D / Math.PI)); + prevRotationPitch = rotationPitch = (float)(MathHelper.atan2(y, f) * (180D / Math.PI)); } } /** * Called to update the entity's position/logic. */ + @Override public void onUpdate() { - this.lastTickPosX = this.posX; - this.lastTickPosY = this.posY; - this.lastTickPosZ = this.posZ; + lastTickPosX = posX; + lastTickPosY = posY; + lastTickPosZ = posZ; super.onUpdate(); - if (this.throwableShake > 0) + if (throwableShake > 0) { - --this.throwableShake; + --throwableShake; } - if (this.inGround) + if (inGround) { - if (this.worldObj.getBlockState(new BlockPos(this.xTile, this.yTile, this.zTile)).getBlock() == this.inTile) + if (worldObj.getBlockState(new BlockPos(xTile, yTile, zTile)).getBlock() == inTile) { - ++this.ticksInGround; + ++ticksInGround; - if (this.ticksInGround == 1200) + if (ticksInGround == 1200) { - this.setDead(); + setDead(); } return; } - this.inGround = false; - this.motionX *= (double)(this.rand.nextFloat() * 0.2F); - this.motionY *= (double)(this.rand.nextFloat() * 0.2F); - this.motionZ *= (double)(this.rand.nextFloat() * 0.2F); - this.ticksInGround = 0; - this.ticksInAir = 0; + inGround = false; + motionX *= rand.nextFloat() * 0.2F; + motionY *= rand.nextFloat() * 0.2F; + motionZ *= rand.nextFloat() * 0.2F; + ticksInGround = 0; } else { - ++this.ticksInAir; } - Vec3d vec3d = new Vec3d(this.posX, this.posY, this.posZ); - Vec3d vec3d1 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - RayTraceResult raytraceresult = this.worldObj.rayTraceBlocks(vec3d, vec3d1); - vec3d = new Vec3d(this.posX, this.posY, this.posZ); - vec3d1 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3d vec3d = new Vec3d(posX, posY, posZ); + Vec3d vec3d1 = new Vec3d(posX + motionX, posY + motionY, posZ + motionZ); + RayTraceResult raytraceresult = worldObj.rayTraceBlocks(vec3d, vec3d1); + vec3d = new Vec3d(posX, posY, posZ); + vec3d1 = new Vec3d(posX + motionX, posY + motionY, posZ + motionZ); if (raytraceresult != null) { @@ -205,23 +208,23 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile } Entity entity = null; - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.getEntityBoundingBox().addCoord(this.motionX, this.motionY, this.motionZ).expandXyz(1.0D)); + List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expandXyz(1.0D)); double d0 = 0.0D; boolean flag = false; for (int i = 0; i < list.size(); ++i) { - Entity entity1 = (Entity)list.get(i); + Entity entity1 = list.get(i); if (entity1.canBeCollidedWith()) { - if (entity1 == this.field_184539_c) + if (entity1 == field_184539_c) { flag = true; } - else if (this.ticksExisted < 2 && this.field_184539_c == null) + else if (ticksExisted < 2 && field_184539_c == null) { - this.field_184539_c = entity1; + field_184539_c = entity1; flag = true; } else @@ -244,15 +247,15 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile } } - if (this.field_184539_c != null) + if (field_184539_c != null) { if (flag) { - this.field_184540_av = 2; + field_184540_av = 2; } - else if (this.field_184540_av-- <= 0) + else if (field_184540_av-- <= 0) { - this.field_184539_c = null; + field_184539_c = null; } } @@ -263,63 +266,63 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (raytraceresult != null) { - if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && this.worldObj.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.PORTAL) + if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && worldObj.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.PORTAL) { - this.setPortal(raytraceresult.getBlockPos()); + setPortal(raytraceresult.getBlockPos()); } else { - this.onImpact(raytraceresult); + onImpact(raytraceresult); } } - this.posX += this.motionX; - this.posY += this.motionY; - this.posZ += this.motionZ; - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float)(MathHelper.atan2(this.motionX, this.motionZ) * (180D / Math.PI)); + posX += motionX; + posY += motionY; + posZ += motionZ; + float f = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ); + rotationYaw = (float)(MathHelper.atan2(motionX, motionZ) * (180D / Math.PI)); - for (this.rotationPitch = (float)(MathHelper.atan2(this.motionY, (double)f) * (180D / Math.PI)); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (rotationPitch = (float)(MathHelper.atan2(motionY, f) * (180D / Math.PI)); rotationPitch - prevRotationPitch < -180.0F; prevRotationPitch -= 360.0F) { ; } - while (this.rotationPitch - this.prevRotationPitch >= 180.0F) + while (rotationPitch - prevRotationPitch >= 180.0F) { - this.prevRotationPitch += 360.0F; + prevRotationPitch += 360.0F; } - while (this.rotationYaw - this.prevRotationYaw < -180.0F) + while (rotationYaw - prevRotationYaw < -180.0F) { - this.prevRotationYaw -= 360.0F; + prevRotationYaw -= 360.0F; } - while (this.rotationYaw - this.prevRotationYaw >= 180.0F) + while (rotationYaw - prevRotationYaw >= 180.0F) { - this.prevRotationYaw += 360.0F; + prevRotationYaw += 360.0F; } - this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; - this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; + rotationPitch = prevRotationPitch + (rotationPitch - prevRotationPitch) * 0.2F; + rotationYaw = prevRotationYaw + (rotationYaw - prevRotationYaw) * 0.2F; float f1 = 0.99F; - float f2 = this.getGravityVelocity(); + float f2 = getGravityVelocity(); - if (this.isInWater()) + if (isInWater()) { for (int j = 0; j < 4; ++j) { float f3 = 0.25F; - this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX - this.motionX * (double)f3, this.posY - this.motionY * (double)f3, this.posZ - this.motionZ * (double)f3, this.motionX, this.motionY, this.motionZ); + worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX - motionX * f3, posY - motionY * f3, posZ - motionZ * f3, motionX, motionY, motionZ); } f1 = 0.8F; } - this.motionX *= (double)f1; - this.motionY *= (double)f1; - this.motionZ *= (double)f1; - this.motionY -= (double)f2; - this.setPosition(this.posX, this.posY, this.posZ); + motionX *= f1; + motionY *= f1; + motionZ *= f1; + motionY -= f2; + setPosition(posX, posY, posZ); } /** @@ -338,79 +341,81 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile /** * (abstract) Protected helper method to write subclass entity data to NBT. */ + @Override public void writeEntityToNBT(@Nonnull NBTTagCompound compound) { - compound.setInteger("xTile", this.xTile); - compound.setInteger("yTile", this.yTile); - compound.setInteger("zTile", this.zTile); - ResourceLocation resourcelocation = (ResourceLocation)Block.REGISTRY.getNameForObject(this.inTile); + compound.setInteger("xTile", xTile); + compound.setInteger("yTile", yTile); + compound.setInteger("zTile", zTile); + ResourceLocation resourcelocation = Block.REGISTRY.getNameForObject(inTile); compound.setString("inTile", resourcelocation == null ? "" : resourcelocation.toString()); - compound.setByte("shake", (byte)this.throwableShake); - compound.setByte("inGround", (byte)(this.inGround ? 1 : 0)); + compound.setByte("shake", (byte)throwableShake); + compound.setByte("inGround", (byte)(inGround ? 1 : 0)); - if ((this.throwerName == null || this.throwerName.isEmpty()) && this.thrower instanceof EntityPlayer) + if ((throwerName == null || throwerName.isEmpty()) && thrower instanceof EntityPlayer) { - this.throwerName = this.thrower.getName(); + throwerName = thrower.getName(); } - compound.setString("ownerName", this.throwerName == null ? "" : this.throwerName); + compound.setString("ownerName", throwerName == null ? "" : throwerName); } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ + @Override public void readEntityFromNBT(@Nonnull NBTTagCompound compound) { - this.xTile = compound.getInteger("xTile"); - this.yTile = compound.getInteger("yTile"); - this.zTile = compound.getInteger("zTile"); + xTile = compound.getInteger("xTile"); + yTile = compound.getInteger("yTile"); + zTile = compound.getInteger("zTile"); if (compound.hasKey("inTile", 8)) { - this.inTile = Block.getBlockFromName(compound.getString("inTile")); + inTile = Block.getBlockFromName(compound.getString("inTile")); } else { - this.inTile = Block.getBlockById(compound.getByte("inTile") & 255); + inTile = Block.getBlockById(compound.getByte("inTile") & 255); } - this.throwableShake = compound.getByte("shake") & 255; - this.inGround = compound.getByte("inGround") == 1; - this.thrower = null; - this.throwerName = compound.getString("ownerName"); + throwableShake = compound.getByte("shake") & 255; + inGround = compound.getByte("inGround") == 1; + thrower = null; + throwerName = compound.getString("ownerName"); - if (this.throwerName != null && this.throwerName.isEmpty()) + if (throwerName != null && throwerName.isEmpty()) { - this.throwerName = null; + throwerName = null; } - this.thrower = this.getThrower(); + thrower = getThrower(); } public EntityLivingBase getThrower() { - if (this.thrower == null && this.throwerName != null && !this.throwerName.isEmpty()) + if (thrower == null && throwerName != null && !throwerName.isEmpty()) { - this.thrower = this.worldObj.getPlayerEntityByName(this.throwerName); + thrower = worldObj.getPlayerEntityByName(throwerName); - if (this.thrower == null && this.worldObj instanceof WorldServer) + if (thrower == null && worldObj instanceof WorldServer) { try { - Entity entity = ((WorldServer)this.worldObj).getEntityFromUuid(UUID.fromString(this.throwerName)); + Entity entity = ((WorldServer)worldObj).getEntityFromUuid(UUID.fromString(throwerName)); if (entity instanceof EntityLivingBase) { - this.thrower = (EntityLivingBase)entity; + thrower = (EntityLivingBase)entity; } } catch (Throwable var2) { - this.thrower = null; + thrower = null; } } } - return this.thrower; + return thrower; } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 4210251b8..7247d112e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.common.entity; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -22,9 +26,6 @@ import net.minecraft.world.World; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.Vector3; -import javax.annotation.Nonnull; -import java.util.List; - public class EntityThrownItem extends EntityItem { public EntityThrownItem(World world) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index 0cd26a163..a2360ee14 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -2,15 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 26, 2014, 7:32:16 PM (GMT)] */ package vazkii.botania.common.entity; +import java.util.Map; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableMap; + import net.minecraft.block.Block; import net.minecraft.block.BlockVine; import net.minecraft.block.properties.PropertyBool; @@ -29,9 +34,6 @@ import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; -import java.util.Map; - public class EntityVineBall extends EntityThrowable { private static final DataParameter GRAVITY = EntityDataManager.createKey(EntityVineBall.class, DataSerializers.FLOAT); @@ -58,7 +60,7 @@ public class EntityVineBall extends EntityThrowable { if(worldObj.isRemote) { for(int j = 0; j < 16; j++) { - this.worldObj.spawnParticle(EnumParticleTypes.ITEM_CRACK, this.posX, this.posY, this.posZ, Math.random() * 0.2 - 0.1, Math.random() * 0.25, Math.random() * 0.2 - 0.1, Item.getIdFromItem(ModItems.vineBall)); + worldObj.spawnParticle(EnumParticleTypes.ITEM_CRACK, posX, posY, posZ, Math.random() * 0.2 - 0.1, Math.random() * 0.25, Math.random() * 0.2 - 0.1, Item.getIdFromItem(ModItems.vineBall)); } } else { if(var1 != null) { diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index 7fb8fc032..a053389b8 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 26, 2014, 4:11:03 PM (GMT)] */ package vazkii.botania.common.entity; diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java index 28364aa84..f7cd8b9f6 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java @@ -1,5 +1,8 @@ package vazkii.botania.common.integration.buildcraft; +import java.util.ArrayList; +import java.util.Collection; + import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; @@ -11,9 +14,6 @@ import vazkii.botania.api.mana.IManaBlock; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileRuneAltar; -import java.util.ArrayList; -import java.util.Collection; - public class StatementAPIPlugin implements ITriggerProvider { public static final ITriggerExternal triggerManaEmpty = new TriggerManaLevel(TriggerManaLevel.State.EMPTY); diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index 2f07c69e9..04a7a351f 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -1,9 +1,10 @@ package vazkii.botania.common.integration.buildcraft; +import com.google.common.base.Predicates; + import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; -import com.google.common.base.Predicates; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index 462527a7e..2a265dfb3 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -1,5 +1,7 @@ package vazkii.botania.common.integration.buildcraft; +import org.apache.commons.lang3.text.WordUtils; + import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; @@ -9,7 +11,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.text.WordUtils; import vazkii.botania.api.mana.IManaBlock; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.client.core.handler.MiscellaneousIcons; diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java index ab999e521..8b83b57ed 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java @@ -2,13 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * */ package vazkii.botania.common.integration.corporea; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.items.wrapper.InvWrapper; @@ -19,9 +22,6 @@ import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.Botania; -import java.util.ArrayList; -import java.util.List; - /** * Wrapper for StorageDrawers compatibility. * @@ -34,13 +34,13 @@ public class WrappedDeepStorage extends WrappedInventoryBase { private final IDeepStorageUnit invRaw; private WrappedDeepStorage(IDeepStorageUnit inv, ICorporeaSpark spark) { - this.invRaw = inv; + invRaw = inv; this.spark = spark; } @Override public InvWithLocation getWrappedObject() { - return new InvWithLocation(new InvWrapper(((IInventory) invRaw)), spark.getSparkInventory().world, spark.getSparkInventory().pos); + return new InvWithLocation(new InvWrapper((IInventory) invRaw), spark.getSparkInventory().world, spark.getSparkInventory().pos); } @Override @@ -111,7 +111,7 @@ public class WrappedDeepStorage extends WrappedInventoryBase { */ public static IWrappedInventory wrap(InvWithLocation inv, ICorporeaSpark spark) { if(isDeepStorageNeeded() && inv.handler instanceof InvWrapper && ((InvWrapper) inv.handler).getInv() instanceof IDeepStorageUnit) { - return new WrappedDeepStorage(((IDeepStorageUnit) ((InvWrapper) inv.handler).getInv()), spark); + return new WrappedDeepStorage((IDeepStorageUnit) ((InvWrapper) inv.handler).getInv(), spark); } else return null; } @@ -123,7 +123,7 @@ public class WrappedDeepStorage extends WrappedInventoryBase { private static boolean isDeepStorageNeeded() { if(!checkedInterface) { try { - deepStoragePresent = (Class.forName("powercrystals.minefactoryreloaded.api.IDeepStorageUnit") != null); + deepStoragePresent = Class.forName("powercrystals.minefactoryreloaded.api.IDeepStorageUnit") != null; } catch (ClassNotFoundException e) { deepStoragePresent = false; } diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java index af10215bb..8cb6d4011 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java @@ -2,22 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * */ package vazkii.botania.common.integration.corporea; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.item.ItemStack; import vazkii.botania.api.corporea.CorporeaRequest; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; -import java.util.ArrayList; -import java.util.List; - public class WrappedIInventory extends WrappedInventoryBase{ private final InvWithLocation inv; diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java index 5b11f17d0..de8b91f30 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java @@ -2,22 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * */ package vazkii.botania.common.integration.corporea; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import net.minecraft.item.ItemStack; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - public abstract class WrappedInventoryBase implements IWrappedInventory { protected ICorporeaSpark spark; diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java index 19973269b..3920ee3b4 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java @@ -2,15 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * */ package vazkii.botania.common.integration.corporea; +import java.util.ArrayList; +import java.util.List; + import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.items.wrapper.InvWrapper; @@ -19,9 +23,6 @@ import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; -import java.util.ArrayList; -import java.util.List; - /** * Wrapper for StorageDrawers compatibility. * @@ -31,7 +32,7 @@ public class WrappedStorageDrawers extends WrappedInventoryBase { private final IDrawerGroup invRaw; private WrappedStorageDrawers(IDrawerGroup inv, ICorporeaSpark spark) { - this.invRaw = inv; + invRaw = inv; this.spark = spark; } @@ -105,7 +106,7 @@ public class WrappedStorageDrawers extends WrappedInventoryBase { /** * Creates {@link WrappedStorageDrawers} if specified inv can be wrapped. - * + * * @return wrapped inventory or null if it has incompatible type. */ public static IWrappedInventory wrap(InvWithLocation inv, ICorporeaSpark spark) { diff --git a/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java b/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java index f05bb4ba3..42cfd6f0e 100644 --- a/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java +++ b/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 1, 2015, 5:32:15 PM (GMT)] *//* diff --git a/src/main/java/vazkii/botania/common/item/IFloatingFlowerVariant.java b/src/main/java/vazkii/botania/common/item/IFloatingFlowerVariant.java index 94e981ad9..c2e96e1c7 100644 --- a/src/main/java/vazkii/botania/common/item/IFloatingFlowerVariant.java +++ b/src/main/java/vazkii/botania/common/item/IFloatingFlowerVariant.java @@ -14,5 +14,5 @@ import net.minecraft.item.ItemStack; import vazkii.botania.api.item.IFloatingFlower.IslandType; public interface IFloatingFlowerVariant { - public IslandType getIslandType(ItemStack stack); + public IslandType getIslandType(ItemStack stack); } diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index d647f98d6..e732b06cd 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 19, 2014, 4:09:57 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -18,9 +22,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; -import javax.annotation.Nonnull; -import java.util.List; - public class Item16Colors extends ItemMod { public Item16Colors(String name) { diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 8a9a6b710..676c6c003 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 30, 2015, 10:59:45 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -24,9 +28,6 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemAncientWill extends ItemMod { private static final int SUBTYPES = 6; diff --git a/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java index b84491605..ca2925fe2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java @@ -2,17 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 1, 2015, 2:23:26 AM (GMT)] */ package vazkii.botania.common.item; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index ab0349f05..76c5cdb07 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -2,18 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [25/11/2015, 19:46:11 (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import baubles.api.IBauble; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; @@ -32,13 +34,9 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemStackHandler; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.Botania; -import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - public class ItemBaubleBox extends ItemMod { private static final String TAG_ITEMS = "InvItems"; @@ -61,7 +59,7 @@ public class ItemBaubleBox extends ItemMod { public ItemStack insertItem(int slot, ItemStack toInsert, boolean simulate) { if(toInsert != null && (toInsert.getItem() instanceof IManaItem - || toInsert.getItem() instanceof IBauble)) + || toInsert.getItem() instanceof IBauble)) return super.insertItem(slot, toInsert, simulate); else return toInsert; } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 98ab43385..97fa94aa0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -10,17 +10,17 @@ */ package vazkii.botania.common.item; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -28,7 +28,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -43,15 +42,10 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.List; - public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { private static final String TAG_BLOCK_NAME = "blockName"; diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 8a62d69b1..0dd1c5352 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 18, 2015, 12:17:10 AM (GMT)] */ package vazkii.botania.common.item; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; @@ -28,9 +32,6 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemBlackLotus extends ItemMod implements IManaDissolvable { private static final int MANA_PER = 8000; diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 534a5d7ca..d13bb9bd1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -10,6 +10,11 @@ */ package vazkii.botania.common.item; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; @@ -40,10 +45,6 @@ import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Random; - public class ItemBottledMana extends ItemMod { private static final String TAG_SEED = "randomSeed"; @@ -97,7 +98,7 @@ public class ItemBottledMana extends ItemMod { } case 7 : { // All your inventory is belong to us if(!living.worldObj.isRemote && living instanceof EntityPlayer) { - EntityPlayer player = ((EntityPlayer) living); + EntityPlayer player = (EntityPlayer) living; for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackAt = player.inventory.getStackInSlot(i); if(stackAt != stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 1737d3632..72799dc9e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 20, 2015, 9:53:57 PM (GMT)] */ package vazkii.botania.common.item; +import java.lang.reflect.InvocationTargetException; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityList; @@ -36,7 +42,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.logging.log4j.core.helpers.Strings; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ICraftAchievement; @@ -47,11 +52,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.lang.reflect.InvocationTargetException; -import java.util.List; - public class ItemCacophonium extends ItemMod implements ICraftAchievement { private static final String TAG_SOUND = "sound"; diff --git a/src/main/java/vazkii/botania/common/item/ItemClip.java b/src/main/java/vazkii/botania/common/item/ItemClip.java index b8f0e34b7..90c9cc1a3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemClip.java +++ b/src/main/java/vazkii/botania/common/item/ItemClip.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 7:56:38 PM (GMT)] */ package vazkii.botania.common.item; diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index aa55c48a2..ddff74014 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 13, 2015, 10:25:32 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -28,9 +32,6 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemCorporeaSpark extends ItemMod { public ItemCorporeaSpark() { @@ -50,7 +51,7 @@ public class ItemCorporeaSpark extends ItemMod { public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); if(tile != null && (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP) || tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) - && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { + && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { stack.stackSize--; if(!world.isRemote) { EntityCorporeaSpark spark = new EntityCorporeaSpark(world); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index cbdad90d7..194c3ddb6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 28, 2015, 2:59:06 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -26,9 +30,6 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemCraftPattern extends ItemMod { public ItemCraftPattern() { diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 8c9245145..8591cd451 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Dec 15, 2014, 3:53:30 PM (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; @@ -48,10 +52,9 @@ import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientMethodHandles; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.crafting.InventoryCraftingHalo; @@ -65,8 +68,6 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { private static final ResourceLocation glowTexture = new ResourceLocation(LibResources.MISC_GLOW_GREEN); @@ -122,7 +123,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { public void onUpdate(ItemStack stack, World world, Entity entity, int pos, boolean equipped) { if (!(entity instanceof EntityLivingBase)) return; - EntityLivingBase living = ((EntityLivingBase) entity); + EntityLivingBase living = (EntityLivingBase) entity; boolean eqLastTick = wasEquipped(stack); diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index b26a2a3ff..38b7e8572 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 31, 2014, 7:19:26 PM (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -18,7 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.mana.IManaUsingItem; @@ -27,8 +28,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.rod.ItemExchangeRod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProvider { private static final int COST_PROVIDE = 5; diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index ba62b754b..cb116fcd6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 29, 2014, 10:41:52 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; @@ -23,10 +28,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class ItemFertilizer extends ItemMod { public ItemFertilizer() { diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 7a08a8aae..9413fdb9c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 16, 2015, 6:43:33 PM (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -22,7 +25,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.play.server.SPacketCollectItem; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; @@ -45,13 +47,9 @@ import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - public class ItemFlowerBag extends ItemMod { private static final String TAG_ITEMS = "InvItems"; @@ -151,7 +149,7 @@ public class ItemFlowerBag extends ItemMod { } ((EntityPlayerMP) event.getEntityPlayer()).connection.sendPacket(new SPacketCollectItem(event.getItem().getEntityId(), event.getEntityPlayer().getEntityId())); event.getEntityPlayer().openContainer.detectAndSendChanges(); - + return; } } @@ -176,7 +174,7 @@ public class ItemFlowerBag extends ItemMod { if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side)) tileInv = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side); else if(tile instanceof IInventory) - tileInv = new InvWrapper(((IInventory) tile)); + tileInv = new InvWrapper((IInventory) tile); if(tileInv == null) return EnumActionResult.FAIL; diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index ee156c1f6..895d69fcd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; @@ -36,8 +38,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemGaiaHead extends ItemMod { public ItemGaiaHead() { @@ -94,7 +94,7 @@ public class ItemGaiaHead extends ItemMod { int i = 0; if (facing == EnumFacing.UP) { - i = MathHelper.floor_double((double) (playerIn.rotationYaw * 16.0F / 360.0F) + 0.5D) & 15; + i = MathHelper.floor_double(playerIn.rotationYaw * 16.0F / 360.0F + 0.5D) & 15; } TileEntity tileentity = worldIn.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index e706ed3de..0e3868809 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -2,14 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 11, 2014, 2:57:30 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.state.IBlockState; @@ -20,7 +28,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; @@ -40,14 +47,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Locale; -import java.util.Random; - public class ItemGrassHorn extends ItemMod { private static final int SUBTYPES = 3; @@ -117,9 +116,9 @@ public class ItemGrassHorn extends ItemMod { Block block = world.getBlockState(pos).getBlock(); if(block instanceof IHornHarvestable ? ((IHornHarvestable) block).canHornHarvest(world, pos, stack, type) - : stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) - || stackDmg == 1 && block.isLeaves(world.getBlockState(pos), world, pos) - || stackDmg == 2 && block == Blocks.SNOW_LAYER) + : stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) + || stackDmg == 1 && block.isLeaves(world.getBlockState(pos), world, pos) + || stackDmg == 2 && block == Blocks.SNOW_LAYER) coords.add(pos); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 4bac00777..029f01734 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -2,14 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 9, 2014, 5:11:34 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import java.util.Set; + +import javax.annotation.Nonnull; + import gnu.trove.map.hash.TIntObjectHashMap; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; @@ -38,14 +47,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Random; -import java.util.Set; - public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { /** @@ -55,9 +56,9 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { private static final TIntObjectHashMap> blockSwappers = new TIntObjectHashMap<>(); private static final IslandType[] ISLAND_TYPES = { - IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL, - IslandType.DRY, IslandType.GOLDEN, IslandType.VIVID, - IslandType.SCORCHED, IslandType.INFUSED, IslandType.MUTATED + IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL, + IslandType.DRY, IslandType.GOLDEN, IslandType.VIVID, + IslandType.SCORCHED, IslandType.INFUSED, IslandType.MUTATED }; private static final int SUBTYPES = 9; @@ -86,7 +87,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { IBlockState state = world.getBlockState(pos); - if((state.getBlock() == Blocks.DIRT && state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT) || (state.getBlock() == Blocks.GRASS && par1ItemStack.getItemDamage() != 0)) { + if(state.getBlock() == Blocks.DIRT && state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT || state.getBlock() == Blocks.GRASS && par1ItemStack.getItemDamage() != 0) { int meta = par1ItemStack.getItemDamage(); BlockSwapper swapper = addBlockSwapper(world, pos, meta); @@ -194,7 +195,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { * Adds a grass seed block swapper to the world at the provided positiona * and with the provided meta (which designates the type of the grass * being spread). - * + * * Block swappers are only actually created on the server, so a client * calling this method will recieve a marker block swapper which contains * the provided information but is not ticked. @@ -240,7 +241,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { * centered around a provided point to a provided block/metadata. */ private static class BlockSwapper { - + /** * The range of the block swapper, in blocks. */ @@ -267,9 +268,9 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { */ public BlockSwapper(World world, BlockPos coords, IBlockState state) { this.world = world; - this.stateToSet = state; - this.rand = new Random(coords.hashCode()); - this.startCoords = coords; + stateToSet = state; + rand = new Random(coords.hashCode()); + startCoords = coords; } /** @@ -338,11 +339,12 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { // levels by 2 or more blocks grass growth. return (block == Blocks.DIRT || block == Blocks.GRASS) - && (block != Blocks.DIRT || state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT) - && (world.getBlockState(pos.up()).getLightOpacity(world, pos.up()) <= 1); + && (block != Blocks.DIRT || state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT) + && world.getBlockState(pos.up()).getLightOpacity(world, pos.up()) <= 1; } } + @Override public IslandType getIslandType(ItemStack stack) { return ISLAND_TYPES[Math.min(stack.getItemDamage(), ISLAND_TYPES.length - 1)]; } diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 5182b7741..42ef06feb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 31, 2015, 9:11:23 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -25,9 +28,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.KeepIvyRecipe; import vazkii.botania.common.lib.LibItemNames; -import java.util.ArrayList; -import java.util.List; - public class ItemKeepIvy extends ItemMod { public static final String TAG_KEEP = "Botania_keepIvy"; diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index fd9df9ade..2ded52e7d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 19, 2014, 10:46:14 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.block.state.IBlockState; @@ -45,9 +49,6 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanetExcempt { private static final String TAG_BLOCK = "_block"; diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index a7e7a7ba0..7ff2dbf62 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -10,8 +10,14 @@ */ package vazkii.botania.common.item; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; @@ -52,10 +58,6 @@ import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { private static final String TAG_KNOWLEDGE_PREFIX = "knowledge."; @@ -243,7 +245,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelLoader.registerItemVariants(this, new ModelResourceLocation("botania:lexicon_default", "inventory")); + ModelBakery.registerItemVariants(this, new ModelResourceLocation("botania:lexicon_default", "inventory")); ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index b98ccc4d3..f66d191cb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -2,19 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 21, 2014, 8:44:35 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.Locale; + +import javax.annotation.Nonnull; + import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; @@ -31,10 +33,6 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.Locale; - public class ItemManaCookie extends ItemFood implements IModelRegister { public ItemManaCookie() { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index c5138f6cb..189cc0429 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -2,31 +2,33 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 13, 2014, 4:30:27 PM (GMT)] */ package vazkii.botania.common.item; -import net.minecraft.client.Minecraft; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -41,7 +43,6 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.api.sound.BotaniaSoundEvents; -import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -51,11 +52,6 @@ import vazkii.botania.common.crafting.recipe.ManaGunRemoveLensRecipe; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; - public class ItemManaGun extends ItemMod implements IManaUsingItem { private static final String TAG_LENS = "lens"; @@ -319,7 +315,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelLoader.registerItemVariants(this, + ModelBakery.registerItemVariants(this, new ModelResourceLocation("botania:desuGunClip", "inventory"), new ModelResourceLocation("botania:desuGun", "inventory"), new ModelResourceLocation("botania:manaGunClip", "inventory"), diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 880162575..b85d630b3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 13, 2014, 5:39:24 PM (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; @@ -23,8 +25,6 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaTooltipDisplay; @@ -34,9 +34,6 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.awt.*; - public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay { private static final String TAG_MANA = "mana"; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 333524059..ca13b0fab 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 7, 2014, 7:06:20 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -25,10 +29,6 @@ import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.awt.*; -import java.util.List; - public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay { public static final int MAX_MANA = 500000; @@ -146,7 +146,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP public float getManaFractionForDisplay(ItemStack stack) { return (float) getMana(stack) / (float) getMaxMana(stack); } - + @Override public boolean showDurabilityBar(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index 58c5eb080..95daebfdc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 5:30:18 PM (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,8 +25,6 @@ import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; - public abstract class ItemMod extends Item implements IModelRegister { public ItemMod(String name) { diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index 5b27380d5..1a3a543aa 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 20, 2015, 7:26:14 PM (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -24,12 +26,9 @@ import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemObedienceStick extends ItemMod { public ItemObedienceStick() { diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index 50354752c..ea27ba733 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 20, 2014, 12:12:58 AM (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -22,8 +24,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemOpenBucket extends ItemMod { public ItemOpenBucket() { @@ -53,7 +53,7 @@ public class ItemOpenBucket extends ItemMod { if((material == Material.LAVA || material == Material.WATER) && l == 0) { world.setBlockToAir(pos); - + for(int x = 0; x < 5; x++) world.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0, 0, 0); diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index bfe420a78..d6f5446c8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 26, 2015, 5:59:21 PM (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -24,8 +26,6 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemOvergrowthSeed extends ItemMod { public ItemOvergrowthSeed() { diff --git a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java index 4daf6ff4a..41fb357f3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java +++ b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 17, 2015, 4:46:36 PM (GMT)] */ package vazkii.botania.common.item; diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index f2bc9d8f5..dc85b0b27 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 25, 2015, 6:03:28 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.resources.I18n; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; @@ -27,9 +31,6 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemPinkinator extends ItemMod { public ItemPinkinator() { diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 46bf17e79..e4b27d41d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -2,15 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 17, 2015, 6:48:29 PM (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + import com.mojang.authlib.GameProfile; + import mods.railcraft.api.core.items.IMinecartItem; import net.minecraft.block.BlockRailBase; import net.minecraft.entity.item.EntityMinecart; @@ -29,8 +32,6 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPoolMinecart; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - @Optional.Interface(modid = "Railcraft", iface = "mods.railcraft.api.core.items.IMinecartItem", striprefs = true) public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMinecartItem { diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index a64a5e064..42af3f78b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -2,14 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [01/11/2015, 18:25:54 (GMT)] */ package vazkii.botania.common.item; +import java.util.EnumMap; +import java.util.Map; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; @@ -27,7 +34,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -36,10 +42,6 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.EnumMap; -import java.util.Map; - public class ItemSextant extends ItemMod { private static final String TAG_SOURCE_X = "sourceX"; @@ -72,10 +74,9 @@ public class ItemSextant extends ItemMod { int y = ItemNBTHelper.getInt(stack, TAG_SOURCE_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_SOURCE_Z, 0); if(y != -1) { - World world = living.worldObj; Vector3 source = new Vector3(x, y, z); - double radius = calculateRadius(stack, ((EntityPlayer) living)); + double radius = calculateRadius(stack, (EntityPlayer) living); if(count % 10 == 0) for(int i = 0; i < 360; i++) { @@ -91,7 +92,7 @@ public class ItemSextant extends ItemMod { public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase living, int time) { if(!(living instanceof EntityPlayer)) return; - double radius = calculateRadius(stack, ((EntityPlayer) living)); + double radius = calculateRadius(stack, (EntityPlayer) living); if(radius > 1) { int x = ItemNBTHelper.getInt(stack, TAG_SOURCE_X, 0); int y = ItemNBTHelper.getInt(stack, TAG_SOURCE_Y, -1); @@ -126,7 +127,6 @@ public class ItemSextant extends ItemMod { int x = ItemNBTHelper.getInt(stack, TAG_SOURCE_X, 0); int y = ItemNBTHelper.getInt(stack, TAG_SOURCE_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_SOURCE_Z, 0); - World world = player.worldObj; Vector3 source = new Vector3(x, y, z); Botania.proxy.wispFX(source.x + 0.5, source.y + 1, source.z + 0.5, 1F, 0F, 0F, 0.2F, -0.1F); diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index f8f7018e9..8ca0f9411 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 17, 2015, 1:32:58 AM (GMT)] */ package vazkii.botania.common.item; diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index 50941026b..483be2007 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 27, 2014, 12:38:58 AM (GMT)] */ package vazkii.botania.common.item; +import java.util.function.Predicate; + +import javax.annotation.Nonnull; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -24,9 +28,6 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityVineBall; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.function.Predicate; - public class ItemSlingshot extends ItemMod { private static final Predicate AMMO_FUNC = s -> s != null && s.getItem() == ModItems.vineBall; @@ -40,7 +41,7 @@ public class ItemSlingshot extends ItemMod { public void onPlayerStoppedUsing(ItemStack par1ItemStack, World world, EntityLivingBase living, int par4) { int j = getMaxItemUseDuration(par1ItemStack) - par4; - if(!world.isRemote && (!(living instanceof EntityPlayer) || ((EntityPlayer) living).capabilities.isCreativeMode || PlayerHelper.hasAmmo(((EntityPlayer) living), AMMO_FUNC))) { + if(!world.isRemote && (!(living instanceof EntityPlayer) || ((EntityPlayer) living).capabilities.isCreativeMode || PlayerHelper.hasAmmo((EntityPlayer) living, AMMO_FUNC))) { float f = j / 20.0F; f = (f * f + f * 2.0F) / 3.0F; @@ -48,7 +49,7 @@ public class ItemSlingshot extends ItemMod { return; if(living instanceof EntityPlayer && !((EntityPlayer) living).capabilities.isCreativeMode) - PlayerHelper.consumeAmmo(((EntityPlayer) living), AMMO_FUNC); + PlayerHelper.consumeAmmo((EntityPlayer) living, AMMO_FUNC); EntityVineBall ball = new EntityVineBall(living, false); ball.setHeadingFromThrower(living, living.rotationPitch, living.rotationYaw, 0F, 1.5F, 1F); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index 1c048f1b5..813d593e5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 21, 2014, 5:24:55 PM (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -28,8 +30,6 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGivingItem { public ItemSpark() { diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 368567c21..e53ce853b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 21, 2014, 5:32:06 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -18,9 +22,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemSparkUpgrade extends ItemMod { public static final int VARIANTS = 4; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 7c23c5350..760d9e089 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [? (GMT)] */ package vazkii.botania.common.item; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; @@ -33,9 +37,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemSpawnerMover extends ItemMod { public static final String TAG_SPAWNER = "spawner"; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index e300e8431..a1d636eb2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -2,26 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 25, 2015, 6:14:13 PM (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.SpellClothRecipe; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.awt.*; - public class ItemSpellCloth extends ItemMod { public ItemSpellCloth() { diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index f36629641..a5a26e728 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 12, 2015, 5:56:45 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -25,9 +29,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemTemperanceStone extends ItemMod { public ItemTemperanceStone() { diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 5a93994d4..f5a4dd9bd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 25, 2015, 6:42:47 PM (GMT)] */ package vazkii.botania.common.item; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -30,9 +34,6 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityThornChakram; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemThornChakram extends ItemMod implements ICraftAchievement { public ItemThornChakram() { diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 71b29d596..db9863ebb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 20, 2014, 7:42:46 PM (GMT)] */ package vazkii.botania.common.item; +import java.awt.Color; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -18,7 +23,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.EnumDyeColor; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -52,10 +56,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.awt.*; -import java.util.List; - public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { private static final String TAG_COLOR1 = "color1"; @@ -145,12 +145,12 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } return wanded ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; - } else if(((BlockPistonRelay) (ModBlocks.pistonRelay)).playerPositions.containsKey(player.getUniqueID()) && !world.isRemote) { - BlockPistonRelay.DimWithPos bindPos = ((BlockPistonRelay) (ModBlocks.pistonRelay)).playerPositions.get(player.getUniqueID()); + } else if(((BlockPistonRelay) ModBlocks.pistonRelay).playerPositions.containsKey(player.getUniqueID()) && !world.isRemote) { + BlockPistonRelay.DimWithPos bindPos = ((BlockPistonRelay) ModBlocks.pistonRelay).playerPositions.get(player.getUniqueID()); BlockPistonRelay.DimWithPos currentPos = new BlockPistonRelay.DimWithPos(world.provider.getDimension(), pos); - ((BlockPistonRelay) (ModBlocks.pistonRelay)).playerPositions.remove(player.getUniqueID()); - ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.put(bindPos, currentPos); + ((BlockPistonRelay) ModBlocks.pistonRelay).playerPositions.remove(player.getUniqueID()); + ((BlockPistonRelay) ModBlocks.pistonRelay).mappedPositions.put(bindPos, currentPos); BlockPistonRelay.WorldData.get(world).markDirty(); world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 1F, 1F); diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index 59d52dbb0..25fe6518a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -21,8 +23,6 @@ import net.minecraft.world.World; import vazkii.botania.common.entity.EntityVineBall; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemVineBall extends ItemMod { public ItemVineBall() { diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 351c99776..2f61f7cc8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 21, 2014, 4:46:17 PM (GMT)] */ package vazkii.botania.common.item; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -37,11 +43,6 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import javax.annotation.Nonnull; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.List; - public class ItemVirus extends ItemMod { private static final int SUBTYPES = 2; diff --git a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java index 32024fa7c..0128e7cee 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java +++ b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 8, 2015, 9:07:35 PM (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -20,8 +22,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStackSimple; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemWaterBowl extends ItemMod { public ItemWaterBowl() { diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index cc5edb63e..7451ff169 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 25, 2015, 12:27:31 AM (GMT)] */ package vazkii.botania.common.item; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -23,8 +25,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemWorldSeed extends ItemMod { public ItemWorldSeed() { diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index a533c18f2..7670e8e8a 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 5:17:47 PM (GMT)] */ package vazkii.botania.common.item; @@ -415,7 +415,7 @@ public final class ModItems { speedUpBelt = new ItemSpeedUpBelt(); baubleBox = new ItemBaubleBox(); dodgeRing = new ItemDodgeRing(); - + 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/src/main/java/vazkii/botania/common/item/block/IRarityBlock.java b/src/main/java/vazkii/botania/common/item/block/IRarityBlock.java index d404d084d..793043ffc 100644 --- a/src/main/java/vazkii/botania/common/item/block/IRarityBlock.java +++ b/src/main/java/vazkii/botania/common/item/block/IRarityBlock.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 31, 2015, 9:00:38 PM (GMT)] */ package vazkii.botania.common.item.block; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java index f1fd4f4dd..cf3c3eeb5 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 9, 2014, 5:02:06 PM (GMT)] */ package vazkii.botania.common.item.block; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java index 56e950c45..670612cc7 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java @@ -2,20 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 17, 2014, 5:39:08 PM (GMT)] */ package vazkii.botania.common.item.block; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; -import javax.annotation.Nonnull; - public class ItemBlockFloatingSpecialFlower extends ItemBlockSpecialFlower { public ItemBlockFloatingSpecialFlower(Block block1) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java index bca4aab76..f22050e5e 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 16, 2014, 7:00:36 PM (GMT)] */ package vazkii.botania.common.item.block; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -21,8 +23,6 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.IPickupAchievement; -import javax.annotation.Nonnull; - public class ItemBlockMod extends ItemBlock implements IPickupAchievement, ICraftAchievement { public ItemBlockMod(Block block) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java index a8c442b55..cd10c0532 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java @@ -2,21 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 11, 2014, 1:16:59 AM (GMT)] */ package vazkii.botania.common.item.block; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.decor.slabs.BlockModSlab; -import javax.annotation.Nonnull; - public class ItemBlockModSlab extends ItemSlab { public ItemBlockModSlab(Block par1) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 86aaa4aed..317000ee2 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -2,39 +2,36 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 27, 2014, 8:32:52 PM (GMT)] */ package vazkii.botania.common.item.block; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; - public class ItemBlockPool extends ItemBlockWithMetadataAndName { public ItemBlockPool(Block par2Block) { super(par2Block); addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "full"), (stack, worldIn, entityIn) -> { - boolean renderFull = stack.getItemDamage() == PoolVariant.CREATIVE.ordinal() || (stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull")); - return renderFull ? 1F : 0F; - }); + boolean renderFull = stack.getItemDamage() == PoolVariant.CREATIVE.ordinal() || stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull"); + return renderFull ? 1F : 0F; + }); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index f1552b059..97c97b459 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 25, 2014, 2:04:15 PM (GMT)] */ package vazkii.botania.common.item.block; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; @@ -30,7 +34,6 @@ import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.api.subtile.signature.SubTileSignature; -import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileSpecialFlower; @@ -39,9 +42,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyProvider { public ItemBlockSpecialFlower(Block block1) { @@ -122,24 +122,24 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr public Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item) { String type = getType(stack); switch (type) { - case LibBlockNames.SUBTILE_KEKIMURUS: - return ModAchievements.kekimurusPickup; - case LibBlockNames.SUBTILE_HEISEI_DREAM: - return ModAchievements.heiseiDreamPickup; - case LibBlockNames.SUBTILE_POLLIDISIAC: - return ModAchievements.pollidisiacPickup; - case LibBlockNames.SUBTILE_BUBBELL: - return ModAchievements.bubbellPickup; - case LibBlockNames.SUBTILE_DANDELIFEON: - return ModAchievements.dandelifeonPickup; - case "": - return ModAchievements.nullFlower; - default: - Class clazz = BotaniaAPI.getSubTileMapping(type); - if(SubTileGenerating.class.isAssignableFrom(clazz)) - return ModAchievements.daybloomPickup; - else if(SubTileFunctional.class.isAssignableFrom(clazz)) - return ModAchievements.endoflamePickup; + case LibBlockNames.SUBTILE_KEKIMURUS: + return ModAchievements.kekimurusPickup; + case LibBlockNames.SUBTILE_HEISEI_DREAM: + return ModAchievements.heiseiDreamPickup; + case LibBlockNames.SUBTILE_POLLIDISIAC: + return ModAchievements.pollidisiacPickup; + case LibBlockNames.SUBTILE_BUBBELL: + return ModAchievements.bubbellPickup; + case LibBlockNames.SUBTILE_DANDELIFEON: + return ModAchievements.dandelifeonPickup; + case "": + return ModAchievements.nullFlower; + default: + Class clazz = BotaniaAPI.getSubTileMapping(type); + if(SubTileGenerating.class.isAssignableFrom(clazz)) + return ModAchievements.daybloomPickup; + else if(SubTileFunctional.class.isAssignableFrom(clazz)) + return ModAchievements.endoflamePickup; } return null; } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java index c062f6045..efca8172b 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java @@ -2,21 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 11, 2014, 1:13:36 AM (GMT)] */ package vazkii.botania.common.item.block; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.item.ItemMultiTexture; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz; -import javax.annotation.Nonnull; - public class ItemBlockSpecialQuartz extends ItemMultiTexture { public ItemBlockSpecialQuartz(Block par1) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockStorage.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockStorage.java index 1b196bd36..eacb3600e 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockStorage.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockStorage.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 22, 2014, 1:04:55 AM (GMT)] */ package vazkii.botania.common.item.block; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java index 44193b07a..49129a268 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 27, 2015, 3:44:10 PM (GMT)] */ package vazkii.botania.common.item.block; +import java.util.Arrays; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -19,31 +22,28 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import vazkii.botania.common.core.helper.ItemNBTHelper; -import java.util.Arrays; -import java.util.List; - public class ItemBlockTinyPotato extends ItemBlockMod { private static final List TYPOS = Arrays.asList("vaskii", "vazki", "voskii", "vazkkii", "vazkki", "vazzki", "vaskki", "vozkii", "vazkil", "vaskil", "vazkill", "vaskill", "vaski"); private static final String NOT_MY_NAME[] = { - "Six letter word just to get me along", - "It's a intricacy and I'm coding on my mod and I,", - "I keep fixin', and keepin' it together", - "People around gotta find something to play now", - "Holding back, every mod's the same", - "Don't wanna be a loser", - "Listen to me, oh no, I don't break anything at all", - "But with nothing to consider they forget my name", - "'ame, 'ame, 'ame", - "They call me Vaskii", - "They call me Vazki", - "They call me Voskii", - "They call me Vazkki", - "That's not my name", - "That's not my name", - "That's not my name", - "That's not my name" + "Six letter word just to get me along", + "It's a intricacy and I'm coding on my mod and I,", + "I keep fixin', and keepin' it together", + "People around gotta find something to play now", + "Holding back, every mod's the same", + "Don't wanna be a loser", + "Listen to me, oh no, I don't break anything at all", + "But with nothing to consider they forget my name", + "'ame, 'ame, 'ame", + "They call me Vaskii", + "They call me Vazki", + "They call me Voskii", + "They call me Vazkki", + "That's not my name", + "That's not my name", + "That's not my name", + "That's not my name" }; private static final String TAG_TICKS = "notMyNameTicks"; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index 99bf0a084..a87f41982 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 16, 2014, 5:54:06 PM (GMT)] */ package vazkii.botania.common.item.block; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -21,8 +23,6 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.IPickupAchievement; -import javax.annotation.Nonnull; - public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAchievement, ICraftAchievement { public ItemBlockWithMetadataAndName(Block par2Block) { diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index 4d16cf367..a1e3ad971 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 5:45:58 PM (GMT)] */ package vazkii.botania.common.item.brew; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -40,9 +44,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.List; - public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickupAchievement { private static final String TAG_BREW_KEY = "brewKey"; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java index 0a9ba330c..3b8cb5e21 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 7:34:30 PM (GMT)] */ package vazkii.botania.common.item.brew; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewVial.java index d62840bf9..4d3455331 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewVial.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 7:33:24 PM (GMT)] */ package vazkii.botania.common.item.brew; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 67f9fb4ba..db7d9c0c7 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 15, 2015, 3:13:43 PM (GMT)] */ package vazkii.botania.common.item.brew; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -28,9 +32,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContainer { private static final String TAG_BREW_KEY = "brewKey"; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 6fe3b8421..05d510304 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 5:45:50 PM (GMT)] */ package vazkii.botania.common.item.brew; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -23,9 +27,6 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemVial extends ItemMod implements IBrewContainer { public ItemVial() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 96a87fafa..5e215895f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -1,5 +1,7 @@ package vazkii.botania.common.item.equipment.armor.elementium; +import java.util.List; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; @@ -15,8 +17,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; -import java.util.List; - public abstract class ItemElementiumArmor extends ItemManasteelArmor implements IPixieSpawner { public ItemElementiumArmor(EntityEquipmentSlot type, String name) { @@ -46,10 +46,10 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements public ItemStack[] getArmorSetStacks() { if(armorset == null) armorset = new ItemStack[] { - new ItemStack(ModItems.elementiumHelm), - new ItemStack(ModItems.elementiumChest), - new ItemStack(ModItems.elementiumLegs), - new ItemStack(ModItems.elementiumBoots) + new ItemStack(ModItems.elementiumHelm), + new ItemStack(ModItems.elementiumChest), + new ItemStack(ModItems.elementiumLegs), + new ItemStack(ModItems.elementiumBoots) }; return armorset; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 1f700ac64..cf9e27efa 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 13, 2014, 6:38:21 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.manasteel; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.Nonnull; + import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -45,11 +51,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRunicArmor") public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IManaUsingItem, IPhantomInkable, IRunicArmor, IModelRegister { @@ -177,7 +178,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan if(hasPhantomInk(stack)) addStringToTooltip(I18n.format("botaniamisc.hasPhantomInk"), list); } - + public void addStringToTooltip(String s, List tooltip) { tooltip.add(s.replaceAll("&", "\u00a7")); } @@ -187,10 +188,10 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan public ItemStack[] getArmorSetStacks() { if(armorset == null) armorset = new ItemStack[] { - new ItemStack(ModItems.manasteelHelm), - new ItemStack(ModItems.manasteelChest), - new ItemStack(ModItems.manasteelLegs), - new ItemStack(ModItems.manasteelBoots) + new ItemStack(ModItems.manasteelHelm), + new ItemStack(ModItems.manasteelChest), + new ItemStack(ModItems.manasteelLegs), + new ItemStack(ModItems.manasteelBoots) }; return armorset; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelBoots.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelBoots.java index f23a2c8b9..fd9fddc42 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelBoots.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelBoots.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 13, 2014, 10:24:08 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.manasteel; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelChest.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelChest.java index 3af2b5ef0..bb6234132 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelChest.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelChest.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 13, 2014, 10:22:57 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.manasteel; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java index 1ba8171d8..d059ef31c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 13, 2014, 10:22:24 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.manasteel; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelLegs.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelLegs.java index 96ed84e08..c96fe317a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelLegs.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelLegs.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 13, 2014, 10:23:28 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.manasteel; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index e38abef77..43a3e92b2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -2,25 +2,26 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 28, 2015, 8:30:19 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.manaweave; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.resources.I18n; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; @@ -33,11 +34,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchievement { - + public ItemManaweaveArmor(EntityEquipmentSlot type, String name) { super(type, name, BotaniaAPI.manaweaveArmorMaterial); addPropertyOverride(new ResourceLocation("botania", "holiday"), (stack, worldIn, entityIn) -> ClientProxy.jingleTheBells ? 1 : 0); @@ -49,12 +47,12 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi models.put(slot, new ModelArmorManaweave(slot)); return models.get(slot); } - + @Override public String getArmorTextureAfterInk(ItemStack stack, EntityEquipmentSlot slot) { - return ConfigHandler.enableArmorModels ? (ClientProxy.jingleTheBells ? LibResources.MODEL_MANAWEAVE_NEW_HOLIDAY : LibResources.MODEL_MANAWEAVE_NEW) : slot == EntityEquipmentSlot.LEGS ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; + return ConfigHandler.enableArmorModels ? ClientProxy.jingleTheBells ? LibResources.MODEL_MANAWEAVE_NEW_HOLIDAY : LibResources.MODEL_MANAWEAVE_NEW : slot == EntityEquipmentSlot.LEGS ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; } - + @Nonnull @Override @SideOnly(Side.CLIENT) @@ -64,7 +62,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi name = name.replaceAll("manaweave", "santaweave"); return name; } - + @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 22 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); @@ -76,10 +74,10 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi public ItemStack[] getArmorSetStacks() { if(armorset == null) armorset = new ItemStack[] { - new ItemStack(ModItems.manaweaveHelm), - new ItemStack(ModItems.manaweaveChest), - new ItemStack(ModItems.manaweaveLegs), - new ItemStack(ModItems.manaweaveBoots) + new ItemStack(ModItems.manaweaveHelm), + new ItemStack(ModItems.manaweaveChest), + new ItemStack(ModItems.manaweaveLegs), + new ItemStack(ModItems.manaweaveBoots) }; return armorset; @@ -114,7 +112,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi addStringToTooltip(I18n.format("botaniamisc.santaweaveInfo"), list); addStringToTooltip("", list); } - + super.addInformationAfterShift(stack, player, list, adv); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java index 89fc43681..114b5facb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 28, 2015, 8:48:58 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.manaweave; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java index 5f1287db7..caa5fc86f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 28, 2015, 8:48:17 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.manaweave; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java index 325b6989e..c6315da54 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 28, 2015, 8:47:04 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.manaweave; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java index 3030ff90a..4449c4db5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 28, 2015, 8:48:36 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.manaweave; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index d956cee96..3533c636e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -2,15 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 14, 2014, 2:58:13 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.terrasteel; +import java.util.List; +import java.util.UUID; + +import javax.annotation.Nonnull; + import com.google.common.collect.Multimap; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.resources.I18n; import net.minecraft.entity.SharedMonsterAttributes; @@ -27,10 +33,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.UUID; - public class ItemTerrasteelArmor extends ItemManasteelArmor { public ItemTerrasteelArmor(EntityEquipmentSlot type, String name) { @@ -59,7 +61,7 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { public Multimap getAttributeModifiers(@Nonnull EntityEquipmentSlot slot, ItemStack stack) { Multimap multimap = super.getAttributeModifiers(slot, stack); UUID uuid = new UUID((getUnlocalizedName() + slot.toString()).hashCode(), 0); - if (slot == this.armorType) { + if (slot == armorType) { multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type.getIndex()) / 20, 0)); } return multimap; @@ -71,10 +73,10 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { public ItemStack[] getArmorSetStacks() { if(armorset == null) armorset = new ItemStack[] { - new ItemStack(ModItems.terrasteelHelm), - new ItemStack(ModItems.terrasteelChest), - new ItemStack(ModItems.terrasteelLegs), - new ItemStack(ModItems.terrasteelBoots) + new ItemStack(ModItems.terrasteelHelm), + new ItemStack(ModItems.terrasteelChest), + new ItemStack(ModItems.terrasteelLegs), + new ItemStack(ModItems.terrasteelBoots) }; return armorset; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java index 27344b340..ed59b76b0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 14, 2014, 3:14:11 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.terrasteel; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java index 8a786a92a..f405024f5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 14, 2014, 3:13:36 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.terrasteel; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 748e4c549..1d67284af 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 14, 2014, 3:13:05 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.terrasteel; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -37,8 +39,6 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import java.util.List; - public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDiscountArmor, IAncientWillContainer, IManaGivingItem { private static final String TAG_ANCIENT_WILL = "AncientWill"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java index 9f81f930a..34c883a15 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 14, 2014, 3:13:49 PM (GMT)] */ package vazkii.botania.common.item.equipment.armor.terrasteel; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java index 9aaed4af5..5bff8a240 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 24, 2014, 4:43:47 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 9fb29ce70..7535f824e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -10,6 +10,11 @@ */ package vazkii.botania.common.item.equipment.bauble; +import java.util.List; +import java.util.UUID; + +import javax.annotation.Nonnull; + import baubles.api.BaubleType; import baubles.api.IBauble; import baubles.common.container.InventoryBaubles; @@ -37,10 +42,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ItemMod; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.UUID; - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRunicArmor") public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAttachable, IPhantomInkable, IRunicArmor { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 106b05744..28a366aa5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -10,6 +10,12 @@ */ package vazkii.botania.common.item.equipment.bauble; +import java.util.List; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import baubles.api.BaubleType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; @@ -33,16 +39,12 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.ICosmeticBauble; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { public enum Variants { @@ -115,192 +117,192 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { Helper.translateToFace(); Helper.defaultTransforms(); switch (variant) { - case RED_GLASSES: - GlStateManager.scale(1.25, 1.25, 1.25); - GlStateManager.translate(0F, -0.085F, 0.045F); - renderItem(); - break; - case ENGINEER_GOGGLES: - GlStateManager.scale(1.25, 1.25, 1.25); - GlStateManager.translate(0F, -0.085F, 0.045F); - renderItem(); - break; - case EYEPATCH: - scale(0.55F); - GlStateManager.translate(-0.45F, -0.25F, 0F); - renderItem(); - break; - case WICKED_EYEPATCH: - scale(0.55F); - GlStateManager.translate(0.45F, -0.25F, 0F); - renderItem(); - break; - case RED_RIBBONS: - scale(0.9F); - GlStateManager.translate(0F, 0.75F, 1F); - renderItem(); - break; - case PINK_FLOWER_BUD: - GlStateManager.rotate(-90F, 0F, 1F, 0F); - GlStateManager.translate(0.4F, 0.6F, 0.45F); - renderItem(); - break; - case POLKA_DOTTED_BOWS: - GlStateManager.rotate(-90F, 0F, 1F, 0F); - GlStateManager.translate(0.65F, 0.3F, 0.5F); - renderItem(); - GlStateManager.translate(0F, 0F, -1F); - renderItem(); - break; - case BLUE_BUTTERFLY: - GlStateManager.translate(-0.75F, 0.1F, 1F); - GlStateManager.pushMatrix(); - GlStateManager.rotate(45F, 0F, 1F, 0F); - renderItem(); - GlStateManager.popMatrix(); + case RED_GLASSES: + GlStateManager.scale(1.25, 1.25, 1.25); + GlStateManager.translate(0F, -0.085F, 0.045F); + renderItem(); + break; + case ENGINEER_GOGGLES: + GlStateManager.scale(1.25, 1.25, 1.25); + GlStateManager.translate(0F, -0.085F, 0.045F); + renderItem(); + break; + case EYEPATCH: + scale(0.55F); + GlStateManager.translate(-0.45F, -0.25F, 0F); + renderItem(); + break; + case WICKED_EYEPATCH: + scale(0.55F); + GlStateManager.translate(0.45F, -0.25F, 0F); + renderItem(); + break; + case RED_RIBBONS: + scale(0.9F); + GlStateManager.translate(0F, 0.75F, 1F); + renderItem(); + break; + case PINK_FLOWER_BUD: + GlStateManager.rotate(-90F, 0F, 1F, 0F); + GlStateManager.translate(0.4F, 0.6F, 0.45F); + renderItem(); + break; + case POLKA_DOTTED_BOWS: + GlStateManager.rotate(-90F, 0F, 1F, 0F); + GlStateManager.translate(0.65F, 0.3F, 0.5F); + renderItem(); + GlStateManager.translate(0F, 0F, -1F); + renderItem(); + break; + case BLUE_BUTTERFLY: + GlStateManager.translate(-0.75F, 0.1F, 1F); + GlStateManager.pushMatrix(); + GlStateManager.rotate(45F, 0F, 1F, 0F); + renderItem(); + GlStateManager.popMatrix(); - GlStateManager.translate(0F, 0F, -0.75F); - GlStateManager.rotate(-45F, 0F, 1F, 0F); - renderItem(); - break; - case CAT_EARS: - GlStateManager.translate(0F, 0.25F, 0.25F); - renderItem(); - break; - case GOOGLY_EYES: - GlStateManager.rotate(180F, 0F, 1F, 0F); - GlStateManager.scale(1.5F, 1.5F, 1F); - GlStateManager.translate(0F, -0.05F, -0.15F); - renderItem(); - break; - case CLOCK_EYE: - scale(0.75F); - GlStateManager.translate(-0.25F, -0.1F, 0F); - GlStateManager.rotate(180F, 0F, 0F, 1F); - renderItem(); - break; - case UNICORN_HORN: - scale(1.25F); - GlStateManager.rotate(-90F, 0F, 1F, 0F); - GlStateManager.translate(0F, 0.4F, 0F); - renderItem(); - break; - case DEVIL_HORNS: - GlStateManager.translate(0F, 0.2F, 0.25F); - renderItem(); - break; - case HYPER_PLUS: - scale(0.35F); - GlStateManager.translate(-0.7F, 1F, -0.5F); - renderItem(); - GlStateManager.translate(1.45F, 0F, 0F); - renderItem(); - break; - case ANCIENT_MASK: - scale(1.25F); - GlStateManager.translate(0F, 0.025F, 0.01F); - renderItem(); - break; - case EERIE_MASK: - renderItem(); - break; - case ALIEN_ANTENNA: - scale(0.9F); - GlStateManager.rotate(180F, 0F, 1F, 0F); - GlStateManager.translate(0F, 0.75F, -1F); - renderItem(); - break; - case ANAGLYPH_GLASSES: - scale(1.25F); - GlStateManager.translate(0F, -0.025F, 0F); - renderItem(); - break; - case ORANGE_SHADES: - scale(1.25f); - GlStateManager.translate(0F, 0.04F, 0F); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color(1F, 1F, 1F, 0.7F); - renderItem(); - break; - case GROUCHO_GLASSES: - scale(1.5F); - GlStateManager.translate(0F, -0.2125F, 0F); - renderItem(); - break; - case THICK_EYEBROWS: - scale(0.5F); - GlStateManager.translate(-0.4F, 0.05F, 0F); - renderItem(); - GlStateManager.rotate(180F, 0F, 1F, 0F); - GlStateManager.translate(-0.775F, 0F, 0F); - renderItem(); - break; - case TINY_POTATO_MASK: - scale(1.25F); - GlStateManager.translate(0F, 0.025F, 0F); - renderItem(); - break; - case QUESTGIVER_MARK: - scale(0.8F); - GlStateManager.translate(0F, 1F, 0.3F); - renderItem(); - break; - default: break; + GlStateManager.translate(0F, 0F, -0.75F); + GlStateManager.rotate(-45F, 0F, 1F, 0F); + renderItem(); + break; + case CAT_EARS: + GlStateManager.translate(0F, 0.25F, 0.25F); + renderItem(); + break; + case GOOGLY_EYES: + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.scale(1.5F, 1.5F, 1F); + GlStateManager.translate(0F, -0.05F, -0.15F); + renderItem(); + break; + case CLOCK_EYE: + scale(0.75F); + GlStateManager.translate(-0.25F, -0.1F, 0F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + renderItem(); + break; + case UNICORN_HORN: + scale(1.25F); + GlStateManager.rotate(-90F, 0F, 1F, 0F); + GlStateManager.translate(0F, 0.4F, 0F); + renderItem(); + break; + case DEVIL_HORNS: + GlStateManager.translate(0F, 0.2F, 0.25F); + renderItem(); + break; + case HYPER_PLUS: + scale(0.35F); + GlStateManager.translate(-0.7F, 1F, -0.5F); + renderItem(); + GlStateManager.translate(1.45F, 0F, 0F); + renderItem(); + break; + case ANCIENT_MASK: + scale(1.25F); + GlStateManager.translate(0F, 0.025F, 0.01F); + renderItem(); + break; + case EERIE_MASK: + renderItem(); + break; + case ALIEN_ANTENNA: + scale(0.9F); + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0F, 0.75F, -1F); + renderItem(); + break; + case ANAGLYPH_GLASSES: + scale(1.25F); + GlStateManager.translate(0F, -0.025F, 0F); + renderItem(); + break; + case ORANGE_SHADES: + scale(1.25f); + GlStateManager.translate(0F, 0.04F, 0F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 0.7F); + renderItem(); + break; + case GROUCHO_GLASSES: + scale(1.5F); + GlStateManager.translate(0F, -0.2125F, 0F); + renderItem(); + break; + case THICK_EYEBROWS: + scale(0.5F); + GlStateManager.translate(-0.4F, 0.05F, 0F); + renderItem(); + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(-0.775F, 0F, 0F); + renderItem(); + break; + case TINY_POTATO_MASK: + scale(1.25F); + GlStateManager.translate(0F, 0.025F, 0F); + renderItem(); + break; + case QUESTGIVER_MARK: + scale(0.8F); + GlStateManager.translate(0F, 1F, 0.3F); + renderItem(); + break; + default: break; } } else { Helper.rotateIfSneaking(player); Helper.translateToChest(); Helper.defaultTransforms(); switch (variant) { - case BLACK_BOWTIE: - GlStateManager.translate(0F, 0.15F, 0F); - renderItem(); - break; - case BLACK_TIE: - GlStateManager.translate(0F, -0.15F, 0F); - renderItem(); - break; - case PUFFY_SCARF: - GlStateManager.translate(0F, -0.15F, 0F); - renderItem(); - break; - case WITCH_PIN: - scale(0.35F); - GlStateManager.translate(-0.35F, 0.35F, 0.15F); - renderItem(); - break; - case DEVIL_TAIL: - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.translate(0.5F, -0.75F, 0F); - renderItem(); - break; - case KAMUI_EYE: // DON'T LOSE YOUR WAAAAAAAAY - scale(0.9F); - GlStateManager.translate(0.9F, 0.35F, 0F); - renderItem(); - GlStateManager.translate(-1.3F, -0.5F, 0.5F); - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.rotate(180F, 1F, 0F, 0F); - renderKamuiBlack(); - break; - case FOUR_LEAF_CLOVER: - scale(0.5F); - GlStateManager.translate(0.35F, 0.3F, -0.075F); - renderItem(); - break; - case BOTANIST_EMBLEM: - scale(0.5F); - GlStateManager.translate(0F, -0.75F, 0F); - renderItem(); - break; - case LUSITANIC_SHIELD: - GlStateManager.rotate(180F, 0F, 1F, 0F); - GlStateManager.translate(0.035F, -0.2F, 0.55F); - GlStateManager.rotate(8F, 0F, 0F, 1F); - renderItem(); - break; - default: break; + case BLACK_BOWTIE: + GlStateManager.translate(0F, 0.15F, 0F); + renderItem(); + break; + case BLACK_TIE: + GlStateManager.translate(0F, -0.15F, 0F); + renderItem(); + break; + case PUFFY_SCARF: + GlStateManager.translate(0F, -0.15F, 0F); + renderItem(); + break; + case WITCH_PIN: + scale(0.35F); + GlStateManager.translate(-0.35F, 0.35F, 0.15F); + renderItem(); + break; + case DEVIL_TAIL: + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(0.5F, -0.75F, 0F); + renderItem(); + break; + case KAMUI_EYE: // DON'T LOSE YOUR WAAAAAAAAY + scale(0.9F); + GlStateManager.translate(0.9F, 0.35F, 0F); + renderItem(); + GlStateManager.translate(-1.3F, -0.5F, 0.5F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + renderKamuiBlack(); + break; + case FOUR_LEAF_CLOVER: + scale(0.5F); + GlStateManager.translate(0.35F, 0.3F, -0.075F); + renderItem(); + break; + case BOTANIST_EMBLEM: + scale(0.5F); + GlStateManager.translate(0F, -0.75F, 0F); + renderItem(); + break; + case LUSITANIC_SHIELD: + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0.035F, -0.2F, 0.55F); + GlStateManager.rotate(8F, 0F, 0F, 1F); + renderItem(); + break; + default: break; } } } @@ -330,7 +332,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { GlStateManager.pushMatrix(); model = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(model, ItemCameraTransforms.TransformType.NONE, false); - this.renderModel(model, renderStack, 0xFF00004C); + renderModel(model, renderStack, 0xFF00004C); GlStateManager.cullFace(GlStateManager.CullFace.BACK); GlStateManager.popMatrix(); @@ -348,10 +350,10 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { for (EnumFacing enumfacing : EnumFacing.values()) { - this.renderQuads(worldrenderer, model.getQuads(null, enumfacing, 0), color, stack); + renderQuads(worldrenderer, model.getQuads(null, enumfacing, 0), color, stack); } - this.renderQuads(worldrenderer, model.getQuads(null, null, 0), color, stack); + renderQuads(worldrenderer, model.getQuads(null, null, 0), color, stack); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java index c0e27d830..0b985af24 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java @@ -2,16 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 26, 2014, 10:28:39 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 34b82401b..0fca2e921 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -2,14 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 6, 2014, 5:11:23 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; +import java.awt.Color; +import java.util.List; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import baubles.api.BaubleType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -29,7 +36,6 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; @@ -42,10 +48,6 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.awt.*; -import java.util.List; - public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem, IManaUsingItem, IBaubleRender { private static final String TAG_BREW_KEY = "brewKey"; @@ -170,7 +172,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); } - GL11.glColor3ub(((byte) 255), ((byte) 255), ((byte) 255)); + GL11.glColor3ub((byte) 255, (byte) 255, (byte) 255); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index 5ec2a86dd..222760af3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -2,17 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 25, 2014, 10:30:39 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; +import java.util.List; + +import com.google.common.base.Predicates; + import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; -import com.google.common.base.Predicates; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -40,8 +43,6 @@ import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import java.util.List; - public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBaubleRender { public ItemDivaCharm() { @@ -61,7 +62,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(event.getEntityLiving().posX - range, event.getEntityLiving().posY - range, event.getEntityLiving().posZ - range, event.getEntityLiving().posX + range, event.getEntityLiving().posY + range, event.getEntityLiving().posZ + range), Predicates.instanceOf(IMob.class)); if(mobs.size() > 1) { - if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.getEntityLiving(), ((List) mobs))) { + if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.getEntityLiving(), (List) mobs)) { if(event.getEntityLiving() instanceof EntityCreeper) ReflectionHelper.setPrivateValue(EntityCreeper.class, (EntityCreeper) event.getEntityLiving(), 2, LibObfuscation.TIME_SINCE_IGNITED); event.getEntityLiving().heal(event.getEntityLiving().getMaxHealth()); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java index 0bd5df543..c65af8fa3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java @@ -2,16 +2,14 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [22/09/2016, 12:56:22 (GMT)] */ package vazkii.botania.common.item.equipment.bauble; -import org.lwjgl.opengl.GL11; - import baubles.api.BaubleType; import baubles.api.BaublesApi; import net.minecraft.client.Minecraft; @@ -23,7 +21,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Vec3d; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -31,8 +28,6 @@ import net.minecraftforge.fml.common.gameevent.InputEvent.KeyInputEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; @@ -43,12 +38,12 @@ public class ItemDodgeRing extends ItemBauble { public static final String TAG_DODGE_COOLDOWN = "dodgeCooldown"; public static final int MAX_CD = 20; - + int leftDown, rightDown; - + public ItemDodgeRing() { super(LibItemNames.DODGE_RING); - + if(FMLCommonHandler.instance().getSide().isClient()) MinecraftForge.EVENT_BUS.register(this); } @@ -57,7 +52,7 @@ public class ItemDodgeRing extends ItemBauble { @SideOnly(Side.CLIENT) public void onKeyDown(KeyInputEvent event) { Minecraft mc = Minecraft.getMinecraft(); - + IInventory baublesInv = BaublesApi.getBaubles(mc.thePlayer); ItemStack ringStack = baublesInv.getStackInSlot(1); if(ringStack == null || !(ringStack.getItem() instanceof ItemDodgeRing)) { @@ -65,64 +60,61 @@ public class ItemDodgeRing extends ItemBauble { if(ringStack == null || !(ringStack.getItem() instanceof ItemDodgeRing)) return; } - + if(ItemNBTHelper.getInt(ringStack, TAG_DODGE_COOLDOWN, 0) > 0) return; - + int threshold = 4; if(mc.gameSettings.keyBindLeft.isKeyDown()) { int oldLeft = leftDown; leftDown = ClientTickHandler.ticksInGame; - + if(leftDown - oldLeft < threshold) dodge(mc.thePlayer, true); } else if(mc.gameSettings.keyBindRight.isKeyDown()) { int oldRight = rightDown; rightDown = ClientTickHandler.ticksInGame; - + if(rightDown - oldRight < threshold) dodge(mc.thePlayer, false); } } - + @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { int cd = ItemNBTHelper.getInt(stack, TAG_DODGE_COOLDOWN, 0); if(cd > 0) ItemNBTHelper.setInt(stack, TAG_DODGE_COOLDOWN, cd - 1); } - + @SideOnly(Side.CLIENT) public void dodge(EntityPlayer player, boolean left) { if(player.capabilities.isFlying || !player.onGround || player.moveForward > 0.2 || player.moveForward < -0.2) return; - + float yaw = player.rotationYaw; float x = MathHelper.sin(-yaw * 0.017453292F - (float) Math.PI); - float z = MathHelper.cos(-yaw * 0.017453292F - (float) Math.PI); - Vector3 lookVec = new Vector3(x, 0, z); + float z = MathHelper.cos(-yaw * 0.017453292F - (float) Math.PI); + Vector3 lookVec = new Vector3(x, 0, z); Vector3 sideVec = lookVec.crossProduct(new Vector3(0, left ? 1 : -1, 0)).multiply(1.25); - + player.motionX = sideVec.x; player.motionY = sideVec.y; player.motionZ = sideVec.z; - + PacketHandler.sendToServer(new PacketDodge()); } @SideOnly(Side.CLIENT) public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack, float pticks) { - int u = Math.max(1, stack.getItemDamage()) * 9 - 9; - int v = 0; - - Minecraft mc = Minecraft.getMinecraft(); + Math.max(1, stack.getItemDamage()); + Minecraft.getMinecraft(); int xo = resolution.getScaledWidth() / 2 - 20; - int x = xo; int y = resolution.getScaledHeight() / 2 + 20; if(!player.capabilities.isFlying) { int cd = ItemNBTHelper.getInt(stack, TAG_DODGE_COOLDOWN, 0); - int width = Math.min((int) (((float) cd - pticks) * 2), 40); + int width = Math.min((int) ((cd - pticks) * 2), 40); GlStateManager.color(1F, 1F, 1F, 1F); if(width > 0) { Gui.drawRect(xo, y - 2, xo + 40, y - 1, 0x88000000); @@ -133,7 +125,7 @@ public class ItemDodgeRing extends ItemBauble { GlStateManager.enableAlpha(); GlStateManager.color(1F, 1F, 1F, 1F); } - + @Override public BaubleType getBaubleType(ItemStack arg0) { return BaubleType.RING; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 370a04b2e..9cf266834 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -2,14 +2,25 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 26, 2014, 4:05:50 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.xml.bind.annotation.adapters.HexBinaryAdapter; + +import org.lwjgl.opengl.GL11; + import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; import net.minecraft.client.Minecraft; @@ -38,7 +49,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; @@ -59,14 +69,6 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import javax.xml.bind.annotation.adapters.HexBinaryAdapter; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.util.ArrayList; -import java.util.List; - public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaubleRender, ICraftAchievement { private static final ResourceLocation textureHud = new ResourceLocation(LibResources.GUI_HUD_ICONS); @@ -354,10 +356,10 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub int light = 15728880; int lightmapX = light % 65536; int lightmapY = light / 65536; - + float lbx = OpenGlHelper.lastBrightnessX; float lby = OpenGlHelper.lastBrightnessY; - + switch(meta) { case 1 : { // Jibril h = 0.4F; @@ -415,11 +417,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GlStateManager.color(1F, 1F, 1F, 0.5F + (flying ? (float) Math.cos((double) (player.ticksExisted + partialTicks) * 0.3F) * 0.25F + 0.25F : 0F)); } } - + // account for padding in the texture float mul = 32F / 20F; s *= mul; - + float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); @@ -455,7 +457,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GlStateManager.color(1F, 1F, 1F); GlStateManager.popMatrix(); - + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lbx, lby); } } else if(meta == 1) // Jibril's Halo diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java index ff7608103..0c6ac8b96 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 27, 2014, 8:49:01 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java index 6a94b5843..0b073fe79 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 24, 2014, 5:12:53 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterMagnetRing.java index 8a1983959..79c6bcdf9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterMagnetRing.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 21, 2015, 9:00:04 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterManaRing.java index c680da8f3..2f81d9903 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterManaRing.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 24, 2014, 5:20:54 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 056854ef8..d8a5296b9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Dec 4, 2014, 11:03:13 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; @@ -15,9 +15,7 @@ import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; @@ -129,7 +127,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { ResourceLocation getCloakTexture() { return texture; } - + @SideOnly(Side.CLIENT) ResourceLocation getCloakGlowTexture() { return textureGlow; @@ -142,18 +140,18 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; GlStateManager.translate(0F, armor ? -0.07F : -0.01F, 0F); - + float s = 1F / 16F; GlStateManager.scale(s, s, s); if(model == null) model = new ModelCloak(); - + GlStateManager.enableLighting(); GlStateManager.enableRescaleNormal(); - + Minecraft.getMinecraft().renderEngine.bindTexture(getCloakTexture()); model.render(1F); - + int light = 15728880; int lightmapX = light % 65536; int lightmapY = light / 65536; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index dec6f32f5..dbd99ea7c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 26, 2014, 2:06:17 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index ed18bace5..f2af40f00 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 31, 2014, 12:59:16 AM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; import baubles.common.network.PacketHandler; @@ -47,10 +51,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - public class ItemItemFinder extends ItemBauble implements IBaubleRender { private static final String TAG_POSITIONS_OLD = "highlightPositions"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index ea59157e8..74a235e8d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -2,16 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 26, 2014, 7:08:53 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; -import baubles.api.BaubleType; import com.google.common.collect.Multimap; + +import baubles.api.BaubleType; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index 49179c98d..707713dfc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 26, 2014, 11:23:27 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index 0b347c03e..2282b5ba1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -2,18 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 17, 2014, 3:16:36 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; +import java.util.List; + +import com.google.common.collect.ImmutableList; + import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; @@ -35,8 +38,6 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; -import java.util.List; - public class ItemMagnetRing extends ItemBauble { private static final String TAG_COOLDOWN = "cooldown"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index 099ada167..dc50cd456 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 24, 2014, 2:55:28 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; +import java.util.List; + +import javax.annotation.Nonnull; + import baubles.api.BaubleType; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -23,9 +27,6 @@ import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipDisplay { protected static final int MAX_MANA = 500000; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java index 09d2d95bd..58092da8a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 17, 2014, 4:12:46 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index 0c6dd68d8..a9c558ee3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 3:03:18 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemPixieRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemPixieRing.java index fcc90e45c..3a79bfff2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemPixieRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemPixieRing.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 20, 2014, 6:13:45 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java index 69ee17884..0ceefe5e9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 22, 2014, 3:00:09 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSpeedUpBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSpeedUpBelt.java index 36022a24d..2554080ee 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSpeedUpBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSpeedUpBelt.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [24/11/2015, 22:50:29 (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index 701697414..c4335ef15 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 31, 2014, 6:09:17 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperTravelBelt.java index f884e615b..3a3e2e946 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperTravelBelt.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 20, 2014, 6:26:40 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java index a1f3d0974..dc3491647 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 23, 2015, 7:21:52 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index f59b350d5..44962b8c2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -2,16 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 20, 2014, 10:58:00 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; -import baubles.api.BaubleType; +import java.util.List; + import com.google.common.base.Predicates; + +import baubles.api.BaubleType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; @@ -31,8 +34,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; -import java.util.List; - public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { public static final String TAG_ORBIT = "orbit"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 34d9c668b..9332fb126 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 24, 2014, 11:14:57 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; +import java.util.ArrayList; +import java.util.List; + import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; import net.minecraft.block.material.Material; @@ -32,9 +35,6 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibItemNames; -import java.util.ArrayList; -import java.util.List; - public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUsingItem { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TRAVEL_BELT); @@ -80,18 +80,18 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs if(player.worldObj.isRemote) { if((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F && !player.isInsideOfMaterial(Material.WATER)) { - float speed = beltItem.getSpeed(belt); - player.moveRelative(0F, 1F, player.capabilities.isFlying ? speed : speed); - beltItem.onMovedTick(belt, player); + float speed = beltItem.getSpeed(belt); + player.moveRelative(0F, 1F, player.capabilities.isFlying ? speed : speed); + beltItem.onMovedTick(belt, player); - if(player.ticksExisted % COST_INTERVAL == 0) - ManaItemHandler.requestManaExact(belt, player, COST, true); - } else beltItem.onNotMovingTick(belt, player); + if(player.ticksExisted % COST_INTERVAL == 0) + ManaItemHandler.requestManaExact(belt, player, COST, true); + } else beltItem.onNotMovingTick(belt, player); } if(player.isSneaking()) player.stepHeight = 0.50001F; // Not 0.5F because that is the default - else player.stepHeight = 1F; + else player.stepHeight = 1F; } else { player.stepHeight = 0.5F; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index ca96f6b7f..bf0214279 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -2,15 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Dec 4, 2014, 11:12:51 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; +import java.util.List; + import com.google.common.base.Predicates; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; @@ -28,8 +31,6 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; -import java.util.List; - public class ItemUnholyCloak extends ItemHolyCloak { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_UNHOLY_CLOAK); @@ -44,7 +45,7 @@ public class ItemUnholyCloak extends ItemHolyCloak { if(!event.getSource().isUnblockable()) { int range = 6; List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range), Predicates.instanceOf(IMob.class)); - for(IMob mob : ((List) mobs)) + for(IMob mob : (List) mobs) if(mob instanceof EntityLivingBase) { EntityLivingBase entity = (EntityLivingBase) mob; entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.getAmount()); @@ -64,11 +65,13 @@ public class ItemUnholyCloak extends ItemHolyCloak { return false; } + @Override @SideOnly(Side.CLIENT) ResourceLocation getCloakTexture() { return texture; } - + + @Override @SideOnly(Side.CLIENT) ResourceLocation getCloakGlowTexture() { return textureGlow; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java index 24414352b..8cc1e6c87 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 17, 2014, 3:44:24 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 5cf860cd0..c98976255 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -2,15 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 10, 2014, 11:48:12 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool; +import javax.annotation.Nonnull; + import com.google.common.collect.Multimap; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -25,8 +28,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemEnderDagger extends ItemManasteelSword { public ItemEnderDagger() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java index a4489fc0e..a795d3d8e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 6, 2014, 9:55:23 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool; +import javax.annotation.Nonnull; + import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -21,8 +23,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemGlassPick extends ItemManasteelPick { private static final int MANA_PER_DAMAGE = 160; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java index f093099ee..b05c4d283 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 17, 2015, 3:55:52 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool; +import javax.annotation.Nonnull; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; @@ -30,8 +32,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemStarSword extends ItemManasteelSword implements ICraftAchievement { private static final int MANA_PER_DAMAGE = 120; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index ee4b62717..b77cb2c8d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -2,15 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 27, 2015, 10:38:50 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.function.Predicate; + +import javax.annotation.Nonnull; + import com.google.common.collect.Multimap; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -32,12 +40,6 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.function.Predicate; - public class ItemThunderSword extends ItemManasteelSword implements ICraftAchievement { private static final String TAG_LIGHTNING_SEED = "lightningSeed"; @@ -64,7 +66,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev if(entities.isEmpty()) break; - EntityLivingBase target = ((EntityLivingBase) entities.get(rand.nextInt(entities.size()))); + EntityLivingBase target = (EntityLivingBase) entities.get(rand.nextInt(entities.size())); if(attacker instanceof EntityPlayer) target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), dmg); else target.attackEntityFrom(DamageSource.causeMobDamage(attacker), dmg); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index 44a922aff..f200b3a16 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 13, 2014, 7:13:04 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool; @@ -50,7 +50,7 @@ public final class ToolCommons { /** * Pos is the actual block coordinate, posStart and posEnd are deltas from pos - */ + */ public static void removeBlocksInIteration(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos posStart, BlockPos posEnd, Block block, Material[] materialsListing, boolean silk, int fortune, boolean dispose) { float blockHardness = block == null ? 1F : block.getBlockHardness(world.getBlockState(pos), world, pos); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java index 4a753c3c3..5f5046946 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 21, 2015, 6:33:40 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool.bow; @@ -43,7 +43,7 @@ public class ItemCrystalBow extends ItemLivingwoodBow { void onFire(ItemStack stack, EntityLivingBase living, boolean infinity, EntityArrow arrow) { arrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; if(living instanceof EntityPlayer) - ManaItemHandler.requestManaExactForTool(stack, ((EntityPlayer) living), ARROW_COST / (infinity ? 2 : 1), false); + ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) living, ARROW_COST / (infinity ? 2 : 1), false); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index 3d775d710..e5750af86 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 21, 2015, 4:58:45 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool.bow; +import java.util.function.Predicate; + +import javax.annotation.Nonnull; + import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -20,7 +24,6 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Enchantments; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemArrow; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; @@ -32,9 +35,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeEventFactory; -import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -42,7 +43,6 @@ import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.render.IModelRegister; -import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; @@ -50,9 +50,6 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.function.Predicate; - public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModelRegister { private static final Predicate AMMO_FUNC = s -> s != null && s.getItem() instanceof ItemArrow; @@ -68,16 +65,16 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel setUnlocalizedName(name); setMaxDamage(500); addPropertyOverride(new ResourceLocation("minecraft:pull"), (stack, worldIn, entityIn) -> { - if (entityIn == null) - { - return 0.0F; - } - else - { - ItemStack itemstack = entityIn.getActiveItemStack(); - return itemstack != null && itemstack.getItem() instanceof ItemLivingwoodBow ? (float)(stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) * chargeVelocityMultiplier() / 20.0F : 0.0F; - } - }); + if (entityIn == null) + { + return 0.0F; + } + else + { + ItemStack itemstack = entityIn.getActiveItemStack(); + return itemstack != null && itemstack.getItem() instanceof ItemLivingwoodBow ? (stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) * chargeVelocityMultiplier() / 20.0F : 0.0F; + } + }); } @Nonnull @@ -113,7 +110,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel // Begin copy modified ItemBow.onPlayerStoppedUsing boolean flag = !isPlayer || canFire(stack, player); // Botania - Custom canFire check - ItemStack itemstack = this.getAmmo(shooter); + ItemStack itemstack = getAmmo(shooter); int i = (int) ((getMaxItemUseDuration(stack) - useTicks) * chargeVelocityMultiplier()); // Botania - velocity multiplier if(isPlayer) @@ -129,9 +126,9 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel float f = getArrowVelocity(i); - if ((double)f >= 0.1D) + if (f >= 0.1D) { - boolean infinite = !isPlayer || player.capabilities.isCreativeMode || (itemstack.getItem() instanceof ItemArrow && ((ItemArrow) itemstack.getItem()).isInfinite(itemstack, stack, player)); + boolean infinite = !isPlayer || player.capabilities.isCreativeMode || itemstack.getItem() instanceof ItemArrow && ((ItemArrow) itemstack.getItem()).isInfinite(itemstack, stack, player); if (!world.isRemote) { @@ -148,7 +145,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel if (j > 0) { - entityarrow.setDamage(entityarrow.getDamage() + (double)j * 0.5D + 0.5D); + entityarrow.setDamage(entityarrow.getDamage() + j * 0.5D + 0.5D); } int k = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH, stack); @@ -198,7 +195,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel if(living instanceof EntityPlayerMP) { ToolCommons.damageItem(bow, 1, living, MANA_PER_DAMAGE); if(((EntityPlayerMP) living).interactionManager.getGameType().isSurvivalOrAdventure()) - PlayerHelper.consumeAmmo(((EntityPlayerMP) living), AMMO_FUNC); + PlayerHelper.consumeAmmo((EntityPlayerMP) living, AMMO_FUNC); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java index 5f0fc1b75..92ec8d4b1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java @@ -1,5 +1,7 @@ package vazkii.botania.common.item.equipment.tool.elementium; +import java.util.Random; + import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; @@ -14,15 +16,12 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; import vazkii.botania.common.lib.LibItemNames; -import java.util.Random; - public class ItemElementiumAxe extends ItemManasteelAxe { public ItemElementiumAxe() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index adc263411..5556ce527 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -27,7 +27,7 @@ public class ItemElementiumPick extends ItemManasteelPick { for(int i = 0; i < event.getDrops().size(); i++) { ItemStack drop = event.getDrops().get(i); if(drop != null) { - if(isDisposable(drop) || (isSemiDisposable(drop) && !event.getHarvester().isSneaking())) + if(isDisposable(drop) || isSemiDisposable(drop) && !event.getHarvester().isSneaking()) event.getDrops().remove(i); } } @@ -47,10 +47,6 @@ public class ItemElementiumPick extends ItemManasteelPick { } return false; } - - private static boolean isSemiDisposable(Block block) { - return isSemiDisposable(new ItemStack(block)); - } private static boolean isSemiDisposable(ItemStack stack) { for(int id : OreDictionary.getOreIDs(stack)) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java index f1e51222f..8499aa17d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java @@ -1,6 +1,12 @@ package vazkii.botania.common.item.equipment.tool.elementium; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nonnull; + import com.google.common.base.Predicates; + import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -8,7 +14,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; import net.minecraft.item.EnumAction; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; @@ -23,12 +28,6 @@ import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; -import java.util.Locale; -import java.util.Random; - public class ItemElementiumShears extends ItemManasteelShears { public ItemElementiumShears() { @@ -64,7 +63,7 @@ public class ItemElementiumShears extends ItemManasteelShears { int range = 12; List sheep = living.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(living.posX - range, living.posY - range, living.posZ - range, living.posX + range, living.posY + range, living.posZ + range), Predicates.instanceOf(IShearable.class)); if(sheep.size() > 0) { - for(IShearable target : ((List) sheep)) { + for(IShearable target : (List) sheep) { Entity entity = (Entity) target; if(target.isShearable(stack, entity.worldObj, new BlockPos(entity))) { List drops = target.onSheared(stack, entity.worldObj, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index ca607fc4f..48b3c3711 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -2,15 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 13, 2014, 7:15:39 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool.manasteel; -import com.google.common.collect.ImmutableSet; +import java.util.regex.Pattern; + +import javax.annotation.Nonnull; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; @@ -19,7 +22,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemTool; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -43,10 +45,6 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.Set; -import java.util.regex.Pattern; - public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortableTool, IModelRegister { private static final Pattern SAPLING_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)sapling)|(?:(?:[a-z-_.:]|^)Sapling))(?:[A-Z-_.:]|$)"); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index 10a7f128d..fce599e17 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 13, 2014, 7:05:58 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool.manasteel; +import java.util.regex.Pattern; + +import javax.annotation.Nonnull; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; @@ -41,9 +45,6 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.regex.Pattern; - public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, ISortableTool, IModelRegister { private static final Pattern TORCH_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)torch)|(?:(?:[a-z-_.:]|^)Torch))(?:[A-Z-_.:]|$)"); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index 957a750a1..44ca9b154 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 13, 2014, 7:28:35 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool.manasteel; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.enchantment.EnchantmentHelper; @@ -40,10 +45,6 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Random; - public class ItemManasteelShears extends ItemShears implements IManaUsingItem, IModelRegister { public static final int MANA_PER_DAMAGE = 30; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 5623f1008..4c90443c2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 13, 2014, 7:14:54 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool.manasteel; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -45,8 +47,6 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; - public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, ISortableTool, IModelRegister { private static final int MANA_PER_DAMAGE = 60; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index 51075af7d..1c504f474 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -2,20 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 13, 2014, 7:21:32 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool.manasteel; +import javax.annotation.Nonnull; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.util.ResourceLocation; @@ -36,8 +37,6 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; - public class ItemManasteelSword extends ItemSword implements IManaUsingItem, IModelRegister { public static final int MANA_PER_DAMAGE = 60; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index 45c2d870e..d5e67baac 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -2,21 +2,29 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 15, 2015, 6:55:34 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool.terrasteel; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; +import java.util.PriorityQueue; +import java.util.Set; + +import javax.annotation.Nonnull; + import gnu.trove.map.hash.TIntObjectHashMap; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; @@ -36,36 +44,27 @@ import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; -import java.util.PriorityQueue; -import java.util.Set; - public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker { - + /** * The number of blocks per tick which the Terra Truncator will * collect. */ private static final int BLOCK_SWAP_RATE = 10; - + /** * The maximum radius (in blocks) which the Terra Truncator will go * in order to try and murder/cut down the tree. */ public static final int BLOCK_RANGE = 32; - + /** * The maximum number of leaf blocks which the Terra Truncator will chew/go * through once a leaf block is encountered. */ private static final int LEAF_BLOCK_RANGE = 3; - + /** * The amount of mana required to restore 1 point of damage. */ @@ -80,12 +79,12 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker public ItemTerraAxe() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_AXE); MinecraftForge.EVENT_BUS.register(this); - this.attackSpeed = -3f; + attackSpeed = -3f; addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "terraaxe_on"), (stack, world, entity) -> { - if(entity instanceof EntityPlayer && !shouldBreak(((EntityPlayer) entity))) - return 0; - return 1; - }); + if(entity instanceof EntityPlayer && !shouldBreak((EntityPlayer) entity)) + return 0; + return 1; + }); } private boolean shouldBreak(EntityPlayer player) { @@ -130,7 +129,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker int dim = event.world.provider.getDimension(); if(blockSwappers.containsKey(dim)) { Set swappers = blockSwappers.get(dim); - + // Iterate through all of our swappers, removing any // which no longer need to tick. Iterator swapper = swappers.iterator(); @@ -150,7 +149,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * Block swappers are only added on the server, and a marker instance * which is not actually ticked but contains the proper passed in * information will be returned to the client. - * + * * @param world The world to add the swapper to. * @param player The player who is responsible for this swapper. * @param stack The Terra Truncator which caused this block swapper. @@ -178,20 +177,20 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker /** * A block swapper for the Terra Truncator, which uses a standard * Breadth First Search to try and murder/cut down trees. - * + * * The Terra Truncator will look up to BLOCK_RANGE blocks to find wood * to cut down (only cutting down adjacent pieces of wood, so it doesn't * jump through the air). However, the truncator will only go through * LEAF_BLOCK_RANGE leave blocks in order to prevent adjacent trees which * are connected only by leaves from being devoured as well. - * + * * The leaf restriction is implemented by reducing the number of remaining * steps to the min of LEAF_BLOCK_RANGE and the current range. The restriction * can be removed entirely by setting the "leaves" variable to true, in which * case leaves will be treated normally. */ private static class BlockSwapper { - + /** * Represents the range which a single block will scan when looking * for the next candidates for swapping. 1 is a good default. @@ -202,43 +201,43 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * The world the block swapper is doing the swapping in. */ private final World world; - + /** * The player the swapper is swapping for. */ private final EntityPlayer player; - + /** * The Terra Truncator which created this swapper. */ private final ItemStack truncator; - + /** * The origin of the swapper (eg, where it started). */ private final BlockPos origin; - + /** * Denotes whether leaves should be treated specially. */ private final boolean treatLeavesSpecial; - + /** * The initial range which this block swapper starts with. */ private final int range; - + /** * The priority queue of all possible candidates for swapping. */ private final PriorityQueue candidateQueue; - + /** * The set of already swaps coordinates which do not have * to be revisited. */ private final Set completedCoords; - + /** * Creates a new block swapper with the provided parameters. * @param world The world the swapper is in. @@ -253,17 +252,17 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker this.world = world; this.player = player; this.truncator = truncator; - this.origin = origCoords; + origin = origCoords; this.range = range; - this.treatLeavesSpecial = leaves; - - this.candidateQueue = new PriorityQueue<>(); - this.completedCoords = new HashSet<>(); - + treatLeavesSpecial = leaves; + + candidateQueue = new PriorityQueue<>(); + completedCoords = new HashSet<>(); + // Add the origin to our candidate queue with the original range - candidateQueue.offer(new SwapCandidate(this.origin, this.range)); + candidateQueue.offer(new SwapCandidate(origin, this.range)); } - + /** * Ticks this Block Swapper, which allows it to swap BLOCK_SWAP_RATE * further blocks and expands the breadth first search. The return @@ -276,61 +275,61 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker // If empty, this swapper is done. if(candidateQueue.isEmpty()) return false; - + int remainingSwaps = BLOCK_SWAP_RATE; while(remainingSwaps > 0 && !candidateQueue.isEmpty()) { SwapCandidate cand = candidateQueue.poll(); - + // If we've already completed this location, move along, as this // is just a suboptimal one. if(completedCoords.contains(cand.coordinates)) continue; - + // If this candidate is out of range, discard it. if(cand.range <= 0) continue; - + // Otherwise, perform the break and then look at the adjacent tiles. // This is a ridiculous function call here. - ToolCommons.removeBlockWithDrops(player, truncator, world, - cand.coordinates, - origin, + ToolCommons.removeBlockWithDrops(player, truncator, world, + cand.coordinates, + origin, null, ToolCommons.materialsAxe, EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, truncator) > 0, EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, truncator), 0F, false, treatLeavesSpecial); - + remainingSwaps--; - + completedCoords.add(cand.coordinates); - + // Then, go through all of the adjacent blocks and look if // any of them are any good. for(BlockPos adj : adjacent(cand.coordinates)) { Block block = world.getBlockState(adj).getBlock(); - + boolean isWood = block.isWood(world, adj); boolean isLeaf = block.isLeaves(world.getBlockState(adj), world, adj); - + // If it's not wood or a leaf, we aren't interested. if(!isWood && !isLeaf) continue; - + // If we treat leaves specially and this is a leaf, it gets // the minimum of the leaf range and the current range - 1. // Otherwise, it gets the standard range - 1. int newRange = treatLeavesSpecial && isLeaf ? Math.min(LEAF_BLOCK_RANGE, cand.range - 1) : - cand.range - 1; - - candidateQueue.offer(new SwapCandidate(adj, newRange)); + cand.range - 1; + + candidateQueue.offer(new SwapCandidate(adj, newRange)); } } - + // If we did any iteration, then hang around until next tick. return true; } - + public List adjacent(BlockPos original) { List coords = new ArrayList<>(); // Visit all the surrounding blocks in the provided radius. @@ -339,15 +338,15 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker for(int dy = -SINGLE_BLOCK_RADIUS; dy <= SINGLE_BLOCK_RADIUS; dy++) for(int dz = -SINGLE_BLOCK_RADIUS; dz <= SINGLE_BLOCK_RADIUS; dz++) { // Skip the central tile. - if(dx == 0 && dy == 0 && dz == 0) + if(dx == 0 && dy == 0 && dz == 0) continue; - + coords.add(original.add(dx, dy, dz)); } - + return coords; } - + /** * Represents a potential candidate for swapping/removal. Sorted by * range (where a larger range is more preferable). As we're using @@ -360,12 +359,12 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * The location of this swap candidate. */ public final BlockPos coordinates; - + /** * The remaining range of this swap candidate. */ public final int range; - + /** * Constructs a new Swap Candidate with the provided * coordinates and range. @@ -376,18 +375,18 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker this.coordinates = coordinates; this.range = range; } - + @Override public int compareTo(@Nonnull SwapCandidate other) { // Aka, a bigger range implies a smaller value, meaning // bigger ranges will be preferred in a min-heap return other.range - range; } - + @Override public boolean equals(Object other) { if(!(other instanceof SwapCandidate)) return false; - + SwapCandidate cand = (SwapCandidate) other; return coordinates.equals(cand.coordinates) && range == cand.range; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 177ec3045..eb5a8366a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 20, 2014, 10:56:14 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool.terrasteel; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.material.Material; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; @@ -51,9 +55,6 @@ import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.item.relic.ItemThorRing; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker { private static final String TAG_ENABLED = "enabled"; @@ -66,11 +67,11 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ private static final Material[] MATERIALS = new Material[] { Material.ROCK, Material.IRON, Material.ICE, Material.GLASS, Material.PISTON, Material.ANVIL, Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY }; public static final int[] LEVELS = new int[] { - 0, 10000, 1000000, 10000000, 100000000, 1000000000 + 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 - 1 + 10000 - 1, 1000000 - 1, 10000000 - 1, 100000000 - 1, 1000000000 - 1, MAX_MANA - 1 }; public ItemTerraPick() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index f19ee6299..4d969be0d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 14, 2014, 7:34:56 PM (GMT)] */ package vazkii.botania.common.item.equipment.tool.terrasteel; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; @@ -41,9 +45,6 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.network.PacketLeftClick; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, ICraftAchievement { private static final String TAG_ATTACKER_USERNAME = "attackerUsername"; diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java index eb87351fd..225ae0e60 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 28, 2014, 6:16:24 PM (GMT)] */ package vazkii.botania.common.item.interaction.thaumcraft; diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index a99b2d4bf..dfc502eba 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 26, 2014, 5:39:07 PM (GMT)] */ package vazkii.botania.common.item.interaction.thaumcraft; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -24,9 +28,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IScribeTools") public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools { diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java index c6b522c6c..bdb85ca56 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 28, 2014, 6:18:05 PM (GMT)] */ package vazkii.botania.common.item.interaction.thaumcraft; diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java index bd47d39fb..4ba7c6e6b 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 28, 2014, 6:22:51 PM (GMT)] */ package vazkii.botania.common.item.interaction.thaumcraft; diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 99cc4d539..f6f060b63 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 31, 2014, 3:02:58 PM (GMT)] */ package vazkii.botania.common.item.lens; +import java.awt.Color; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -39,10 +44,6 @@ import vazkii.botania.common.crafting.recipe.LensDyeingRecipe; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.awt.*; -import java.util.List; - public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt { public static final int SUBTYPES = 24; diff --git a/src/main/java/vazkii/botania/common/item/lens/Lens.java b/src/main/java/vazkii/botania/common/item/lens/Lens.java index 544ea8450..6b72a0015 100644 --- a/src/main/java/vazkii/botania/common/item/lens/Lens.java +++ b/src/main/java/vazkii/botania/common/item/lens/Lens.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:31:16 PM (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensBounce.java b/src/main/java/vazkii/botania/common/item/lens/LensBounce.java index 6f6ef2aa7..415138940 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensBounce.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensBounce.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:34:29 PM (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java index 627c91680..fae8270d7 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:37:33 PM (GMT)] */ package vazkii.botania.common.item.lens; +import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; @@ -18,8 +20,6 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; -import java.util.List; - public class LensDamage extends Lens { @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/LensEfficiency.java b/src/main/java/vazkii/botania/common/item/lens/LensEfficiency.java index 6e5b6eaf8..eaea75604 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensEfficiency.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensEfficiency.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:34:06 PM (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java index dd1be21b7..2da82df1d 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java @@ -3,10 +3,10 @@ . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:41:44 PM (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFire.java b/src/main/java/vazkii/botania/common/item/lens/LensFire.java index 188793b48..43444f38c 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFire.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFire.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:46:03 PM (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java index 186dd47e5..17d3c2521 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [15/11/2015, 19:12:41 (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java index 83db6ce41..8ec44272a 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [15/11/2015, 19:13:10 (GMT)] */ package vazkii.botania.common.item.lens; +import java.awt.Color; + import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -17,8 +19,6 @@ import net.minecraft.util.math.MathHelper; import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.common.Botania; -import java.awt.*; - public class LensFlare extends Lens { @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/LensGravity.java b/src/main/java/vazkii/botania/common/item/lens/LensGravity.java index ae7a684b1..6feda7b0d 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensGravity.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensGravity.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:35:52 PM (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java index 0549d384c..2ec4f198b 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java @@ -2,15 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:42:33 PM (GMT)] */ package vazkii.botania.common.item.lens; +import java.util.List; + import com.google.common.base.Predicates; + import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.item.EntityItem; @@ -22,8 +25,6 @@ import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.item.ModItems; -import java.util.List; - public class LensInfluence extends Lens { @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/LensLight.java b/src/main/java/vazkii/botania/common/item/lens/LensLight.java index 08fb8eb77..2fbcf62b2 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensLight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensLight.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:47:20 PM (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java index dc1071e9f..ee221b819 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:39:58 PM (GMT)] */ package vazkii.botania.common.item.lens; @@ -16,7 +16,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaReceiver; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; public class LensMagnet extends Lens { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMessenger.java b/src/main/java/vazkii/botania/common/item/lens/LensMessenger.java index 4dc94fc3e..6ba9aa53f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMessenger.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMessenger.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [01/10/2016, 20:37:46 (GMT)] */ package vazkii.botania.common.item.lens; @@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.BurstProperties; public class LensMessenger extends Lens { - + @Override public void apply(ItemStack stack, BurstProperties props) { props.maxMana /= 5; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMine.java b/src/main/java/vazkii/botania/common/item/lens/LensMine.java index 52872d4ab..a7a14d970 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:36:20 PM (GMT)] */ package vazkii.botania.common.item.lens; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -26,9 +29,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; -import java.util.ArrayList; -import java.util.List; - public class LensMine extends Lens { @Override @@ -43,12 +43,12 @@ public class LensMine extends Lens { ItemStack composite = ((ItemLens) ModItems.lens).getCompositeLens(stack); boolean warp = composite != null && composite.getItem() == ModItems.lens && composite.getItemDamage() == ItemLens.WARP; - + if(warp && (block == ModBlocks.pistonRelay || block == Blocks.PISTON || block == Blocks.PISTON_EXTENSION || block == Blocks.PISTON_HEAD)) return false; int harvestLevel = ConfigHandler.harvestLevelBore; - + TileEntity tile = world.getTileEntity(pos_); IBlockState state = world.getBlockState(pos_); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index 4feebdb3e..232460a73 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:44:01 PM (GMT)] */ package vazkii.botania.common.item.lens; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.passive.EntitySheep; @@ -25,9 +28,6 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; -import java.util.ArrayList; -import java.util.List; - public class LensPaint extends Lens { @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPhantom.java b/src/main/java/vazkii/botania/common/item/lens/LensPhantom.java index f193abff8..74fd3375c 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPhantom.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPhantom.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:39:24 PM (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java index 50bf0829f..a4d4b7965 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:46:39 PM (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPower.java b/src/main/java/vazkii/botania/common/item/lens/LensPower.java index 84ac6d9fb..185c0a192 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPower.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPower.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:33:14 PM (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java index 5e406db0a..0eb9c91af 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [15/11/2015, 19:13:03 (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensSpeed.java b/src/main/java/vazkii/botania/common/item/lens/LensSpeed.java index d7ada90f5..0a590589f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensSpeed.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensSpeed.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:32:47 PM (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensStorm.java b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java index 92797a2fa..60502b23a 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensStorm.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 25, 2015, 2:10:26 AM (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensTime.java b/src/main/java/vazkii/botania/common/item/lens/LensTime.java index 14aa471f4..a7b56559c 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensTime.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensTime.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:33:41 PM (GMT)] */ package vazkii.botania.common.item.lens; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java b/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java index de710bc68..08ccda287 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [02/10/2016, 18:27:42 (GMT)] */ package vazkii.botania.common.item.lens; @@ -14,21 +14,16 @@ import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.IManaSpreader; -import vazkii.botania.common.core.helper.ItemNBTHelper; public class LensTripwire extends Lens { private static final String TAG_TRIPPED = "botania:triwireLensTripped"; - + @Override public boolean allowBurstShooting(ItemStack stack, IManaSpreader spreader, boolean redstone) { IManaBurst burst = spreader.runBurstSimulation(); @@ -41,7 +36,7 @@ public class LensTripwire extends Lens { if(burst.isFake()) { if(entity.worldObj.isRemote) return; - + AxisAlignedBB axis = new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(0.25, 0.25, 0.25); List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); if(!entities.isEmpty()) { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index 272be6d4c..5b880ebf5 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 8, 2015, 2:17:01 PM (GMT)] */ package vazkii.botania.common.item.lens; @@ -27,7 +27,7 @@ public class LensWarp extends Lens { Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); if(block == ModBlocks.pistonRelay) { - BlockPistonRelay.DimWithPos key = ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.get(new BlockPistonRelay.DimWithPos(entity.worldObj.provider.getDimension(), pos.getBlockPos())); + BlockPistonRelay.DimWithPos key = ((BlockPistonRelay) ModBlocks.pistonRelay).mappedPositions.get(new BlockPistonRelay.DimWithPos(entity.worldObj.provider.getDimension(), pos.getBlockPos())); if(key != null) { if(key.dim == entity.worldObj.provider.getDimension()) { entity.setPosition(key.blockPos.getX() + 0.5, key.blockPos.getY() + 0.5, key.blockPos.getZ() + 0.5); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java index ba6a39c44..eb728040e 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java @@ -2,15 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 4:43:16 PM (GMT)] */ package vazkii.botania.common.item.lens; +import java.util.Map; + import com.google.common.collect.ImmutableMap; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityFallingBlock; @@ -21,24 +24,22 @@ import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.core.handler.ConfigHandler; -import java.util.Map; - public class LensWeight extends Lens { private static final Map TECHNICAL_BLOCK_REMAP = ImmutableMap.of( Blocks.LIT_REDSTONE_ORE.getDefaultState(), Blocks.REDSTONE_ORE.getDefaultState(), Blocks.LIT_REDSTONE_LAMP.getDefaultState(), Blocks.REDSTONE_LAMP.getDefaultState() - ); + ); @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!entity.worldObj.isRemote && !burst.isFake() && pos.getBlockPos() != null) { int harvestLevel = ConfigHandler.harvestLevelWeight; - + Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); int neededHarvestLevel = block.getHarvestLevel(state); - + if(entity.worldObj.isAirBlock(pos.getBlockPos().down()) && state.getBlockHardness(entity.worldObj, pos.getBlockPos()) != -1 && neededHarvestLevel <= harvestLevel && entity.worldObj.getTileEntity(pos.getBlockPos()) == null && block.canSilkHarvest(entity.worldObj, pos.getBlockPos(), state, null)) { state = TECHNICAL_BLOCK_REMAP.getOrDefault(state, state); EntityFallingBlock falling = new EntityFallingBlock(entity.worldObj, pos.getBlockPos().getX() + 0.5, pos.getBlockPos().getY() + 0.5, pos.getBlockPos().getZ() + 0.5, state); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index b4814f715..7248a4f5c 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 19, 2014, 4:10:47 PM (GMT)] */ package vazkii.botania.common.item.material; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.BlockCarpet; import net.minecraft.block.BlockColored; @@ -29,8 +31,6 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemDye extends Item16Colors { public ItemDye() { diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 77f1ea8d1..54aa9ae42 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 30, 2014, 4:49:16 PM (GMT)] */ package vazkii.botania.common.item.material; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -42,9 +46,6 @@ import vazkii.botania.common.entity.EntityEnderAirBottle; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { final int types = 24; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java index a5d7c844b..716190d93 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 19, 2014, 7:00:34 PM (GMT)] */ package vazkii.botania.common.item.material; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index 4ababaf64..1dfb2fab7 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 19, 2014, 3:28:21 PM (GMT)] */ package vazkii.botania.common.item.material; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; @@ -29,8 +31,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemPetal extends Item16Colors implements IFlowerComponent { public ItemPetal() { diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 6c935047e..7e18fa428 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 11, 2014, 2:16:47 AM (GMT)] */ package vazkii.botania.common.item.material; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -21,9 +25,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemQuartz extends ItemMod implements IElvenItem { private static final int SUBTYPES = 7; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index 24f7163f1..17bab8aae 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 7, 2014, 9:46:24 PM (GMT)] */ package vazkii.botania.common.item.material; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -26,9 +30,6 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchievement { public ItemRune() { diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index 5d36bb0a8..787055091 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 11, 2015, 9:56:00 PM (GMT)] */ package vazkii.botania.common.item.record; +import javax.annotation.Nonnull; + import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; @@ -24,8 +26,6 @@ import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; - public class ItemModRecord extends ItemRecord implements IModelRegister { private final String file; diff --git a/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia1.java b/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia1.java index 758dc699b..58091eb25 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia1.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia1.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 11, 2015, 10:03:46 PM (GMT)] */ package vazkii.botania.common.item.record; diff --git a/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia2.java b/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia2.java index c01774a79..87b135def 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia2.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia2.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 11, 2015, 10:06:28 PM (GMT)] */ package vazkii.botania.common.item.record; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 528f53fe0..7a9f7fadf 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -2,17 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 29, 2015, 10:16:29 PM (GMT)] */ package vazkii.botania.common.item.relic; -import baubles.api.BaubleType; +import java.util.List; +import java.util.UUID; + import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; + +import baubles.api.BaubleType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -37,9 +41,6 @@ import vazkii.botania.common.crafting.recipe.AesirRingRecipe; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import java.util.List; -import java.util.UUID; - public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordinateListProvider, ICraftAchievement { private final Multimap attributes = HashMultimap.create(); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index c845baf6b..a702e2ea1 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 30, 2015, 6:52:35 PM (GMT)] */ package vazkii.botania.common.item.relic; +import javax.annotation.Nonnull; + import gnu.trove.list.array.TIntArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -29,8 +31,6 @@ import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemDice extends ItemRelic { private static final int[] SIDES_FOR_MOON_PHASES = { -1, 0, 1, 2, -1, 2, 3, 4 }; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index 2f76ae11b..4a7c67caa 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 29, 2015, 10:13:26 PM (GMT)] */ package vazkii.botania.common.item.relic; +import javax.annotation.Nonnull; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -32,8 +34,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUsingItem { public ItemFlugelEye() { @@ -89,7 +89,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs if(!(living instanceof EntityPlayer)) return stack; - EntityPlayer player = ((EntityPlayer) living); + EntityPlayer player = (EntityPlayer) living; int x = ItemNBTHelper.getInt(stack, TAG_X, 0); int y = ItemNBTHelper.getInt(stack, TAG_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_Z, 0); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 2479fefe8..e5cc381b2 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -2,18 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 29, 2015, 10:12:55 PM (GMT)] */ package vazkii.botania.common.item.relic; +import java.util.Locale; + +import javax.annotation.Nonnull; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; @@ -27,10 +30,6 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.Locale; - public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { public ItemInfiniteFruit() { @@ -64,7 +63,7 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { super.onUsingTick(stack, living, count); if(!(living instanceof EntityPlayer)) return; - EntityPlayer player = ((EntityPlayer) living); + EntityPlayer player = (EntityPlayer) living; if(ManaItemHandler.requestManaExact(stack, player, 500, true)) { if(count % 5 == 0) player.getFoodStats().addStats(1, 1F); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index e84dcb1c8..d2284bfb9 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 16, 2015, 2:54:35 PM (GMT)] */ package vazkii.botania.common.item.relic; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -27,9 +31,6 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityBabylonWeapon; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class ItemKingKey extends ItemRelic implements IManaUsingItem { private static final String TAG_WEAPONS_SPAWNED = "weaponsSpawned"; @@ -62,7 +63,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { int spawned = getWeaponsSpawned(stack); - if(count != getMaxItemUseDuration(stack) && spawned < 20 && !living.worldObj.isRemote && (!(living instanceof EntityPlayer) || ManaItemHandler.requestManaExact(stack, ((EntityPlayer) living), 150, true))) { + if(count != getMaxItemUseDuration(stack) && spawned < 20 && !living.worldObj.isRemote && (!(living instanceof EntityPlayer) || ManaItemHandler.requestManaExact(stack, (EntityPlayer) living, 150, true))) { Vector3 look = new Vector3(living.getLookVec()).multiply(1, 0, 1).normalize().negate().multiply(2); int div = spawned / 5; int mod = spawned % 5; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index c0a4d38c0..d5c9f70b7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -2,20 +2,24 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 29, 2015, 10:13:32 PM (GMT)] */ package vazkii.botania.common.item.relic; +import java.util.ArrayList; +import java.util.List; + +import com.google.common.collect.ImmutableList; + import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import baubles.common.network.PacketHandler; import baubles.common.network.PacketSyncBauble; -import com.google.common.collect.ImmutableList; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -45,9 +49,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import java.util.ArrayList; -import java.util.List; - public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinateListProvider, IManaUsingItem { private static final String TAG_CURSOR_LIST = "cursorList"; 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 700a6d181..80241ead6 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -2,19 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 29, 2015, 10:13:41 PM (GMT)] */ package vazkii.botania.common.item.relic; +import java.util.ArrayList; +import java.util.List; + +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -28,9 +32,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import java.util.ArrayList; -import java.util.List; - public class ItemOdinRing extends ItemRelicBauble { private static final List damageNegations = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 170a9cfe5..b3d1a51eb 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 29, 2015, 7:54:40 PM (GMT)] */ package vazkii.botania.common.item.relic; +import java.util.List; +import java.util.UUID; + +import javax.annotation.Nonnull; + import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; @@ -29,10 +34,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.UUID; - public class ItemRelic extends ItemMod implements IRelic { private static final String TAG_SOULBIND_NAME = "soulbind"; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 9e4690736..026d6c2bb 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 29, 2015, 7:56:27 PM (GMT)] */ package vazkii.botania.common.item.relic; +import java.util.List; +import java.util.UUID; + +import javax.annotation.Nonnull; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -23,10 +28,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.equipment.bauble.ItemBauble; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.UUID; - public abstract class ItemRelicBauble extends ItemBauble implements IRelic { Achievement achievement; @@ -69,7 +70,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { @Override public boolean canEquip(ItemStack stack, EntityLivingBase player) { - return player instanceof EntityPlayer && dummy.isRightPlayer(((EntityPlayer) player), stack); + return player instanceof EntityPlayer && dummy.isRightPlayer((EntityPlayer) player, stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java index ac6c5949b..2294378f1 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 29, 2015, 10:13:37 PM (GMT)] */ package vazkii.botania.common.item.relic; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java index 8a299bed5..2bd98c659 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 10:28:03 PM (GMT)] */ package vazkii.botania.common.item.rod; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -25,8 +27,6 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProvider { static final int COST = 150; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java index 50930f034..d9d8e84e2 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 11, 2014, 2:53:41 PM (GMT)] */ package vazkii.botania.common.item.rod; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -38,12 +40,10 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchievement, IBlockProvider, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_DIRT); - + static final int COST = 75; public ItemDirtRod() { @@ -116,7 +116,7 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev IBlockState state = world.getBlockState(pos); if(state.getBlock().isAir(state, world, pos)) { world.setBlockState(pos, Blocks.DIRT.getDefaultState()); - world.playEvent(2001, pos, Block.getStateId(Blocks.DIRT.getDefaultState())); + world.playEvent(2001, pos, Block.getStateId(Blocks.DIRT.getDefaultState())); tile.recieveMana(-COST); } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 6d3589f81..3d5da0aeb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 25, 2014, 2:57:16 PM (GMT)] */ package vazkii.botania.common.item.rod; +import java.util.Random; + +import javax.annotation.Nonnull; + import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -34,9 +38,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.Random; - public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_DIVINING); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 877a75b3f..67327fa83 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -2,15 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 20, 2015, 8:08:34 PM (GMT)] */ package vazkii.botania.common.item.rod; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableList; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -47,10 +53,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWireframeCoordinateListProvider { private static final int RANGE = 3; @@ -83,7 +85,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra if(BlockCamo.isValidBlock(wstate)) { Item item = Item.getItemFromBlock(wstate.getBlock()); - boolean set = setBlock(par1ItemStack, wstate.getBlock(), !item.getHasSubtypes() ? 0 : wstate.getBlock().getMetaFromState(wstate)); + setBlock(par1ItemStack, wstate.getBlock(), !item.getHasSubtypes() ? 0 : wstate.getBlock().getMetaFromState(wstate)); player.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, par1ItemStack); displayRemainderCounter(player, par1ItemStack); @@ -170,7 +172,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra // We subtract 1 from the effective range as the center tile is included // So, with a range of 3, we are visiting tiles at -2, -1, 0, 1, 2 int effRange = RANGE + ItemNBTHelper.getInt(stack, TAG_EXTRA_RANGE, 1) - 1; - + // Iterate in all 3 dimensions through our possible positions. for(int offsetX = -effRange; offsetX <= effRange; offsetX++) for(int offsetY = -effRange; offsetY <= effRange; offsetY++) @@ -178,17 +180,17 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra BlockPos pos_ = pos.add(offsetX, offsetY, offsetZ); IBlockState currentState = world.getBlockState(pos_); - + // If this block is not our target, ignore it, as we don't need // to consider replacing it if(currentState != targetState) continue; - + // If this block is already the block we're swapping to, // we don't need to swap again if(currentState == swapState) continue; - + // Check to see if the block is visible on any side: for(EnumFacing dir : EnumFacing.VALUES) { BlockPos adjPos = pos_.offset(dir); @@ -197,7 +199,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra // If the side of the adjacent block facing this block is // _not_ solid, then this block is considered "visible" // and should be replaced. - + // If there is a rendering-specific way to check for this, // that should be placed in preference to this. if(!adjState.isSideSolid(world, adjPos, dir.getOpposite())) { @@ -294,7 +296,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra int count = getInventoryItemCount(player, player.inventory, stack, block, meta); if (count == -1) return -1; - + return count+baubleCount; } @@ -399,10 +401,10 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra int targetMeta = 0; if(ItemNBTHelper.getBoolean(stack, TAG_SWAPPING, false)) { bPos = new BlockPos( - ItemNBTHelper.getInt(stack, TAG_SELECT_X, 0), - ItemNBTHelper.getInt(stack, TAG_SELECT_Y, 0), - ItemNBTHelper.getInt(stack, TAG_SELECT_Z, 0) - ); + ItemNBTHelper.getInt(stack, TAG_SELECT_X, 0), + ItemNBTHelper.getInt(stack, TAG_SELECT_Y, 0), + ItemNBTHelper.getInt(stack, TAG_SELECT_Z, 0) + ); targetBlock = getTargetBlock(stack); targetMeta = getTargetBlockMeta(stack); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java index 093aacdc3..f99e18270 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 26, 2014, 12:08:06 AM (GMT)] */ package vazkii.botania.common.item.rod; +import javax.annotation.Nonnull; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -32,8 +34,6 @@ import vazkii.botania.common.entity.EntityFlameRing; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_FIRE); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 730f39adb..5a07b829a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 25, 2014, 2:57:16 PM (GMT)] */ package vazkii.botania.common.item.rod; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -35,10 +40,6 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class ItemGravityRod extends ItemMod implements IManaUsingItem { private static final float RANGE = 3F; @@ -92,12 +93,12 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { int targetID = ItemNBTHelper.getInt(stack, TAG_TARGET, -1); int ticksCooldown = ItemNBTHelper.getInt(stack, TAG_TICKS_COOLDOWN, 0); double length = ItemNBTHelper.getDouble(stack, TAG_DIST, -1); - + if(ticksCooldown == 0) { Entity item = null; if(targetID != -1 && player.worldObj.getEntityByID(targetID) != null) { Entity taritem = player.worldObj.getEntityByID(targetID); - + boolean found = false; Vector3 target = Vector3.fromEntityCenter(player); List entities = new ArrayList<>(); @@ -135,7 +136,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { if(item != null) { if(BotaniaAPI.isEntityBlacklistedFromGravityRod(item.getClass())) return ActionResult.newResult(EnumActionResult.FAIL, stack); - + if(ManaItemHandler.requestManaExactForTool(stack, player, COST, true)) { if(item instanceof EntityItem) ((EntityItem) item).setPickupDelay(5); @@ -162,7 +163,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { float zm = ((float) Math.random() - 0.5F) * m; Botania.proxy.wispFX(item.posX + item.width / 2, item.posY + item.height / 2, item.posZ + item.width / 2, r, 0F, b, s, xm, ym, zm); } - + MathHelper.setEntityMotionFromVector(item, target3, 0.3333333F); ItemNBTHelper.setInt(stack, TAG_TARGET, item.getEntityId()); @@ -187,7 +188,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { int targetID = ItemNBTHelper.getInt(stack, TAG_TARGET, -1); ItemNBTHelper.getDouble(stack, TAG_DIST, -1); Entity item; - + if(targetID != -1 && player.worldObj.getEntityByID(targetID) != null) { Entity taritem = player.worldObj.getEntityByID(targetID); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index d28642129..d77cd1c50 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 24, 2014, 5:58:16 PM (GMT)] */ package vazkii.botania.common.item.rod; +import javax.annotation.Nonnull; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -32,8 +34,6 @@ import vazkii.botania.common.entity.EntityMagicMissile; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_MISSILE); @@ -60,7 +60,7 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi @Override public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { if(!(living instanceof EntityPlayer)) return; - EntityPlayer player = ((EntityPlayer) living); + EntityPlayer player = (EntityPlayer) living; if(count != getMaxItemUseDuration(stack) && count % (IManaProficiencyArmor.Helper.hasProficiency(player) ? 1 : 2) == 0 && !player.worldObj.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST_PER, false)) { if(spawnMissile(player.worldObj, player, player.posX + (Math.random() - 0.5 * 0.1), player.posY + 2.4 + (Math.random() - 0.5 * 0.1), player.posZ + (Math.random() - 0.5 * 0.1))) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index d0fb172fc..e93844731 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 20, 2014, 7:09:51 PM (GMT)] */ package vazkii.botania.common.item.rod; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -33,16 +37,12 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileBifrost; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_RAINBOW); @@ -84,7 +84,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi if (!lastChecker.equals(pos)) { if (y >= world.getHeight() || y <= 0 - || (!world.isAirBlock(pos) && world.getBlockState(pos).getBlock() != place)) + || !world.isAirBlock(pos) && world.getBlockState(pos).getBlock() != place) break; for(int i = -2; i < 1; i++) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java index cdd5432f2..0aa0a7359 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 23, 2014, 1:06:51 AM (GMT)] */ package vazkii.botania.common.item.rod; +import javax.annotation.Nonnull; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -27,8 +29,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemSkyDirtRod extends ItemDirtRod { public ItemSkyDirtRod() { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index d2863b97c..70981faf5 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 24, 2015, 11:05:41 PM (GMT)] */ package vazkii.botania.common.item.rod; +import java.util.Map; +import java.util.WeakHashMap; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -33,10 +38,6 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.Map; -import java.util.WeakHashMap; - public class ItemSmeltRod extends ItemMod implements IManaUsingItem { private static final int TIME = 10; @@ -71,7 +72,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { @Override public void onUsingTick(ItemStack stack, EntityLivingBase living, int time) { if(!(living instanceof EntityPlayer)) return; - EntityPlayer p = ((EntityPlayer) living); + EntityPlayer p = (EntityPlayer) living; if(!ManaItemHandler.requestManaExactForTool(stack, p, COST_PER_TICK, false)) return; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index 0a907e424..347bad1cf 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -2,15 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 11, 2014, 2:56:39 PM (GMT)] */ package vazkii.botania.common.item.rod; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableList; + import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.state.IBlockState; @@ -42,10 +48,6 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockProvider, ICraftAchievement{ private static final int COST_PER = 55; @@ -73,7 +75,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP "blockMarble", "limestone", "blockLimestone" - ); + ); public ItemTerraformRod() { super(LibItemNames.TERRAFORM_ROD); @@ -94,7 +96,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP @Override public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { if(count != getMaxItemUseDuration(stack) && count % 10 == 0 && living instanceof EntityPlayer) - terraform(stack, living.worldObj, ((EntityPlayer) living)); + terraform(stack, living.worldObj, (EntityPlayer) living); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index e82460907..162d93dcc 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 25, 2014, 4:36:13 PM (GMT)] */ package vazkii.botania.common.item.rod; +import java.util.List; + +import javax.annotation.Nonnull; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -36,9 +40,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; -import java.util.List; - public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_TORNADO); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java index 42ae3c89a..0cbe20e5f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -1,5 +1,7 @@ package vazkii.botania.common.item.rod; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemBucket; @@ -16,8 +18,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; - public class ItemWaterRod extends ItemMod implements IManaUsingItem { public static final int COST = 75; diff --git a/src/main/java/vazkii/botania/common/lexicon/BLexiconCategory.java b/src/main/java/vazkii/botania/common/lexicon/BLexiconCategory.java index 6e4bf200d..d13ad27b9 100644 --- a/src/main/java/vazkii/botania/common/lexicon/BLexiconCategory.java +++ b/src/main/java/vazkii/botania/common/lexicon/BLexiconCategory.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Oct 18, 2014, 3:46:10 PM (GMT)] */ package vazkii.botania.common.lexicon; diff --git a/src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java index c0f2afa5b..5b1970f58 100644 --- a/src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java @@ -2,22 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 9:47:21 PM (GMT)] */ package vazkii.botania.common.lexicon; +import javax.annotation.Nonnull; + import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ITwoNamedPage; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -import javax.annotation.Nonnull; - public class BasicLexiconEntry extends LexiconEntry { public BasicLexiconEntry(String unlocalizedName, LexiconCategory category) { diff --git a/src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java index 541974c24..b4648d910 100644 --- a/src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 24, 2015, 5:43:11 PM (GMT)] */ package vazkii.botania.common.lexicon; diff --git a/src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java index ae2190f08..629e78d16 100644 --- a/src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [16/12/2015, 20:38:33 (GMT)] */ package vazkii.botania.common.lexicon; @@ -20,7 +20,7 @@ public class DogLexiconEntry extends BasicLexiconEntry { public DogLexiconEntry(String unlocalizedName, LexiconCategory category) { super(unlocalizedName, category); } - + @Override @SideOnly(Side.CLIENT) public boolean isVisible() { diff --git a/src/main/java/vazkii/botania/common/lexicon/HeadLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/HeadLexiconEntry.java index e4cc9a29a..049fdf880 100644 --- a/src/main/java/vazkii/botania/common/lexicon/HeadLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/HeadLexiconEntry.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 27, 2015, 7:34:43 PM (GMT)] */ package vazkii.botania.common.lexicon; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 2ff182a00..8bbd55bb8 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 9:12:15 PM (GMT)] */ package vazkii.botania.common.lexicon; @@ -318,18 +318,18 @@ public final class LexiconData { flowers = new BasicLexiconEntry(LibLexicon.BASICS_FLOWERS, categoryBasics); flowers.setPriority() - .setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_FLOWERS), new PageText("2"), - new PageCraftingRecipe("3", ModCraftingRecipes.recipesPetals), - new PageCraftingRecipe("4", ModCraftingRecipes.recipePestleAndMortar), - new PageCraftingRecipe("5", ModCraftingRecipes.recipesDyes), - new PageCraftingRecipe("5.5", ModCraftingRecipes.recipesDyesVanilla), - new PageText("6"), - new PageCraftingRecipe("7", ModCraftingRecipes.recipeFertilizerPowder), - new PageCraftingRecipe("8", ModCraftingRecipes.recipeFerilizerDye), new PageText("10"), - new PageText("12"), new PageCraftingRecipe("11", ModCraftingRecipes.recipesPetalsDouble), - new PageCraftingRecipe("9", ModCraftingRecipes.recipesPetalBlocks), - new PageCraftingRecipe("13", ModCraftingRecipes.recipesReversePetalBlocks)) - .setIcon(new ItemStack(ModBlocks.flower, 1, 6)); + .setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_FLOWERS), new PageText("2"), + new PageCraftingRecipe("3", ModCraftingRecipes.recipesPetals), + new PageCraftingRecipe("4", ModCraftingRecipes.recipePestleAndMortar), + new PageCraftingRecipe("5", ModCraftingRecipes.recipesDyes), + new PageCraftingRecipe("5.5", ModCraftingRecipes.recipesDyesVanilla), + new PageText("6"), + new PageCraftingRecipe("7", ModCraftingRecipes.recipeFertilizerPowder), + new PageCraftingRecipe("8", ModCraftingRecipes.recipeFerilizerDye), new PageText("10"), + new PageText("12"), new PageCraftingRecipe("11", ModCraftingRecipes.recipesPetalsDouble), + new PageCraftingRecipe("9", ModCraftingRecipes.recipesPetalBlocks), + new PageCraftingRecipe("13", ModCraftingRecipes.recipesReversePetalBlocks)) + .setIcon(new ItemStack(ModBlocks.flower, 1, 6)); apothecary = new BasicLexiconEntry(LibLexicon.BASICS_APOTHECARY, categoryBasics); apothecary.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_APOTHECARY), @@ -346,10 +346,10 @@ public final class LexiconData { pureDaisy = new BasicLexiconEntry(LibLexicon.BASICS_PURE_DAISY, categoryBasics); pureDaisy.setPriority() - .setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingwoodTwig), new PageText("4"), - new PagePetalRecipe<>("3", ModPetalRecipes.pureDaisyRecipe)) - .setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); + .setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), + new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingwoodTwig), new PageText("4"), + new PagePetalRecipe<>("3", ModPetalRecipes.pureDaisyRecipe)) + .setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingwood)); pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingrock)); LexiconRecipeMappings.map(new ItemStack(ModBlocks.livingwood), pureDaisy, 1); @@ -378,7 +378,7 @@ public final class LexiconData { terrasteel = new BasicLexiconEntry(LibLexicon.BASICS_TERRASTEEL, categoryBasics); terrasteel.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerraPlate), new PageText("2"), new PageMultiblock("4", ModMultiblocks.terrasteelPlate), new PageTerrasteel("3")) - .setIcon(new ItemStack(ModItems.manaResource, 1, 4)); + .setIcon(new ItemStack(ModItems.manaResource, 1, 4)); blackLotus = new BasicLexiconEntry(LibLexicon.BASICS_BLACK_LOTUS, categoryBasics); blackLotus.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.blackLotus)); @@ -415,19 +415,19 @@ public final class LexiconData { pool = new BasicLexiconEntry(LibLexicon.MANA_POOL, categoryMana); pool.setPriority() - .setLexiconPages(new PageText("0"), new PageText("9"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipePool), - new PageCraftingRecipe("10", ModCraftingRecipes.recipePoolDiluted), new PageText("14"), - new PageText("2"), new PageText("8"), - new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipes), - new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), - new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipes), - new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPowderRecipes), - new PageManaInfusionRecipe("11", ModManaInfusionRecipes.managlassRecipe), - new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaStringRecipe), - new PageCraftingRecipe("13", ModCraftingRecipes.recipeCobweb), - new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe)) - .setIcon(new ItemStack(ModBlocks.pool)); + .setLexiconPages(new PageText("0"), new PageText("9"), + new PageCraftingRecipe("1", ModCraftingRecipes.recipePool), + new PageCraftingRecipe("10", ModCraftingRecipes.recipePoolDiluted), new PageText("14"), + new PageText("2"), new PageText("8"), + new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipes), + new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), + new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipes), + new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPowderRecipes), + new PageManaInfusionRecipe("11", ModManaInfusionRecipes.managlassRecipe), + new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaStringRecipe), + new PageCraftingRecipe("13", ModCraftingRecipes.recipeCobweb), + new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe)) + .setIcon(new ItemStack(ModBlocks.pool)); sparks = new BasicLexiconEntry(LibLexicon.MANA_SPARKS, categoryMana); sparks.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), @@ -524,15 +524,15 @@ public final class LexiconData { // FUNCTIONAL FLOWERS ENTRIES functionalIntro = new BasicLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers); functionalIntro - .setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRedstoneRoot)) - .setIcon(null); + .setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), + new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRedstoneRoot)) + .setIcon(null); ; flowerShrinking = new BasicLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers); flowerShrinking.setPriority() - .setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", BotaniaAPI.miniFlowerRecipes)) - .setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN + "Chibi")); + .setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", BotaniaAPI.miniFlowerRecipes)) + .setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN + "Chibi")); flowerSpeed = new BasicLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers); flowerSpeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1")); @@ -684,10 +684,10 @@ public final class LexiconData { if (ConfigHandler.enchanterEnabled) { manaEnchanting = new BasicLexiconEntry(LibLexicon.DEVICE_MANA_ENCHANTING, categoryDevices); manaEnchanting - .setLexiconPages(new PageText("0"), new PageText("1"), - new PageMultiblock("2", ModMultiblocks.enchanter), new PageText("5"), new PageText("6"), - new PageText("7"), new PageText("8"), new PageText("9")) - .setIcon(new ItemStack(ModBlocks.enchanter)); + .setLexiconPages(new PageText("0"), new PageText("1"), + new PageMultiblock("2", ModMultiblocks.enchanter), new PageText("5"), new PageText("6"), + new PageText("7"), new PageText("8"), new PageText("9")) + .setIcon(new ItemStack(ModBlocks.enchanter)); } turntable = new BasicLexiconEntry(LibLexicon.DEVICE_TURNTABLE, categoryDevices); @@ -761,12 +761,12 @@ public final class LexiconData { craftCrate = new AlfheimLexiconEntry(LibLexicon.DEVICE_CRAFT_CRATE, categoryDevices); craftCrate - .setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipePlaceholder), new PageText("3"), - new PageText("4"), new PageText("7"), new PageImage("5", LibResources.ENTRY_CRAFT_CRATE), - new PageCraftingRecipe("6", ModCraftingRecipes.recipeCraftCrate), new PageText("8"), - new PageCraftingRecipe("9", ModCraftingRecipes.recipesPatterns)) - .setIcon(new ItemStack(ModBlocks.openCrate, 1, 1)); + .setLexiconPages(new PageText("0"), new PageText("1"), + new PageCraftingRecipe("2", ModCraftingRecipes.recipePlaceholder), new PageText("3"), + new PageText("4"), new PageText("7"), new PageImage("5", LibResources.ENTRY_CRAFT_CRATE), + new PageCraftingRecipe("6", ModCraftingRecipes.recipeCraftCrate), new PageText("8"), + new PageCraftingRecipe("9", ModCraftingRecipes.recipesPatterns)) + .setIcon(new ItemStack(ModBlocks.openCrate, 1, 1)); brewery = new BasicLexiconEntry(LibLexicon.DEVICE_BREWERY, categoryDevices); brewery.setLexiconPages(new PageText("0"), new PageText("1"), @@ -797,8 +797,8 @@ public final class LexiconData { new PageBrew(ModBrewRecipes.emptinessBrew, "4a", "4b"), new PageBrew(ModBrewRecipes.bloodthirstBrew, "5a", "5b"), new PageBrew(ModBrewRecipes.allureBrew, "6a", "6b"), new PageBrew(ModBrewRecipes.clearBrew, "7a", "7b")) - .setIcon(((IBrewContainer) ModItems.vial).getItemForBrew(ModBrews.jumpBoost, - new ItemStack(ModItems.vial))); + .setIcon(((IBrewContainer) ModItems.vial).getItemForBrew(ModBrews.jumpBoost, + new ItemStack(ModItems.vial))); incense = new BasicLexiconEntry(LibLexicon.DEVICE_INCENSE, categoryDevices); incense.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("5"), @@ -836,7 +836,7 @@ public final class LexiconData { animatedTorch = new BasicLexiconEntry(LibLexicon.DEVICE_ANIMATED_TORCH, categoryDevices); animatedTorch.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeAnimatedTorch)); - + // TOOLS ENTRIES manaBlaster = new BasicLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools); manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), @@ -983,7 +983,7 @@ public final class LexiconData { overgrowthSeed = new BasicLexiconEntry(LibLexicon.TOOL_OVERGROWTH_SEED, categoryTools); overgrowthSeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1")) - .setIcon(new ItemStack(ModItems.overgrowthSeed)); + .setIcon(new ItemStack(ModItems.overgrowthSeed)); overgrowthSeed.addExtraDisplayedRecipe(new ItemStack(ModItems.overgrowthSeed)); overgrowthSeed.addExtraDisplayedRecipe(new ItemStack(ModBlocks.enchantedSoil)); @@ -1223,38 +1223,38 @@ public final class LexiconData { baubleBox = new BasicLexiconEntry(LibLexicon.BAUBLE_BOX, categoryBaubles); baubleBox.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeBaubleCase)) - .setPriority(); + .setPriority(); dodgeRing = new BasicLexiconEntry(LibLexicon.BAUBLE_DODGE_RING, categoryBaubles); dodgeRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDodgeRing)); - + // ALFHOMANCY ENTRIES alfhomancyIntro = new BasicLexiconEntry(LibLexicon.ALF_INTRO, categoryAlfhomancy); alfhomancyIntro.setPriority() - .setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeAlfPortal), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeNaturaPylon), - new PageMultiblock("4", ModMultiblocks.alfPortal), new PageText("5"), new PageText("6"), - new PageText("7")) - .setIcon(new ItemStack(ModItems.lexicon)); + .setLexiconPages(new PageText("0"), new PageText("1"), + new PageCraftingRecipe("2", ModCraftingRecipes.recipeAlfPortal), + new PageCraftingRecipe("3", ModCraftingRecipes.recipeNaturaPylon), + new PageMultiblock("4", ModMultiblocks.alfPortal), new PageText("5"), new PageText("6"), + new PageText("7")) + .setIcon(new ItemStack(ModItems.lexicon)); elvenMessage = new AlfheimLexiconEntry(LibLexicon.ALF_MESSAGE, categoryAlfhomancy); elvenMessage.setPriority() - .setLexiconPages(new PageImage("0", LibResources.ENTRY_ELVEN_GARDE), new PageLoreText("1"), - new PageLoreText("2"), new PageLoreText("3"), new PageLoreText("4"), new PageLoreText("5"), - new PageLoreText("6")) - .setIcon(new ItemStack(Items.WRITABLE_BOOK)); + .setLexiconPages(new PageImage("0", LibResources.ENTRY_ELVEN_GARDE), new PageLoreText("1"), + new PageLoreText("2"), new PageLoreText("3"), new PageLoreText("4"), new PageLoreText("5"), + new PageLoreText("6")) + .setIcon(new ItemStack(Items.WRITABLE_BOOK)); elvenResources = new AlfheimLexiconEntry(LibLexicon.ALF_RESOURCES, categoryAlfhomancy); elvenResources.setPriority() - .setLexiconPages(new PageText("0"), new PageElvenRecipe("1", ModElvenTradeRecipes.dreamwoodRecipe), - new PageText("2"), new PageCraftingRecipe("10", ModCraftingRecipes.recipeDreamwoodTwig), - new PageElvenRecipe("3", ModElvenTradeRecipes.elementiumRecipes), - new PageElvenRecipe("4", ModElvenTradeRecipes.pixieDustRecipe), - new PageElvenRecipe("5", ModElvenTradeRecipes.dragonstoneRecipes), new PageText("6"), - new PageElvenRecipe("7", ModElvenTradeRecipes.elvenQuartzRecipe), new PageText("8"), - new PageElvenRecipe("9", ModElvenTradeRecipes.alfglassRecipe)) - .setIcon(new ItemStack(ModItems.manaResource, 1, 9)); + .setLexiconPages(new PageText("0"), new PageElvenRecipe("1", ModElvenTradeRecipes.dreamwoodRecipe), + new PageText("2"), new PageCraftingRecipe("10", ModCraftingRecipes.recipeDreamwoodTwig), + new PageElvenRecipe("3", ModElvenTradeRecipes.elementiumRecipes), + new PageElvenRecipe("4", ModElvenTradeRecipes.pixieDustRecipe), + new PageElvenRecipe("5", ModElvenTradeRecipes.dragonstoneRecipes), new PageText("6"), + new PageElvenRecipe("7", ModElvenTradeRecipes.elvenQuartzRecipe), new PageText("8"), + new PageElvenRecipe("9", ModElvenTradeRecipes.alfglassRecipe)) + .setIcon(new ItemStack(ModItems.manaResource, 1, 9)); gaiaRitual = new AlfheimLexiconEntry(LibLexicon.ALF_GAIA_RITUAL, categoryAlfhomancy); gaiaRitual.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGaiaPylon), @@ -1264,15 +1264,15 @@ public final class LexiconData { gaiaRitualHardmode = new AlfheimLexiconEntry(LibLexicon.ALF_GAIA_RITUAL_HARDMODE, categoryAlfhomancy); gaiaRitualHardmode - .setLexiconPages(new PageText("0"), new PageText("1"), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeGaiaIngot)) - .setIcon(new ItemStack(ModItems.manaResource, 1, 14)); + .setLexiconPages(new PageText("0"), new PageText("1"), + new PageCraftingRecipe("2", ModCraftingRecipes.recipeGaiaIngot)) + .setIcon(new ItemStack(ModItems.manaResource, 1, 14)); elvenLore = new AlfheimLexiconEntry(LibLexicon.ALF_LORE, categoryAlfhomancy); elvenLore - .setLexiconPages(new PageText("0"), new PageLoreText("1"), new PageLoreText("2"), new PageLoreText("3"), - new PageLoreText("4"), new PageLoreText("5"), new PageLoreText("6"), new PageLoreText("7")) - .setIcon(new ItemStack(Items.WRITABLE_BOOK)); + .setLexiconPages(new PageText("0"), new PageLoreText("1"), new PageLoreText("2"), new PageLoreText("3"), + new PageLoreText("4"), new PageLoreText("5"), new PageLoreText("6"), new PageLoreText("7")) + .setIcon(new ItemStack(Items.WRITABLE_BOOK)); if (ConfigHandler.relicsEnabled) { relics = new AlfheimLexiconEntry(LibLexicon.ALF_RELICS, categoryAlfhomancy); @@ -1339,7 +1339,7 @@ public final class LexiconData { dispenserTweaks = new BasicLexiconEntry(LibLexicon.MISC_DISPENSER_TWEAKS, categoryMisc); dispenserTweaks.setLexiconPages(new PageText("0")).setPriority().setIcon(new ItemStack(Blocks.DISPENSER)); - + shinyFlowers = new BasicLexiconEntry(LibLexicon.MISC_SHINY_FLOWERS, categoryMisc); shinyFlowers.setLexiconPages(new PageText("0"), new PageText("3"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesShinyFlowers), @@ -1373,7 +1373,7 @@ public final class LexiconData { challenges = new BasicLexiconEntry(LibLexicon.MISC_CHALLENGES, categoryMisc); challenges.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")).setPriority() - .setIcon(new ItemStack(ModItems.cosmetic, 1, 31)); + .setIcon(new ItemStack(ModItems.cosmetic, 1, 31)); cacophonium = new BasicLexiconEntry(LibLexicon.MISC_CACOPHONIUM, categoryMisc); cacophonium.setLexiconPages(new PageText("0"), @@ -1406,19 +1406,19 @@ public final class LexiconData { new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageText("5"), new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")) - .setIcon(new ItemStack(ModItems.manaInkwell)); + .setIcon(new ItemStack(ModItems.manaInkwell)); else tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")) - .setIcon(new ItemStack(ModItems.manaInkwell)); + .setIcon(new ItemStack(ModItems.manaInkwell)); } if (Botania.etFuturumLoaded) { banners = new CompatLexiconEntry(LibLexicon.MISC_BANNERS, BotaniaAPI.categoryMisc, "EtFuturum"); banners.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BANNERS)) - .setIcon(new ItemStack(ModItems.lexicon)); + .setIcon(new ItemStack(ModItems.lexicon)); } } } diff --git a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java index 9d0d9ee41..ce9154af5 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Aug 16, 2015, 10:52:36 PM (GMT)] */ package vazkii.botania.common.lexicon; diff --git a/src/main/java/vazkii/botania/common/lexicon/TutLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/TutLexiconEntry.java index 2a4beb1fd..e44f63a32 100644 --- a/src/main/java/vazkii/botania/common/lexicon/TutLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/TutLexiconEntry.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 16, 2015, 1:41:58 PM (GMT)] */ package vazkii.botania.common.lexicon; diff --git a/src/main/java/vazkii/botania/common/lexicon/WIPLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/WIPLexiconEntry.java index be16aca87..0ddefd499 100644 --- a/src/main/java/vazkii/botania/common/lexicon/WIPLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/WIPLexiconEntry.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 8, 2014, 7:06:06 PM (GMT)] */ package vazkii.botania.common.lexicon; diff --git a/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java index f04f75fb2..5f1393d9d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [May 30, 2015, 10:54:30 PM (GMT)] */ package vazkii.botania.common.lexicon; +import javax.annotation.Nonnull; + import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; @@ -18,8 +20,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibLexicon; -import javax.annotation.Nonnull; - public class WelcomeLexiconEntry extends BasicLexiconEntry { private static final int PAGES = 7; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index c7e324b3b..9ec80ff32 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 2, 2014, 5:17:46 PM (GMT)] */ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; @@ -27,9 +30,6 @@ import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; -import java.util.ArrayList; -import java.util.List; - public class PageBrew extends PageRecipe implements ITwoNamedPage { final RecipeBrew recipe; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 40776c448..f312d7265 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 19, 2014, 4:58:19 PM (GMT)] */ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -25,17 +31,12 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - public class PageCraftingRecipe extends PageRecipe { private static final ResourceLocation craftingOverlay = new ResourceLocation(LibResources.GUI_CRAFTING_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index a5ee24418..a3031fdc1 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -1,5 +1,11 @@ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -11,7 +17,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; @@ -19,10 +24,6 @@ import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.lib.LibResources; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - public class PageElvenRecipe extends PageRecipe { private static final ResourceLocation elvenTradeOverlay = new ResourceLocation(LibResources.GUI_ELVEN_TRADE_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java index 89d17e710..acca12a8e 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 4, 2014, 10:38:50 PM (GMT)] */ package vazkii.botania.common.lexicon.page; +import java.lang.reflect.Constructor; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -23,8 +25,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -import java.lang.reflect.Constructor; - public class PageEntity extends LexiconPage{ Entity dummyEntity; @@ -35,7 +35,7 @@ public class PageEntity extends LexiconPage{ public PageEntity(String unlocalizedName, String entity, int size) { super(unlocalizedName); - Class EntityClass = (Class) EntityList.NAME_TO_CLASS.get(entity); + Class EntityClass = EntityList.NAME_TO_CLASS.get(entity); this.size = size; try { entityConstructor = EntityClass.getConstructor(World.class); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java b/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java index bfe14bd15..b027b7d7b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java @@ -2,23 +2,23 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Sep 3, 2014, 9:41:47 PM (GMT)] */ package vazkii.botania.common.lexicon.page; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.text.translation.I18n; -import vazkii.botania.api.internal.IGuiLexiconEntry; - -import java.awt.*; +import java.awt.Desktop; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.util.text.translation.I18n; +import vazkii.botania.api.internal.IGuiLexiconEntry; + public class PageGuide extends PageText { GuiButton button; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java index 2dae4ee89..4de98e4fa 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 16, 2014, 6:13:08 PM (GMT)] */ package vazkii.botania.common.lexicon.page; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -17,7 +19,6 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java index 8540ce8cb..fc14eb43c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java @@ -2,19 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 7, 2014, 11:46:21 PM (GMT)] */ package vazkii.botania.common.lexicon.page; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.client.lib.LibResources; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 882ee8161..c79f88c51 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -2,14 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 8, 2014, 1:11:42 PM (GMT)] */ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.lwjgl.opengl.GL11; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -24,7 +31,6 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; @@ -36,11 +42,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - public class PageManaInfusionRecipe extends PageRecipe { private static final ResourceLocation manaInfusionOverlay = new ResourceLocation(LibResources.GUI_MANA_INFUSION_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java index 793170b0d..2991eeea3 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 28, 2015, 1:48:58 AM (GMT)] */ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; +import java.util.List; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; @@ -25,7 +30,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.multiblock.Multiblock; @@ -33,9 +37,6 @@ import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.lib.LibResources; -import java.util.ArrayList; -import java.util.List; - public class PageMultiblock extends LexiconPage { private static final ResourceLocation multiblockOverlay = new ResourceLocation(LibResources.GUI_MULTIBLOCK_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index b1d5202ac..6f1a846a9 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -2,14 +2,20 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 8, 2014, 1:11:35 PM (GMT)] */ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -21,7 +27,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; @@ -31,10 +36,6 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - public class PagePetalRecipe extends PageRecipe { private static final ResourceLocation petalOverlay = new ResourceLocation(LibResources.GUI_PETAL_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index bac21ab62..b985abac4 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -2,14 +2,22 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 8, 2014, 2:46:36 PM (GMT)] */ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -20,8 +28,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconPage; @@ -30,11 +36,6 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.common.core.helper.PlayerHelper; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - public class PageRecipe extends LexiconPage { int relativeMouseX, relativeMouseY; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index 7efb3323b..3320db19b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -2,14 +2,18 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 8, 2014, 1:11:48 PM (GMT)] */ package vazkii.botania.common.lexicon.page; +import java.util.List; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; @@ -17,15 +21,12 @@ import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; -import java.util.List; - public class PageRuneRecipe extends PagePetalRecipe { public PageRuneRecipe(String unlocalizedName, List recipes) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 6cbe76290..2e1c7e609 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 4, 2014, 10:38:50 PM (GMT)] */ package vazkii.botania.common.lexicon.page; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java index b7fad0753..b5fcaedf1 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -2,14 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Apr 14, 2014, 5:57:26 PM (GMT)] */ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; +import java.util.List; + +import org.lwjgl.opengl.GL11; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -19,7 +24,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; @@ -27,9 +31,6 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; -import java.util.ArrayList; -import java.util.List; - public class PageTerrasteel extends PageRecipe { private static final ResourceLocation terrasteelOverlay = new ResourceLocation(LibResources.GUI_TERRASTEEL_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index 12c2355d5..330736972 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -2,15 +2,19 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:45:33 PM (GMT)] */ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; +import java.util.List; + import com.google.common.base.Joiner; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; @@ -20,9 +24,6 @@ import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.common.core.handler.ConfigHandler; -import java.util.ArrayList; -import java.util.List; - public class PageText extends LexiconPage { public PageText(String unlocalizedName) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java index 921e8625d..d8e4f2642 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java @@ -2,14 +2,17 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 16, 2015, 1:39:10 PM (GMT)] */ package vazkii.botania.common.lexicon.page; +import java.awt.Desktop; +import java.net.URI; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.text.Style; @@ -21,9 +24,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.client.gui.lexicon.GuiLexicon; -import java.awt.*; -import java.net.URI; - public class PageTutorial extends PageText { // Turn this on once we have an up to date video diff --git a/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java b/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java index 5372b364d..428be0e7a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 28, 2015, 4:44:34 PM (GMT)] */ package vazkii.botania.common.lib; diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 6e1cb71fd..353037744 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 16, 2014, 5:55:03 PM (GMT)] */ package vazkii.botania.common.lib; diff --git a/src/main/java/vazkii/botania/common/lib/LibBrewNames.java b/src/main/java/vazkii/botania/common/lib/LibBrewNames.java index e4219171b..edef26c82 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBrewNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBrewNames.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 1, 2014, 7:03:57 PM (GMT)] */ package vazkii.botania.common.lib; diff --git a/src/main/java/vazkii/botania/common/lib/LibEntityNames.java b/src/main/java/vazkii/botania/common/lib/LibEntityNames.java index e36c7aa78..2bf5eac35 100644 --- a/src/main/java/vazkii/botania/common/lib/LibEntityNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibEntityNames.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 26, 2014, 5:30:03 PM (GMT)] */ package vazkii.botania.common.lib; diff --git a/src/main/java/vazkii/botania/common/lib/LibGuiIDs.java b/src/main/java/vazkii/botania/common/lib/LibGuiIDs.java index fefcb749a..5160ed97c 100644 --- a/src/main/java/vazkii/botania/common/lib/LibGuiIDs.java +++ b/src/main/java/vazkii/botania/common/lib/LibGuiIDs.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:50:36 PM (GMT)] */ package vazkii.botania.common.lib; diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 1a4c926ea..09d322381 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 5:49:06 PM (GMT)] */ package vazkii.botania.common.lib; @@ -162,56 +162,56 @@ public final class LibItemNames { public static final String DODGE_RING = "dodgeRing"; public static final String[] LENS_NAMES = new String[] { - "lensNormal", - "lensSpeed", - "lensPower", - "lensTime", - "lensEfficiency", - "lensBounce", - "lensGravity", - "lensMine", - "lensDamage", - "lensPhantom", - "lensMagnet", - "lensExplosive", - "lensInfluence", - "lensWeight", - "lensPaint", - "lensFire", - "lensPiston", - "lensLight", - "lensWarp", - "lensRedirect", - "lensFirework", - "lensFlare", - "lensMessenger", - "lensTripwire" + "lensNormal", + "lensSpeed", + "lensPower", + "lensTime", + "lensEfficiency", + "lensBounce", + "lensGravity", + "lensMine", + "lensDamage", + "lensPhantom", + "lensMagnet", + "lensExplosive", + "lensInfluence", + "lensWeight", + "lensPaint", + "lensFire", + "lensPiston", + "lensLight", + "lensWarp", + "lensRedirect", + "lensFirework", + "lensFlare", + "lensMessenger", + "lensTripwire" }; public static final String[] MANA_RESOURCE_NAMES = new String[] { - "manasteel", - "manaPearl", - "manaDiamond", - "livingwoodTwig", - "terrasteel", - "lifeEssence", - "redstoneRoot", - "elementium", - "pixieDust", - "dragonstone", - "prismarineShard", - "placeholder", - "redString", - "dreamwoodTwig", - "gaiaIngot", - "enderAirBottle", - "manaString", - "manasteelNugget", - "terrasteelNugget", - "elementiumNugget", - "livingRoot", - "pebble", - "manaweaveCloth", - "manaPowder" + "manasteel", + "manaPearl", + "manaDiamond", + "livingwoodTwig", + "terrasteel", + "lifeEssence", + "redstoneRoot", + "elementium", + "pixieDust", + "dragonstone", + "prismarineShard", + "placeholder", + "redString", + "dreamwoodTwig", + "gaiaIngot", + "enderAirBottle", + "manaString", + "manasteelNugget", + "terrasteelNugget", + "elementiumNugget", + "livingRoot", + "pebble", + "manaweaveCloth", + "manaPowder" }; } diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index a2c12bc57..9b54e85cc 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 9:14:08 PM (GMT)] */ package vazkii.botania.common.lib; diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 72f8f5aa3..74e8c91ef 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 13, 2014, 6:32:05 PM (GMT)] */ package vazkii.botania.common.lib; @@ -31,12 +31,12 @@ public final class LibMisc { public static final String BLACKLIST_ITEM = "blackListItem"; public static final int[] CONTROL_CODE_COLORS = new int[] { - 0x000000, 0x0000AA, 0x00AA00, 0x00AAAA, - 0xAA0000, 0xAA00AA, 0xFFAA00, 0xAAAAAA, - 0x555555, 0x5555FF, 0x55FF55, 0x55FFFF, - 0xFF5555, 0xFF55FF, 0xFFFF55, 0xFFFFFF + 0x000000, 0x0000AA, 0x00AA00, 0x00AAAA, + 0xAA0000, 0xAA00AA, 0xFFAA00, 0xAAAAAA, + 0x555555, 0x5555FF, 0x55FF55, 0x55FFFF, + 0xFF5555, 0xFF55FF, 0xFFFF55, 0xFFFFFF }; - + public static final int PASSIVE_FLOWER_DECAY = 72000; } diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 6947941c4..84df974e5 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 17, 2014, 4:52:15 PM (GMT)] */ package vazkii.botania.common.lib; @@ -77,7 +77,7 @@ public final class LibObfuscation { // Entityliving public static final String[] GET_LIVING_SOUND = { "getAmbientSound", "func_184639_G", "G" }; - + // RenderGlobal public static final String[] STAR_GL_CALL_LIST = { "starGLCallList", "field_72772_v", "p" }; public static final String[] STAR_VBO = { "starVBO", "field_175013_s", "t" }; diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index e8af12145..9ad76f414 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 19, 2014, 4:30:32 PM (GMT)] */ package vazkii.botania.common.lib; @@ -52,42 +52,42 @@ public final class LibOreDict { public static final String DYE_WILDCARD = "dye"; public static final String[] FLOWER = new String[] { - "mysticFlowerWhite", "mysticFlowerOrange", "mysticFlowerMagenta", "mysticFlowerLightBlue", - "mysticFlowerYellow", "mysticFlowerLime", "mysticFlowerPink", "mysticFlowerGray", - "mysticFlowerLightGray", "mysticFlowerCyan", "mysticFlowerPurple", "mysticFlowerBlue", - "mysticFlowerBrown", "mysticFlowerGreen", "mysticFlowerRed", "mysticFlowerBlack" + "mysticFlowerWhite", "mysticFlowerOrange", "mysticFlowerMagenta", "mysticFlowerLightBlue", + "mysticFlowerYellow", "mysticFlowerLime", "mysticFlowerPink", "mysticFlowerGray", + "mysticFlowerLightGray", "mysticFlowerCyan", "mysticFlowerPurple", "mysticFlowerBlue", + "mysticFlowerBrown", "mysticFlowerGreen", "mysticFlowerRed", "mysticFlowerBlack" }; public static final String[] DOUBLE_FLOWER = new String[] { - "mysticFlowerWhiteDouble", "mysticFlowerOrangeDouble", "mysticFlowerMagentaDouble", "mysticFlowerLightBlueDouble", - "mysticFlowerYellowDouble", "mysticFlowerLimeDouble", "mysticFlowerPinkDouble", "mysticFlowerGrayDouble", - "mysticFlowerLightGrayDouble", "mysticFlowerCyanDouble", "mysticFlowerPurpleDouble", "mysticFlowerBlueDouble", - "mysticFlowerBrownDouble", "mysticFlowerGreenDouble", "mysticFlowerRedDouble", "mysticFlowerBlackDouble" + "mysticFlowerWhiteDouble", "mysticFlowerOrangeDouble", "mysticFlowerMagentaDouble", "mysticFlowerLightBlueDouble", + "mysticFlowerYellowDouble", "mysticFlowerLimeDouble", "mysticFlowerPinkDouble", "mysticFlowerGrayDouble", + "mysticFlowerLightGrayDouble", "mysticFlowerCyanDouble", "mysticFlowerPurpleDouble", "mysticFlowerBlueDouble", + "mysticFlowerBrownDouble", "mysticFlowerGreenDouble", "mysticFlowerRedDouble", "mysticFlowerBlackDouble" }; public static final String[] PETAL = new String[] { - "petalWhite", "petalOrange", "petalMagenta", "petalLightBlue", - "petalYellow", "petalLime", "petalPink", "petalGray", - "petalLightGray", "petalCyan", "petalPurple", "petalBlue", - "petalBrown", "petalGreen", "petalRed", "petalBlack" + "petalWhite", "petalOrange", "petalMagenta", "petalLightBlue", + "petalYellow", "petalLime", "petalPink", "petalGray", + "petalLightGray", "petalCyan", "petalPurple", "petalBlue", + "petalBrown", "petalGreen", "petalRed", "petalBlack" }; public static final String[] DYE = new String[] { - "dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", - "dyeYellow", "dyeLime", "dyePink", "dyeGray", - "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", - "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack" + "dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", + "dyeYellow", "dyeLime", "dyePink", "dyeGray", + "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", + "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack" }; public static final String[] RUNE = new String[] { - "runeWaterB", "runeFireB", "runeEarthB", "runeAirB", - "runeSpringB", "runeSummerB", "runeAutumnB", "runeWinterB", - "runeManaB", "runeLustB", "runeGluttonyB", "runeGreedB", - "runeSlothB", "runeWrathB", "runeEnvyB", "runePrideB" + "runeWaterB", "runeFireB", "runeEarthB", "runeAirB", + "runeSpringB", "runeSummerB", "runeAutumnB", "runeWinterB", + "runeManaB", "runeLustB", "runeGluttonyB", "runeGreedB", + "runeSlothB", "runeWrathB", "runeEnvyB", "runePrideB" }; public static final String[] QUARTZ = new String[] { - "quartzDark", "quartzMana", "quartzBlaze", - "quartzLavender", "quartzRed", "quartzElven", "quartzSunny" + "quartzDark", "quartzMana", "quartzBlaze", + "quartzLavender", "quartzRed", "quartzElven", "quartzSunny" }; } diff --git a/src/main/java/vazkii/botania/common/lib/LibPotionNames.java b/src/main/java/vazkii/botania/common/lib/LibPotionNames.java index 049ca9abb..8f62d7fd1 100644 --- a/src/main/java/vazkii/botania/common/lib/LibPotionNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibPotionNames.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Nov 2, 2014, 10:33:37 PM (GMT)] */ package vazkii.botania.common.lib; diff --git a/src/main/java/vazkii/botania/common/network/GuiHandler.java b/src/main/java/vazkii/botania/common/network/GuiHandler.java index 403babdcd..5bedda98d 100644 --- a/src/main/java/vazkii/botania/common/network/GuiHandler.java +++ b/src/main/java/vazkii/botania/common/network/GuiHandler.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:50:15 PM (GMT)] */ package vazkii.botania.common.network; diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 049973844..76417cd37 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -1,5 +1,7 @@ package vazkii.botania.common.network; +import java.awt.Color; + import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -18,254 +20,252 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityDoppleganger; -import java.awt.*; - public class PacketBotaniaEffect implements IMessage { - private EffectType type; - private double x; - private double y; - private double z; - private int[] args; + private EffectType type; + private double x; + private double y; + private double z; + private int[] args; - public PacketBotaniaEffect() {} + public PacketBotaniaEffect() {} - public PacketBotaniaEffect(EffectType type, double x, double y, double z, int... args) { - this.type = type; - this.x = x; - this.y = y; - this.z = z; - this.args = args; - } + public PacketBotaniaEffect(EffectType type, double x, double y, double z, int... args) { + this.type = type; + this.x = x; + this.y = y; + this.z = z; + this.args = args; + } - public PacketBotaniaEffect(EffectType type, double x, double y, double z, double... args) { - this(type, x, y, z, MathHelper.doubleArrayToIntArray(args)); - } + public PacketBotaniaEffect(EffectType type, double x, double y, double z, double... args) { + this(type, x, y, z, MathHelper.doubleArrayToIntArray(args)); + } - @Override - public void fromBytes(ByteBuf buf) { - type = EffectType.values()[buf.readShort()]; - x = buf.readDouble(); - y = buf.readDouble(); - z = buf.readDouble(); - args = new int[type.argCount]; + @Override + public void fromBytes(ByteBuf buf) { + type = EffectType.values()[buf.readShort()]; + x = buf.readDouble(); + y = buf.readDouble(); + z = buf.readDouble(); + args = new int[type.argCount]; - for (int i = 0; i < args.length; i++) { - args[i] = ByteBufUtils.readVarInt(buf, 5); - } - } + for (int i = 0; i < args.length; i++) { + args[i] = ByteBufUtils.readVarInt(buf, 5); + } + } - @Override - public void toBytes(ByteBuf buf) { - buf.writeShort(type.ordinal()); - buf.writeDouble(x); - buf.writeDouble(y); - buf.writeDouble(z); + @Override + public void toBytes(ByteBuf buf) { + buf.writeShort(type.ordinal()); + buf.writeDouble(x); + buf.writeDouble(y); + buf.writeDouble(z); - for (int i = 0; i < type.argCount; i++) { - ByteBufUtils.writeVarInt(buf, args[i], 5); - } - } + for (int i = 0; i < type.argCount; i++) { + ByteBufUtils.writeVarInt(buf, args[i], 5); + } + } - public static class Handler implements IMessageHandler { + public static class Handler implements IMessageHandler { - @Override - public IMessage onMessage(final PacketBotaniaEffect message, final MessageContext ctx) { - Minecraft.getMinecraft().addScheduledTask(new Runnable() { - // Use anon - lambda causes classloading issues - @Override - public void run() { - Minecraft mc = Minecraft.getMinecraft(); - World world = mc.theWorld; - switch (message.type) { - case POOL_CRAFT: { - for(int i = 0; i < 25; i++) { - float red = (float) Math.random(); - float green = (float) Math.random(); - float blue = (float) Math.random(); - Botania.proxy.sparkleFX(message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 0.75, message.z + 0.5 + Math.random() * 0.4 - 0.2, - red, green, blue, (float) Math.random(), 10); - } - break; - } - case POOL_CHARGE: { - if(ConfigHandler.chargingAnimationEnabled) { - boolean outputting = message.args[0] == 1; - BlockPos pos = new BlockPos(message.x, message.y, message.z); - Vector3 itemVec = Vector3.fromBlockPos(pos).add(0.5, 0.5 + Math.random() * 0.3, 0.5); - Vector3 tileVec = Vector3.fromBlockPos(pos).add(0.2 + Math.random() * 0.6, 0, 0.2 + Math.random() * 0.6); - Botania.proxy.lightningFX(outputting ? tileVec : itemVec, - outputting ? itemVec : tileVec, 80, world.rand.nextLong(), 0x4400799c, 0x4400C6FF); - } - break; - } - case PAINT_LENS: { - EnumDyeColor placeColor = EnumDyeColor.byMetadata(message.args[0]); - int hex = placeColor.getMapColor().colorValue; - int r = (hex & 0xFF0000) >> 16; - int g = (hex & 0xFF00) >> 8; - int b = (hex & 0xFF); - for(int i = 0; i < 10; i++) { - BlockPos pos = new BlockPos(message.x, message.y, message.z).offset(EnumFacing.VALUES[world.rand.nextInt(6)]); - Botania.proxy.sparkleFX( - pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), - r / 255F, g / 255F, b / 255F, 0.6F + (float) Math.random() * 0.5F, 5); - } - break; - } - case ARENA_INDICATOR: { - for(int i = 0; i < 360; i += 8) { - float r = 1F; - float g = 0F; - float b = 1F; - float rad = i * (float) Math.PI / 180F; - double x = message.x + 0.5 - Math.cos(rad) * EntityDoppleganger.ARENA_RANGE; - double y = message.y + 0.5; - double z = message.z + 0.5 - Math.sin(rad) * EntityDoppleganger.ARENA_RANGE; + @Override + public IMessage onMessage(final PacketBotaniaEffect message, final MessageContext ctx) { + Minecraft.getMinecraft().addScheduledTask(new Runnable() { + // Use anon - lambda causes classloading issues + @Override + public void run() { + Minecraft mc = Minecraft.getMinecraft(); + World world = mc.theWorld; + switch (message.type) { + case POOL_CRAFT: { + for(int i = 0; i < 25; i++) { + float red = (float) Math.random(); + float green = (float) Math.random(); + float blue = (float) Math.random(); + Botania.proxy.sparkleFX(message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 0.75, message.z + 0.5 + Math.random() * 0.4 - 0.2, + red, green, blue, (float) Math.random(), 10); + } + break; + } + case POOL_CHARGE: { + if(ConfigHandler.chargingAnimationEnabled) { + boolean outputting = message.args[0] == 1; + BlockPos pos = new BlockPos(message.x, message.y, message.z); + Vector3 itemVec = Vector3.fromBlockPos(pos).add(0.5, 0.5 + Math.random() * 0.3, 0.5); + Vector3 tileVec = Vector3.fromBlockPos(pos).add(0.2 + Math.random() * 0.6, 0, 0.2 + Math.random() * 0.6); + Botania.proxy.lightningFX(outputting ? tileVec : itemVec, + outputting ? itemVec : tileVec, 80, world.rand.nextLong(), 0x4400799c, 0x4400C6FF); + } + break; + } + case PAINT_LENS: { + EnumDyeColor placeColor = EnumDyeColor.byMetadata(message.args[0]); + int hex = placeColor.getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = hex & 0xFF; + for(int i = 0; i < 10; i++) { + BlockPos pos = new BlockPos(message.x, message.y, message.z).offset(EnumFacing.VALUES[world.rand.nextInt(6)]); + Botania.proxy.sparkleFX( + pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), + r / 255F, g / 255F, b / 255F, 0.6F + (float) Math.random() * 0.5F, 5); + } + break; + } + case ARENA_INDICATOR: { + for(int i = 0; i < 360; i += 8) { + float r = 1F; + float g = 0F; + float b = 1F; + float rad = i * (float) Math.PI / 180F; + double x = message.x + 0.5 - Math.cos(rad) * EntityDoppleganger.ARENA_RANGE; + double y = message.y + 0.5; + double z = message.z + 0.5 - Math.sin(rad) * EntityDoppleganger.ARENA_RANGE; - Botania.proxy.sparkleFX(x, y, z, r, g, b, 5F, 120); - } - break; - } - case ITEM_SMOKE: { - Entity item = world.getEntityByID(message.args[0]); - int p = message.args[1]; + Botania.proxy.sparkleFX(x, y, z, r, g, b, 5F, 120); + } + break; + } + case ITEM_SMOKE: { + Entity item = world.getEntityByID(message.args[0]); + int p = message.args[1]; - for(int i = 0; i < p; i++) { - double m = 0.01; - double d0 = item.worldObj.rand.nextGaussian() * m; - double d1 = item.worldObj.rand.nextGaussian() * m; - double d2 = item.worldObj.rand.nextGaussian() * m; - double d3 = 10.0D; - item.worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, - message.x + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d0 * d3, message.y + item.worldObj.rand.nextFloat() * item.height - d1 * d3, - message.z + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d2 * d3, d0, d1, d2); - } - break; - } - case SPARK_NET_INDICATOR: { - Entity e1 = world.getEntityByID(message.args[0]); - Entity e2 = world.getEntityByID(message.args[1]); + for(int i = 0; i < p; i++) { + double m = 0.01; + double d0 = item.worldObj.rand.nextGaussian() * m; + double d1 = item.worldObj.rand.nextGaussian() * m; + double d2 = item.worldObj.rand.nextGaussian() * m; + double d3 = 10.0D; + item.worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, + message.x + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d0 * d3, message.y + item.worldObj.rand.nextFloat() * item.height - d1 * d3, + message.z + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d2 * d3, d0, d1, d2); + } + break; + } + case SPARK_NET_INDICATOR: { + Entity e1 = world.getEntityByID(message.args[0]); + Entity e2 = world.getEntityByID(message.args[1]); - if(e1 == null || e2 == null) - return; + if(e1 == null || e2 == null) + return; - Vector3 orig = new Vector3(e1.posX , e1.posY + 0.25, e1.posZ); - Vector3 end = new Vector3(e2.posX, e2.posY + 0.25, e2.posZ); - Vector3 diff = end.subtract(orig); - Vector3 movement = diff.normalize().multiply(0.1); - int iters = (int) (diff.mag() / movement.mag()); - float huePer = 1F / iters; - float hueSum = (float) Math.random(); + Vector3 orig = new Vector3(e1.posX , e1.posY + 0.25, e1.posZ); + Vector3 end = new Vector3(e2.posX, e2.posY + 0.25, e2.posZ); + Vector3 diff = end.subtract(orig); + Vector3 movement = diff.normalize().multiply(0.1); + int iters = (int) (diff.mag() / movement.mag()); + float huePer = 1F / iters; + float hueSum = (float) Math.random(); - Vector3 currentPos = orig; - for(int i = 0; i < iters; i++) { - float hue = i * huePer + hueSum; - Color color = Color.getHSBColor(hue, 1F, 1F); - float r = Math.min(1F, color.getRed() / 255F + 0.4F); - float g = Math.min(1F, color.getGreen() / 255F + 0.4F); - float b = Math.min(1F, color.getBlue() / 255F + 0.4F); + Vector3 currentPos = orig; + for(int i = 0; i < iters; i++) { + float hue = i * huePer + hueSum; + Color color = Color.getHSBColor(hue, 1F, 1F); + float r = Math.min(1F, color.getRed() / 255F + 0.4F); + float g = Math.min(1F, color.getGreen() / 255F + 0.4F); + float b = Math.min(1F, color.getBlue() / 255F + 0.4F); - Botania.proxy.setSparkleFXNoClip(true); - Botania.proxy.sparkleFX(currentPos.x, currentPos.y, currentPos.z, r, g, b, 1F, 12); - Botania.proxy.setSparkleFXNoClip(false); - currentPos = currentPos.add(movement); - } + Botania.proxy.setSparkleFXNoClip(true); + Botania.proxy.sparkleFX(currentPos.x, currentPos.y, currentPos.z, r, g, b, 1F, 12); + Botania.proxy.setSparkleFXNoClip(false); + currentPos = currentPos.add(movement); + } - break; - } - case SPARK_MANA_FLOW: { - Entity e1 = world.getEntityByID(message.args[0]); - Entity e2 = world.getEntityByID(message.args[1]); + break; + } + case SPARK_MANA_FLOW: { + Entity e1 = world.getEntityByID(message.args[0]); + Entity e2 = world.getEntityByID(message.args[1]); - if(e1 == null || e2 == null) - return; + if(e1 == null || e2 == null) + return; - double rc = 0.45; - Vector3 thisVec = Vector3.fromEntityCenter(e1).add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); - Vector3 receiverVec = Vector3.fromEntityCenter(e2).add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); + double rc = 0.45; + Vector3 thisVec = Vector3.fromEntityCenter(e1).add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); + Vector3 receiverVec = Vector3.fromEntityCenter(e2).add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); - Vector3 motion = receiverVec.subtract(thisVec).multiply(0.04F); - float r = 0.4F + 0.3F * (float) Math.random(); - float g = 0.4F + 0.3F * (float) Math.random(); - float b = 0.4F + 0.3F * (float) Math.random(); - float size = 0.125F + 0.125F * (float) Math.random(); + Vector3 motion = receiverVec.subtract(thisVec).multiply(0.04F); + float r = 0.4F + 0.3F * (float) Math.random(); + float g = 0.4F + 0.3F * (float) Math.random(); + float b = 0.4F + 0.3F * (float) Math.random(); + float size = 0.125F + 0.125F * (float) Math.random(); - Botania.proxy.wispFX(thisVec.x, thisVec.y, thisVec.z, r, g, b, - size, (float) motion.x, (float) motion.y, (float) motion.z); - break; - } - case ENCHANTER_CRAFT: { - for(int i = 0; i < 25; i++) { - float red = (float) Math.random(); - float green = (float) Math.random(); - float blue = (float) Math.random(); - Botania.proxy.sparkleFX( - message.x + Math.random() * 0.4 - 0.2, message.y, message.z + Math.random() * 0.4 - 0.2, - red, green, blue, (float) Math.random(), 10); - } - break; - } - case ENCHANTER_DESTROY: { - for(int i = 0; i < 50; i++) { - float red = (float) Math.random(); - float green = (float) Math.random(); - float blue = (float) Math.random(); - Botania.proxy.wispFX(message.x, message.y, message.z, - red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F); - } - break; - } - case ENTROPINNYUM: { - for(int i = 0; i < 50; i++) - Botania.proxy.sparkleFX(message.x + Math.random() * 4 - 2, message.y + Math.random() * 4 - 2, message.z + Math.random() * 4 - 2, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, (float) (Math.random() * 0.65F + 1.25F), 12); + Botania.proxy.wispFX(thisVec.x, thisVec.y, thisVec.z, r, g, b, + size, (float) motion.x, (float) motion.y, (float) motion.z); + break; + } + case ENCHANTER_CRAFT: { + for(int i = 0; i < 25; i++) { + float red = (float) Math.random(); + float green = (float) Math.random(); + float blue = (float) Math.random(); + Botania.proxy.sparkleFX( + message.x + Math.random() * 0.4 - 0.2, message.y, message.z + Math.random() * 0.4 - 0.2, + red, green, blue, (float) Math.random(), 10); + } + break; + } + case ENCHANTER_DESTROY: { + for(int i = 0; i < 50; i++) { + float red = (float) Math.random(); + float green = (float) Math.random(); + float blue = (float) Math.random(); + Botania.proxy.wispFX(message.x, message.y, message.z, + red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F); + } + break; + } + case ENTROPINNYUM: { + for(int i = 0; i < 50; i++) + Botania.proxy.sparkleFX(message.x + Math.random() * 4 - 2, message.y + Math.random() * 4 - 2, message.z + Math.random() * 4 - 2, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, (float) (Math.random() * 0.65F + 1.25F), 12); - world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, message.x, message.y, message.z, 1D, 0D, 0D); - break; - } - case BLACK_LOTUS_DISSOLVE: { - for(int i = 0; i < 50; i++) { - float r = (float) Math.random() * 0.35F; - float g = 0F; - float b = (float) Math.random() * 0.35F; - float s = 0.45F * (float) Math.random() * 0.25F; + world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, message.x, message.y, message.z, 1D, 0D, 0D); + break; + } + case BLACK_LOTUS_DISSOLVE: { + for(int i = 0; i < 50; i++) { + float r = (float) Math.random() * 0.35F; + float g = 0F; + float b = (float) Math.random() * 0.35F; + float s = 0.45F * (float) Math.random() * 0.25F; - float m = 0.045F; - float mx = ((float) Math.random() - 0.5F) * m; - float my = (float) Math.random() * m; - float mz = ((float) Math.random() - 0.5F) * m; + float m = 0.045F; + float mx = ((float) Math.random() - 0.5F) * m; + float my = (float) Math.random() * m; + float mz = ((float) Math.random() - 0.5F) * m; - Botania.proxy.wispFX(message.x, message.y, message.z, r, g, b, s, mx, my, mz); - } + Botania.proxy.wispFX(message.x, message.y, message.z, r, g, b, s, mx, my, mz); + } - break; - } - } - } - }); + break; + } + } + } + }); - return null; - } - } + return null; + } + } - public enum EffectType { - POOL_CRAFT(0), - POOL_CHARGE(1), // Arg: 1 if outputting, 0 if inputting - PAINT_LENS(1), // Arg: colour - ARENA_INDICATOR(0), - ITEM_SMOKE(2), // Arg: Entity ID, number of particles - SPARK_NET_INDICATOR(2), // Arg: Entity ID from, Entity ID towards - SPARK_MANA_FLOW(2), // Arg: Entity ID from, Entity ID towards - ENCHANTER_CRAFT(0), - ENCHANTER_DESTROY(0), - ENTROPINNYUM(0), - BLACK_LOTUS_DISSOLVE(0); + public enum EffectType { + POOL_CRAFT(0), + POOL_CHARGE(1), // Arg: 1 if outputting, 0 if inputting + PAINT_LENS(1), // Arg: colour + ARENA_INDICATOR(0), + ITEM_SMOKE(2), // Arg: Entity ID, number of particles + SPARK_NET_INDICATOR(2), // Arg: Entity ID from, Entity ID towards + SPARK_MANA_FLOW(2), // Arg: Entity ID from, Entity ID towards + ENCHANTER_CRAFT(0), + ENCHANTER_DESTROY(0), + ENTROPINNYUM(0), + BLACK_LOTUS_DISSOLVE(0); - private final int argCount; + private final int argCount; - EffectType(int argCount) { - this.argCount = argCount; - } - } + EffectType(int argCount) { + this.argCount = argCount; + } + } } diff --git a/src/main/java/vazkii/botania/common/network/PacketDodge.java b/src/main/java/vazkii/botania/common/network/PacketDodge.java index 5f3a3ca20..d20bc30e2 100644 --- a/src/main/java/vazkii/botania/common/network/PacketDodge.java +++ b/src/main/java/vazkii/botania/common/network/PacketDodge.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [22/09/2016, 13:06:44 (GMT)] */ package vazkii.botania.common.network; @@ -21,39 +21,37 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing; -import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraSword; public class PacketDodge implements IMessage { - - @Override - public void fromBytes(ByteBuf buf) {} - @Override - public void toBytes(ByteBuf buf) {} + @Override + public void fromBytes(ByteBuf buf) {} - public static class Handler implements IMessageHandler { + @Override + public void toBytes(ByteBuf buf) {} - @Override - public IMessage onMessage(PacketDodge message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - player.mcServer.addScheduledTask(() -> { - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); - - IInventory baublesInv = BaublesApi.getBaubles(player); - ItemStack ringStack = baublesInv.getStackInSlot(1); - if(ringStack == null || !(ringStack.getItem() instanceof ItemDodgeRing)) { - ringStack = baublesInv.getStackInSlot(2); - if(ringStack == null || !(ringStack.getItem() instanceof ItemDodgeRing)) - ctx.getServerHandler().kickPlayerFromServer("Invalid Dodge Packet"); - } - - player.addExhaustion(0.3F); - ItemNBTHelper.setInt(ringStack, ItemDodgeRing.TAG_DODGE_COOLDOWN, ItemDodgeRing.MAX_CD); - }); - return null; - } - } + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(PacketDodge message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + player.mcServer.addScheduledTask(() -> { + player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); + + IInventory baublesInv = BaublesApi.getBaubles(player); + ItemStack ringStack = baublesInv.getStackInSlot(1); + if(ringStack == null || !(ringStack.getItem() instanceof ItemDodgeRing)) { + ringStack = baublesInv.getStackInSlot(2); + if(ringStack == null || !(ringStack.getItem() instanceof ItemDodgeRing)) + ctx.getServerHandler().kickPlayerFromServer("Invalid Dodge Packet"); + } + + player.addExhaustion(0.3F); + ItemNBTHelper.setInt(ringStack, ItemDodgeRing.TAG_DODGE_COOLDOWN, ItemDodgeRing.MAX_CD); + }); + return null; + } + } } diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 9311394d9..55f624863 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -13,46 +13,46 @@ import vazkii.botania.common.lib.LibMisc; public final class PacketHandler { - private static final SimpleNetworkWrapper HANDLER = new SimpleNetworkWrapper(LibMisc.NETWORK_CHANNEL); + private static final SimpleNetworkWrapper HANDLER = new SimpleNetworkWrapper(LibMisc.NETWORK_CHANNEL); - public static void init() { - int id = 0; - HANDLER.registerMessage(PacketBotaniaEffect.Handler.class, PacketBotaniaEffect.class, id++, Side.CLIENT); - HANDLER.registerMessage(PacketLeftClick.Handler.class, PacketLeftClick.class, id++, Side.SERVER); - HANDLER.registerMessage(PacketDodge.Handler.class, PacketDodge.class, id++, Side.SERVER); - } + public static void init() { + int id = 0; + HANDLER.registerMessage(PacketBotaniaEffect.Handler.class, PacketBotaniaEffect.class, id++, Side.CLIENT); + HANDLER.registerMessage(PacketLeftClick.Handler.class, PacketLeftClick.class, id++, Side.SERVER); + HANDLER.registerMessage(PacketDodge.Handler.class, PacketDodge.class, id++, Side.SERVER); + } - /** - * Send message to all within 64 blocks that have this chunk loaded - */ - public static void sendToNearby(World world, BlockPos pos, IMessage toSend) { - if(world instanceof WorldServer) { - WorldServer ws = ((WorldServer) world); + /** + * Send message to all within 64 blocks that have this chunk loaded + */ + public static void sendToNearby(World world, BlockPos pos, IMessage toSend) { + if(world instanceof WorldServer) { + WorldServer ws = (WorldServer) world; - for (EntityPlayer player : ws.playerEntities) { - EntityPlayerMP playerMP = ((EntityPlayerMP) player); + for (EntityPlayer player : ws.playerEntities) { + EntityPlayerMP playerMP = (EntityPlayerMP) player; - if (playerMP.getDistanceSq(pos) < 64 * 64 - && ws.getPlayerChunkMap().isPlayerWatchingChunk(playerMP, pos.getX() >> 4, pos.getZ() >> 4)) { - HANDLER.sendTo(toSend, playerMP); - } - } + if (playerMP.getDistanceSq(pos) < 64 * 64 + && ws.getPlayerChunkMap().isPlayerWatchingChunk(playerMP, pos.getX() >> 4, pos.getZ() >> 4)) { + HANDLER.sendTo(toSend, playerMP); + } + } - } - } + } + } - public static void sendToNearby(World world, Entity e, IMessage toSend) { - sendToNearby(world, new BlockPos(e), toSend); - } + public static void sendToNearby(World world, Entity e, IMessage toSend) { + sendToNearby(world, new BlockPos(e), toSend); + } - public static void sendTo(EntityPlayerMP playerMP, IMessage toSend) { - HANDLER.sendTo(toSend, playerMP); - } + public static void sendTo(EntityPlayerMP playerMP, IMessage toSend) { + HANDLER.sendTo(toSend, playerMP); + } - public static void sendToServer(IMessage msg) { - HANDLER.sendToServer(msg); - } + public static void sendToServer(IMessage msg) { + HANDLER.sendToServer(msg); + } - private PacketHandler() {} + private PacketHandler() {} } diff --git a/src/main/java/vazkii/botania/common/network/PacketLeftClick.java b/src/main/java/vazkii/botania/common/network/PacketLeftClick.java index 284059c36..7cbe4fd09 100644 --- a/src/main/java/vazkii/botania/common/network/PacketLeftClick.java +++ b/src/main/java/vazkii/botania/common/network/PacketLeftClick.java @@ -1,7 +1,6 @@ package vazkii.botania.common.network; import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; @@ -10,20 +9,20 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraSword; public class PacketLeftClick implements IMessage { - @Override - public void fromBytes(ByteBuf buf) {} + @Override + public void fromBytes(ByteBuf buf) {} - @Override - public void toBytes(ByteBuf buf) {} + @Override + public void toBytes(ByteBuf buf) {} - public static class Handler implements IMessageHandler { + public static class Handler implements IMessageHandler { - @Override - public IMessage onMessage(PacketLeftClick message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - player.mcServer.addScheduledTask(() -> ((ItemTerraSword) ModItems.terraSword).trySpawnBurst(player)); - return null; - } - } + @Override + public IMessage onMessage(PacketLeftClick message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + player.mcServer.addScheduledTask(() -> ((ItemTerraSword) ModItems.terraSword).trySpawnBurst(player)); + return null; + } + } } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index caab50865..41b713d87 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 7, 2015, 6:14:18 PM (GMT)] */ package vazkii.botania.common.world; +import java.awt.Color; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -19,7 +21,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -29,12 +30,9 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; -import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; -import java.awt.*; - public final class SkyblockWorldEvents { private SkyblockWorldEvents() {} @@ -164,17 +162,17 @@ public final class SkyblockWorldEvents { ((TileManaFlame) world.getTileEntity(pos.add(1, 2, 1))).setColor(new Color(70 + world.rand.nextInt(185), 70 + world.rand.nextInt(185), 70 + world.rand.nextInt(185)).getRGB()); int[][] rootPositions = new int[][] { - { -1, -3, -1 }, - { -2, -4, -1 }, - { -2, -4, -2 }, - { +1, -4, -1 }, - { +1, -5, -1 }, - { +2, -5, -1 }, - { +2, -6, +0 }, - { +0, -4, +2 }, - { +0, -5, +2 }, - { +0, -5, +3 }, - { +0, -6, +3 }, + { -1, -3, -1 }, + { -2, -4, -1 }, + { -2, -4, -2 }, + { +1, -4, -1 }, + { +1, -5, -1 }, + { +2, -5, -1 }, + { +2, -6, +0 }, + { +0, -4, +2 }, + { +0, -5, +2 }, + { +0, -5, +3 }, + { +0, -6, +3 }, }; for(int[] root : rootPositions) world.setBlockState(pos.add(root[0], root[1], root[2]), ModBlocks.root.getDefaultState()); diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index ff3b44a9d..7a061e0ad 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -2,14 +2,16 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 7, 2015, 2:06:01 AM (GMT)] */ package vazkii.botania.common.world; +import javax.annotation.Nonnull; + import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -17,8 +19,6 @@ import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkGenerator; import net.minecraft.world.gen.ChunkProviderFlat; -import javax.annotation.Nonnull; - public class WorldTypeSkyblock extends WorldType { public WorldTypeSkyblock() { @@ -48,11 +48,11 @@ public class WorldTypeSkyblock extends WorldType { public float getCloudHeight() { return 260f; } - + @Nonnull @Override public IChunkGenerator getChunkGenerator(@Nonnull World world, String generatorOptions) { return new ChunkProviderFlat(world, world.getSeed(), false, "3;minecraft:air;"); } - + } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 80625db22..31f0c343d 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3850,4 +3850,4 @@ botania.subtitle.terraPickMode=Terrasteel Pick powers up botania.subtitle.terrasteelCraft=Terrasteel finishes botania.subtitle.thermalily=Thermalily consumes lava botania.subtitle.unholyCloak=Cloak of Sin activates -botania.subtitle.way=And his name is.... JOHN CENA!!! +botania.subtitle.way=O-oooooooooo AAAAE-A-A-I-A-U-JO-oooooooooooo AAE-O-A-A-U-U-A-E-eee-ee-eee AAAAE-A-E-I-E-A-JO-ooo-oo-oo-oo EEEEO-A-AAA-AAAA O-oooooooooo AAAAE-A-A-I-A-U-JO-oooooooooooo AAE-O-A-A-U-U-A-E-eee-ee-eee AAAAE-A-E-I-E-A-JO-ooo-oo-oo-oo EEEEO-A-AAA-AAAA O-oooooooooo AAAAE-A-A-I-A-U-JO-oooooooooooo AAE-O-A-A-U-U-A-E-eee-ee-eee AAAAE-A-E-I-E-A-JO-ooo-oo-oo-oo EEEEO-A-AAA-AAAA diff --git a/src/main/resources/assets/botania/sounds/way.ogg b/src/main/resources/assets/botania/sounds/way.ogg index ff12b38bfed9850d0d8f58f7f84c51ced6c8e9fe..5c7b3bbe41751a4fca085b18853165c835697591 100644 GIT binary patch literal 217701 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%0AsrctZb6JyIO@To?u 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�ubyF0Td42l|X7;8957z^2Jam9Ek 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 URtJ&QJ~Zc*C61S)bS)zPKk5??ZvX%Q literal 143821 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 Vc-F1Z%A#oyjH=*&sx1JH{{sMEWFG(k