From 0996ffbcca95da531682c94795e508b22c41dea6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Feb 2019 23:58:58 -0600 Subject: [PATCH] Minor tweaks, full replace sideonly/side with onlyin/dist --- .../vazkii/botania/api/BotaniaAPIClient.java | 6 +-- .../vazkii/botania/api/boss/IBotaniaBoss.java | 6 +-- .../botania/api/internal/DummyPage.java | 6 +-- .../api/internal/IInternalMethodHandler.java | 12 ++--- .../botania/api/lexicon/LexiconEntry.java | 6 +-- .../botania/api/lexicon/LexiconPage.java | 18 +++---- .../component/MultiblockComponent.java | 6 +-- .../api/mana/IPoolOverlayProvider.java | 6 +-- .../botania/api/subtile/SubTileEntity.java | 14 +++--- .../api/subtile/SubTileFunctional.java | 6 +-- .../api/subtile/SubTileGenerating.java | 6 +-- .../api/subtile/signature/BasicSignature.java | 6 +-- .../subtile/signature/SubTileSignature.java | 6 +-- .../vazkii/botania/api/wand/IWandHUD.java | 6 +-- .../core/handler/AstrolabePreviewHandler.java | 2 +- .../handler/BlockHighlightRenderHandler.java | 2 +- .../client/core/handler/BossBarHandler.java | 2 +- .../core/handler/ClientTickHandler.java | 2 +- .../core/handler/CorporeaInputHandler.java | 2 +- .../client/core/handler/DebugHandler.java | 2 +- .../client/core/handler/HUDHandler.java | 2 +- .../handler/ItemsRemainingRenderHandler.java | 8 ++-- .../client/core/handler/LightningHandler.java | 2 +- .../client/core/handler/ModelHandler.java | 2 +- .../core/handler/MultiblockRenderHandler.java | 2 +- .../client/core/handler/RenderLexicon.java | 2 +- .../TooltipAdditionDisplayHandler.java | 2 +- .../client/core/handler/TooltipHandler.java | 2 +- .../client/core/proxy/ClientProxy.java | 2 +- .../client/gui/box/ContainerBaubleBox.java | 6 +-- .../botania/client/render/IModelRegister.java | 6 +-- .../render/world/SkyblockRenderEvents.java | 2 +- .../botania/common/block/BlockAltGrass.java | 6 +-- .../botania/common/block/BlockAltar.java | 6 +-- .../common/block/BlockAnimatedTorch.java | 8 ++-- .../botania/common/block/BlockAvatar.java | 6 +-- .../common/block/BlockBifrostPerm.java | 6 +-- .../common/block/BlockCraftyCrate.java | 6 +-- .../botania/common/block/BlockFelPumpkin.java | 6 +-- .../block/BlockFloatingSpecialFlower.java | 8 ++-- .../botania/common/block/BlockGaiaHead.java | 6 +-- .../botania/common/block/BlockGhostRail.java | 6 +-- .../botania/common/block/BlockHourglass.java | 8 ++-- .../botania/common/block/BlockLightRelay.java | 6 +-- .../botania/common/block/BlockLivingrock.java | 6 +-- .../botania/common/block/BlockLivingwood.java | 6 +-- .../common/block/BlockModDoubleFlower.java | 8 ++-- .../common/block/BlockModDoubleFlower1.java | 6 +-- .../common/block/BlockModDoubleFlower2.java | 6 +-- .../botania/common/block/BlockModFlower.java | 8 ++-- .../botania/common/block/BlockPlatform.java | 4 +- .../botania/common/block/BlockPylon.java | 6 +-- .../common/block/BlockSpecialFlower.java | 8 ++-- .../common/block/BlockTeruTeruBozu.java | 6 +-- .../corporea/BlockCorporeaCrystalCube.java | 6 +-- .../block/corporea/BlockCorporeaIndex.java | 6 +-- .../common/block/decor/BlockBuriedPetals.java | 10 ++-- .../block/decor/BlockFloatingFlower.java | 10 ++-- .../common/block/decor/BlockManaGlass.java | 8 ++-- .../common/block/decor/BlockModMushroom.java | 8 ++-- .../common/block/decor/BlockPavement.java | 6 +-- .../common/block/decor/BlockPetalBlock.java | 4 +- .../common/block/decor/BlockShinyFlower.java | 6 +-- .../common/block/decor/BlockStarfield.java | 6 +-- .../decor/biomestone/BlockBiomeStone.java | 4 +- .../decor/biomestone/BlockBiomeStoneA.java | 6 +-- .../decor/biomestone/BlockBiomeStoneB.java | 6 +-- .../block/decor/panes/BlockAlfglassPane.java | 8 ++-- .../block/decor/panes/BlockBifrostPane.java | 8 ++-- .../block/decor/panes/BlockManaglassPane.java | 8 ++-- .../decor/quartz/BlockSpecialQuartz.java | 6 +-- .../block/decor/slabs/BlockModSlab.java | 6 +-- .../block/decor/stairs/BlockModStairs.java | 6 +-- .../decor/walls/BlockBiomeStoneWall.java | 6 +-- .../block/decor/walls/BlockModWall.java | 6 +-- .../walls/living/BlockDreamwoodWall.java | 6 +-- .../walls/living/BlockLivingrockWall.java | 6 +-- .../walls/living/BlockLivingwoodWall.java | 6 +-- .../block/mana/BlockAlchemyCatalyst.java | 6 +-- .../common/block/mana/BlockBellows.java | 6 +-- .../common/block/mana/BlockBrewery.java | 8 ++-- .../block/mana/BlockConjurationCatalyst.java | 6 +-- .../common/block/mana/BlockEnchanter.java | 8 ++-- .../common/block/mana/BlockManaVoid.java | 6 +-- .../botania/common/block/mana/BlockPool.java | 8 ++-- .../botania/common/block/mana/BlockPrism.java | 6 +-- .../botania/common/block/mana/BlockPump.java | 6 +-- .../common/block/mana/BlockSpreader.java | 6 +-- .../common/block/mana/BlockTurntable.java | 6 +-- .../subtile/functional/SubTileHopperhock.java | 6 +-- .../functional/SubTileRannuncarpus.java | 6 +-- .../functional/SubTileSpectranthemum.java | 4 +- .../subtile/generating/SubTileSpectrolus.java | 6 +-- .../botania/common/block/tile/TileAltar.java | 48 ++++++++----------- .../common/block/tile/TileAnimatedTorch.java | 34 ++++++------- .../common/block/tile/TileHourglass.java | 6 +-- .../common/block/tile/TileSpecialFlower.java | 6 +-- .../common/block/tile/mana/TileBellows.java | 4 +- .../common/block/tile/mana/TilePool.java | 6 +-- .../common/block/tile/mana/TilePump.java | 2 +- .../common/block/tile/mana/TileSpreader.java | 6 +-- .../common/core/version/VersionChecker.java | 2 +- .../common/entity/EntityDoppleganger.java | 4 +- .../common/entity/EntityManaBurst.java | 6 +-- .../buildcraft/TriggerManaDetector.java | 8 ++-- .../buildcraft/TriggerManaLevel.java | 8 ++-- .../buildcraft/TriggerRuneAltarCanCraft.java | 8 ++-- .../botania/common/item/ItemAncientWill.java | 6 +-- .../botania/common/item/ItemAstrolabe.java | 6 +-- .../common/item/ItemBlackHoleTalisman.java | 6 +-- .../botania/common/item/ItemBlackLotus.java | 6 +-- .../botania/common/item/ItemBottledMana.java | 6 +-- .../botania/common/item/ItemCacophonium.java | 6 +-- .../botania/common/item/ItemCraftingHalo.java | 14 +++--- .../botania/common/item/ItemGaiaHead.java | 8 ++-- .../botania/common/item/ItemGrassSeeds.java | 4 +- .../vazkii/botania/common/item/ItemHorn.java | 4 +- .../botania/common/item/ItemLaputaShard.java | 8 ++-- .../botania/common/item/ItemLexicon.java | 10 ++-- .../botania/common/item/ItemManaCookie.java | 6 +-- .../botania/common/item/ItemManaGun.java | 8 ++-- .../botania/common/item/ItemManaTablet.java | 6 +-- .../vazkii/botania/common/item/ItemMod.java | 6 +-- .../botania/common/item/ItemSextant.java | 4 +- .../botania/common/item/ItemSpawnerMover.java | 6 +-- .../common/item/block/ItemBlockPool.java | 6 +-- .../item/block/ItemBlockSpecialFlower.java | 6 +-- .../common/item/brew/ItemBrewBase.java | 2 +- .../armor/elementium/ItemElementiumArmor.java | 10 ++-- .../armor/manasteel/ItemManasteelArmor.java | 22 ++++----- .../armor/manaweave/ItemManaweaveArmor.java | 14 +++--- .../armor/terrasteel/ItemTerrasteelArmor.java | 10 ++-- .../armor/terrasteel/ItemTerrasteelHelm.java | 8 ++-- .../equipment/bauble/ItemBalanceCloak.java | 8 ++-- .../item/equipment/bauble/ItemBauble.java | 8 ++-- .../equipment/bauble/ItemBaubleCosmetic.java | 6 +-- .../equipment/bauble/ItemBloodPendant.java | 8 ++-- .../equipment/bauble/ItemCloudPendant.java | 8 ++-- .../item/equipment/bauble/ItemDivaCharm.java | 6 +-- .../item/equipment/bauble/ItemDodgeRing.java | 8 ++-- .../equipment/bauble/ItemFlightTiara.java | 14 +++--- .../equipment/bauble/ItemGoddessCharm.java | 6 +-- .../item/equipment/bauble/ItemHolyCloak.java | 12 ++--- .../item/equipment/bauble/ItemIcePendant.java | 6 +-- .../item/equipment/bauble/ItemItemFinder.java | 6 +-- .../equipment/bauble/ItemKnockbackBelt.java | 6 +-- .../equipment/bauble/ItemLavaPendant.java | 6 +-- .../item/equipment/bauble/ItemManaRing.java | 4 +- .../item/equipment/bauble/ItemMonocle.java | 8 ++-- .../bauble/ItemSuperCloudPendant.java | 6 +-- .../bauble/ItemSuperLavaPendant.java | 6 +-- .../item/equipment/bauble/ItemThirdEye.java | 6 +-- .../item/equipment/bauble/ItemTinyPlanet.java | 6 +-- .../item/equipment/bauble/ItemTravelBelt.java | 10 ++-- .../equipment/bauble/ItemUnholyCloak.java | 8 ++-- .../tool/manasteel/ItemManasteelAxe.java | 6 +-- .../tool/manasteel/ItemManasteelPick.java | 6 +-- .../tool/manasteel/ItemManasteelShears.java | 6 +-- .../tool/manasteel/ItemManasteelShovel.java | 6 +-- .../tool/manasteel/ItemManasteelSword.java | 6 +-- .../tool/terrasteel/ItemTerraPick.java | 6 +-- .../thaumcraft/ItemManaInkwell.java | 4 +- .../botania/common/item/material/ItemDye.java | 6 +-- .../common/item/material/ItemPetal.java | 6 +-- .../common/item/relic/ItemLokiRing.java | 6 +-- .../botania/common/item/relic/ItemRelic.java | 8 ++-- .../common/item/relic/ItemRelicBauble.java | 6 +-- .../common/item/rod/ItemExchangeRod.java | 6 +-- .../common/lexicon/DogLexiconEntry.java | 6 +-- .../common/lexicon/RelicLexiconEntry.java | 6 +-- .../botania/common/lexicon/page/PageBrew.java | 8 ++-- .../lexicon/page/PageCraftingRecipe.java | 10 ++-- .../common/lexicon/page/PageElvenRecipe.java | 12 ++--- .../common/lexicon/page/PageEntity.java | 10 ++-- .../common/lexicon/page/PageImage.java | 6 +-- .../lexicon/page/PageManaInfusionRecipe.java | 8 ++-- .../common/lexicon/page/PageMultiblock.java | 12 ++--- .../common/lexicon/page/PagePetalRecipe.java | 10 ++-- .../common/lexicon/page/PageRecipe.java | 14 +++--- .../common/lexicon/page/PageRuneRecipe.java | 6 +-- .../common/lexicon/page/PageShedding.java | 8 ++-- .../common/lexicon/page/PageTerrasteel.java | 6 +-- .../botania/common/lexicon/page/PageText.java | 8 ++-- .../common/lexicon/page/PageTutorial.java | 6 +-- .../botania/common/network/PacketHandler.java | 2 +- .../common/world/SkyblockWorldEvents.java | 14 +++--- .../common/world/WorldTypeSkyblock.java | 6 +-- 187 files changed, 645 insertions(+), 653 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java index 8017ee681..dab96c97f 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -11,8 +11,8 @@ package vazkii.botania.api; import com.google.common.collect.Maps; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.subtile.SubTileEntity; @@ -22,7 +22,7 @@ import java.util.Map; /** * Class for API calls that must be made clientside */ -@SideOnly(Side.CLIENT) +@OnlyIn(Dist.CLIENT) public final class BotaniaAPIClient { private static final Map subtileBlockModels = Maps.newHashMap(); diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index 4a8f71700..f6ca9f03e 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -12,8 +12,8 @@ package vazkii.botania.api.boss; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.ShaderCallback; import java.awt.Rectangle; @@ -51,7 +51,7 @@ public interface IBotaniaBoss { * here if needed. * @return How tall your auxiliary renders were */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public int bossBarRenderCallback(ScaledResolution res, int x, int y); /** diff --git a/src/main/java/vazkii/botania/api/internal/DummyPage.java b/src/main/java/vazkii/botania/api/internal/DummyPage.java index 0b73dd4fa..20f0759d6 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyPage.java +++ b/src/main/java/vazkii/botania/api/internal/DummyPage.java @@ -10,8 +10,8 @@ */ package vazkii.botania.api.internal; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.LexiconPage; /** @@ -26,7 +26,7 @@ public class DummyPage extends LexiconPage { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderScreen(IGuiLexiconEntry gui, int x, int y) {} } diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 195d61782..1da937817 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -22,8 +22,8 @@ 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.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; @@ -85,10 +85,10 @@ public interface IInternalMethodHandler { public ResourceLocation getStackSubTileKey(ItemStack stack); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ModelResourceLocation getSubTileBlockModelForName(String name); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ModelResourceLocation getSubTileItemModelForName(String name); public boolean shouldForceCheck(); @@ -103,10 +103,10 @@ public interface IInternalMethodHandler { public boolean hasSolegnoliaAround(Entity e); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound); public ItemStack getBindDisplayForFlowerType(SubTileEntity e); diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 6afe79d42..7db342393 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -12,8 +12,8 @@ package vazkii.botania.api.lexicon; 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 net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import javax.annotation.Nonnull; @@ -86,7 +86,7 @@ public class LexiconEntry implements Comparable { return ""; // Override this if you want a tagline. You probably do } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public boolean isVisible() { return true; } diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java index b958f9d3e..a9097afaf 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java @@ -13,8 +13,8 @@ package vazkii.botania.api.lexicon; import com.google.common.collect.ImmutableList; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.IGuiLexiconEntry; import java.util.List; @@ -34,20 +34,20 @@ public abstract class LexiconPage { * @param mx The mouse's relative X position. * @param my The mouse's relative Y position. */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public abstract void renderScreen(IGuiLexiconEntry gui, int mx, int my); /** * Called per update tick. Non gui-sensitive version, kept for backwards compatibility only. */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void updateScreen() {} /** * Called per update tick. Feel free to override fully, the * call to updateScreen() is for backwards compatibility. */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void updateScreen(IGuiLexiconEntry gui) { updateScreen(); } @@ -56,26 +56,26 @@ public abstract class LexiconPage { * Called when this page is opened, be it via initGui() or when the player changes page. * You can add buttons and whatever you'd do on initGui() here. */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onOpened(IGuiLexiconEntry gui) {} /** * Called when this page is opened, be it via closing the gui or when the player changes page. * Make sure to dispose of anything you don't use any more, such as buttons in the gui's buttonList. */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onClosed(IGuiLexiconEntry gui) {} /** * Called when a button is pressed, equivalent to GuiScreen.actionPerformed. */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onActionPerformed(IGuiLexiconEntry gui, GuiButton button) {} /** * Called when a key is pressed. */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onKeyPressed(char c, int key) {} /** 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 6631068fc..c6fe8ee6c 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 @@ -15,8 +15,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; /** * A component of a multiblock, the normal one @@ -83,7 +83,7 @@ public class MultiblockComponent { return tileEntity; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public boolean shouldDoFancyRender() { return doFancyRender; } diff --git a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java index 0f1711f17..c1130ab4c 100644 --- a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java +++ b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java @@ -13,8 +13,8 @@ package vazkii.botania.api.mana; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; /** * A block that implements this can provide an IIcon (block icons only) @@ -23,7 +23,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; */ public interface IPoolOverlayProvider { - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public TextureAtlasSprite getIcon(World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 6ceb99ba8..a1819889a 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -24,8 +24,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.LexiconEntry; @@ -106,7 +106,7 @@ public class SubTileEntity { /** * Gets the block model path for this subtile */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ModelResourceLocation getBlockModel() { return BotaniaAPI.internalHandler.getSubTileBlockModelForName(getUnlocalizedName()); } @@ -114,7 +114,7 @@ public class SubTileEntity { /** * Gets the item model path for this subtile */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ModelResourceLocation getItemModel() { return BotaniaAPI.internalHandler.getSubTileItemModelForName(getUnlocalizedName()); } @@ -173,7 +173,7 @@ public class SubTileEntity { * Gets the block coordinates this is bound to, for use with the wireframe render * when the sub tile is being hovered with a wand of the forest. */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public BlockPos getBinding() { return null; } @@ -182,7 +182,7 @@ public class SubTileEntity { * Returns a descriptor for the radius of this sub tile. This is called while a player * is looking at the block with a Manaseer Monocle (IBurstViewerBauble). */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public RadiusDescriptor getRadius() { return null; } @@ -212,7 +212,7 @@ public class SubTileEntity { * Called on the client when the block being pointed at is the one with this sub tile. * Used to render a HUD portraying some data from this sub tile. */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) {} /** diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 500b5f29e..9831bf947 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -21,8 +21,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaPool; @@ -215,7 +215,7 @@ public class SubTileFunctional extends SubTileEntity { return linkedPool != null && linkedPool.hasWorld() && !linkedPool.isInvalid() && supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { String name = I18n.format("tile.botania:flower." + getUnlocalizedName() + ".name"); diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index b1f83bd15..191013d87 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -27,8 +27,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; @@ -312,7 +312,7 @@ public class SubTileGenerating extends SubTileEntity { return linkedCollector != null && !linkedCollector.isInvalid() && supertile.getWorld().getTileEntity(linkedCollector.getPos()) == linkedCollector; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { String name = I18n.format("tile.botania:flower." + getUnlocalizedName() + ".name"); 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 ed7b37410..fa9c786c6 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java @@ -15,8 +15,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.SubTileFunctional; @@ -64,7 +64,7 @@ public class BasicSignature implements SubTileSignature { return "botania.flowerType.misc"; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addTooltip(ItemStack stack, World world, List tooltip) { tooltip.add(TextFormatting.BLUE + I18n.translateToLocal(getType())); 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 da1a54ac1..68f5261a2 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java @@ -12,8 +12,8 @@ package vazkii.botania.api.subtile.signature; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.List; @@ -39,7 +39,7 @@ public interface SubTileSignature { /** * Adds additional text to the tooltip. This text is added after getUnlocalizedLoreTextForStack. */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) default void addTooltip(ItemStack stack, World world, List tooltip) {} } diff --git a/src/main/java/vazkii/botania/api/wand/IWandHUD.java b/src/main/java/vazkii/botania/api/wand/IWandHUD.java index eee22fc35..a2269982f 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandHUD.java +++ b/src/main/java/vazkii/botania/api/wand/IWandHUD.java @@ -14,8 +14,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; /** * Any block that implements this has a HUD rendered when being hovered @@ -23,7 +23,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; */ public interface IWandHUD { - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java b/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java index b932e9541..055189eb5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java @@ -24,7 +24,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.helper.ShaderHelper; 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 ada5ba786..d4851f9fc 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -23,7 +23,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import org.lwjgl.opengl.GL11; import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; 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 6016d9690..d45685436 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -16,7 +16,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; import vazkii.botania.api.boss.IBotaniaBoss; 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 fb28c3c8b..814e8d6ec 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -20,7 +20,7 @@ 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.common.gameevent.TickEvent.RenderTickEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.TileSignature; import vazkii.botania.client.gui.lexicon.GuiLexicon; diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaInputHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaInputHandler.java index c3284e2f2..de61cb96f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaInputHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaInputHandler.java @@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.GuiScreenEvent.KeyboardInputEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import org.lwjgl.input.Keyboard; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.client.core.proxy.ClientProxy; 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 724685322..6d098b81d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -22,7 +22,7 @@ import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import org.lwjgl.opengl.ARBFragmentShader; import org.lwjgl.opengl.ContextCapabilities; import org.lwjgl.opengl.GL11; 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 0ac50fe41..e18c1ed2d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -34,7 +34,7 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import org.lwjgl.opengl.GL11; 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 0b7959264..c949801d4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -17,8 +17,8 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import java.util.regex.Pattern; @@ -32,7 +32,7 @@ public final class ItemsRemainingRenderHandler { private static String customString; private static int ticks, count; - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static void render(ScaledResolution resolution, float partTicks) { if(ticks > 0 && !stack.isEmpty()) { int pos = maxTicks - ticks; @@ -86,7 +86,7 @@ public final class ItemsRemainingRenderHandler { } } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static void tick() { if(ticks > 0) --ticks; 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 944305dcb..277d572bd 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -21,7 +21,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import org.lwjgl.opengl.GL11; import vazkii.botania.client.fx.FXLightning; import vazkii.botania.client.fx.ParticleRenderDispatcher; 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 4caa591d8..272d08628 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -21,7 +21,7 @@ import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.registries.IRegistryDelegate; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; 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 f4aa98edf..f18037106 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -31,7 +31,7 @@ import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; 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 5cda7ad7b..6bf7adc70 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -15,7 +15,7 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.client.event.RenderSpecificHandEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; 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 7c647e295..49780e945 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -25,7 +25,7 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.client.event.RenderTooltipEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconRecipeMappings; 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 896959e9e..26a110d85 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -15,7 +15,7 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; import vazkii.botania.common.lib.LibMisc; 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 a743ef3ad..f4a891b61 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -35,7 +35,7 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import org.lwjgl.input.Keyboard; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.lexicon.LexiconEntry; 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 4d5bdef45..3a806a57d 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -19,8 +19,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.client.gui.SlotLocked; @@ -75,7 +75,7 @@ public class ContainerBaubleBox extends Container { || player.getHeldItemOffhand() == baubleBoxInv.box; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void setAll(List l) { baubles.setEventBlock(true); diff --git a/src/main/java/vazkii/botania/client/render/IModelRegister.java b/src/main/java/vazkii/botania/client/render/IModelRegister.java index 1cb0a8495..955deead5 100644 --- a/src/main/java/vazkii/botania/client/render/IModelRegister.java +++ b/src/main/java/vazkii/botania/client/render/IModelRegister.java @@ -1,7 +1,7 @@ package vazkii.botania.client.render; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; public interface IModelRegister { /** @@ -9,6 +9,6 @@ public interface IModelRegister { * For Blocks, statemapper registration needs to be done BEFORE itemblock registration * Exceptions to that rule are noted */ - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) void registerModels(); } diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java index d14449785..97e3b00ca 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -15,7 +15,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.world.WorldTypeSkyblock; diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index e65257e40..72365b087 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -30,8 +30,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -96,7 +96,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { return type == EnumPlantType.Plains || type == EnumPlantType.Beach; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random r) { if (state.getBlock() != this) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index a6d8ec574..43da0b6d7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -33,8 +33,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandlerItem; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; @@ -85,7 +85,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { return AABB; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Nonnull @Override public BlockRenderLayer getRenderLayer() { diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index 7c2b679cd..fb455b4b5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -26,8 +26,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.item.IHourglassTrigger; import vazkii.botania.api.lexicon.ILexiconable; @@ -84,7 +84,7 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileAnimatedTorch) world.getTileEntity(pos)).renderHUD(mc, res); } @@ -164,7 +164,7 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig return LexiconData.animatedTorch; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { super.registerModels(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 3322f04f7..257055a5b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -30,8 +30,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.lexicon.ILexiconable; @@ -155,7 +155,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return LexiconData.avatar; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 2f1eaf425..008c2e624 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -20,8 +20,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.Botania; @@ -69,7 +69,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Nonnull @Override public BlockRenderLayer getRenderLayer() { diff --git a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java index a1db707bf..2e4a48d2f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java @@ -14,8 +14,8 @@ import net.minecraft.world.ChunkCache; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.CratePattern; @@ -67,7 +67,7 @@ public class BlockCraftyCrate extends BlockOpenCrate implements IWandHUD { return LexiconData.craftCrate; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 7bb01b414..c43e0fd26 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -29,8 +29,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -112,7 +112,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { return LexiconData.gardenOfGlass; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerBlockToState(this, 0, getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 242cb5ec7..d669d6ed5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -34,8 +34,8 @@ import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -111,7 +111,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I return true; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) {} @@ -186,7 +186,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I ((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 387d7802f..ba848d97d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -25,8 +25,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; @@ -80,7 +80,7 @@ public class BlockGaiaHead extends BlockSkull implements IModelRegister { return new TileGaiaHead(); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(FACING, NODROP).build()); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 9e03b7c63..20cbaf199 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -25,8 +25,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -111,7 +111,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable, IMode return BlockRailPowered.SHAPE; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerCustomItemblock(this, "ghost_rail"); diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index a2c189a32..8b1efc17a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -32,8 +32,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; @@ -188,7 +188,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return false; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { TileHourglass tile = (TileHourglass) world.getTileEntity(pos); @@ -200,7 +200,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return LexiconData.hourglass; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index a50bf0dbc..8b1de3fb5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -27,8 +27,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -177,7 +177,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return LexiconData.luminizerTransport; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { int i = 0; diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index f28f61b11..0a0d59d07 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -21,8 +21,8 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -86,7 +86,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { return isDefaultVariant ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerBlockToState(this, LivingRockVariant.values().length); diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 4fc579f75..b9be76aaa 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -22,8 +22,8 @@ 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.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -102,7 +102,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.DEFAULT; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerBlockToState(this, LivingWoodVariant.values().length); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 1758cc8f3..da46af8ac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -33,8 +33,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -168,7 +168,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { state = getActualState(state, world, pos); int hex = state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getColorValue(); @@ -209,7 +209,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return new ItemStack(Item.getItemFromBlock(state.getBlock()), 1, state.getValue(prop).ordinal() - (second ? 8 : 0)); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { 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 cfe911174..44186cafc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -5,8 +5,8 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; @@ -50,7 +50,7 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.byMetadata(meta)); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { super.registerModels(); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index 11d5a62f8..2e2bc837a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -5,8 +5,8 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; @@ -51,7 +51,7 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.byMetadata(meta + 8)); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { super.registerModels(); diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 8d4a23a26..286760a61 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -30,8 +30,8 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -118,7 +118,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IGrowab return getMetaFromState(state); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { int hex = state.getValue(BotaniaStateProps.COLOR).getColorValue(); @@ -160,7 +160,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IGrowab world.setBlockState(pos.up(), flower.getDefaultState().withProperty(color.getMetadata() >= 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, color).withProperty(BlockDoublePlant.HALF, BlockDoublePlant.EnumBlockHalf.UPPER), flags); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(getTypeProperty()).build()); diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index b743a24f8..291f23af9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -35,8 +35,8 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaCollisionGhost; diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 0be2ce272..f06940c69 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -29,8 +29,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -114,7 +114,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi return ConfigHandler.enableThaumcraftStablizers; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerInventoryVariant(this); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index b44254447..314120de4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -40,8 +40,8 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -324,13 +324,13 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { // Let custom loader work diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 8262a5161..d4b45aeea 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -28,8 +28,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.handler.ModelHandler; @@ -151,7 +151,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return BlockFaceShape.UNDEFINED; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerCustomItemblock(this, "teru_teru_bozu"); 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 24569f08e..dd40858f3 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -31,8 +31,8 @@ import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.handler.ModelHandler; @@ -121,7 +121,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return BlockFaceShape.UNDEFINED; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerInventoryVariant(this); 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 a0447ec63..77d647442 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -30,8 +30,8 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -108,7 +108,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl } } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerCustomItemblock(this, "corporea_index"); 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 5ea46877e..3e50c79f0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -23,8 +23,8 @@ 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.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; @@ -45,7 +45,7 @@ public class BlockBuriedPetals extends BlockModFlower { @Nonnull @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public Block.EnumOffsetType getOffsetType() { return Block.EnumOffsetType.NONE; } @@ -56,7 +56,7 @@ public class BlockBuriedPetals extends BlockModFlower { return AABB; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { EnumDyeColor color = state.getValue(BotaniaStateProps.COLOR); @@ -93,7 +93,7 @@ public class BlockBuriedPetals extends BlockModFlower { return EnumBlockRenderType.INVISIBLE; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public final void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(getTypeProperty()).build()); 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 28ece574e..8663a80cf 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -40,8 +40,8 @@ import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IFloatingFlower; @@ -92,7 +92,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Nonnull - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; @@ -131,7 +131,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu return state; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { int hex = state.getValue(BotaniaStateProps.COLOR).getColorValue(); @@ -213,7 +213,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu return ConfigHandler.enableThaumcraftStablizers; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); 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 3f6146056..7ca83f930 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -21,8 +21,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; @@ -54,14 +54,14 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { return false; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { Block block = world.getBlockState(pos.offset(side)).getBlock(); return block == this ? false : super.shouldSideBeRendered(state, world, pos, side); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Nonnull @Override public BlockRenderLayer getRenderLayer() { 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 128156490..cb20db679 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -27,8 +27,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.item.IPetalApothecary; @@ -121,7 +121,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis return getMetaFromState(state); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { int hex = state.getValue(BotaniaStateProps.COLOR).getColorValue(); @@ -156,7 +156,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) {} - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerCustomItemblock(this, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName()); 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 616da7dd0..94f562738 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -22,8 +22,8 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; @@ -99,7 +99,7 @@ public class BlockPavement extends BlockMod { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerBlockToState(this, BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues().size()); 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 ed3cc9285..4d18d63b4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -23,8 +23,8 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; 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 9aaa983e9..a7211032a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -19,8 +19,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -68,7 +68,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili @Override public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) {} - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(getTypeProperty()).build()); 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 ad5dabf3d..7bc9f6fad 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -24,8 +24,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -54,7 +54,7 @@ public class BlockStarfield extends BlockMod implements ILexiconable { return AABB; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Nonnull @Override public BlockRenderLayer getRenderLayer() { 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 3c6f908bd..088dd85cc 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 @@ -20,8 +20,8 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; 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 31c579122..5ec42b24f 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 @@ -16,8 +16,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.client.core.handler.ModelHandler; @@ -58,7 +58,7 @@ public class BlockBiomeStoneA extends BlockBiomeStone { drops.add(new ItemStack(this, 1, cobbleMeta)); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerBlockToState(this, BiomeStoneVariant.values().length); 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 a841bf001..dc95cf9e9 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 @@ -12,8 +12,8 @@ package vazkii.botania.common.block.decor.biomestone; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.client.core.handler.ModelHandler; @@ -48,7 +48,7 @@ public class BlockBiomeStoneB extends BlockBiomeStone { return getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, BiomeBrickVariant.values()[meta]); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerBlockToState(this, BiomeBrickVariant.values().length); 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 da9be50c4..1b1ca2d4c 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 @@ -11,8 +11,8 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; @@ -24,14 +24,14 @@ public class BlockAlfglassPane extends BlockModPane { super(ModBlocks.elfGlass); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Nonnull @Override public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerCustomItemblock(this, "alfglass_pane"); 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 8e8af5653..67ddfa49f 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 @@ -11,8 +11,8 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; @@ -24,14 +24,14 @@ public class BlockBifrostPane extends BlockModPane { super(ModBlocks.bifrostPerm); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Nonnull @Override public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerCustomItemblock(this, "bifrost_pane"); 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 03b856b14..e9dcce72c 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 @@ -11,8 +11,8 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; @@ -24,14 +24,14 @@ public class BlockManaglassPane extends BlockModPane { super(ModBlocks.manaGlass); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Nonnull @Override public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerCustomItemblock(this, "managlass_pane"); 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 7766a6c46..aee369aca 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 @@ -21,8 +21,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -118,7 +118,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { return this == ModFluffBlocks.elfQuartz ? LexiconData.elvenResources : LexiconData.decorativeBlocks; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerBlockToState(this, 0, getDefaultState()); 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 8e6c5f6c3..b6cc10465 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 @@ -16,8 +16,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.handler.ModelHandler; @@ -127,7 +127,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM return LexiconData.decorativeBlocks; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { if(!doubleSlab) { diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index cf2fb2eb9..771f4d021 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -10,8 +10,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.render.IModelRegister; @@ -34,7 +34,7 @@ public class BlockModStairs extends BlockStairs implements ILexiconable, IModelR return LexiconData.decorativeBlocks; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(this), 0, new ModelResourceLocation(getRegistryName(), "inventory")); 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 23dd2ca73..2116f3c59 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 @@ -21,8 +21,8 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeStoneVariant; @@ -76,7 +76,7 @@ public class BlockBiomeStoneWall extends BlockModWall { return LexiconData.marimorphosis; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, 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 55098b0f8..dc81b1dcd 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 @@ -23,8 +23,8 @@ 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.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.render.IModelRegister; @@ -98,7 +98,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM return LexiconData.decorativeBlocks; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { 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 813633e12..efbc5a6e2 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 @@ -11,8 +11,8 @@ package vazkii.botania.common.block.decor.walls.living; import net.minecraft.block.SoundType; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -25,7 +25,7 @@ public class BlockDreamwoodWall extends BlockModWall { setSoundType(SoundType.WOOD); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerCustomItemblock(this, "dreamwood_wall"); 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 a0a0f1c30..ee9e31ff6 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 @@ -11,8 +11,8 @@ package vazkii.botania.common.block.decor.walls.living; import net.minecraft.block.SoundType; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -26,7 +26,7 @@ public class BlockLivingrockWall extends BlockModWall { setSoundType(SoundType.STONE); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerCustomItemblock(this, "livingrock_wall"); 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 38a88e915..5735b7f12 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 @@ -11,8 +11,8 @@ package vazkii.botania.common.block.decor.walls.living; import net.minecraft.block.SoundType; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -25,7 +25,7 @@ public class BlockLivingwoodWall extends BlockModWall { setSoundType(SoundType.WOOD); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerCustomItemblock(this, "livingwood_wall"); 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 bd085e2c6..028f8f535 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -17,8 +17,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; @@ -46,7 +46,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public TextureAtlasSprite getIcon(World world, BlockPos pos) { return MiscellaneousIcons.INSTANCE.alchemyCatalystOverlay; } 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 1eb368bf5..492d0bf18 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -30,8 +30,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -125,7 +125,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { return LexiconData.bellows; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); 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 d17ed48aa..52d2989f2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -31,8 +31,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -151,13 +151,13 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { return LexiconData.brewery; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileBrewery) world.getTileEntity(pos)).renderHUD(mc, res); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); 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 478516f9c..dd6ab0901 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java @@ -15,8 +15,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.lexicon.LexiconData; @@ -34,7 +34,7 @@ public class BlockConjurationCatalyst extends BlockAlchemyCatalyst { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public TextureAtlasSprite getIcon(World world, BlockPos pos) { return MiscellaneousIcons.INSTANCE.conjurationCatalystOverlay; } 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 5ce008588..3e4f102a0 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -27,8 +27,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -157,13 +157,13 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, return LexiconData.manaEnchanting; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileEnchanter) world.getTileEntity(pos)).renderHUD(res); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerBlockToState(this, 0, getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); 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 9e592d763..ca8b01d16 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -19,8 +19,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; @@ -58,7 +58,7 @@ public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverla } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public TextureAtlasSprite getIcon(World world, BlockPos pos) { return MiscellaneousIcons.INSTANCE.manaVoidOverlay; } 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 a2e52e8ce..e2f4ff200 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -33,8 +33,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; @@ -196,7 +196,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return TilePool.calculateComparatorLevel(pool.getCurrentMana(), pool.manaCap); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TilePool) world.getTileEntity(pos)).renderHUD(mc, res); @@ -213,7 +213,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return variant == Variant.FABULOUS ? LexiconData.rainbowRod : LexiconData.pool; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); 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 b8d7b9c60..8a1574d5d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -26,8 +26,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; @@ -86,7 +86,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, @Nonnull @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } 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 48ceada6b..1f0c6d04a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -28,8 +28,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -132,7 +132,7 @@ public class BlockPump extends BlockMod implements ILexiconable { return new TilePump(); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerInventoryVariant(this); 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 672446967..c09cb8f14 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -32,8 +32,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -195,7 +195,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return new TileSpreader(); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileSpreader) world.getTileEntity(pos)).renderHUD(mc, res); 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 50147c5e7..342dcf37f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -21,8 +21,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; @@ -53,7 +53,7 @@ public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILe return new TileTurntable(); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileTurntable) world.getTileEntity(pos)).renderHUD(mc, res); 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 dbca761c0..9857f6cb6 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 @@ -25,8 +25,8 @@ import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import org.lwjgl.opengl.GL11; @@ -217,7 +217,7 @@ public class SubTileHopperhock extends SubTileFunctional { filterType = cmp.getInt(TAG_FILTER_TYPE); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { super.renderHUD(mc, res); 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 15612b15e..2c676236d 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 @@ -29,8 +29,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; 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 net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.item.IFlowerPlaceable; @@ -158,7 +158,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { return true; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { super.renderHUD(mc, res); 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 fa78539f0..add3b1e8b 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 @@ -22,8 +22,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; 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 a7929ae91..824bb4d6e 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 @@ -24,8 +24,8 @@ import net.minecraft.particles.ItemParticleData; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.WorldServer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -93,7 +93,7 @@ public class SubTileSpectrolus extends SubTileGenerating { return LexiconData.spectrolus; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { super.renderHUD(mc, res); 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 b13deda3c..38195f75f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.init.Particles; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -34,8 +35,8 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandlerItem; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -62,24 +63,21 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, public static final String TAG_HAS_WATER = "hasWater"; public static final String TAG_HAS_LAVA = "hasLava"; - public static final String TAG_IS_MOSSY = "isMossy"; private static final String ITEM_TAG_APOTHECARY_SPAWNED = "ApothecarySpawned"; public boolean hasWater = false; public boolean hasLava = false; - private boolean mossyLegacy = false; - List lastRecipe = null; int recipeKeepTicks = 0; public boolean collideEntityItem(EntityItem item) { ItemStack stack = item.getItem(); - if(world.isRemote || stack.isEmpty() || item.isDead) + if(world.isRemote || stack.isEmpty() || !item.isAlive()) return false; - if(getBlockType() == ModBlocks.defaultAltar && stack.getItem() == Item.getItemFromBlock(Blocks.VINE)) { + if(getBlockState().getBlock() == ModBlocks.defaultAltar && stack.getItem() == Item.getItemFromBlock(Blocks.VINE)) { // todo 1.13 this resets the tile entity/drops all contents world.setBlockState(getPos(), ModBlocks.mossyAltar.getDefaultState()); stack.shrink(1); @@ -137,7 +135,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, setWater(false); world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); - world.addBlockEvent(getPos(), getBlockType(), CRAFT_EFFECT_EVENT, 0); + world.addBlockEvent(getPos(), getBlockState().getBlock(), CRAFT_EFFECT_EVENT, 0); return true; } @@ -148,7 +146,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, for(int i = 0; i < getSizeInventory(); i++) { if(itemHandler.getStackInSlot(i).isEmpty()) { - itemHandler.setStackInSlot(i, stack.splitStack(1)); + itemHandler.setStackInSlot(i, stack.split(1)); world.playSound(null, pos, SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); return true; } @@ -177,7 +175,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, lastRecipe.add(stack.copy()); } recipeKeepTicks = 400; - world.addBlockEvent(getPos(), getBlockType(), SET_KEEP_TICKS_EVENT, 400); + world.addBlockEvent(getPos(), getBlockState().getBlock(), SET_KEEP_TICKS_EVENT, 400); } public void trySetLastRecipe(EntityPlayer player) { @@ -199,7 +197,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack pstack = player.inventory.getStackInSlot(i); if(!pstack.isEmpty() && pstack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(stack, pstack)) { - inv.setStackInSlot(index, pstack.splitStack(1)); + inv.setStackInSlot(index, pstack.split(1)); didAny = true; index++; break; @@ -223,13 +221,8 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, } @Override - public void update() { + public void tick() { if(!world.isRemote) { - if(mossyLegacy) { - world.setBlockState(getPos(), ModBlocks.mossyAltar.getDefaultState()); - mossyLegacy = false; - } - List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 32D, 1))); boolean didChange = false; @@ -257,9 +250,9 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, } if(hasLava()) { - world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.05, 0); + world.spawnParticle(Particles.SMOKE, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.05, 0); if(Math.random() > 0.9) - world.spawnParticle(EnumParticleTypes.LAVA, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.01, 0); + world.spawnParticle(Particles.LAVA, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.01, 0); } } @@ -282,7 +275,6 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, hasWater = cmp.getBoolean(TAG_HAS_WATER); hasLava = cmp.getBoolean(TAG_HAS_LAVA); - mossyLegacy = cmp.getBoolean(TAG_IS_MOSSY); } @Override @@ -340,7 +332,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, return hasLava; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { int xc = res.getScaledWidth() / 2; int yc = res.getScaledHeight() / 2; @@ -359,15 +351,15 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, for(RecipePetals recipe : BotaniaAPI.petalRecipes) if(recipe.matches(itemHandler)) { - GlStateManager.color(1F, 1F, 1F, 1F); - mc.renderEngine.bindTexture(HUDHandler.manaBar); + GlStateManager.color4f(1F, 1F, 1F, 1F); + mc.textureManager.bindTexture(HUDHandler.manaBar); RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, 0, 8, 22, 15); ItemStack stack = recipe.getOutput(); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - mc.getRenderItem().renderItemIntoGUI(stack, xc + radius + 32, yc - 8); - mc.getRenderItem().renderItemIntoGUI(new ItemStack(Items.WHEAT_SEEDS), xc + radius + 16, yc + 6); + mc.getItemRenderer().renderItemIntoGUI(stack, xc + radius + 32, yc - 8); + mc.getItemRenderer().renderItemIntoGUI(new ItemStack(Items.WHEAT_SEEDS), xc + radius + 16, yc + 6); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); mc.fontRenderer.drawStringWithShadow("+", xc + radius + 14, yc + 10, 0xFFFFFF); } @@ -376,9 +368,9 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, for(int i = 0; i < amt; i++) { double xPos = xc + Math.cos(angle * Math.PI / 180D) * radius - 8; double yPos = yc + Math.sin(angle * Math.PI / 180D) * radius - 8; - GlStateManager.translate(xPos, yPos, 0); - mc.getRenderItem().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0); - GlStateManager.translate(-xPos, -yPos, 0); + GlStateManager.translated(xPos, yPos, 0); + mc.getItemRenderer().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0); + GlStateManager.translated(-xPos, -yPos, 0); angle += anglePer; } 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 b88085836..36a51f907 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java @@ -20,8 +20,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ITickable; import net.minecraft.util.text.translation.I18n; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.ModBlocks; @@ -70,7 +70,7 @@ public class TileAnimatedTorch extends TileMod implements ITickable { if(entity != null) { side = Arrays.asList(SIDES).indexOf(entity.getHorizontalFacing().getOpposite()); } - world.notifyNeighborsOfStateChange(getPos().offset(SIDES[side].getOpposite()), getBlockType(), false); + world.notifyNeighborsOfStateChange(getPos().offset(SIDES[side].getOpposite()), getBlockState().getBlock()); } public void toggle() { @@ -115,13 +115,13 @@ public class TileAnimatedTorch extends TileMod implements ITickable { rotating = true; // tell neighbors that signal is off because we are rotating - world.notifyNeighborsOfStateChange(getPos(), getBlockType(), false); + world.notifyNeighborsOfStateChange(getPos(), getBlockState().getBlock()); for(EnumFacing e : EnumFacing.VALUES) { - world.notifyNeighborsOfStateChange(getPos().offset(e), getBlockType(), false); + world.notifyNeighborsOfStateChange(getPos().offset(e), getBlockState().getBlock()); } } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { int x = res.getScaledWidth() / 2 + 10; int y = res.getScaledHeight() / 2 - 8; @@ -140,9 +140,9 @@ public class TileAnimatedTorch extends TileMod implements ITickable { if(rotationTicks <= 0) { rotating = false; // done rotating, tell neighbors - world.notifyNeighborsOfStateChange(getPos(), getBlockType(), false); - for(EnumFacing e : EnumFacing.VALUES) { - world.notifyNeighborsOfStateChange(getPos().offset(e), getBlockType(), false); + world.notifyNeighborsOfStateChange(getPos(), getBlockState().getBlock()); + for(EnumFacing e : EnumFacing.BY_INDEX) { + world.notifyNeighborsOfStateChange(getPos().offset(e), getBlockState().getBlock()); } } @@ -161,24 +161,24 @@ public class TileAnimatedTorch extends TileMod implements ITickable { @Override public void writePacketNBT(NBTTagCompound cmp) { - cmp.setInteger(TAG_SIDE, side); + cmp.setInt(TAG_SIDE, side); cmp.setBoolean(TAG_ROTATING, rotating); - cmp.setInteger(TAG_ROTATION_TICKS, rotationTicks); + cmp.setInt(TAG_ROTATION_TICKS, rotationTicks); cmp.setDouble(TAG_ANGLE_PER_TICK, anglePerTick); - cmp.setInteger(TAG_TORCH_MODE, torchMode.ordinal()); - cmp.setInteger(TAG_NEXT_RANDOM_ROTATION, nextRandomRotation); + cmp.setInt(TAG_TORCH_MODE, torchMode.ordinal()); + cmp.setInt(TAG_NEXT_RANDOM_ROTATION, nextRandomRotation); } @Override public void readPacketNBT(NBTTagCompound cmp) { - side = cmp.getInteger(TAG_SIDE); + side = cmp.getInt(TAG_SIDE); rotating = cmp.getBoolean(TAG_ROTATING); if(world != null && !world.isRemote) - rotationTicks = cmp.getInteger(TAG_ROTATION_TICKS); + rotationTicks = cmp.getInt(TAG_ROTATION_TICKS); anglePerTick = cmp.getDouble(TAG_ANGLE_PER_TICK); - nextRandomRotation = cmp.getInteger(TAG_NEXT_RANDOM_ROTATION); + nextRandomRotation = cmp.getInt(TAG_NEXT_RANDOM_ROTATION); - int modeOrdinal = cmp.getInteger(TAG_TORCH_MODE); + int modeOrdinal = cmp.getInt(TAG_TORCH_MODE); TorchMode[] modes = TorchMode.values(); torchMode = modes[modeOrdinal % modes.length]; } 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 f50ecf510..81124979e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -24,8 +24,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; import net.minecraft.util.StringUtils; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IHourglassTrigger; import vazkii.botania.api.state.BotaniaStateProps; @@ -186,7 +186,7 @@ public class TileHourglass extends TileSimpleInventory implements ITickable { return 1; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderHUD(ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); int x = res.getScaledWidth() / 2 + 10; 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 238fdf322..35af1ecf3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -27,8 +27,8 @@ import net.minecraft.util.ITickable; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileSlowableContainer; @@ -179,7 +179,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil return super.receiveClientEvent(id, param); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { if(subTile != null) subTile.renderHUD(mc, res); 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 f1443c7d9..57e78e4cc 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 @@ -39,7 +39,7 @@ public class TileBellows extends TileMod implements ITickable { } @Override - public void update() { + public void tick() { boolean disable = true; TileEntity tile = getLinkedTile(); if(!active && tile instanceof TilePool) { @@ -119,7 +119,7 @@ public class TileBellows extends TileMod implements ITickable { } public TileEntity getLinkedTile() { - EnumFacing side = world.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS); + EnumFacing side = world.getBlockState(getPos()).get(BotaniaStateProps.CARDINALS); return world.getTileEntity(getPos().offset(side)); } 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 1498b8b72..ed18afc80 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 @@ -32,8 +32,8 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -390,7 +390,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.ding, SoundCategory.PLAYERS, 0.11F, 1F); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { ItemStack pool = new ItemStack(getBlockType()); String name = I18n.format(pool.getTranslationKey().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); 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 0cdebc14b..cd9418ae4 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 @@ -22,7 +22,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.model.animation.CapabilityAnimation; import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; 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 f7760d087..bf9e8f24a 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 @@ -36,8 +36,8 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -559,7 +559,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, return worldIn.rayTraceBlocks(vec3d, vec3d1, useLiquids, !useLiquids, false); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { String name = new ItemStack(getBlockType()).getDisplayName(); int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00; 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 8e580b1d6..cf83fc836 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -22,7 +22,7 @@ import net.minecraftforge.fml.common.Mod; 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.Side; +import net.minecraftforge.api.distmarker.Dist; import vazkii.botania.common.lib.LibMisc; @Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index ce4a7b7c0..449ed3719 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -61,8 +61,8 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ObjectHolder; import org.lwjgl.opengl.ARBShaderObjects; import vazkii.botania.api.boss.IBotaniaBoss; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 5933424ad..a551c948e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -46,8 +46,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -349,7 +349,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst, ILig } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void setPositionAndRotationDirect(double x, double y, double z, float yaw, float pitch, int posRotationIncrements, boolean teleport) { setPosition(x, y, z); setRotation(yaw, pitch); 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 4bf21daaa..a28e827ef 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -10,8 +10,8 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.Botania; @@ -20,7 +20,7 @@ import vazkii.botania.common.lib.LibTriggerNames; public class TriggerManaDetector extends StatementBase implements ITriggerInternal { @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ISprite getSprite() { return new TASprite(MiscellaneousIcons.INSTANCE.manaDetectorIcon); } @@ -31,7 +31,7 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public String getDescription() { return I18n.format(LibTriggerNames.TRIGGER_MANA_DETECTOR); } 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 08055dd80..8ac3a0b2c 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -10,8 +10,8 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.mana.IManaBlock; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.client.core.handler.MiscellaneousIcons; @@ -39,13 +39,13 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ISprite getSprite() { return new TASprite(MiscellaneousIcons.INSTANCE.manaLevelTriggerIcons.get(state)); } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public String getDescription() { return I18n.format(LibTriggerNames.TRIGGER_MANA_PREFIX + WordUtils.capitalizeFully(state.name())); } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java index 3459d553b..6762dd302 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java @@ -7,8 +7,8 @@ import buildcraft.api.statements.ITriggerExternal; import net.minecraft.client.resources.I18n; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.lib.LibTriggerNames; @@ -21,13 +21,13 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ISprite getSprite() { return new TASprite(MiscellaneousIcons.INSTANCE.runeAltarTriggerIcon); } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public String getDescription() { return I18n.format(LibTriggerNames.TRIGGER_RUNE_ALTAR_CAN_CRAFT); } diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 10331ff9c..785646d90 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -14,8 +14,8 @@ import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.common.lib.LibItemNames; @@ -31,7 +31,7 @@ public class ItemAncientWill extends ItemMod { setMaxStackSize(1); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { addStringToTooltip(I18n.format("botaniamisc.craftToAddWill"), list); diff --git a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java index 49aac5a51..e5362003e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java +++ b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java @@ -29,8 +29,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; @@ -276,7 +276,7 @@ public class ItemAstrolabe extends ItemMod { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack par1ItemStack, World world, List par3List, ITooltipFlag flags) { Block block = getBlock(par1ItemStack); int size = getSize(par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 0904b41b7..32977593c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -29,8 +29,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -221,7 +221,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, World world, List stacks, ITooltipFlag flags) { Block block = getBlock(stack); if(block != null) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index d5987d57e..80e41e91f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -18,8 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IManaDissolvable; import vazkii.botania.api.mana.IManaPool; @@ -64,7 +64,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { item.playSound(ModSounds.blackLotus, 0.5F, t2 ? 0.1F : 1F); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { list.add(I18n.format("botaniamisc.lotusDesc")); diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 370bf5dfd..12a7f9531 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -34,8 +34,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityPixie; @@ -213,7 +213,7 @@ public class ItemBottledMana extends ItemMod { return seed; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, World world, List stacks, ITooltipFlag flags) { stacks.add(I18n.format("botaniamisc.bottleTooltip")); diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 00c8603b8..a93fb34db 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -33,8 +33,8 @@ import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCacophonium; @@ -112,7 +112,7 @@ public class ItemCacophonium extends ItemMod { return EnumActionResult.PASS; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { if(isDOIT(stack)) diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 0ff27f2c3..9b84d1151 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -43,8 +43,8 @@ import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -396,7 +396,7 @@ public class ItemCraftingHalo extends ItemMod { ItemNBTHelper.setFloat(stack, TAG_ROTATION_BASE, rotation); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @SubscribeEvent public void onRenderWorldLast(RenderWorldLastEvent event) { EntityPlayer player = Minecraft.getMinecraft().player; @@ -405,7 +405,7 @@ public class ItemCraftingHalo extends ItemMod { render(stack, player, event.getPartialTicks()); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void render(ItemStack stack, EntityPlayer player, float partialTicks) { Minecraft mc = Minecraft.getMinecraft(); Tessellator tess = Tessellator.getInstance(); @@ -507,12 +507,12 @@ public class ItemCraftingHalo extends ItemMod { GlStateManager.popMatrix(); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ResourceLocation getGlowResource() { return glowTexture; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack) { Minecraft mc = Minecraft.getMinecraft(); int slot = getSegmentLookedAt(stack, player); @@ -549,7 +549,7 @@ public class ItemCraftingHalo extends ItemMod { } } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static void renderRecipe(ScaledResolution resolution, String label, ItemStack[] recipe, EntityPlayer player, boolean setRecipe) { Minecraft mc = Minecraft.getMinecraft(); diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index ca164de7b..15994e18b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -29,8 +29,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileGaiaHead; @@ -49,14 +49,14 @@ public class ItemGaiaHead extends ItemMod { return armorType == EntityEquipmentSlot.HEAD; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Nonnull @Override public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped _default) { return (ModelBiped) Botania.proxy.getEmptyModelBiped(); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { super.registerModels(); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index de3f45027..499418f76 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -30,8 +30,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IFloatingFlower.IslandType; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; diff --git a/src/main/java/vazkii/botania/common/item/ItemHorn.java b/src/main/java/vazkii/botania/common/item/ItemHorn.java index 1bfdd2d7d..1397bf670 100644 --- a/src/main/java/vazkii/botania/common/item/ItemHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemHorn.java @@ -29,8 +29,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.item.IHornHarvestable.EnumHornType; import vazkii.botania.api.subtile.ISpecialFlower; diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 3163f0d33..e1630db6a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -34,8 +34,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILaputaImmobile; @@ -87,7 +87,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { list.add(I18n.format("botaniamisc.shardLevel", I18n.format("botania.roman" + (stack.getItemDamage() + 1)))); @@ -291,7 +291,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet return false; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerItemAllMeta(this, 20); diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index fa9450594..365d33d9d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -39,8 +39,8 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.ILexiconable; @@ -114,7 +114,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, World world, List stacks, ITooltipFlag flags) { if(GuiScreen.isShiftKeyDown()) { @@ -142,7 +142,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { tooltip.add(s.replaceAll("&", "\u00a7")); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static String getEdition() { String version = LibMisc.BUILD; int build = version.contains("GRADLE") ? 0 : Integer.parseInt(version); @@ -262,7 +262,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { return isKnowledgeUnlocked(stack, BotaniaAPI.elvenKnowledge); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { // Load and bake the 2D models diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 5375f1228..fb8cc2bb7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -17,8 +17,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -46,7 +46,7 @@ public class ItemManaCookie extends ItemFood implements IModelRegister { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 607badfc7..b97f0a1e2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -32,8 +32,8 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaUsingItem; @@ -169,7 +169,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { return null; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, World world, List stacks, ITooltipFlag flags) { boolean clip = hasClip(par1ItemStack); @@ -304,7 +304,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { return true; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelBakery.registerItemVariants(this, diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 836557c6b..ca44a6954 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -18,8 +18,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.mana.ICreativeManaProvider; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaTooltipDisplay; @@ -68,7 +68,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP return 0; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, World world, List stacks, ITooltipFlag flags) { if(isStackCreative(par1ItemStack)) diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index f039166d0..8d65ac1d9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -15,8 +15,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -39,7 +39,7 @@ public class ItemMod extends Item implements IModelRegister { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index ad5e5a969..1f01d3017 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -29,8 +29,8 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.common.Botania; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 558d57237..406ef26a5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -30,8 +30,8 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.Botania; import vazkii.botania.common.advancements.UseItemSuccessTrigger; @@ -77,7 +77,7 @@ public class ItemSpawnerMover extends ItemMod { return getEntityId(stack) != null; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List infoList, ITooltipFlag flags) { String id = getEntityId(stack); 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 c7d71319c..799b2733d 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -16,8 +16,8 @@ import net.minecraft.client.util.ITooltipFlag; 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 net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.lib.LibMisc; @@ -34,7 +34,7 @@ public class ItemBlockPool extends ItemBlockMod { }); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(@Nonnull ItemStack par1ItemStack, World world, @Nonnull List stacks, @Nonnull ITooltipFlag flag) { if(((BlockPool) block).variant == BlockPool.Variant.CREATIVE) 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 cdc6d7f16..92fe8b06a 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -33,8 +33,8 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.IRecipeKeyProvider; import vazkii.botania.api.subtile.SubTileEntity; @@ -90,7 +90,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr return getUnlocalizedNameInefficiently_(par1ItemStack); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(@Nonnull ItemStack par1ItemStack, World world, @Nonnull List stacks, @Nonnull ITooltipFlag flag) { ResourceLocation type = getType(par1ItemStack); 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 2f3f8679a..77371c88f 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -123,7 +123,7 @@ public class ItemBrewBase extends ItemMod implements IBrewItem { return String.format(net.minecraft.util.text.translation.I18n.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name"), net.minecraft.util.text.translation.I18n.translateToLocal(getBrew(stack).getUnlocalizedName(stack)), TextFormatting.BOLD + "" + getSwigsLeft(stack) + TextFormatting.RESET); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { Brew brew = getBrew(stack); 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 b3b4bac93..4bbee62cb 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 @@ -5,8 +5,8 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IPixieSpawner; import vazkii.botania.client.lib.LibResources; @@ -25,7 +25,7 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ModelBiped provideArmorModelForSlot(ItemStack stack, EntityEquipmentSlot slot) { models.put(slot, new ModelArmorElementium(slot)); return models.get(slot); @@ -75,13 +75,13 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements return false; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public String getArmorSetName() { return I18n.format("botania.armorset.elementium.name"); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addArmorSetDescription(ItemStack stack, List list) { super.addArmorSetDescription(stack, list); 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 4dfd23d2c..defc3f9ef 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 @@ -31,8 +31,8 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.ISpecialArmor; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.api.mana.IManaUsingItem; @@ -128,7 +128,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped original) { if(ConfigHandler.enableArmorModels) { ModelBiped model = getArmorModelForSlot(entityLiving, itemStack, armorSlot); @@ -144,7 +144,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return super.getArmorModel(entityLiving, itemStack, armorSlot, original); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ModelBiped getArmorModelForSlot(EntityLivingBase entity, ItemStack stack, EntityEquipmentSlot slot) { if(models == null) models = new EnumMap<>(EntityEquipmentSlot.class); @@ -152,7 +152,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return models.get(slot); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ModelBiped provideArmorModelForSlot(ItemStack stack, EntityEquipmentSlot slot) { models.put(slot, new ModelArmorManasteel(slot)); return models.get(slot); @@ -168,7 +168,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return true; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { if(GuiScreen.isShiftKeyDown()) @@ -176,7 +176,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), list); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void addInformationAfterShift(ItemStack stack, World world, List list, ITooltipFlag flags) { EntityPlayer player = Minecraft.getMinecraft().player; addStringToTooltip(getArmorSetTitle(player), list); @@ -237,17 +237,17 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return pieces; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public String getArmorSetName() { return I18n.format("botania.armorset.manasteel.name"); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) private String getArmorSetTitle(EntityPlayer player) { return I18n.format("botaniamisc.armorset") + " " + getArmorSetName() + " (" + getSetPiecesEquipped(player) + "/" + getArmorSetStacks().length + ")"; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void addArmorSetDescription(ItemStack stack, List list) { addStringToTooltip(I18n.format("botania.armorset.manasteel.desc"), list); } @@ -262,7 +262,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan ItemNBTHelper.setBoolean(stack, TAG_PHANTOM_INK, ink); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); 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 20990a32e..fdb560f43 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 @@ -18,8 +18,8 @@ import net.minecraft.inventory.EntityEquipmentSlot; 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 net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; @@ -39,7 +39,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ModelBiped provideArmorModelForSlot(ItemStack stack, EntityEquipmentSlot slot) { models.put(slot, new ModelArmorManaweave(slot)); return models.get(slot); @@ -52,7 +52,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor { @Nonnull @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public String getTranslationKey(ItemStack stack) { String name = super.getTranslationKey(stack); if(ClientProxy.jingleTheBells) @@ -99,13 +99,13 @@ public class ItemManaweaveArmor extends ItemManasteelArmor { return false; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public String getArmorSetName() { return I18n.format("botania.armorset.manaweave.name"); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformationAfterShift(ItemStack stack, World world, List list, ITooltipFlag flags) { if(ClientProxy.jingleTheBells) { @@ -116,7 +116,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor { super.addInformationAfterShift(stack, world, list, flags); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addArmorSetDescription(ItemStack stack, List list) { addStringToTooltip(I18n.format("botania.armorset.manaweave.desc0"), list); 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 36d4c6e88..3793e9aa6 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 @@ -18,8 +18,8 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.armor.ModelArmorTerrasteel; @@ -38,7 +38,7 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public ModelBiped provideArmorModelForSlot(ItemStack stack, EntityEquipmentSlot slot) { models.put(slot, new ModelArmorTerrasteel(slot)); return models.get(slot); @@ -99,13 +99,13 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { return false; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public String getArmorSetName() { return I18n.format("botania.armorset.terrasteel.name"); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addArmorSetDescription(ItemStack stack, List list) { addStringToTooltip(I18n.format("botania.armorset.terrasteel.desc0"), list); 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 4678e591d..f4001240c 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 @@ -25,8 +25,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaDiscountArmor; @@ -85,7 +85,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void addArmorSetDescription(ItemStack stack, List list) { super.addArmorSetDescription(stack, list); for(AncientWillType type : AncientWillType.values()) @@ -101,7 +101,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc return false; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static void renderOnPlayer(ItemStack stack, EntityPlayer player) { if(hasAnyWill(stack) && !((ItemTerrasteelArmor) stack.getItem()).hasPhantomInk(stack)) { GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java index b91630b3c..730046d21 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java @@ -16,8 +16,8 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ModSounds; @@ -57,13 +57,13 @@ public class ItemBalanceCloak extends ItemHolyCloak { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) ResourceLocation getCloakTexture() { return texture; } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) ResourceLocation getCloakGlowTexture() { return textureGlow; } 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 9946f3326..0f41fde76 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 @@ -30,8 +30,8 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.item.ICosmeticAttachable; @@ -131,14 +131,14 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack par1ItemStack, World world, List stacks, ITooltipFlag flags) { if(GuiScreen.isShiftKeyDown()) addHiddenTooltip(par1ItemStack, world, stacks, flags); else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), stacks); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void addHiddenTooltip(ItemStack par1ItemStack, World world, List stacks, ITooltipFlag flags) { String key = vazkii.botania.client.core.helper.RenderHelper.getKeyDisplayString("Baubles Inventory"); 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 ffd2cde38..2207d928a 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 @@ -30,8 +30,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.ICosmeticBauble; import vazkii.botania.client.core.handler.ModelHandler; @@ -63,7 +63,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { this.variant = variant; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addHiddenTooltip(ItemStack stack, World world, List stacks, ITooltipFlag flags) { addStringToTooltip(I18n.format(stack.getItemDamage() == 32 ? "botaniamisc.cosmeticThinking" : "botaniamisc.cosmeticBauble"), stacks); 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 756624314..75a02d8a3 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 @@ -29,8 +29,8 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; @@ -68,7 +68,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addHiddenTooltip(ItemStack stack, World world, List list, ITooltipFlag adv) { super.addHiddenTooltip(stack, world, list, adv); @@ -148,7 +148,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java index e291c9217..298181e45 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java @@ -21,8 +21,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -51,7 +51,7 @@ public class ItemCloudPendant extends CloudPendantShim implements IBaubleRender } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void clientWornTick(ItemStack stack, EntityLivingBase player) { if(player instanceof EntityPlayerSP && player == Minecraft.getMinecraft().player) { EntityPlayerSP playerSp = (EntityPlayerSP) player; @@ -73,7 +73,7 @@ public class ItemCloudPendant extends CloudPendantShim implements IBaubleRender } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); 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 9f2e9b20b..5a8dcb913 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 @@ -32,8 +32,8 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -104,7 +104,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { Helper.translateToHeadLevel(player); 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 4f81b8483..2d81662b9 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 @@ -25,8 +25,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.InputEvent.KeyInputEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandler; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -50,7 +50,7 @@ public class ItemDodgeRing extends ItemBauble { } @SubscribeEvent - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static void onKeyDown(KeyInputEvent event) { Minecraft mc = Minecraft.getMinecraft(); @@ -108,7 +108,7 @@ public class ItemDodgeRing extends ItemBauble { PacketHandler.sendToServer(new PacketDodge()); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack, float pticks) { int xo = resolution.getScaledWidth() / 2 - 20; int y = resolution.getScaledHeight() / 2 + 20; 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 7b374d925..fc5aa64bb 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 @@ -37,8 +37,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; 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 net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBaubleRender; @@ -103,7 +103,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addHiddenTooltip(ItemStack par1ItemStack, World world, List stacks, ITooltipFlag flags) { super.addHiddenTooltip(par1ItemStack, world, stacks, flags); @@ -298,7 +298,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { int meta = stack.getItemDamage(); if(type == RenderType.BODY) { @@ -432,7 +432,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub renderHalo(player, partialTicks); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static void renderHalo(EntityPlayer player, float partialTicks) { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -468,7 +468,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GlStateManager.enableCull(); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack) { int u = Math.max(1, stack.getItemDamage()) * 9 - 9; int v = 0; @@ -514,7 +514,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub mc.renderEngine.bindTexture(Gui.ICONS); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelHandler.registerItemAllMeta(this, WING_TYPES + 1); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java index 982e449dc..d25e2774c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java @@ -24,8 +24,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.ExplosionEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -64,7 +64,7 @@ public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem, IBau } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if (type == RenderType.HEAD) { GlStateManager.pushMatrix(); 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 3378c5f0e..0da4e64cd 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 @@ -24,8 +24,8 @@ import net.minecraft.util.SoundCategory; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelCloak; @@ -39,7 +39,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOLY_CLOAK); private static final ResourceLocation textureGlow = new ResourceLocation(LibResources.MODEL_HOLY_CLOAK_GLOW); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) private static ModelCloak model; private static final String TAG_COOLDOWN = "cooldown"; @@ -121,18 +121,18 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { ItemNBTHelper.setBoolean(stack, TAG_IN_EFFECT, effect); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) ResourceLocation getCloakTexture() { return texture; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) ResourceLocation getCloakGlowTexture() { return textureGlow; } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Helper.rotateIfSneaking(player); 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 e82a67b9f..fff754b14 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 @@ -22,8 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -52,7 +52,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); 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 b80787ef7..3124b1d03 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 @@ -34,8 +34,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.village.MerchantRecipe; import net.minecraftforge.common.util.Constants; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.InvWrapper; @@ -209,7 +209,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.itemFinderGem; if(type == RenderType.HEAD) { 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 32c99d640..149d2e4a5 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 @@ -20,8 +20,8 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibItemNames; @@ -49,7 +49,7 @@ public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRend } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(texture); 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 319cde724..9f9516ec1 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 @@ -20,8 +20,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -45,7 +45,7 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); 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 62742185f..6aa2c1b81 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 @@ -17,8 +17,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; 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 00a4d1b60..9c3c5c0ac 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 @@ -30,8 +30,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IBurstViewerBauble; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; @@ -49,7 +49,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.HEAD).isEmpty(); @@ -65,7 +65,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm } } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static void renderHUD(ScaledResolution resolution, EntityPlayer player) { Minecraft mc = Minecraft.getMinecraft(); RayTraceResult pos = mc.objectMouseOver; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java index bbee162c4..113120f20 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java @@ -18,8 +18,8 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; @@ -36,7 +36,7 @@ public class ItemSuperCloudPendant extends ItemCloudPendant { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); 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 91e8e8d4b..059f9aad8 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 @@ -21,8 +21,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -50,7 +50,7 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java index 961bab410..ea05e8bc1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java @@ -25,8 +25,8 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -76,7 +76,7 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem, IBaubleR } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); 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 c8f25d642..fa27a7eea 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 @@ -23,8 +23,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.ITinyPlanetExcempt; @@ -104,7 +104,7 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); 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 df14f9eef..aac280a93 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 @@ -24,8 +24,8 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; 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 net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -38,7 +38,7 @@ import java.util.List; public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUsingItem { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TRAVEL_BELT); - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) private static ModelBiped model; private static final int COST = 1; @@ -141,13 +141,13 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs return player.getGameProfile().getName() + ":" + player.world.isRemote; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) ResourceLocation getRenderTexture() { return texture; } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(getRenderTexture()); 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 a33d6f634..796f521d2 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 @@ -21,8 +21,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ModSounds; @@ -65,13 +65,13 @@ public class ItemUnholyCloak extends ItemHolyCloak { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) ResourceLocation getCloakTexture() { return texture; } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) ResourceLocation getCloakGlowTexture() { return textureGlow; } 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 30ff48886..a3a905bfe 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 @@ -25,8 +25,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; @@ -130,7 +130,7 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab return ToolCommons.getToolPriority(stack); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); 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 05864ff70..04828c635 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 @@ -25,8 +25,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; @@ -129,7 +129,7 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS return ToolCommons.getToolPriority(stack); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); 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 5b0b5aba2..f06f531a6 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 @@ -27,8 +27,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.IShearable; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; @@ -134,7 +134,7 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem, I return true; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); 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 a9e26bfd4..141116fe9 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 @@ -30,8 +30,8 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.fml.common.eventhandler.Event.Result; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; @@ -146,7 +146,7 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS return ToolCommons.getToolPriority(stack); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); 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 21c2934af..61f4a99bd 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 @@ -21,8 +21,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -94,7 +94,7 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem, IMo return true; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); 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 46b66692d..9810ec984 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 @@ -33,8 +33,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3i; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.api.mana.IManaGivingItem; @@ -91,7 +91,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, World world, List stacks, ITooltipFlag flags) { String rank = I18n.format("botania.rank" + getLevel(par1ItemStack)); 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 039e937f2..73b1d2f29 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 @@ -16,8 +16,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import thaumcraft.api.items.IScribeTools; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.core.helper.ItemNBTHelper; 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 7f4c1faac..91dd9ecc5 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -27,8 +27,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; @@ -83,7 +83,7 @@ public class ItemDye extends Item16Colors { return false; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(LibMisc.MOD_ID + ":" + LibItemNames.DYE, "inventory")); 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 9f492a924..b617f7d86 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -25,8 +25,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.common.block.ModBlocks; @@ -99,7 +99,7 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { return color.colorValue; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void registerModels() { ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(LibMisc.MOD_ID + ":" + LibItemNames.PETAL, "inventory")); 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 36e2dcee1..d1fec62e3 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -31,8 +31,8 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISequentialBreaker; @@ -166,7 +166,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { if(getLokiRing(player) != stack) return ImmutableList.of(); 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 4719eed0f..90900978d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -22,8 +22,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.advancements.RelicBindTrigger; @@ -50,13 +50,13 @@ public class ItemRelic extends ItemMod implements IRelic { updateRelic(stack, (EntityPlayer) entity); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flags) { addBindInfo(tooltip, stack); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void addBindInfo(List list, ItemStack stack) { if(GuiScreen.isShiftKeyDown()) { if(!hasUUID(stack)) { 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 2de433cef..30718f4f6 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -17,8 +17,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.equipment.bauble.ItemBauble; @@ -52,7 +52,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { } } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public void addHiddenTooltip(ItemStack par1ItemStack, World world, List stacks, ITooltipFlag flags) { super.addHiddenTooltip(par1ItemStack, world, stacks, flags); 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 4b8fcae7f..64cfb43c2 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -33,8 +33,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.BotaniaAPI; @@ -377,7 +377,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { ItemStack holding = player.getHeldItemMainhand(); if(holding != stack || !canExchange(stack)) diff --git a/src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java index 629e78d16..e0f308374 100644 --- a/src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java @@ -10,8 +10,8 @@ */ package vazkii.botania.common.lexicon; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.client.core.handler.PersistentVariableHelper; @@ -22,7 +22,7 @@ public class DogLexiconEntry extends BasicLexiconEntry { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public boolean isVisible() { return !PersistentVariableHelper.dog; } diff --git a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java index 80024c468..2cb26b4fd 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java @@ -16,8 +16,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; @@ -31,7 +31,7 @@ public class RelicLexiconEntry extends BasicLexiconEntry { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public boolean isVisible() { EntityPlayerSP player = Minecraft.getMinecraft().player; if(advancement == null || player.capabilities.isCreativeMode) { 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 9996d8983..5fc55ff2f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -15,8 +15,8 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; @@ -42,7 +42,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { int width = gui.getWidth() - 30; int height = gui.getHeight(); @@ -80,7 +80,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { super.renderRecipe(gui, mx, my); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderItemAtLinePos(IGuiLexiconEntry gui, int offset, int pos, int yPos, ItemStack stack) { if(stack.isEmpty()) return; 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 1c434a297..2be90e833 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -23,8 +23,8 @@ import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import org.lwjgl.opengl.GL11; @@ -75,7 +75,7 @@ public class PageCraftingRecipe extends PageRecipe { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { oreDictRecipe = shapelessRecipe = false; @@ -118,7 +118,7 @@ public class PageCraftingRecipe extends PageRecipe { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void updateScreen() { if(GuiScreen.isShiftKeyDown()) return; @@ -132,7 +132,7 @@ public class PageCraftingRecipe extends PageRecipe { ++ticksElapsed; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderCraftingRecipe(IGuiLexiconEntry gui, IRecipe recipe) { if(recipe == null) return; 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 4c40ee47a..077d6daa6 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -8,8 +8,8 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; @@ -48,7 +48,7 @@ public class PageElvenRecipe extends PageRecipe { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { RecipeElvenTrade recipe = recipes.get(recipeAt); TextureManager render = Minecraft.getMinecraft().renderEngine; @@ -80,7 +80,7 @@ public class PageElvenRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft() + 22, gui.getTop() + 36, portalIcon, 48, 48); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderItemAtInputPos(IGuiLexiconEntry gui, int x, ItemStack stack) { if(stack.isEmpty()) return; @@ -98,7 +98,7 @@ public class PageElvenRecipe extends PageRecipe { renderItem(gui, xPos, yPos, stack1, false); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderItemAtOutputPos(IGuiLexiconEntry gui, int x, int y, ItemStack stack) { if(stack.isEmpty()) return; @@ -120,7 +120,7 @@ public class PageElvenRecipe extends PageRecipe { @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void updateScreen() { if(GuiScreen.isShiftKeyDown()) return; 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 356aff013..618a1ab12 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -19,8 +19,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; @@ -46,7 +46,7 @@ public class PageEntity extends LexiconPage{ } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { prepDummy(); int text_x = gui.getLeft() + 16; @@ -60,7 +60,7 @@ public class PageEntity extends LexiconPage{ PageText.renderText(text_x, text_y, gui.getWidth() - 30, gui.getHeight(), getUnlocalizedName()); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public int getEntityScale(int targetSize) { float entity_size = dummyEntity.width; @@ -77,7 +77,7 @@ public class PageEntity extends LexiconPage{ dummyEntity.ticksExisted++; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderEntity(IGuiLexiconEntry gui, Entity entity, int x, int y, int scale, float rotation) { dummyEntity.world = Minecraft.getMinecraft() != null ? Minecraft.getMinecraft().world : null; 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 6a35040e4..f1cb137b0 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java @@ -15,8 +15,8 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; 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 net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; @@ -31,7 +31,7 @@ public class PageImage extends LexiconPage { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { TextureManager render = Minecraft.getMinecraft().renderEngine; render.bindTexture(resource); 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 53cf51d5a..3e9ccba93 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -22,8 +22,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; @@ -69,7 +69,7 @@ public class PageManaInfusionRecipe extends PageRecipe { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { RecipeManaInfusion recipe = recipes.get(recipeAt); TextureManager render = Minecraft.getMinecraft().renderEngine; @@ -143,7 +143,7 @@ public class PageManaInfusionRecipe extends PageRecipe { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void updateScreen() { if(GuiScreen.isShiftKeyDown()) return; 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 1ef78d6e8..00b340cc3 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -23,8 +23,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; @@ -52,7 +52,7 @@ public class PageMultiblock extends LexiconPage { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { TextureManager render = Minecraft.getMinecraft().renderEngine; render.bindTexture(multiblockOverlay); @@ -121,7 +121,7 @@ public class PageMultiblock extends LexiconPage { gui.getButtonList().add(button); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) private String getButtonStr() { return I18n.format(MultiblockRenderHandler.currentMultiblock == set ? "botaniamisc.unvisualize" : "botaniamisc.visualize"); } @@ -132,7 +132,7 @@ public class PageMultiblock extends LexiconPage { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onActionPerformed(IGuiLexiconEntry gui, GuiButton button) { if(button == this.button) { if(MultiblockRenderHandler.currentMultiblock == set) @@ -143,7 +143,7 @@ public class PageMultiblock extends LexiconPage { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void updateScreen() { ++ticksElapsed; } 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 b3519d65b..ce3d02d73 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -25,8 +25,8 @@ import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; @@ -61,7 +61,7 @@ public class PagePetalRecipe extends PageRecipe { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { T recipe = recipes.get(recipeAt); TextureManager render = Minecraft.getMinecraft().renderEngine; @@ -102,7 +102,7 @@ public class PagePetalRecipe extends PageRecipe { return new ItemStack(ModBlocks.defaultAltar); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) { FontRenderer font = Minecraft.getMinecraft().fontRenderer; GlStateManager.enableBlend(); @@ -121,7 +121,7 @@ public class PagePetalRecipe extends PageRecipe { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void updateScreen() { if(GuiScreen.isShiftKeyDown()) return; 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 1a0cee680..8aeebf711 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -23,8 +23,8 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.event.RenderTooltipEvent; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; @@ -56,7 +56,7 @@ public class PageRecipe extends LexiconPage { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { relativeMouseX = mx; relativeMouseY = my; @@ -111,10 +111,10 @@ public class PageRecipe extends LexiconPage { mouseDownLastTick = Mouse.isButtonDown(0); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {} - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderItemAtAngle(IGuiLexiconEntry gui, float angle, ItemStack stack) { if(stack.isEmpty()) return; @@ -132,7 +132,7 @@ public class PageRecipe extends LexiconPage { renderItem(gui, xPos, yPos, workStack, false); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderItemAtGridPos(IGuiLexiconEntry gui, int x, int y, ItemStack stack, boolean accountForContainer) { if(stack.isEmpty()) return; @@ -150,7 +150,7 @@ public class PageRecipe extends LexiconPage { renderItem(gui, xPos, yPos, stack1, accountForContainer); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderItem(IGuiLexiconEntry gui, double xPos, double yPos, ItemStack stack, boolean accountForContainer) { RenderItem render = Minecraft.getMinecraft().getRenderItem(); boolean mouseDown = Mouse.isButtonDown(0); 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 dfa2d6a8c..a2ecc891a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -15,8 +15,8 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.recipe.RecipeRuneAltar; @@ -42,7 +42,7 @@ public class PageRuneRecipe extends PagePetalRecipe { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderManaBar(IGuiLexiconEntry gui, RecipeRuneAltar recipe, int mx, int my) { FontRenderer font = Minecraft.getMinecraft().fontRenderer; GlStateManager.enableBlend(); 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 50d6e5754..0e5774e8a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -23,8 +23,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; @@ -53,7 +53,7 @@ public class PageShedding extends PageEntity { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { prepDummy(); relativeMouseX = mx; @@ -109,7 +109,7 @@ public class PageShedding extends PageEntity { mouseDownLastTick = Mouse.isButtonDown(0); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderItem(IGuiLexiconEntry gui, int xPos, int yPos, ItemStack stack) { RenderItem render = Minecraft.getMinecraft().getRenderItem(); boolean mouseDown = Mouse.isButtonDown(0); 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 5c706c2d0..f7bad2e9b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -17,8 +17,8 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; @@ -39,7 +39,7 @@ public class PageTerrasteel extends PageRecipe { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { Block block1 = ModBlocks.livingrock; Block block2 = Blocks.LAPIS_BLOCK; 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 1662ff52b..7b1f27def 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -14,8 +14,8 @@ import com.google.common.base.Joiner; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.common.core.handler.ConfigHandler; @@ -30,7 +30,7 @@ public class PageText extends LexiconPage { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { int width = gui.getWidth() - 30; int x = gui.getLeft() + 16; @@ -43,7 +43,7 @@ public class PageText extends LexiconPage { renderText(x, y, width, height, 10, true, 0, unlocalizedText); } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public static void renderText(int x, int y, int width, int height, int paragraphSize, boolean useUnicode, int color, String unlocalizedText) { x += 2; y += 10; 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 7870f529e..40f264acc 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java @@ -16,8 +16,8 @@ import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -62,7 +62,7 @@ public class PageTutorial extends PageText { } @Override - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) public void onActionPerformed(IGuiLexiconEntry gui, GuiButton button) { if(button == buttonText) { GuiLexicon.startTutorial(); diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 838f50a63..c52ccc8a5 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.api.distmarker.Dist; import vazkii.botania.common.lib.LibMisc; public final class PacketHandler { diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 5b8f62289..0c47ee670 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -27,7 +27,7 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -93,7 +93,7 @@ public final class SkyblockWorldEvents { } else if(!equipped.isEmpty() && equipped.getItem() == Items.BOWL) { RayTraceResult rtr = ToolCommons.raytraceFromEntity(event.getWorld(), event.getEntityPlayer(), true, 4.5F); if(rtr != null) { - if (rtr.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { + if (rtr.type == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { if(event.getWorld().getBlockState(rtr.getBlockPos()).getMaterial() == Material.WATER) { if(!event.getWorld().isRemote) { equipped.shrink(1); @@ -114,17 +114,17 @@ public final class SkyblockWorldEvents { @SubscribeEvent public static void onDrops(BlockEvent.HarvestDropsEvent event) { - if(Botania.gardenOfGlassLoaded && event.getState().getBlock() == Blocks.TALLGRASS) { + if(Botania.gardenOfGlassLoaded && event.getState().getBlock() == Blocks.GRASS) { ItemStack stackToRemove = ItemStack.EMPTY; for(ItemStack stack : event.getDrops()) - if(stack.getItem() == Items.WHEAT_SEEDS && event.getWorld().rand.nextInt(4) == 0) { + if(stack.getItem() == Items.WHEAT_SEEDS && event.getWorld().getRandom().nextInt(4) == 0) { stackToRemove = stack; break; } if(!stackToRemove.isEmpty()) { event.getDrops().remove(stackToRemove); - event.getDrops().add(new ItemStack(event.getWorld().rand.nextBoolean() ? Items.PUMPKIN_SEEDS : Items.MELON_SEEDS)); + event.getDrops().add(new ItemStack(event.getWorld().getRandom().nextBoolean() ? Items.PUMPKIN_SEEDS : Items.MELON_SEEDS)); } } } @@ -143,7 +143,7 @@ public final class SkyblockWorldEvents { if(player instanceof EntityPlayerMP) { EntityPlayerMP pmp = (EntityPlayerMP) player; pmp.setPositionAndUpdate(pos.getX() + 0.5, pos.getY() + 1.6, pos.getZ() + 0.5); - pmp.setSpawnChunk(pos, true, player.world.provider.getDimension()); + pmp.setSpawnPoint(pos, true, player.world.getDimension().getId()); player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon)); } @@ -170,7 +170,7 @@ public final class SkyblockWorldEvents { for(int j = 0; j < 4; j++) for(int k = 0; k < 3; k++) world.setBlockState(pos.add(-1 + i, -1 - j, -1 + k), j == 0 ? Blocks.GRASS.getDefaultState() : Blocks.DIRT.getDefaultState()); - world.setBlockState(pos.add(-1, -2, 0), Blocks.FLOWING_WATER.getDefaultState()); + world.setBlockState(pos.add(-1, -2, 0), Blocks.WATER.getDefaultState()); world.setBlockState(pos.add(1, 2, 1), ModBlocks.manaFlame.getDefaultState()); ((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()); diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 049ddea4b..6db7c6200 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -16,8 +16,8 @@ import net.minecraft.world.WorldServer; import net.minecraft.world.WorldType; import net.minecraft.world.gen.ChunkGeneratorFlat; import net.minecraft.world.gen.IChunkGenerator; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; @@ -32,7 +32,7 @@ public class WorldTypeSkyblock extends WorldType { return world.getWorldInfo().getTerrainType() instanceof WorldTypeSkyblock; } - @SideOnly(Side.CLIENT) + @OnlyIn(Dist.CLIENT) @Override public boolean hasInfoNotice() { return true;