Fix sounds (removing BotaniaSoundEvents, query the registry directly

instead

Full optimize imports (sorry diff thrash :/)
This commit is contained in:
Vincent Lee committed 2017-06-25 01:40:46 -05:00
1 parent e0e5503fe8
commit c58ae21173
609 files changed
+2015 -3051

No files matched your search

@@ -10,19 +10,9 @@
*/
package vazkii.botania.api;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.base.Preconditions;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import net.minecraft.block.Block;
import net.minecraft.block.BlockCarpet;
import net.minecraft.block.BlockColored;
@@ -39,12 +29,10 @@ import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemArmor.ArmorMaterial;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.LoaderState;
import net.minecraftforge.oredict.OreDictionary;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.api.internal.DummyMethodHandler;
@@ -67,6 +55,15 @@ import vazkii.botania.api.wiki.IWikiProvider;
import vazkii.botania.api.wiki.SimpleWikiProvider;
import vazkii.botania.api.wiki.WikiHooks;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
public final class BotaniaAPI {
private static final List<LexiconCategory> categories = new ArrayList<>();
@@ -8,20 +8,16 @@
*/
package vazkii.botania.api;
import java.util.Collections;
import java.util.Map;
import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.LoaderState;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.subtile.SubTileEntity;
import java.util.Collections;
import java.util.Map;
/**
* Class for API calls that must be made clientside
*/
@@ -10,15 +10,15 @@
*/
package vazkii.botania.api.boss;
import java.awt.Rectangle;
import java.util.UUID;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.internal.ShaderCallback;
import java.awt.Rectangle;
import java.util.UUID;
/**
* A Botania boss, that is subject to special rendering.
*/
@@ -10,13 +10,12 @@
*/
package vazkii.botania.api.brew;
import java.util.List;
import com.google.common.collect.ImmutableList;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.PotionEffect;
import java.util.List;
/**
* The class for a Brew definition, each one is a singleton.
*/
@@ -10,16 +10,8 @@
*/
package vazkii.botania.api.corporea;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.regex.Pattern;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -29,6 +21,13 @@ import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import vazkii.botania.api.BotaniaAPI;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.regex.Pattern;
public final class CorporeaHelper {
private static final List<InvWithLocation> empty = ImmutableList.of();
@@ -10,10 +10,10 @@
*/
package vazkii.botania.api.corporea;
import java.util.List;
import net.minecraft.item.ItemStack;
import java.util.List;
/**
* A TileEntity that implements this will be able to intercept corporea
* requests case there is a Corporea Spark on top.
@@ -10,11 +10,11 @@
*/
package vazkii.botania.api.corporea;
import java.util.List;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.ItemStack;
import java.util.List;
/**
* An interface for a Corporea Spark. Includes functions for handling
* connections.
@@ -9,10 +9,10 @@
*/
package vazkii.botania.api.corporea;
import java.util.List;
import net.minecraft.item.ItemStack;
import java.util.List;
/**
* This interface wraps IInventory corporea works with in order to provide
* compatibility with different storage mods.
@@ -10,15 +10,14 @@
*/
package vazkii.botania.api.internal;
import java.util.Set;
import com.google.common.collect.ImmutableSet;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.api.mana.TileSignature;
import java.util.Set;
public class DummyManaNetwork implements IManaNetwork {
public static final DummyManaNetwork instance = new DummyManaNetwork();
@@ -10,8 +10,6 @@
*/
package vazkii.botania.api.internal;
import java.util.List;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.entity.Entity;
@@ -37,6 +35,8 @@ import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.recipe.RecipeRuneAltar;
import vazkii.botania.api.subtile.SubTileEntity;
import java.util.List;
public class DummyMethodHandler implements IInternalMethodHandler {
@Override
@@ -10,11 +10,11 @@
*/
package vazkii.botania.api.internal;
import java.util.List;
import net.minecraft.client.gui.GuiButton;
import vazkii.botania.api.lexicon.LexiconEntry;
import java.util.List;
/**
* Internal interface for the Lexicon Entry GUI. This contains
* everything that can be accessed from it. It's safe to cast
@@ -10,8 +10,6 @@
*/
package vazkii.botania.api.internal;
import java.util.List;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.entity.Entity;
@@ -38,6 +36,8 @@ import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.recipe.RecipeRuneAltar;
import vazkii.botania.api.subtile.SubTileEntity;
import java.util.List;
/**
* Any methods that refer to internal methods in Botania are here.
* This is defaulted to a dummy handler, whose methods do nothing.
@@ -10,11 +10,11 @@
*/
package vazkii.botania.api.internal;
import java.util.UUID;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import java.util.UUID;
/**
* Interface for the Mana Burst entity. This can safely be casted to EntityThrowable.
*/
@@ -10,13 +10,13 @@
*/
package vazkii.botania.api.internal;
import java.util.Set;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.api.mana.TileSignature;
import java.util.Set;
/**
* A basic interface for a world's Mana Network.
* @see IInternalMethodHandler#getManaNetworkInstance()
@@ -10,7 +10,6 @@
*/
package vazkii.botania.api.internal;
import net.minecraft.block.state.IBlockState;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.server.management.PlayerChunkMapEntry;
import net.minecraft.tileentity.TileEntity;
@@ -10,10 +10,10 @@
*/
package vazkii.botania.api.item;
import java.util.HashMap;
import net.minecraft.item.ItemStack;
import java.util.HashMap;
public interface IFloatingFlower {
public ItemStack getDisplayStack();
@@ -10,14 +10,12 @@
*/
package vazkii.botania.api.item;
import javax.annotation.Nullable;
import vazkii.botania.api.mana.ManaProficiencyEvent;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import vazkii.botania.api.mana.ManaProficiencyEvent;
/**
* An armor item that implements this gives the player wearing it mana proficiency, by
@@ -10,10 +10,10 @@
*/
package vazkii.botania.api.item;
import java.util.UUID;
import net.minecraft.item.ItemStack;
import java.util.UUID;
/**
* An item that implements this counts as a Relic item. This is purely for interaction
* and other mod items should not implement this interface.
@@ -10,12 +10,12 @@
*/
package vazkii.botania.api.item;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import java.util.List;
/**
* An item that implements this will allow for various wireframes to be drawn
* around the player. This will be called while the item is in the inventory,
@@ -10,10 +10,10 @@
*/
package vazkii.botania.api.lexicon;
import java.util.Queue;
import net.minecraftforge.fml.common.eventhandler.Event;
import java.util.Queue;
/**
* Fired when the Lexica Botania's tutorial is started. You can add your
* own entries to the tutorial here. Please use this responsibly.
@@ -10,12 +10,11 @@
*/
package vazkii.botania.api.lexicon;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.util.ResourceLocation;
import javax.annotation.Nonnull;
import net.minecraft.util.ResourceLocation;
import java.util.ArrayList;
import java.util.List;
public class LexiconCategory implements Comparable<LexiconCategory> {
@@ -10,18 +10,17 @@
*/
package vazkii.botania.api.lexicon;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.annotation.Nonnull;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.translation.I18n;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.BotaniaAPI;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class LexiconEntry implements Comparable<LexiconEntry> {
public final String unlocalizedName;
@@ -10,8 +10,6 @@
*/
package vazkii.botania.api.lexicon;
import java.util.List;
import com.google.common.collect.ImmutableList;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.item.ItemStack;
@@ -19,6 +17,8 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.internal.IGuiLexiconEntry;
import java.util.List;
public abstract class LexiconPage {
public String unlocalizedName;
@@ -10,13 +10,13 @@
*/
package vazkii.botania.api.lexicon;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import vazkii.botania.api.mana.IManaItem;
import java.util.HashMap;
import java.util.Map;
/**
* This class contains mappings for which entry and page correspond to each
* craftable ItemStack. Use the map method to map an ItemStack to a page in
@@ -10,14 +10,14 @@
*/
package vazkii.botania.api.lexicon.multiblock;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.world.IBlockAccess;
import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;
import java.util.HashMap;
import java.util.Map;
/**
* A hook for rendering blocks in the multiblock display.
*/
@@ -10,18 +10,18 @@
*/
package vazkii.botania.api.lexicon.multiblock;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* This class describes a Mutiblock object. It's used to display a
* multiblock in the lexicon and to show the player in a ghost-like
@@ -10,12 +10,12 @@
*/
package vazkii.botania.api.lexicon.multiblock;
import java.util.Collections;
import java.util.Map;
import net.minecraft.entity.Entity;
import net.minecraft.util.EnumFacing;
import java.util.Collections;
import java.util.Map;
/**
* A set of Multiblock objects for various rotations.
*/
@@ -10,9 +10,7 @@
*/
package vazkii.botania.api.mana;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.internal.IManaBurst;
/**
* Have an Item implement this to be counted as a lens for the mana spreader.
@@ -10,11 +10,11 @@
*/
package vazkii.botania.api.mana;
import javax.annotation.Nullable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import javax.annotation.Nullable;
/**
* An armor item that implements this can provide a mana discount for mana tools.
* Mana tools are the ones on the main toolset (Pick, Shovel, Axe, Sword and Shovel)
@@ -10,10 +10,10 @@
*/
package vazkii.botania.api.mana;
import java.util.UUID;
import vazkii.botania.api.internal.IManaBurst;
import java.util.UUID;
/**
* This describes an interface of a Mana Sender block that should be able to pingbackable
* by a burst to tell it that the burst is still alive.
@@ -10,8 +10,6 @@
*/
package vazkii.botania.api.mana;
import javax.annotation.Nullable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.eventhandler.Event;
@@ -10,14 +10,6 @@
*/
package vazkii.botania.api.mana;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.annotation.Nullable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
@@ -25,6 +17,12 @@ import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import vazkii.botania.api.BotaniaAPI;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
public final class ManaItemHandler {
/**
@@ -10,12 +10,12 @@
*/
package vazkii.botania.api.mana;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.eventhandler.Event;
import java.util.List;
public class ManaItemsEvent extends Event {
private final EntityPlayer entityPlayer;
@@ -10,14 +10,13 @@
*/
package vazkii.botania.api.mana.spark;
import java.util.List;
import com.google.common.base.Predicates;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.world.World;
import java.util.List;
public final class SparkHelper {
public static final int SPARK_SCAN_RANGE = 12;
@@ -10,13 +10,13 @@
*/
package vazkii.botania.api.recipe;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraftforge.fml.common.eventhandler.Event;
import java.util.List;
/**
* An event fired when an Elven Portal TE updates. The portal's
* relevant AABB and other stuff is passed in for convenience. This
@@ -10,11 +10,7 @@
*/
package vazkii.botania.api.recipe;
import java.util.ArrayList;
import java.util.List;
import com.google.common.collect.ImmutableList;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
@@ -22,6 +18,9 @@ import net.minecraftforge.oredict.OreDictionary;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.api.brew.IBrewContainer;
import java.util.ArrayList;
import java.util.List;
public class RecipeBrew {
private final Brew brew;
@@ -1,13 +1,12 @@
package vazkii.botania.api.recipe;
import com.google.common.collect.ImmutableList;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import java.util.ArrayList;
import java.util.List;
import com.google.common.collect.ImmutableList;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
public class RecipeElvenTrade {
private final ImmutableList<ItemStack> outputs;
@@ -10,14 +10,13 @@
*/
package vazkii.botania.api.recipe;
import java.util.List;
import javax.annotation.Nullable;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import javax.annotation.Nullable;
import java.util.List;
public class RecipeManaInfusion {
private final ItemStack output;
@@ -10,15 +10,14 @@
*/
package vazkii.botania.api.recipe;
import java.util.ArrayList;
import java.util.List;
import com.google.common.collect.ImmutableList;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.oredict.OreDictionary;
import java.util.ArrayList;
import java.util.List;
public class RecipePetals {
private final ItemStack output;
@@ -10,12 +10,7 @@
*/
package vazkii.botania.api.recipe;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.google.common.base.Preconditions;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
@@ -24,6 +19,10 @@ import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
import vazkii.botania.api.subtile.SubTileEntity;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class RecipePureDaisy {
public static final int DEFAULT_TIME = 150;
@@ -1,62 +0,0 @@
package vazkii.botania.api.sound;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundEvent;
/**
* Use these to play Botania sounds.
* Do not access this class before Botania preinits!
*/
public final class BotaniaSoundEvents {
public static final SoundEvent airRod = getRegisteredSoundEvent("airrod");
public static final SoundEvent agricarnation = getRegisteredSoundEvent("agricarnation");
public static final SoundEvent altarCraft = getRegisteredSoundEvent("altarcraft");
public static final SoundEvent babylonAttack = getRegisteredSoundEvent("babylonattack");
public static final SoundEvent babylonSpawn = getRegisteredSoundEvent("babylonspawn");
public static final SoundEvent bellows = getRegisteredSoundEvent("bellows");
public static final SoundEvent bifrostRod = getRegisteredSoundEvent("bifrostrod");
public static final SoundEvent blackLotus = getRegisteredSoundEvent("blacklotus");
public static final SoundEvent dash = getRegisteredSoundEvent("dash");
public static final SoundEvent ding = getRegisteredSoundEvent("ding");
public static final SoundEvent divaCharm = getRegisteredSoundEvent("divacharm");
public static final SoundEvent divinationRod = getRegisteredSoundEvent("divinationrod");
public static final SoundEvent doit = getRegisteredSoundEvent("doit");
public static final SoundEvent enchanterFade = getRegisteredSoundEvent("enchanterform");
public static final SoundEvent enchanterForm = getRegisteredSoundEvent("enchanterfade");
public static final SoundEvent enchanterEnchant = getRegisteredSoundEvent("enchanterenchant");
public static final SoundEvent endoflame = getRegisteredSoundEvent("endoflame");
public static final SoundEvent equipBauble = getRegisteredSoundEvent("equipbauble");
public static final SoundEvent gaiaTrap = getRegisteredSoundEvent("gaiatrap");
public static final SoundEvent goldenLaurel = getRegisteredSoundEvent("goldenlaurel");
public static final SoundEvent holyCloak = getRegisteredSoundEvent("holycloak");
public static final SoundEvent laputaStart = getRegisteredSoundEvent("laputastart");
public static final SoundEvent lexiconOpen = getRegisteredSoundEvent("lexiconopen");
public static final SoundEvent lexiconPage = getRegisteredSoundEvent("lexiconpage");
public static final SoundEvent lightRelay = getRegisteredSoundEvent("lightrelay");
public static final SoundEvent manaBlaster = getRegisteredSoundEvent("manablaster");
public static final SoundEvent manaPoolCraft = getRegisteredSoundEvent("manapoolcraft");
public static final SoundEvent missile = getRegisteredSoundEvent("missile");
public static final SoundEvent orechid = getRegisteredSoundEvent("orechid");
public static final SoundEvent potionCreate = getRegisteredSoundEvent("potioncreate");
public static final SoundEvent runeAltarCraft = getRegisteredSoundEvent("runealtarcraft");
public static final SoundEvent runeAltarStart = getRegisteredSoundEvent("runealtarstart");
public static final SoundEvent spreaderFire = getRegisteredSoundEvent("spreaderfire");
public static final SoundEvent starcaller = getRegisteredSoundEvent("starcaller");
public static final SoundEvent terraBlade = getRegisteredSoundEvent("terrablade");
public static final SoundEvent terraformRod = getRegisteredSoundEvent("terraformrod");
public static final SoundEvent terraPickMode = getRegisteredSoundEvent("terrapickmode");
public static final SoundEvent terrasteelCraft = getRegisteredSoundEvent("terrasteelcraft");
public static final SoundEvent thermalily = getRegisteredSoundEvent("thermalily");
public static final SoundEvent unholyCloak = getRegisteredSoundEvent("unholycloak");
public static final SoundEvent way = getRegisteredSoundEvent("way");
public static final SoundEvent gaiaMusic1 = getRegisteredSoundEvent("music.gaia1");
public static final SoundEvent gaiaMusic2 = getRegisteredSoundEvent("music.gaia2");
private static SoundEvent getRegisteredSoundEvent(String name) {
return SoundEvent.REGISTRY.getObject(new ResourceLocation("botania", name));
}
private BotaniaSoundEvents() {}
}
@@ -10,7 +10,6 @@ package vazkii.botania.api.state;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import net.minecraft.block.BlockRailBase;
import net.minecraft.block.BlockRailPowered;
import net.minecraft.block.BlockRotatedPillar;
@@ -8,14 +8,13 @@
*/
package vazkii.botania.api.state;
import java.util.Objects;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import net.minecraftforge.common.property.IUnlistedProperty;
import java.util.Objects;
// Generic base class for unlisted properties
public class PropertyObject<T> implements IUnlistedProperty<T> {
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum AlfPortalState implements IStringSerializable {
OFF,
ON_Z,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum AltGrassVariant implements IStringSerializable {
DRY,
GOLDEN,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum AltarVariant implements IStringSerializable {
DEFAULT,
FOREST,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum BiomeBrickVariant implements IStringSerializable {
FOREST,
PLAINS,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum BiomeStoneVariant implements IStringSerializable {
FOREST,
PLAINS,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum CratePattern implements IStringSerializable {
NONE,
CRAFTY_1_1,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum CrateVariant implements IStringSerializable {
OPEN,
CRAFTY;
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum CustomBrickVariant implements IStringSerializable {
HELLISH_BRICK,
SOUL_BRICK,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum DrumVariant implements IStringSerializable {
WILD,
GATHERING,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum LivingRockVariant implements IStringSerializable {
DEFAULT,
BRICK,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum LivingWoodVariant implements IStringSerializable {
DEFAULT,
PLANKS,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum LuminizerVariant implements IStringSerializable {
DEFAULT,
DETECTOR,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum PlatformVariant implements IStringSerializable {
ABSTRUSE,
SPECTRAL,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum PoolVariant implements IStringSerializable {
DEFAULT,
CREATIVE,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum PylonVariant implements IStringSerializable {
MANA,
NATURA,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum QuartzVariant implements IStringSerializable {
NORMAL,
CHISELED,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum SpreaderVariant implements IStringSerializable {
MANA,
REDSTONE,
@@ -8,10 +8,10 @@
*/
package vazkii.botania.api.state.enums;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum StorageVariant implements IStringSerializable {
MANASTEEL,
TERRASTEEL,
@@ -10,9 +10,6 @@
*/
package vazkii.botania.api.subtile;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
@@ -33,6 +30,8 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.wand.IWandBindable;
import java.util.List;
/**
* A Sub-TileEntity, this is used for the flower system. Make sure to map subclasses
* of this using BotaniaAPI.mapSubTile(String, Class). Any subclass of this must have
@@ -10,8 +10,6 @@
*/
package vazkii.botania.api.subtile;
import java.awt.Color;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.resources.I18n;
@@ -27,7 +25,9 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.IManaNetwork;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.api.sound.BotaniaSoundEvents;
import vazkii.botania.common.core.handler.ModSounds;
import java.awt.Color;
/**
* The basic class for a Functional Flower.
@@ -137,7 +137,7 @@ public class SubTileFunctional extends SubTileEntity {
return false;
knownMana = mana;
player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F);
player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.ding, SoundCategory.PLAYERS, 0.1F, 1F);
return super.onWanded(player, wand);
}
@@ -10,9 +10,6 @@
*/
package vazkii.botania.api.subtile;
import java.awt.Color;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
@@ -33,7 +30,10 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.IManaNetwork;
import vazkii.botania.api.mana.IManaCollector;
import vazkii.botania.api.sound.BotaniaSoundEvents;
import vazkii.botania.common.core.handler.ModSounds;
import java.awt.Color;
import java.util.List;
/**
* The basic class for a Generating Flower.
@@ -224,7 +224,7 @@ public class SubTileGenerating extends SubTileEntity {
sync();
knownMana = mana;
player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F);
player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.ding, SoundCategory.PLAYERS, 0.1F, 1F);
return super.onWanded(player, wand);
}
@@ -10,9 +10,6 @@
*/
package vazkii.botania.api.subtile.signature;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.translation.I18n;
@@ -24,6 +21,8 @@ import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileGenerating;
import java.util.List;
/**
* A basic (and fallback) implementation of SubTileSignature.
*/
@@ -10,14 +10,13 @@
*/
package vazkii.botania.api.subtile.signature;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
/**
* A singleton instance for a SubTileEntity, this is called for a few methods.
*/
@@ -10,14 +10,13 @@
*/
package vazkii.botania.api.wiki;
import org.apache.commons.lang3.text.WordUtils;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import org.apache.commons.lang3.text.WordUtils;
public class SimpleWikiProvider implements IWikiProvider {
@@ -10,12 +10,12 @@
*/
package vazkii.botania.api.wiki;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.util.ResourceLocation;
import java.util.HashMap;
import java.util.Map;
public class WikiHooks {
private static final IWikiProvider FALLBACK_PROVIDER = new SimpleWikiProvider("FTB Wiki", "http://ftb.gamepedia.com/%s");
@@ -10,12 +10,6 @@
*/
package vazkii.botania.client.challenge;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@@ -24,6 +18,12 @@ import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lib.LibBlockNames;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public final class ModChallenges {
public static final Map<EnumChallengeLevel, List<Challenge>> challenges = new EnumMap<>(EnumChallengeLevel.class);
@@ -10,18 +10,12 @@
*/
package vazkii.botania.client.core.handler;
import java.util.List;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.GL11;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BlockRendererDispatcher;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.shader.Shader;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
@@ -29,9 +23,13 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.common.item.ItemAstrolabe;
import java.util.List;
public final class AstrolabePreviewHandler {
@SubscribeEvent
@@ -10,11 +10,6 @@
*/
package vazkii.botania.client.core.handler;
import javax.annotation.Nonnull;
import net.minecraftforge.items.IItemHandler;
import org.lwjgl.opengl.GL11;
import baubles.api.BaublesApi;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
@@ -27,6 +22,8 @@ import net.minecraft.init.MobEffects;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.item.IBaubleRender;
import vazkii.botania.api.item.IBaubleRender.Helper;
import vazkii.botania.api.item.IBaubleRender.RenderType;
@@ -36,6 +33,8 @@ import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm;
import javax.annotation.Nonnull;
public final class BaubleRenderHandler implements LayerRenderer<EntityPlayer> {
@Override
@@ -10,10 +10,6 @@
*/
package vazkii.botania.client.core.handler;
import java.awt.Color;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
@@ -26,6 +22,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.subtile.ISubTileContainer;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileEntity;
@@ -35,6 +32,8 @@ import vazkii.botania.common.entity.EntityMagicLandmine;
import vazkii.botania.common.item.ItemTwigWand;
import vazkii.botania.common.item.ModItems;
import java.awt.Color;
public final class BlockHighlightRenderHandler {
private BlockHighlightRenderHandler() {}
@@ -10,26 +10,25 @@
*/
package vazkii.botania.client.core.handler;
import java.awt.Rectangle;
import java.util.Collections;
import java.util.Set;
import java.util.UUID;
import java.util.WeakHashMap;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.boss.IBotaniaBoss;
import vazkii.botania.api.internal.ShaderCallback;
import vazkii.botania.client.core.helper.RenderHelper;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.client.lib.LibResources;
import java.awt.Rectangle;
import java.util.Collections;
import java.util.Set;
import java.util.UUID;
import java.util.WeakHashMap;
public final class BossBarHandler {
private BossBarHandler() {}
@@ -10,11 +10,6 @@
*/
package vazkii.botania.client.core.handler;
import java.awt.Color;
import java.util.List;
import org.lwjgl.opengl.GL11;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
@@ -33,11 +28,15 @@ import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.IItemHandlerModifiable;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.item.IWireframeCoordinateListProvider;
import vazkii.botania.api.wand.ICoordBoundItem;
import vazkii.botania.api.wand.IWireframeAABBProvider;
import java.awt.Color;
import java.util.List;
public final class BoundTileRenderer {
private BoundTileRenderer() {}
@@ -1,17 +1,16 @@
package vazkii.botania.client.core.handler;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Field;
import com.google.common.base.Throwables;
import net.minecraft.client.renderer.RenderGlobal;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import vazkii.botania.common.Botania;
import vazkii.botania.common.lib.LibObfuscation;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Field;
public final class ClientMethodHandles {
public static final MethodHandle
@@ -11,7 +11,6 @@
package vazkii.botania.client.core.handler;
import com.google.common.collect.ImmutableList;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
@@ -1,8 +1,5 @@
package vazkii.botania.client.core.handler;
import java.awt.Color;
import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
@@ -37,6 +34,9 @@ import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant;
import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick;
import vazkii.botania.common.item.lens.ItemLens;
import java.awt.Color;
import java.util.Map;
public final class ColorHandler {
public static void init() {
@@ -10,15 +10,6 @@
*/
package vazkii.botania.client.core.handler;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import javax.annotation.Nonnull;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
@@ -37,6 +28,14 @@ import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.version.VersionChecker;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import javax.annotation.Nonnull;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
public final class ContributorFancinessHandler implements LayerRenderer<EntityPlayer> {
public volatile static Map<String, ItemStack> flowerMap = null;
@@ -10,33 +10,30 @@
*/
package vazkii.botania.client.core.handler;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
import javax.annotation.Nonnull;
import net.minecraft.util.NonNullList;
import org.lwjgl.input.Keyboard;
import com.google.common.collect.ImmutableList;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiChat;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.text.TextComponentString;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import org.lwjgl.input.Keyboard;
import vazkii.botania.api.corporea.CorporeaHelper;
import vazkii.botania.common.lib.LibObfuscation;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
public class CorporeaAutoCompleteHandler {
private boolean isAutoCompleted = false;
@@ -10,17 +10,7 @@
*/
package vazkii.botania.client.core.handler;
import java.util.Map;
import java.util.UUID;
import org.lwjgl.opengl.ARBFragmentShader;
import org.lwjgl.opengl.ContextCapabilities;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GLContext;
import com.google.common.base.Optional;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
@@ -32,11 +22,19 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.lwjgl.opengl.ARBFragmentShader;
import org.lwjgl.opengl.ContextCapabilities;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GLContext;
import vazkii.botania.client.fx.ParticleRenderDispatcher;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.lib.LibMisc;
import java.util.Map;
import java.util.UUID;
public final class DebugHandler {
private DebugHandler() {}
@@ -10,15 +10,6 @@
*/
package vazkii.botania.client.core.handler;
import java.awt.Color;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import org.lwjgl.opengl.GL11;
import baubles.api.BaublesApi;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLiquid;
@@ -44,6 +35,9 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.lexicon.ILexicon;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
@@ -76,6 +70,11 @@ import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
import vazkii.botania.common.item.equipment.bauble.ItemMonocle;
import vazkii.botania.common.lib.LibObfuscation;
import java.awt.Color;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
public final class HUDHandler {
private HUDHandler() {}
@@ -10,10 +10,6 @@
*/
package vazkii.botania.client.core.handler;
import java.util.regex.Pattern;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.GlStateManager;
@@ -23,6 +19,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.opengl.GL11;
import java.util.regex.Pattern;
public final class ItemsRemainingRenderHandler {
@@ -10,11 +10,6 @@
*/
package vazkii.botania.client.core.handler;
import java.util.ArrayDeque;
import java.util.Deque;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
@@ -25,10 +20,14 @@ import net.minecraft.profiler.Profiler;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.fx.FXLightning;
import vazkii.botania.client.fx.ParticleRenderDispatcher;
import vazkii.botania.client.lib.LibResources;
import java.util.ArrayDeque;
import java.util.Deque;
public class LightningHandler {
private LightningHandler() {}
@@ -8,21 +8,6 @@
*/
package vazkii.botania.client.core.handler;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.nio.IntBuffer;
import java.util.Map;
import javax.imageio.ImageIO;
import org.apache.commons.lang3.text.WordUtils;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import com.google.common.collect.Maps;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@@ -33,6 +18,9 @@ import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.event.entity.player.ArrowLooseEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.model.FloatingFlowerModel;
import vazkii.botania.client.model.GunModel;
@@ -43,6 +31,12 @@ import vazkii.botania.common.item.ItemSparkUpgrade;
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
import vazkii.botania.common.item.relic.ItemKingKey;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.nio.IntBuffer;
public class MiscellaneousIcons {
public static final MiscellaneousIcons INSTANCE = new MiscellaneousIcons();
@@ -8,10 +8,6 @@
*/
package vazkii.botania.client.core.handler;
import java.util.Locale;
import java.util.Map;
import java.util.function.IntFunction;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@@ -32,32 +28,7 @@ import vazkii.botania.client.model.SpecialFlowerModel;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.block.subtile.SubTileManastar;
import vazkii.botania.common.block.subtile.SubTilePureDaisy;
import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation;
import vazkii.botania.common.block.subtile.functional.SubTileBellethorn;
import vazkii.botania.common.block.subtile.functional.SubTileBergamute;
import vazkii.botania.common.block.subtile.functional.SubTileBubbell;
import vazkii.botania.common.block.subtile.functional.SubTileClayconia;
import vazkii.botania.common.block.subtile.functional.SubTileDaffomill;
import vazkii.botania.common.block.subtile.functional.SubTileDreadthorn;
import vazkii.botania.common.block.subtile.functional.SubTileExoflame;
import vazkii.botania.common.block.subtile.functional.SubTileFallenKanade;
import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream;
import vazkii.botania.common.block.subtile.functional.SubTileHopperhock;
import vazkii.botania.common.block.subtile.functional.SubTileHyacidus;
import vazkii.botania.common.block.subtile.functional.SubTileJadedAmaranthus;
import vazkii.botania.common.block.subtile.functional.SubTileJiyuulia;
import vazkii.botania.common.block.subtile.functional.SubTileLoonuim;
import vazkii.botania.common.block.subtile.functional.SubTileMarimorphosis;
import vazkii.botania.common.block.subtile.functional.SubTileMedumone;
import vazkii.botania.common.block.subtile.functional.SubTileOrechid;
import vazkii.botania.common.block.subtile.functional.SubTileOrechidIgnem;
import vazkii.botania.common.block.subtile.functional.SubTilePollidisiac;
import vazkii.botania.common.block.subtile.functional.SubTileRannuncarpus;
import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia;
import vazkii.botania.common.block.subtile.functional.SubTileSpectranthemum;
import vazkii.botania.common.block.subtile.functional.SubTileTangleberrie;
import vazkii.botania.common.block.subtile.functional.SubTileTigerseye;
import vazkii.botania.common.block.subtile.functional.SubTileVinculotus;
import vazkii.botania.common.block.subtile.functional.*;
import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose;
import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon;
import vazkii.botania.common.block.subtile.generating.SubTileEndoflame;
@@ -73,6 +44,10 @@ import vazkii.botania.common.block.subtile.generating.SubTileThermalily;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
import java.util.Locale;
import java.util.Map;
import java.util.function.IntFunction;
@Mod.EventBusSubscriber
public final class ModelHandler {
@SubscribeEvent
@@ -10,8 +10,6 @@
*/
package vazkii.botania.client.core.handler;
import javax.annotation.Nonnull;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Biomes;
import net.minecraft.init.Blocks;
@@ -24,6 +22,8 @@ import net.minecraft.world.biome.Biome;
import vazkii.botania.api.lexicon.multiblock.Multiblock;
import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;
import javax.annotation.Nonnull;
/**
* This class acts as a wrapper around a block access to
* replace blocks with the blocks involved in the multiblock specified
@@ -10,10 +10,6 @@
*/
package vazkii.botania.client.core.handler;
import net.minecraft.util.EnumActionResult;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.GL11;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BlockRendererDispatcher;
@@ -22,6 +18,7 @@ import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
@@ -33,6 +30,8 @@ import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook;
import vazkii.botania.api.lexicon.multiblock.Multiblock;
import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
@@ -10,13 +10,6 @@
*/
package vazkii.botania.client.core.handler;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
import vazkii.botania.client.challenge.Challenge;
@@ -24,6 +17,13 @@ import vazkii.botania.client.challenge.ModChallenges;
import vazkii.botania.client.gui.lexicon.GuiLexicon;
import vazkii.botania.common.lib.LibMisc;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.List;
import java.util.Set;
public final class PersistentVariableHelper {
private static final String TAG_FIRST_LOAD = "firstLoad";
@@ -10,12 +10,6 @@
*/
package vazkii.botania.client.core.handler;
import java.util.ArrayDeque;
import java.util.Queue;
import java.util.Random;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
@@ -23,11 +17,16 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import org.lwjgl.opengl.GL11;
import vazkii.botania.common.block.tile.string.TileRedString;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.item.ModItems;
import java.util.ArrayDeque;
import java.util.Queue;
import java.util.Random;
public final class RedStringRenderer {
public static final Queue<TileRedString> redStringTiles = new ArrayDeque<>();
@@ -10,17 +10,13 @@
*/
package vazkii.botania.client.core.handler;
import java.awt.Color;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.InventoryPlayer;
@@ -28,6 +24,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.client.event.RenderTooltipEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.lexicon.ILexicon;
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData;
@@ -38,6 +35,8 @@ import vazkii.botania.common.item.ItemLexicon;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick;
import java.awt.Color;
public final class TooltipAdditionDisplayHandler {
private static float lexiconLookupTime = 0F;
@@ -10,14 +10,13 @@
*/
package vazkii.botania.client.core.helper;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.lib.LibResources;
public final class IconHelper {
@@ -10,23 +10,22 @@
*/
package vazkii.botania.client.core.helper;
import java.util.List;
import java.util.Random;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.lib.LibResources;
import java.util.List;
import java.util.Random;
public final class RenderHelper {
public static void renderTooltip(int x, int y, List<String> tooltipData) {
@@ -10,23 +10,22 @@
*/
package vazkii.botania.client.core.helper;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.stream.Collectors;
import net.minecraft.client.renderer.OpenGlHelper;
import org.lwjgl.opengl.ARBFragmentShader;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.ARBVertexShader;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.renderer.OpenGlHelper;
import vazkii.botania.api.internal.ShaderCallback;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.handler.ConfigHandler;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.stream.Collectors;
public final class ShaderHelper {
private static final int VERT = ARBVertexShader.GL_VERTEX_SHADER_ARB;
@@ -10,14 +10,6 @@
*/
package vazkii.botania.client.core.proxy;
import java.awt.Desktop;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.time.LocalDateTime;
import java.time.Month;
import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.model.ModelBiped;
@@ -29,8 +21,6 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemRecord;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -69,7 +59,6 @@ import vazkii.botania.client.core.handler.DebugHandler;
import vazkii.botania.client.core.handler.HUDHandler;
import vazkii.botania.client.core.handler.LightningHandler;
import vazkii.botania.client.core.handler.MiscellaneousIcons;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.client.core.handler.MultiblockRenderHandler;
import vazkii.botania.client.core.handler.PersistentVariableHelper;
import vazkii.botania.client.core.handler.RenderLexicon;
@@ -92,55 +81,11 @@ import vazkii.botania.client.render.entity.RenderPixie;
import vazkii.botania.client.render.entity.RenderPoolMinecart;
import vazkii.botania.client.render.entity.RenderSnowballStack;
import vazkii.botania.client.render.entity.RenderSpark;
import vazkii.botania.client.render.tile.RenderTileAlfPortal;
import vazkii.botania.client.render.tile.RenderTileAltar;
import vazkii.botania.client.render.tile.RenderTileAnimatedTorch;
import vazkii.botania.client.render.tile.RenderTileAvatar;
import vazkii.botania.client.render.tile.RenderTileBellows;
import vazkii.botania.client.render.tile.RenderTileBrewery;
import vazkii.botania.client.render.tile.RenderTileCocoon;
import vazkii.botania.client.render.tile.RenderTileCorporeaCrystalCube;
import vazkii.botania.client.render.tile.RenderTileCorporeaIndex;
import vazkii.botania.client.render.tile.RenderTileEnchanter;
import vazkii.botania.client.render.tile.RenderTileFloatingFlower;
import vazkii.botania.client.render.tile.RenderTileGaiaHead;
import vazkii.botania.client.render.tile.RenderTileHourglass;
import vazkii.botania.client.render.tile.RenderTileIncensePlate;
import vazkii.botania.client.render.tile.RenderTileLightRelay;
import vazkii.botania.client.render.tile.RenderTilePool;
import vazkii.botania.client.render.tile.RenderTilePrism;
import vazkii.botania.client.render.tile.RenderTilePylon;
import vazkii.botania.client.render.tile.RenderTileRedString;
import vazkii.botania.client.render.tile.RenderTileRuneAltar;
import vazkii.botania.client.render.tile.RenderTileSparkChanger;
import vazkii.botania.client.render.tile.RenderTileSpreader;
import vazkii.botania.client.render.tile.RenderTileStarfield;
import vazkii.botania.client.render.tile.RenderTileTerraPlate;
import vazkii.botania.client.render.tile.RenderTileTeruTeruBozu;
import vazkii.botania.client.render.tile.RenderTileTinyPotato;
import vazkii.botania.client.render.tile.*;
import vazkii.botania.client.render.world.SkyblockRenderEvents;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.subtile.functional.BergamuteEventHandler;
import vazkii.botania.common.block.tile.TileAlfPortal;
import vazkii.botania.common.block.tile.TileAltar;
import vazkii.botania.common.block.tile.TileAnimatedTorch;
import vazkii.botania.common.block.tile.TileAvatar;
import vazkii.botania.common.block.tile.TileBrewery;
import vazkii.botania.common.block.tile.TileCocoon;
import vazkii.botania.common.block.tile.TileEnchanter;
import vazkii.botania.common.block.tile.TileFloatingFlower;
import vazkii.botania.common.block.tile.TileFloatingSpecialFlower;
import vazkii.botania.common.block.tile.TileGaiaHead;
import vazkii.botania.common.block.tile.TileHourglass;
import vazkii.botania.common.block.tile.TileIncensePlate;
import vazkii.botania.common.block.tile.TileLightRelay;
import vazkii.botania.common.block.tile.TilePylon;
import vazkii.botania.common.block.tile.TileRuneAltar;
import vazkii.botania.common.block.tile.TileSparkChanger;
import vazkii.botania.common.block.tile.TileStarfield;
import vazkii.botania.common.block.tile.TileTerraPlate;
import vazkii.botania.common.block.tile.TileTeruTeruBozu;
import vazkii.botania.common.block.tile.TileTinyPotato;
import vazkii.botania.common.block.tile.*;
import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube;
import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;
import vazkii.botania.common.block.tile.mana.TileBellows;
@@ -172,6 +117,14 @@ import vazkii.botania.common.item.equipment.bauble.ItemMonocle;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibObfuscation;
import java.awt.Desktop;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.time.LocalDateTime;
import java.time.Month;
import java.util.Map;
public class ClientProxy implements IProxy {
public static final VertexFormat POSITION_TEX_LMAP_NORMAL =
@@ -10,13 +10,13 @@
*/
package vazkii.botania.client.core.proxy;
import java.util.Set;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.fml.client.IModGuiFactory;
import vazkii.botania.client.gui.GuiBotaniaConfig;
import java.util.Set;
public class GuiFactory implements IModGuiFactory {
@Override
@@ -1,23 +1,23 @@
package vazkii.botania.client.fx;
import gnu.trove.map.hash.TIntIntHashMap;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.Particle;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import vazkii.botania.client.core.handler.LightningHandler;
import vazkii.botania.common.core.helper.Vector3;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Random;
import gnu.trove.map.hash.TIntIntHashMap;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.Particle;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import vazkii.botania.client.core.handler.LightningHandler;
import vazkii.botania.common.core.helper.Vector3;
// Originally taken with permission from WRCBE - heavily modified
public class FXLightning extends Particle {
@@ -10,26 +10,25 @@
*/
package vazkii.botania.client.fx;
import java.util.ArrayDeque;
import java.util.Queue;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.Particle;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.entity.Entity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.core.handler.ConfigHandler;
import java.util.ArrayDeque;
import java.util.Queue;
public class FXSparkle extends Particle {
private static final ResourceLocation vanillaParticles = new ResourceLocation("textures/particle/particles.png");
@@ -10,24 +10,23 @@
*/
package vazkii.botania.client.fx;
import java.util.ArrayDeque;
import java.util.Queue;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.Particle;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.fml.client.FMLClientHandler;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.core.handler.ConfigHandler;
import java.util.ArrayDeque;
import java.util.Queue;
public class FXWisp extends Particle {
private static final ResourceLocation vanillaParticles = new ResourceLocation("textures/particle/particles.png");
@@ -11,12 +11,11 @@
*/
package vazkii.botania.client.fx;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.profiler.Profiler;
import org.lwjgl.opengl.GL11;
public final class ParticleRenderDispatcher {
@@ -10,8 +10,6 @@
*/
package vazkii.botania.client.gui.bag;
import javax.annotation.Nonnull;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
@@ -20,6 +18,8 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.items.SlotItemHandler;
import vazkii.botania.client.gui.SlotLocked;
import javax.annotation.Nonnull;
public class ContainerFlowerBag extends Container {
private final InventoryFlowerBag flowerBagInv;
Loaded 100 of 609 files, more files were not shown because too many files have changed in this diff. Show more