From 7ef12b61d89df1de8ac10ab7aa489b21231d4530 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 8 Jun 2019 01:07:26 -0700 Subject: [PATCH] update gradle, apply migration mappings, start fixing stuff --- build.gradle | 47 +++-- build.properties | 2 +- .../java/vazkii/botania/api/BotaniaAPI.java | 38 ++-- .../java/vazkii/botania/api/ColorHelper.java | 176 +++++++++-------- .../vazkii/botania/api/boss/IBotaniaBoss.java | 3 +- .../java/vazkii/botania/api/brew/Brew.java | 8 +- .../corporea/CorporeaIndexRequestEvent.java | 6 +- .../botania/api/corporea/ICorporeaSpark.java | 4 +- .../api/imc/PaintableBlockMessage.java | 9 +- .../api/internal/DummyMethodHandler.java | 9 +- .../api/internal/IGuiLexiconEntry.java | 5 +- .../api/internal/IInternalMethodHandler.java | 9 +- .../api/internal/VanillaPacketDispatcher.java | 11 +- .../api/item/AccessoryRenderHelper.java | 13 +- .../vazkii/botania/api/item/IAvatarTile.java | 5 +- .../botania/api/item/IBlockProvider.java | 7 +- .../botania/api/item/IFloatingFlower.java | 17 +- .../botania/api/item/IManaDissolvable.java | 5 +- .../api/item/IManaProficiencyArmor.java | 14 +- .../botania/api/item/ISequentialBreaker.java | 7 +- .../IWireframeCoordinateListProvider.java | 7 +- .../botania/api/lexicon/ILexiconable.java | 5 +- .../botania/api/lexicon/LexiconPage.java | 2 +- .../multiblock/IMultiblockRenderHook.java | 7 +- .../api/lexicon/multiblock/Multiblock.java | 25 +-- .../api/lexicon/multiblock/MultiblockSet.java | 7 +- .../multiblock/component/AnyComponent.java | 6 +- .../component/MultiblockComponent.java | 14 +- .../multiblock/component/TagComponent.java | 4 +- .../vazkii/botania/api/mana/ILensEffect.java | 5 +- .../botania/api/mana/IManaCollisionGhost.java | 5 +- .../botania/api/mana/IManaDiscountArmor.java | 5 +- .../vazkii/botania/api/mana/IManaPool.java | 7 +- .../botania/api/mana/ManaDiscountEvent.java | 9 +- .../botania/api/mana/ManaItemHandler.java | 21 ++- .../botania/api/mana/ManaItemsEvent.java | 9 +- .../api/mana/ManaProficiencyEvent.java | 9 +- .../vazkii/botania/api/recipe/RecipeBrew.java | 2 +- .../api/recipe/RecipeManaInfusion.java | 9 +- .../botania/api/recipe/RecipePetals.java | 2 +- .../botania/api/recipe/RecipePureDaisy.java | 16 +- .../botania/api/state/BotaniaStateProps.java | 19 +- .../subtile/TileEntityFunctionalFlower.java | 20 +- .../subtile/TileEntityGeneratingFlower.java | 35 ++-- .../api/subtile/TileEntitySpecialFlower.java | 69 ++++--- .../botania/api/wand/IWandBindable.java | 10 +- .../vazkii/botania/api/wand/IWandable.java | 8 +- .../botania/api/wiki/IWikiProvider.java | 9 +- .../botania/api/wiki/SimpleWikiProvider.java | 14 +- .../botania/client/challenge/Challenge.java | 6 +- .../client/challenge/ModChallenges.java | 6 +- .../core/handler/AstrolabePreviewHandler.java | 24 +-- .../core/handler/BaubleRenderHandler.java | 21 ++- .../handler/BlockHighlightRenderHandler.java | 6 +- .../client/core/handler/BossBarHandler.java | 2 +- .../core/handler/BoundTileRenderer.java | 19 +- .../core/handler/ClientTickHandler.java | 8 +- .../client/core/handler/ColorHandler.java | 27 +-- .../handler/ContributorFancinessHandler.java | 27 +-- .../handler/CorporeaAutoCompleteHandler.java | 25 +-- .../core/handler/CorporeaInputHandler.java | 22 ++- .../client/core/handler/DebugHandler.java | 12 +- .../client/core/handler/HUDHandler.java | 33 ++-- .../handler/ItemsRemainingRenderHandler.java | 7 +- .../client/core/handler/LayerTerraHelmet.java | 9 +- .../client/core/handler/LightningHandler.java | 2 +- .../core/handler/MiscellaneousIcons.java | 7 +- .../client/core/handler/ModelHandler.java | 7 +- .../core/handler/MultiblockBlockAccess.java | 9 +- .../core/handler/MultiblockRenderHandler.java | 32 ++-- .../handler/PersistentVariableHelper.java | 31 +-- .../core/handler/RedStringRenderer.java | 17 +- .../client/core/handler/RenderLexicon.java | 42 +++-- .../TooltipAdditionDisplayHandler.java | 32 ++-- .../client/core/handler/TooltipHandler.java | 5 +- .../client/core/helper/IconHelper.java | 2 +- .../client/core/helper/RenderHelper.java | 14 +- .../client/core/helper/ShaderHelper.java | 2 +- .../client/core/proxy/ClientProxy.java | 27 +-- .../botania/client/core/proxy/GuiFactory.java | 4 +- .../vazkii/botania/client/fx/FXSparkle.java | 23 +-- .../java/vazkii/botania/client/fx/FXWisp.java | 2 +- .../client/fx/ParticleRenderDispatcher.java | 2 +- .../botania/client/gui/GuiBotaniaConfig.java | 8 +- .../vazkii/botania/client/gui/SlotLocked.java | 6 +- .../client/gui/bag/ContainerFlowerBag.java | 16 +- .../botania/client/gui/bag/GuiFlowerBag.java | 19 +- .../client/gui/box/ContainerBaubleBox.java | 14 +- .../botania/client/gui/box/GuiBaubleBox.java | 14 +- .../gui/crafting/ContainerCraftingHalo.java | 19 +- .../client/gui/lexicon/GuiLexicon.java | 23 ++- .../gui/lexicon/GuiLexiconChallenge.java | 15 +- .../gui/lexicon/GuiLexiconChallengesList.java | 4 +- .../client/gui/lexicon/GuiLexiconEntry.java | 26 +-- .../client/gui/lexicon/GuiLexiconHistory.java | 4 +- .../client/gui/lexicon/GuiLexiconIndex.java | 33 ++-- .../lexicon/button/GuiButtonAchievement.java | 7 +- .../gui/lexicon/button/GuiButtonBack.java | 2 +- .../gui/lexicon/button/GuiButtonBookmark.java | 5 +- .../gui/lexicon/button/GuiButtonCategory.java | 4 +- .../button/GuiButtonChallengeIcon.java | 2 +- .../lexicon/button/GuiButtonChallenges.java | 2 +- .../gui/lexicon/button/GuiButtonDoot.java | 9 +- .../lexicon/button/GuiButtonInvisible.java | 2 +- .../gui/lexicon/button/GuiButtonLexicon.java | 5 +- .../gui/lexicon/button/GuiButtonNotes.java | 2 +- .../gui/lexicon/button/GuiButtonOptions.java | 2 +- .../gui/lexicon/button/GuiButtonPage.java | 2 +- .../lexicon/button/GuiButtonScaleChange.java | 2 +- .../gui/lexicon/button/GuiButtonShare.java | 2 +- .../button/GuiButtonUpdateWarning.java | 7 +- .../lexicon/button/GuiButtonViewOnline.java | 2 +- .../integration/jei/JEIBotaniaPlugin.java | 4 +- .../crafting/CompositeLensRecipeWrapper.java | 2 +- .../elventrade/ElvenTradeRecipeCategory.java | 6 +- .../jei/manapool/ManaPoolRecipeCategory.java | 4 +- .../orechid/OrechidIgnemRecipeCategory.java | 2 +- .../jei/orechid/OrechidRecipeCategory.java | 6 +- .../jei/orechid/OrechidRecipeWrapper.java | 2 +- .../PetalApothecaryRecipeCategory.java | 2 +- .../puredaisy/PureDaisyRecipeCategory.java | 11 +- .../runicaltar/RunicAltarRecipeCategory.java | 2 +- .../client/model/FloatingFlowerModel.java | 23 ++- .../vazkii/botania/client/model/GunModel.java | 23 ++- .../botania/client/model/LexiconModel.java | 8 +- .../botania/client/model/ModelAvatar.java | 33 ++-- .../botania/client/model/ModelBellows.java | 24 +-- .../botania/client/model/ModelBrewery.java | 25 +-- .../botania/client/model/ModelCloak.java | 22 ++- .../botania/client/model/ModelHourglass.java | 36 ++-- .../botania/client/model/ModelPixie.java | 29 +-- .../botania/client/model/ModelPylonGaia.java | 58 +++--- .../botania/client/model/ModelPylonMana.java | 40 ++-- .../client/model/ModelPylonNatura.java | 57 +++--- .../client/model/ModelSpinningCubes.java | 17 +- .../botania/client/model/ModelSpreader.java | 48 ++--- .../client/model/ModelTeruTeruBozu.java | 25 +-- .../botania/client/model/ModelTinyPotato.java | 10 +- .../botania/client/model/PlatformModel.java | 12 +- .../client/model/armor/ModelArmor.java | 23 ++- .../model/armor/ModelArmorElementium.java | 146 +++++++------- .../model/armor/ModelArmorManasteel.java | 118 ++++++------ .../model/armor/ModelArmorManaweave.java | 98 +++++----- .../model/armor/ModelArmorTerrasteel.java | 178 +++++++++--------- .../client/render/entity/LayerGaiaHead.java | 23 +-- .../render/entity/RenderBabylonWeapon.java | 17 +- .../render/entity/RenderCorporeaSpark.java | 12 +- .../render/entity/RenderDoppleganger.java | 20 +- .../client/render/entity/RenderManaStorm.java | 15 +- .../render/entity/RenderPinkWither.java | 14 +- .../client/render/entity/RenderPixie.java | 11 +- .../render/entity/RenderPoolMinecart.java | 13 +- .../render/entity/RenderSnowballStack.java | 9 +- .../client/render/entity/RenderSpark.java | 4 +- .../client/render/entity/RenderSparkBase.java | 16 +- .../render/tile/RenderTileAlfPortal.java | 6 +- .../client/render/tile/RenderTileAltar.java | 14 +- .../render/tile/RenderTileAnimatedTorch.java | 5 +- .../client/render/tile/RenderTileAvatar.java | 16 +- .../client/render/tile/RenderTileBellows.java | 2 +- .../client/render/tile/RenderTileBrewery.java | 8 +- .../client/render/tile/RenderTileCocoon.java | 12 +- .../tile/RenderTileCorporeaCrystalCube.java | 29 +-- .../render/tile/RenderTileCorporeaIndex.java | 10 +- .../render/tile/RenderTileEnchanter.java | 17 +- .../render/tile/RenderTileFloatingFlower.java | 9 +- .../render/tile/RenderTileGaiaHead.java | 70 +++---- .../render/tile/RenderTileHourglass.java | 2 +- .../render/tile/RenderTileIncensePlate.java | 13 +- .../render/tile/RenderTileLightRelay.java | 11 +- .../client/render/tile/RenderTilePool.java | 11 +- .../client/render/tile/RenderTilePrism.java | 6 +- .../client/render/tile/RenderTilePylon.java | 12 +- .../render/tile/RenderTileRuneAltar.java | 6 +- .../render/tile/RenderTileSparkChanger.java | 6 +- .../render/tile/RenderTileSpreader.java | 20 +- .../render/tile/RenderTileStarfield.java | 6 +- .../render/tile/RenderTileTerraPlate.java | 6 +- .../render/tile/RenderTileTeruTeruBozu.java | 2 +- .../render/tile/RenderTileTinyPotato.java | 46 ++--- .../botania/client/render/tile/TEISR.java | 5 +- .../render/world/SkyblockSkyRenderer.java | 20 +- .../java/vazkii/botania/common/Botania.java | 24 ++- .../common/advancements/AlfPortalTrigger.java | 12 +- .../advancements/CorporeaRequestTrigger.java | 10 +- .../DopplegangerNoArmorTrigger.java | 9 +- .../common/advancements/RelicBindTrigger.java | 5 +- .../advancements/UseItemSuccessTrigger.java | 12 +- .../botania/common/block/BlockAlfPortal.java | 28 +-- .../botania/common/block/BlockAltGrass.java | 37 ++-- .../botania/common/block/BlockAltar.java | 45 +++-- .../common/block/BlockAnimatedTorch.java | 47 ++--- .../botania/common/block/BlockAvatar.java | 53 +++--- .../botania/common/block/BlockBifrost.java | 13 +- .../common/block/BlockBifrostPerm.java | 13 +- .../common/block/BlockCacophonium.java | 26 ++- .../botania/common/block/BlockCamo.java | 23 +-- .../botania/common/block/BlockCell.java | 15 +- .../botania/common/block/BlockCocoon.java | 57 +++--- .../common/block/BlockCraftyCrate.java | 22 ++- .../common/block/BlockEnchantedSoil.java | 18 +- .../botania/common/block/BlockEnderEye.java | 25 +-- .../botania/common/block/BlockFakeAir.java | 29 +-- .../botania/common/block/BlockFelPumpkin.java | 31 +-- .../block/BlockFloatingSpecialFlower.java | 55 +++--- .../botania/common/block/BlockForestEye.java | 22 +-- .../botania/common/block/BlockGaiaHead.java | 7 +- .../common/block/BlockGaiaHeadWall.java | 4 +- .../botania/common/block/BlockGhostRail.java | 14 +- .../botania/common/block/BlockHourglass.java | 53 +++--- .../common/block/BlockIncensePlate.java | 41 ++-- .../common/block/BlockLightLauncher.java | 31 +-- .../botania/common/block/BlockLightRelay.java | 46 ++--- .../botania/common/block/BlockManaBomb.java | 5 +- .../vazkii/botania/common/block/BlockMod.java | 6 +- .../common/block/BlockModDoubleFlower.java | 39 ++-- .../botania/common/block/BlockModFlower.java | 34 ++-- .../common/block/BlockModLexiconable.java | 4 +- .../botania/common/block/BlockOpenCrate.java | 22 ++- .../common/block/BlockPistonRelay.java | 55 +++--- .../botania/common/block/BlockPlatform.java | 21 ++- .../botania/common/block/BlockPylon.java | 34 ++-- .../botania/common/block/BlockRoot.java | 11 +- .../botania/common/block/BlockSolidVines.java | 19 +- .../common/block/BlockSparkChanger.java | 36 ++-- .../common/block/BlockSpecialFlower.java | 68 ++++--- .../botania/common/block/BlockStorage.java | 10 +- .../common/block/BlockTeruTeruBozu.java | 47 ++--- .../botania/common/block/BlockTinyPlanet.java | 22 ++- .../botania/common/block/ModBanners.java | 3 +- .../botania/common/block/ModBlocks.java | 45 ++--- .../botania/common/block/ModFluffBlocks.java | 2 +- .../botania/common/block/ModSubtiles.java | 2 +- .../block/corporea/BlockCorporeaBase.java | 7 +- .../corporea/BlockCorporeaCrystalCube.java | 35 ++-- .../block/corporea/BlockCorporeaFunnel.java | 12 +- .../block/corporea/BlockCorporeaIndex.java | 32 ++-- .../corporea/BlockCorporeaInterceptor.java | 25 +-- .../block/corporea/BlockCorporeaRetainer.java | 19 +- .../common/block/decor/BlockBiomeStone.java | 11 +- .../common/block/decor/BlockBuriedPetals.java | 23 +-- .../common/block/decor/BlockElfGlass.java | 5 +- .../block/decor/BlockFloatingFlower.java | 44 +++-- .../common/block/decor/BlockManaFlame.java | 35 ++-- .../common/block/decor/BlockManaGlass.java | 11 +- .../common/block/decor/BlockModMushroom.java | 34 ++-- .../common/block/decor/BlockPetalBlock.java | 14 +- .../common/block/decor/BlockShinyFlower.java | 15 +- .../common/block/decor/BlockStarfield.java | 23 ++- .../common/block/decor/BlockTinyPotato.java | 51 ++--- .../common/block/decor/ItemBlockBlaze.java | 8 +- .../block/decor/panes/BlockModPane.java | 10 +- .../decor/quartz/BlockElfQuartzSlab.java | 4 +- .../decor/quartz/BlockElfQuartzStairs.java | 9 +- .../quartz/BlockSpecialQuartzPillar.java | 9 +- .../decor/slabs/BlockBiomeStoneSlab.java | 9 +- .../block/decor/slabs/BlockModSlab.java | 12 +- .../block/decor/slabs/BlockPavementSlab.java | 9 +- .../decor/stairs/BlockBiomeStoneStairs.java | 9 +- .../block/decor/stairs/BlockModStairs.java | 13 +- .../decor/stairs/BlockPavementStairs.java | 10 +- .../decor/walls/BlockBiomeStoneWall.java | 9 +- .../block/decor/walls/BlockModWall.java | 14 +- .../block/dispenser/BehaviourCocoaBeans.java | 18 +- .../block/dispenser/BehaviourFelPumpkin.java | 13 +- .../dispenser/BehaviourPoolMinecart.java | 32 ++-- .../block/dispenser/BehaviourSeeds.java | 10 +- .../common/block/dispenser/BehaviourWand.java | 11 +- .../block/dispenser/SeedBehaviours.java | 25 +-- .../block/mana/BlockAlchemyCatalyst.java | 7 +- .../common/block/mana/BlockBellows.java | 41 ++-- .../common/block/mana/BlockBrewery.java | 44 ++--- .../block/mana/BlockConjurationCatalyst.java | 4 +- .../common/block/mana/BlockDistributor.java | 15 +- .../common/block/mana/BlockEnchanter.java | 39 ++-- .../common/block/mana/BlockForestDrum.java | 46 +++-- .../common/block/mana/BlockManaDetector.java | 23 +-- .../common/block/mana/BlockManaVoid.java | 12 +- .../botania/common/block/mana/BlockPool.java | 53 +++--- .../botania/common/block/mana/BlockPrism.java | 35 ++-- .../botania/common/block/mana/BlockPump.java | 32 ++-- .../common/block/mana/BlockRFGenerator.java | 12 +- .../common/block/mana/BlockRuneAltar.java | 36 ++-- .../common/block/mana/BlockSpawnerClaw.java | 23 +-- .../common/block/mana/BlockSpreader.java | 51 ++--- .../common/block/mana/BlockTerraPlate.java | 39 ++-- .../common/block/mana/BlockTurntable.java | 16 +- .../common/block/string/BlockRedString.java | 18 +- .../string/BlockRedStringComparator.java | 14 +- .../block/string/BlockRedStringContainer.java | 9 +- .../block/string/BlockRedStringDispenser.java | 14 +- .../string/BlockRedStringFertilizer.java | 15 +- .../string/BlockRedStringInterceptor.java | 22 ++- .../block/string/BlockRedStringRelay.java | 10 +- .../common/block/subtile/SubTileManastar.java | 5 +- .../block/subtile/SubTilePureDaisy.java | 10 +- .../functional/BergamuteEventHandler.java | 5 +- .../functional/SubTileAgricarnation.java | 17 +- .../subtile/functional/SubTileBellethorn.java | 17 +- .../subtile/functional/SubTileBubbell.java | 12 +- .../subtile/functional/SubTileClayconia.java | 10 +- .../subtile/functional/SubTileDaffomill.java | 42 +++-- .../subtile/functional/SubTileDreadthorn.java | 5 +- .../subtile/functional/SubTileExoflame.java | 15 +- .../functional/SubTileFallenKanade.java | 16 +- .../functional/SubTileHeiseiDream.java | 23 ++- .../subtile/functional/SubTileHopperhock.java | 42 +++-- .../subtile/functional/SubTileHyacidus.java | 19 +- .../functional/SubTileJadedAmaranthus.java | 12 +- .../subtile/functional/SubTileLoonuim.java | 74 ++++---- .../functional/SubTileMarimorphosis.java | 14 +- .../subtile/functional/SubTileMedumone.java | 19 +- .../subtile/functional/SubTileOrechid.java | 14 +- .../functional/SubTileOrechidIgnem.java | 7 +- .../functional/SubTilePollidisiac.java | 14 +- .../functional/SubTileRannuncarpus.java | 46 +++-- .../functional/SubTileSpectranthemum.java | 20 +- .../functional/SubTileTangleberrie.java | 11 +- .../subtile/functional/SubTileTigerseye.java | 48 ++--- .../subtile/functional/SubTileVinculotus.java | 4 +- .../subtile/generating/SubTileArcaneRose.java | 14 +- .../generating/SubTileDandelifeon.java | 5 +- .../subtile/generating/SubTileEndoflame.java | 16 +- .../generating/SubTileEntropinnyum.java | 12 +- .../generating/SubTileGourmaryllis.java | 26 +-- .../generating/SubTileHydroangeas.java | 23 ++- .../subtile/generating/SubTileKekimurus.java | 16 +- .../subtile/generating/SubTileMunchdew.java | 19 +- .../subtile/generating/SubTileNarslimmus.java | 11 +- .../subtile/generating/SubTileRafflowsia.java | 15 +- .../subtile/generating/SubTileShulkMeNot.java | 24 +-- .../subtile/generating/SubTileSpectrolus.java | 28 +-- .../common/block/tile/TileAlfPortal.java | 49 ++--- .../botania/common/block/tile/TileAltar.java | 50 ++--- .../common/block/tile/TileAnimatedTorch.java | 35 ++-- .../botania/common/block/tile/TileAvatar.java | 18 +- .../common/block/tile/TileBifrost.java | 13 +- .../common/block/tile/TileBrewery.java | 26 ++- .../common/block/tile/TileCacophonium.java | 11 +- .../botania/common/block/tile/TileCamo.java | 15 +- .../botania/common/block/tile/TileCell.java | 7 +- .../botania/common/block/tile/TileCocoon.java | 82 ++++---- .../common/block/tile/TileCraftCrate.java | 22 ++- .../common/block/tile/TileEnchanter.java | 55 +++--- .../common/block/tile/TileEnderEye.java | 19 +- .../common/block/tile/TileFakeAir.java | 9 +- .../common/block/tile/TileFloatingFlower.java | 16 +- .../common/block/tile/TileForestEye.java | 8 +- .../common/block/tile/TileGaiaHead.java | 4 +- .../common/block/tile/TileHourglass.java | 25 +-- .../common/block/tile/TileIncensePlate.java | 33 ++-- .../common/block/tile/TileLightRelay.java | 56 +++--- .../common/block/tile/TileManaFlame.java | 10 +- .../botania/common/block/tile/TileMod.java | 28 +-- .../common/block/tile/TileOpenCrate.java | 19 +- .../common/block/tile/TilePlatform.java | 8 +- .../botania/common/block/tile/TilePylon.java | 4 +- .../common/block/tile/TileRuneAltar.java | 44 +++-- .../block/tile/TileSimpleInventory.java | 11 +- .../common/block/tile/TileSparkChanger.java | 5 +- .../common/block/tile/TileSpawnerClaw.java | 41 ++-- .../common/block/tile/TileSpiritShrine.java | 4 +- .../common/block/tile/TileStarfield.java | 4 +- .../common/block/tile/TileTerraPlate.java | 29 +-- .../common/block/tile/TileTeruTeruBozu.java | 4 +- .../common/block/tile/TileTinyPlanet.java | 4 +- .../common/block/tile/TileTinyPotato.java | 31 +-- .../corporea/TileCorporeaCrystalCube.java | 24 +-- .../tile/corporea/TileCorporeaFunnel.java | 23 ++- .../tile/corporea/TileCorporeaIndex.java | 25 +-- .../corporea/TileCorporeaInterceptor.java | 15 +- .../tile/corporea/TileCorporeaRetainer.java | 11 +- .../common/block/tile/mana/TileBellows.java | 39 ++-- .../block/tile/mana/TileDistributor.java | 9 +- .../block/tile/mana/TileManaDetector.java | 8 +- .../common/block/tile/mana/TilePool.java | 59 +++--- .../common/block/tile/mana/TilePrism.java | 7 +- .../common/block/tile/mana/TilePump.java | 16 +- .../block/tile/mana/TileRFGenerator.java | 18 +- .../common/block/tile/mana/TileSpreader.java | 57 +++--- .../common/block/tile/mana/TileTurntable.java | 23 ++- .../block/tile/string/TileRedString.java | 22 ++- .../tile/string/TileRedStringComparator.java | 5 +- .../tile/string/TileRedStringContainer.java | 7 +- .../tile/string/TileRedStringDispenser.java | 7 +- .../tile/string/TileRedStringInterceptor.java | 9 +- .../block/tile/string/TileRedStringRelay.java | 8 +- .../vazkii/botania/common/brew/BrewMod.java | 6 +- .../vazkii/botania/common/brew/ModBrews.java | 53 +++--- .../botania/common/brew/ModPotions.java | 16 +- .../common/brew/potion/PotionAllure.java | 12 +- .../common/brew/potion/PotionBloodthirst.java | 5 +- .../common/brew/potion/PotionClear.java | 6 +- .../common/brew/potion/PotionEmptiness.java | 5 +- .../common/brew/potion/PotionFeatherfeet.java | 5 +- .../botania/common/brew/potion/PotionMod.java | 16 +- .../common/brew/potion/PotionSoulCross.java | 7 +- .../common/core/BotaniaCreativeTab.java | 17 +- .../common/core/command/CommandOpen.java | 9 +- .../core/command/CommandSkyblockSpread.java | 4 +- .../common/core/handler/IMCHandler.java | 7 +- .../common/core/handler/IMCSender.java | 3 +- .../core/handler/InternalMethodHandler.java | 10 +- .../common/core/handler/PixieHandler.java | 32 ++-- .../common/core/handler/SleepingHandler.java | 5 +- .../common/core/helper/ExperienceHelper.java | 8 +- .../common/core/helper/InventoryHelper.java | 17 +- .../common/core/helper/ItemNBTHelper.java | 30 +-- .../common/core/helper/MathHelper.java | 5 +- .../common/core/helper/PlayerHelper.java | 40 ++-- .../botania/common/core/loot/BindUuid.java | 12 +- .../common/core/loot/EnableRelics.java | 6 +- .../botania/common/core/loot/LootHandler.java | 15 +- .../common/core/loot/TrueGuardianKiller.java | 7 +- .../botania/common/core/proxy/IProxy.java | 9 +- .../common/core/proxy/ServerProxy.java | 8 +- .../core/version/ThreadDownloadMod.java | 6 +- .../common/core/version/VersionChecker.java | 12 +- .../crafting/FluxfieldConditionFactory.java | 5 +- .../common/crafting/ModBrewRecipes.java | 8 +- .../common/crafting/ModElvenTradeRecipes.java | 6 +- .../crafting/ModManaAlchemyRecipes.java | 6 +- .../crafting/ModManaConjurationRecipes.java | 6 +- .../crafting/ModManaInfusionRecipes.java | 11 +- .../common/crafting/ModPetalRecipes.java | 3 +- .../common/crafting/ModPureDaisyRecipes.java | 3 +- .../common/crafting/ModRuneRecipes.java | 6 +- .../crafting/recipe/AncientWillRecipe.java | 6 +- .../crafting/recipe/ArmorUpgradeRecipe.java | 6 +- .../BlackHoleTalismanExtractRecipe.java | 6 +- .../crafting/recipe/CompositeLensRecipe.java | 8 +- .../crafting/recipe/CosmeticAttachRecipe.java | 7 +- .../crafting/recipe/CosmeticRemoveRecipe.java | 6 +- .../common/crafting/recipe/HeadRecipe.java | 7 +- .../crafting/recipe/HelmRevealingRecipe.java | 9 +- .../common/crafting/recipe/KeepIvyRecipe.java | 7 +- .../crafting/recipe/LensDyeingRecipe.java | 4 +- .../crafting/recipe/ManaGunClipRecipe.java | 7 +- .../crafting/recipe/ManaGunLensRecipe.java | 7 +- .../recipe/ManaGunRemoveLensRecipe.java | 7 +- .../crafting/recipe/ManaUpgradeRecipe.java | 1 - .../crafting/recipe/PhantomInkRecipe.java | 6 +- .../crafting/recipe/SpellClothRecipe.java | 9 +- .../recipe/TerraPickTippingRecipe.java | 15 +- .../common/entity/EntityBabylonWeapon.java | 27 +-- .../common/entity/EntityCorporeaSpark.java | 34 ++-- .../common/entity/EntityDoppleganger.java | 174 +++++++++-------- .../common/entity/EntityEnderAirBottle.java | 18 +- .../common/entity/EntityFallingStar.java | 25 +-- .../common/entity/EntityFlameRing.java | 17 +- .../common/entity/EntityMagicLandmine.java | 22 ++- .../common/entity/EntityMagicMissile.java | 50 ++--- .../common/entity/EntityManaBurst.java | 43 +++-- .../common/entity/EntityManaStorm.java | 6 +- .../common/entity/EntityPinkWither.java | 30 +-- .../botania/common/entity/EntityPixie.java | 33 ++-- .../common/entity/EntityPoolMinecart.java | 25 +-- .../common/entity/EntitySignalFlare.java | 14 +- .../botania/common/entity/EntitySpark.java | 29 +-- .../common/entity/EntityThornChakram.java | 53 +++--- .../common/entity/EntityThrowableCopy.java | 30 +-- .../common/entity/EntityThrownItem.java | 17 +- .../botania/common/entity/EntityVineBall.java | 29 +-- .../common/integration/curios/BaseCurio.java | 13 +- .../integration/curios/CurioIntegration.java | 13 +- .../common/integration/curios/RelicCurio.java | 18 +- .../integration/curios/RenderableCurio.java | 10 +- .../botania/common/item/Item16Colors.java | 7 +- .../botania/common/item/ItemAncientWill.java | 7 +- .../botania/common/item/ItemAstrolabe.java | 69 +++---- .../common/item/ItemAutocraftingHalo.java | 6 +- .../botania/common/item/ItemBaubleBox.java | 32 ++-- .../common/item/ItemBlackHoleTalisman.java | 67 ++++--- .../botania/common/item/ItemBlackLotus.java | 10 +- .../botania/common/item/ItemBottledMana.java | 81 ++++---- .../botania/common/item/ItemCacophonium.java | 72 +++---- .../common/item/ItemCorporeaSpark.java | 18 +- .../botania/common/item/ItemCraftPattern.java | 12 +- .../botania/common/item/ItemCraftingHalo.java | 139 ++++++++------ .../botania/common/item/ItemEnderHand.java | 30 +-- .../botania/common/item/ItemFertilizer.java | 18 +- .../botania/common/item/ItemFlowerBag.java | 66 ++++--- .../botania/common/item/ItemGaiaHead.java | 36 ++-- .../botania/common/item/ItemGrassSeeds.java | 30 +-- .../vazkii/botania/common/item/ItemHorn.java | 39 ++-- .../botania/common/item/ItemKeepIvy.java | 38 ++-- .../botania/common/item/ItemLaputaShard.java | 53 +++--- .../botania/common/item/ItemLexicon.java | 69 ++++--- .../botania/common/item/ItemManaCookie.java | 7 +- .../botania/common/item/ItemManaGun.java | 66 ++++--- .../botania/common/item/ItemManaMirror.java | 25 +-- .../botania/common/item/ItemManaTablet.java | 4 +- .../common/item/ItemObedienceStick.java | 9 +- .../botania/common/item/ItemOpenBucket.java | 35 ++-- .../common/item/ItemOvergrowthSeed.java | 24 +-- .../botania/common/item/ItemPinkinator.java | 36 ++-- .../botania/common/item/ItemPoolMinecart.java | 30 +-- .../botania/common/item/ItemSextant.java | 56 +++--- .../botania/common/item/ItemSlimeBottle.java | 2 +- .../botania/common/item/ItemSlingshot.java | 34 ++-- .../vazkii/botania/common/item/ItemSpark.java | 14 +- .../botania/common/item/ItemSpawnerMover.java | 55 +++--- .../common/item/ItemTemperanceStone.java | 24 +-- .../botania/common/item/ItemThornChakram.java | 15 +- .../botania/common/item/ItemTwigWand.java | 73 +++---- .../botania/common/item/ItemVineBall.java | 15 +- .../vazkii/botania/common/item/ItemVirus.java | 52 ++--- .../botania/common/item/ItemWaterBowl.java | 4 +- .../botania/common/item/ItemWorldSeed.java | 17 +- .../vazkii/botania/common/item/ModItems.java | 32 ++-- .../common/item/block/ItemBlockMod.java | 5 +- .../common/item/block/ItemBlockPool.java | 4 +- .../item/block/ItemBlockSpecialFlower.java | 14 +- .../item/block/ItemBlockTinyPotato.java | 11 +- .../common/item/brew/ItemBrewBase.java | 60 +++--- .../common/item/brew/ItemIncenseStick.java | 27 +-- .../armor/elementium/ItemElementiumArmor.java | 24 +-- .../armor/elementium/ItemElementiumBoots.java | 4 +- .../armor/elementium/ItemElementiumChest.java | 4 +- .../armor/elementium/ItemElementiumHelm.java | 9 +- .../armor/elementium/ItemElementiumLegs.java | 4 +- .../armor/manasteel/ItemManasteelArmor.java | 79 ++++---- .../armor/manasteel/ItemManasteelHelm.java | 8 +- .../armor/manaweave/ItemManaweaveArmor.java | 32 ++-- .../armor/manaweave/ItemManaweaveHelm.java | 18 +- .../armor/terrasteel/ItemTerrasteelArmor.java | 32 ++-- .../armor/terrasteel/ItemTerrasteelHelm.java | 45 +++-- .../item/equipment/bauble/ItemAuraRing.java | 11 +- .../equipment/bauble/ItemBalanceCloak.java | 5 +- .../item/equipment/bauble/ItemBauble.java | 33 ++-- .../equipment/bauble/ItemBaubleCosmetic.java | 31 +-- .../equipment/bauble/ItemBloodPendant.java | 51 ++--- .../equipment/bauble/ItemCloudPendant.java | 25 +-- .../item/equipment/bauble/ItemDivaCharm.java | 30 +-- .../item/equipment/bauble/ItemDodgeRing.java | 20 +- .../equipment/bauble/ItemFlightTiara.java | 56 +++--- .../equipment/bauble/ItemGoddessCharm.java | 14 +- .../equipment/bauble/ItemGreaterAuraRing.java | 10 +- .../item/equipment/bauble/ItemHolyCloak.java | 21 ++- .../item/equipment/bauble/ItemIcePendant.java | 22 ++- .../bauble/ItemInvisibilityCloak.java | 31 +-- .../item/equipment/bauble/ItemItemFinder.java | 74 ++++---- .../equipment/bauble/ItemKnockbackBelt.java | 12 +- .../equipment/bauble/ItemLavaPendant.java | 17 +- .../item/equipment/bauble/ItemMagnetRing.java | 14 +- .../item/equipment/bauble/ItemMiningRing.java | 29 +-- .../item/equipment/bauble/ItemMonocle.java | 40 ++-- .../item/equipment/bauble/ItemReachRing.java | 5 +- .../equipment/bauble/ItemSpeedUpBelt.java | 8 +- .../bauble/ItemSuperCloudPendant.java | 8 +- .../bauble/ItemSuperLavaPendant.java | 20 +- .../item/equipment/bauble/ItemSwapRing.java | 21 ++- .../item/equipment/bauble/ItemThirdEye.java | 37 ++-- .../item/equipment/bauble/ItemTinyPlanet.java | 27 +-- .../item/equipment/bauble/ItemTravelBelt.java | 30 +-- .../equipment/bauble/ItemUnholyCloak.java | 11 +- .../item/equipment/bauble/ItemWaterRing.java | 29 ++- .../item/equipment/tool/ItemEnderDagger.java | 23 ++- .../item/equipment/tool/ItemGlassPick.java | 3 +- .../item/equipment/tool/ItemStarSword.java | 13 +- .../item/equipment/tool/ItemThunderSword.java | 29 +-- .../item/equipment/tool/ToolCommons.java | 46 ++--- .../equipment/tool/bow/ItemCrystalBow.java | 21 ++- .../equipment/tool/bow/ItemLivingwoodBow.java | 76 ++++---- .../tool/elementium/ItemElementiumAxe.java | 43 +++-- .../tool/elementium/ItemElementiumShears.java | 23 ++- .../tool/elementium/ItemElementiumShovel.java | 11 +- .../tool/manasteel/ItemManasteelAxe.java | 36 ++-- .../tool/manasteel/ItemManasteelPick.java | 31 +-- .../tool/manasteel/ItemManasteelShears.java | 32 ++-- .../tool/manasteel/ItemManasteelShovel.java | 47 ++--- .../tool/manasteel/ItemManasteelSword.java | 18 +- .../tool/terrasteel/ItemTerraAxe.java | 21 ++- .../tool/terrasteel/ItemTerraPick.java | 41 ++-- .../tool/terrasteel/ItemTerraSword.java | 26 +-- .../ItemElementiumHelmRevealing.java | 6 +- .../ItemManasteelHelmRevealing.java | 7 +- .../ItemTerrasteelHelmRevealing.java | 6 +- .../botania/common/item/lens/ItemLens.java | 28 +-- .../vazkii/botania/common/item/lens/Lens.java | 9 +- .../botania/common/item/lens/LensBounce.java | 10 +- .../botania/common/item/lens/LensDamage.java | 15 +- .../common/item/lens/LensExplosive.java | 5 +- .../botania/common/item/lens/LensFire.java | 11 +- .../common/item/lens/LensFirework.java | 24 ++- .../botania/common/item/lens/LensFlare.java | 5 +- .../common/item/lens/LensInfluence.java | 26 +-- .../botania/common/item/lens/LensLight.java | 11 +- .../botania/common/item/lens/LensMagnet.java | 5 +- .../botania/common/item/lens/LensMine.java | 17 +- .../botania/common/item/lens/LensPaint.java | 38 ++-- .../botania/common/item/lens/LensPhantom.java | 5 +- .../botania/common/item/lens/LensPiston.java | 14 +- .../common/item/lens/LensRedirect.java | 4 +- .../botania/common/item/lens/LensStorm.java | 4 +- .../common/item/lens/LensTripwire.java | 8 +- .../botania/common/item/lens/LensWarp.java | 6 +- .../botania/common/item/lens/LensWeight.java | 19 +- .../botania/common/item/material/ItemDye.java | 39 ++-- .../common/item/material/ItemEnderAir.java | 20 +- .../item/material/ItemManaResource.java | 9 +- .../common/item/material/ItemPetal.java | 6 +- .../common/item/record/ItemModRecord.java | 4 +- .../botania/common/item/relic/ItemDice.java | 33 ++-- .../common/item/relic/ItemFlugelEye.java | 50 ++--- .../common/item/relic/ItemInfiniteFruit.java | 30 +-- .../common/item/relic/ItemKingKey.java | 28 +-- .../common/item/relic/ItemLokiRing.java | 47 +++-- .../common/item/relic/ItemOdinRing.java | 11 +- .../botania/common/item/relic/ItemRelic.java | 43 +++-- .../common/item/relic/ItemRelicBauble.java | 14 +- .../common/item/relic/ItemThorRing.java | 5 +- .../common/item/rod/ItemCobbleRod.java | 17 +- .../botania/common/item/rod/ItemDirtRod.java | 39 ++-- .../common/item/rod/ItemDiviningRod.java | 19 +- .../common/item/rod/ItemExchangeRod.java | 76 ++++---- .../botania/common/item/rod/ItemFireRod.java | 17 +- .../common/item/rod/ItemGravityRod.java | 58 +++--- .../common/item/rod/ItemMissileRod.java | 28 +-- .../common/item/rod/ItemRainbowRod.java | 15 +- .../common/item/rod/ItemSkyDirtRod.java | 22 ++- .../botania/common/item/rod/ItemSmeltRod.java | 46 +++-- .../common/item/rod/ItemTerraformRod.java | 64 ++++--- .../common/item/rod/ItemTornadoRod.java | 35 ++-- .../botania/common/item/rod/ItemWaterRod.java | 51 ++--- .../botania/common/lexicon/LexiconData.java | 5 +- .../common/lexicon/RelicLexiconEntry.java | 4 +- .../common/lexicon/TutLexiconEntry.java | 3 +- .../lexicon/page/PageCraftingRecipe.java | 10 +- .../common/lexicon/page/PageElvenRecipe.java | 15 +- .../common/lexicon/page/PageEntity.java | 4 +- .../common/lexicon/page/PageGuide.java | 7 +- .../common/lexicon/page/PageImage.java | 7 +- .../common/lexicon/page/PageLoreText.java | 6 +- .../lexicon/page/PageManaInfusionRecipe.java | 11 +- .../common/lexicon/page/PageMultiblock.java | 20 +- .../common/lexicon/page/PagePetalRecipe.java | 11 +- .../common/lexicon/page/PageRecipe.java | 9 +- .../common/lexicon/page/PageRuneRecipe.java | 2 +- .../common/lexicon/page/PageTerrasteel.java | 9 +- .../common/lexicon/page/PageTutorial.java | 14 +- .../botania/common/network/GuiHandler.java | 20 +- .../common/network/PacketBotaniaEffect.java | 9 +- .../botania/common/network/PacketDodge.java | 10 +- .../botania/common/network/PacketHandler.java | 18 +- .../botania/common/network/PacketItemAge.java | 7 +- .../botania/common/network/PacketJump.java | 4 +- .../common/world/MysticalFlowerFeature.java | 26 +-- .../common/world/SkyblockWorldEvents.java | 60 +++--- .../common/world/WorldTypeSkyblock.java | 18 +- 650 files changed, 7307 insertions(+), 6234 deletions(-) diff --git a/build.gradle b/build.gradle index 5cb38796b..21772aee1 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ archivesBaseName = config.mod_name sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { - mappings channel: 'snapshot', version: '20190313-1.13.2' + mappings channel: 'snapshot', version: '20190607-1.14.2' accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { client { @@ -58,10 +58,6 @@ minecraft { // replaceIn 'LibMisc.java' //I may have missed another file, though I can only find it in here. } -dependencies { - minecraft 'net.minecraftforge:forge:1.13.2-25.0.209' -} - repositories { mavenCentral() maven { @@ -84,18 +80,33 @@ repositories { } } -if (System.getenv().BUILD_NUMBER != null) { - //adds the build number to the end of the version string if on a build server - version += ".${System.getenv().BUILD_NUMBER}" -} - //This here is for SCP configurations { sshAntTask } - //End of the SCP config +dependencies { + minecraft 'net.minecraftforge:forge:1.14.2-26.0.5' + + //deobfCompile "com.mod-buildcraft:buildcraft-api:7.99.17" + //deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" + //compileOnly fg.deobf("mezz.jei:jei-1.13.2:5.0.0.20:api") + // runtimeOnly fg.deobf("mezz.jei:jei-1.13.2:5.0.0.20") + + //compileOnly fg.deobf("top.theillusivec4.curios:curios:1.13.2-0.11:api") + //runtimeOnly fg.deobf("top.theillusivec4.curios:curios:1.13.2-0.11") + //deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" + + //and a bit more for SCP + sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" +} + +if (System.getenv().BUILD_NUMBER != null) { + //adds the build number to the end of the version string if on a build server + version += ".${System.getenv().BUILD_NUMBER}" +} + jar { manifest { attributes(["Specification-Title": "botania", @@ -115,20 +126,6 @@ jar { exclude "**/*.exe" } -dependencies { - //deobfCompile "com.mod-buildcraft:buildcraft-api:7.99.17" - //deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" - compileOnly fg.deobf("mezz.jei:jei-1.13.2:5.0.0.20:api") - runtimeOnly fg.deobf("mezz.jei:jei-1.13.2:5.0.0.20") - - compileOnly fg.deobf("top.theillusivec4.curios:curios:1.13.2-0.11:api") - runtimeOnly fg.deobf("top.theillusivec4.curios:curios:1.13.2-0.11") - //deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" - - //and a bit more for SCP - sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" -} - task deobfJar(type: Jar) { from(sourceSets.main.output) archiveName = "${baseName} ${version}-deobf.${extension}" diff --git a/build.properties b/build.properties index 5e598177a..522b343d9 100644 --- a/build.properties +++ b/build.properties @@ -7,5 +7,5 @@ dir_repo=./ mc_mappings=stable_39 version=r1.10 dir_output=../Build Output/Botania/ -mc_version=1.12.2 +mc_version=1.14.2 build_number=361 diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 6871f762b..db13edf28 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -12,12 +12,15 @@ package vazkii.botania.api; import com.google.common.base.Preconditions; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; -import net.minecraft.init.SoundEvents; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.EnumRarity; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.DyeColor; +import net.minecraft.item.Rarity; +import net.minecraft.util.SoundEvents; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.DyeColor; +import net.minecraft.item.Rarity; import net.minecraft.item.IArmorMaterial; import net.minecraft.item.IItemTier; import net.minecraft.item.Item; @@ -25,6 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; +import net.minecraft.util.SoundEvents; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; @@ -77,19 +81,19 @@ public final class BotaniaAPI { public static Map oreWeights = Collections.emptyMap(); public static Map oreWeightsNether = Collections.emptyMap(); - public static Map, Function> paintableBlocks = Collections.emptyMap(); + public static Map, Function> paintableBlocks = Collections.emptyMap(); public static final Set> gravityRodBlacklist = new LinkedHashSet<>(); private static final int[] MAX_DAMAGE_ARRAY = new int[]{13, 15, 16, 11}; public static final IArmorMaterial MANASTEEL_ARMOR_MAT = new IArmorMaterial() { private final int[] damageReduction = { 2, 5, 6, 2 }; @Override - public int getDurability(EntityEquipmentSlot slotIn) { + public int getDurability(EquipmentSlotType slotIn) { return 16 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; } @Override - public int getDamageReductionAmount(EntityEquipmentSlot slotIn) { + public int getDamageReductionAmount(EquipmentSlotType slotIn) { return damageReduction[slotIn.getIndex()]; } @@ -156,12 +160,12 @@ public final class BotaniaAPI { public static final IArmorMaterial ELEMENTIUM_ARMOR_MAT = new IArmorMaterial() { private final int[] damageReduction = { 2, 5, 6, 2 }; @Override - public int getDurability(EntityEquipmentSlot slotIn) { + public int getDurability(EquipmentSlotType slotIn) { return 18 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; } @Override - public int getDamageReductionAmount(EntityEquipmentSlot slotIn) { + public int getDamageReductionAmount(EquipmentSlotType slotIn) { return damageReduction[slotIn.getIndex()]; } @@ -228,12 +232,12 @@ public final class BotaniaAPI { public static final IArmorMaterial TERRASTEEL_ARMOR_MAT = new IArmorMaterial() { private final int[] damageReduction = { 3, 6, 8, 3 }; @Override - public int getDurability(EntityEquipmentSlot slotIn) { + public int getDurability(EquipmentSlotType slotIn) { return 34 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; } @Override - public int getDamageReductionAmount(EntityEquipmentSlot slotIn) { + public int getDamageReductionAmount(EquipmentSlotType slotIn) { return damageReduction[slotIn.getIndex()]; } @@ -299,12 +303,12 @@ public final class BotaniaAPI { public static final IArmorMaterial MANAWEAVE_ARMOR_MAT = new IArmorMaterial() { private final int[] damageReduction = { 1, 2, 2, 1 }; @Override - public int getDurability(EntityEquipmentSlot slotIn) { + public int getDurability(EquipmentSlotType slotIn) { return 5 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; } @Override - public int getDamageReductionAmount(EntityEquipmentSlot slotIn) { + public int getDamageReductionAmount(EquipmentSlotType slotIn) { return damageReduction[slotIn.getIndex()]; } @@ -335,7 +339,7 @@ public final class BotaniaAPI { } }; - public static final EnumRarity rarityRelic = EnumRarity.EPIC; // todo 1.13 EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); + public static final Rarity rarityRelic = Rarity.EPIC; // todo 1.13 EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); public static final KnowledgeType basicKnowledge; public static final KnowledgeType elvenKnowledge; @@ -436,7 +440,7 @@ public final class BotaniaAPI { * @param outputState The blockstate to be placed upon recipe completion. * @return The recipe created. */ - public static RecipePureDaisy registerPureDaisyRecipe(Object input, IBlockState outputState) { + public static RecipePureDaisy registerPureDaisyRecipe(Object input, BlockState outputState) { return registerPureDaisyRecipe(input, outputState, RecipePureDaisy.DEFAULT_TIME); } @@ -448,7 +452,7 @@ public final class BotaniaAPI { * The Pure Daisy only ticks one block at a time in a round robin fashion. * @return The recipe created. */ - public static RecipePureDaisy registerPureDaisyRecipe(Object input, IBlockState outputState, int time) { + public static RecipePureDaisy registerPureDaisyRecipe(Object input, BlockState outputState, int time) { RecipePureDaisy recipe = new RecipePureDaisy(input, outputState, time); pureDaisyRecipes.add(recipe); return recipe; diff --git a/src/main/java/vazkii/botania/api/ColorHelper.java b/src/main/java/vazkii/botania/api/ColorHelper.java index 2ef52538a..346d86ab4 100644 --- a/src/main/java/vazkii/botania/api/ColorHelper.java +++ b/src/main/java/vazkii/botania/api/ColorHelper.java @@ -3,113 +3,111 @@ package vazkii.botania.api; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.EnumDyeColor; +import net.minecraft.block.Blocks; +import net.minecraft.item.DyeColor; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLModIdMappingEvent; -import java.util.function.Function; - @Mod.EventBusSubscriber(modid = "botania") public final class ColorHelper { - public static final BiMap STAINED_GLASS_MAP = HashBiMap.create(); - public static final BiMap STAINED_GLASS_PANE_MAP = HashBiMap.create(); - public static final BiMap TERRACOTTA_MAP = HashBiMap.create(); - public static final BiMap WOOL_MAP = HashBiMap.create(); - public static final BiMap CARPET_MAP = HashBiMap.create(); + public static final BiMap STAINED_GLASS_MAP = HashBiMap.create(); + public static final BiMap STAINED_GLASS_PANE_MAP = HashBiMap.create(); + public static final BiMap TERRACOTTA_MAP = HashBiMap.create(); + public static final BiMap WOOL_MAP = HashBiMap.create(); + public static final BiMap CARPET_MAP = HashBiMap.create(); @SubscribeEvent public static void idShift(FMLModIdMappingEvent evt) { STAINED_GLASS_MAP.clear(); - STAINED_GLASS_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.LIME, Blocks.LIME_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.PINK, Blocks.PINK_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.RED, Blocks.RED_STAINED_GLASS); - STAINED_GLASS_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.WHITE, Blocks.WHITE_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.LIME, Blocks.LIME_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.PINK, Blocks.PINK_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.GRAY, Blocks.GRAY_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.CYAN, Blocks.CYAN_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.BLUE, Blocks.BLUE_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.BROWN, Blocks.BROWN_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.GREEN, Blocks.GREEN_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.RED, Blocks.RED_STAINED_GLASS); + STAINED_GLASS_MAP.put(DyeColor.BLACK, Blocks.BLACK_STAINED_GLASS); STAINED_GLASS_PANE_MAP.clear(); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.LIME, Blocks.LIME_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.PINK, Blocks.PINK_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.RED, Blocks.RED_STAINED_GLASS_PANE); - STAINED_GLASS_PANE_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.WHITE, Blocks.WHITE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.LIME, Blocks.LIME_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.PINK, Blocks.PINK_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.GRAY, Blocks.GRAY_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.CYAN, Blocks.CYAN_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.BLUE, Blocks.BLUE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.BROWN, Blocks.BROWN_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.GREEN, Blocks.GREEN_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.RED, Blocks.RED_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(DyeColor.BLACK, Blocks.BLACK_STAINED_GLASS_PANE); TERRACOTTA_MAP.clear(); - TERRACOTTA_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.LIME, Blocks.LIME_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.PINK, Blocks.PINK_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.RED, Blocks.RED_TERRACOTTA); - TERRACOTTA_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.WHITE, Blocks.WHITE_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.LIME, Blocks.LIME_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.PINK, Blocks.PINK_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.GRAY, Blocks.GRAY_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.CYAN, Blocks.CYAN_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.BLUE, Blocks.BLUE_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.BROWN, Blocks.BROWN_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.GREEN, Blocks.GREEN_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.RED, Blocks.RED_TERRACOTTA); + TERRACOTTA_MAP.put(DyeColor.BLACK, Blocks.BLACK_TERRACOTTA); WOOL_MAP.clear(); - WOOL_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_WOOL); - WOOL_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_WOOL); - WOOL_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_WOOL); - WOOL_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_WOOL); - WOOL_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_WOOL); - WOOL_MAP.put(EnumDyeColor.LIME, Blocks.LIME_WOOL); - WOOL_MAP.put(EnumDyeColor.PINK, Blocks.PINK_WOOL); - WOOL_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_WOOL); - WOOL_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_WOOL); - WOOL_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_WOOL); - WOOL_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_WOOL); - WOOL_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_WOOL); - WOOL_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_WOOL); - WOOL_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_WOOL); - WOOL_MAP.put(EnumDyeColor.RED, Blocks.RED_WOOL); - WOOL_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_WOOL); + WOOL_MAP.put(DyeColor.WHITE, Blocks.WHITE_WOOL); + WOOL_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_WOOL); + WOOL_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_WOOL); + WOOL_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_WOOL); + WOOL_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_WOOL); + WOOL_MAP.put(DyeColor.LIME, Blocks.LIME_WOOL); + WOOL_MAP.put(DyeColor.PINK, Blocks.PINK_WOOL); + WOOL_MAP.put(DyeColor.GRAY, Blocks.GRAY_WOOL); + WOOL_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_WOOL); + WOOL_MAP.put(DyeColor.CYAN, Blocks.CYAN_WOOL); + WOOL_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_WOOL); + WOOL_MAP.put(DyeColor.BLUE, Blocks.BLUE_WOOL); + WOOL_MAP.put(DyeColor.BROWN, Blocks.BROWN_WOOL); + WOOL_MAP.put(DyeColor.GREEN, Blocks.GREEN_WOOL); + WOOL_MAP.put(DyeColor.RED, Blocks.RED_WOOL); + WOOL_MAP.put(DyeColor.BLACK, Blocks.BLACK_WOOL); CARPET_MAP.clear(); - CARPET_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_CARPET); - CARPET_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_CARPET); - CARPET_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_CARPET); - CARPET_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_CARPET); - CARPET_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_CARPET); - CARPET_MAP.put(EnumDyeColor.LIME, Blocks.LIME_CARPET); - CARPET_MAP.put(EnumDyeColor.PINK, Blocks.PINK_CARPET); - CARPET_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_CARPET); - CARPET_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_CARPET); - CARPET_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_CARPET); - CARPET_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_CARPET); - CARPET_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_CARPET); - CARPET_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_CARPET); - CARPET_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_CARPET); - CARPET_MAP.put(EnumDyeColor.RED, Blocks.RED_CARPET); - CARPET_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_CARPET); + CARPET_MAP.put(DyeColor.WHITE, Blocks.WHITE_CARPET); + CARPET_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_CARPET); + CARPET_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_CARPET); + CARPET_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_CARPET); + CARPET_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_CARPET); + CARPET_MAP.put(DyeColor.LIME, Blocks.LIME_CARPET); + CARPET_MAP.put(DyeColor.PINK, Blocks.PINK_CARPET); + CARPET_MAP.put(DyeColor.GRAY, Blocks.GRAY_CARPET); + CARPET_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_CARPET); + CARPET_MAP.put(DyeColor.CYAN, Blocks.CYAN_CARPET); + CARPET_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_CARPET); + CARPET_MAP.put(DyeColor.BLUE, Blocks.BLUE_CARPET); + CARPET_MAP.put(DyeColor.BROWN, Blocks.BROWN_CARPET); + CARPET_MAP.put(DyeColor.GREEN, Blocks.GREEN_CARPET); + CARPET_MAP.put(DyeColor.RED, Blocks.RED_CARPET); + CARPET_MAP.put(DyeColor.BLACK, Blocks.BLACK_CARPET); } private ColorHelper() {} diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index 406d5ab80..3850d9941 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -11,6 +11,7 @@ package vazkii.botania.api.boss; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.ServerBossInfo; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.ShaderCallback; @@ -54,7 +55,7 @@ public interface IBotaniaBoss { public int bossBarRenderCallback(int x, int y); /** - * Get the serverside UUID of the {@link net.minecraft.world.BossInfoServer} instance tracking this boss + * Get the serverside UUID of the {@link ServerBossInfo} instance tracking this boss * 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. diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index d91f0d780..824ac5b49 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -12,7 +12,7 @@ package vazkii.botania.api.brew; import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.EffectInstance; import java.util.List; @@ -25,7 +25,7 @@ public class Brew { private final String name; private final int color; private final int cost; - private final List effects; + private final List effects; private boolean canInfuseBloodPendant = true; private boolean canInfuseIncense = true; @@ -36,7 +36,7 @@ public class Brew { * @param cost The cost, in Mana for this brew. * @param effects A list of effects to apply to the player when they drink it. */ - public Brew(String key, String name, int color, int cost, PotionEffect... effects) { + public Brew(String key, String name, int color, int cost, EffectInstance... effects) { this.key = key; this.name = name; this.color = color; @@ -118,7 +118,7 @@ public class Brew { * Note that for the lexicon, this passes in a botania Managlass * Vial or an Alfglass Flask at all times. */ - public List getPotionEffects(ItemStack stack) { + public List getPotionEffects(ItemStack stack) { return effects; } diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaIndexRequestEvent.java b/src/main/java/vazkii/botania/api/corporea/CorporeaIndexRequestEvent.java index 670531e2d..f4d0b20fd 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaIndexRequestEvent.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaIndexRequestEvent.java @@ -9,7 +9,7 @@ */ package vazkii.botania.api.corporea; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; @@ -19,12 +19,12 @@ import net.minecraftforge.eventbus.api.Event; * */ @Cancelable public class CorporeaIndexRequestEvent extends Event { - public final EntityPlayerMP requester; + public final ServerPlayerEntity requester; public String request; public int requestCount; public ICorporeaSpark indexSpark; - public CorporeaIndexRequestEvent(EntityPlayerMP requester, String request, int requestCount, ICorporeaSpark indexSpark) { + public CorporeaIndexRequestEvent(ServerPlayerEntity requester, String request, int requestCount, ICorporeaSpark indexSpark) { this.requester = requester; this.request = request; this.requestCount = requestCount; diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java index bb25d9841..7a16ae3c8 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java @@ -10,7 +10,7 @@ */ package vazkii.botania.api.corporea; -import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; import java.util.List; @@ -82,6 +82,6 @@ public interface ICorporeaSpark { * Gets the network that this spark is on, or the color it's displaying. Sparks may only connect to others * of the same network, and on changing network should trigger a re-cache of the previous network. */ - public EnumDyeColor getNetwork(); + public DyeColor getNetwork(); } diff --git a/src/main/java/vazkii/botania/api/imc/PaintableBlockMessage.java b/src/main/java/vazkii/botania/api/imc/PaintableBlockMessage.java index 9ac5075c5..8349d8f93 100644 --- a/src/main/java/vazkii/botania/api/imc/PaintableBlockMessage.java +++ b/src/main/java/vazkii/botania/api/imc/PaintableBlockMessage.java @@ -1,7 +1,8 @@ package vazkii.botania.api.imc; import net.minecraft.block.Block; -import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.DyeColor; +import net.minecraft.item.DyeColor; import net.minecraftforge.registries.IRegistryDelegate; import java.util.ArrayList; @@ -10,13 +11,13 @@ import java.util.function.Function; public class PaintableBlockMessage { private final IRegistryDelegate block; - private final Function transformer; + private final Function transformer; /** * @param transformer Lookup function from color to destination block * @param block The block being converted */ - public PaintableBlockMessage(Function transformer, Block block) { + public PaintableBlockMessage(Function transformer, Block block) { this.block = block.delegate; this.transformer = transformer; } @@ -25,7 +26,7 @@ public class PaintableBlockMessage { return block; } - public Function getTransformer() { + public Function getTransformer() { return transformer; } } diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 6f0311090..40f43d591 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -11,11 +11,12 @@ package vazkii.botania.api.internal; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -137,7 +138,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) {} @Override - public IItemHandlerModifiable getAccessoriesInventory(EntityPlayer player) { + public IItemHandlerModifiable getAccessoriesInventory(PlayerEntity player) { return null; } @@ -162,7 +163,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) {} + public void breakOnAllCursors(PlayerEntity player, Item item, ItemStack stack, BlockPos pos, Direction side) {} @Override public boolean hasSolegnoliaAround(Entity e) { diff --git a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java index d774079ee..27eaefc4e 100644 --- a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java @@ -10,7 +10,8 @@ */ package vazkii.botania.api.internal; -import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.widget.button.Button; +import net.minecraft.client.gui.widget.button.Button; import vazkii.botania.api.lexicon.LexiconEntry; import java.util.List; @@ -60,7 +61,7 @@ public interface IGuiLexiconEntry { /** * Gets the list of buttons in this gui. */ - public List getButtonList(); + public List