Minor tweaks, full replace sideonly/side with onlyin/dist

This commit is contained in:
Vincent Lee committed 2019-02-05 23:58:58 -06:00
1 parent 5bf8fbcca6
commit 0996ffbcca
187 files changed
+645 -653

No files matched your search

@@ -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<ResourceLocation, ModelResourceLocation> subtileBlockModels = Maps.newHashMap();
@@ -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);
/**
@@ -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) {}
}
@@ -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);
@@ -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<LexiconEntry> {
return ""; // Override this if you want a tagline. You probably do
}
@SideOnly(Side.CLIENT)
@OnlyIn(Dist.CLIENT)
public boolean isVisible() {
return true;
}
@@ -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) {}
/**
@@ -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;
}
@@ -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);
}
@@ -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) {}
/**
@@ -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");
@@ -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");
@@ -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<String> tooltip) {
tooltip.add(TextFormatting.BLUE + I18n.translateToLocal(getType()));
@@ -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<String> tooltip) {}
}
@@ -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);
}
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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<ItemStack> l) {
baubles.setEventBlock(true);
@@ -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();
}
@@ -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;
@@ -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)
@@ -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() {
@@ -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();
@@ -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());
@@ -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() {
@@ -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);
@@ -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));
@@ -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);
@@ -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());
@@ -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");
@@ -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());
@@ -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;
@@ -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);
@@ -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);
@@ -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());
@@ -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();
@@ -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();
@@ -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());
@@ -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;
@@ -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);
@@ -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
@@ -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");
@@ -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);
@@ -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");
@@ -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());
@@ -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());
@@ -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() {
@@ -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());
@@ -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());
@@ -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;
@@ -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());
@@ -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() {
@@ -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;
@@ -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);
@@ -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);
@@ -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");
@@ -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");
@@ -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");
@@ -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());
@@ -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) {
@@ -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"));
@@ -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,
@@ -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());
@@ -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");
@@ -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");
@@ -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");
@@ -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;
}
@@ -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());
@@ -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());
@@ -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;
}
@@ -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));
@@ -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;
}
@@ -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());
@@ -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;
}
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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);
@@ -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;
@@ -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);
@@ -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<ItemStack> 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<EntityItem> 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;
}
@@ -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];
}
@@ -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;
@@ -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);
@@ -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));
}
@@ -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");
@@ -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;
Loaded 100 of 187 files, more files were not shown because too many files have changed in this diff. Show more