() {
- @Override
- public int compare(IStripesHandler o1, IStripesHandler o2) {
- return stripesHandlerPriorities.get(o2) - stripesHandlerPriorities.get(o1);
- }
- });
- }
-
- public static void registerPipePluggable(Class pluggable, String name) {
- pipePluggables.add(pluggable);
- pipePluggableNames.put(name, pluggable);
- pipePluggableByNames.put(pluggable, name);
- }
-
- public static Class getPluggableByName(String pluggableName) {
- return pipePluggableNames.get(pluggableName);
- }
-
- public static String getPluggableName(Class aClass) {
- return pipePluggableByNames.get(aClass);
- }
-}
diff --git a/src/api/java/buildcraft/api/transport/PipeWire.java b/src/api/java/buildcraft/api/transport/PipeWire.java
deleted file mode 100644
index eb8665e15..000000000
--- a/src/api/java/buildcraft/api/transport/PipeWire.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
- * http://www.mod-buildcraft.com
- *
- * The BuildCraft API is distributed under the terms of the MIT License.
- * Please check the contents of the license, which should be located
- * as "LICENSE.API" in the BuildCraft source code distribution.
- */
-package buildcraft.api.transport;
-
-import java.util.Locale;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-public enum PipeWire {
-
- RED, BLUE, GREEN, YELLOW;
- public static Item item;
- public static final PipeWire[] VALUES = values();
-
- public PipeWire reverse() {
- switch (this) {
- case RED:
- return YELLOW;
- case BLUE:
- return GREEN;
- case GREEN:
- return BLUE;
- default:
- return RED;
- }
- }
-
- public String getTag() {
- return name().toLowerCase(Locale.ENGLISH) + "PipeWire";
- }
-
- public String getColor() {
- String name = this.toString().toLowerCase(Locale.ENGLISH);
- char first = Character.toUpperCase(name.charAt(0));
- return first + name.substring(1);
- }
-
- public ItemStack getStack() {
- return getStack(1);
- }
-
- public ItemStack getStack(int qty) {
- if (item == null) {
- return null;
- } else {
- return new ItemStack(item, qty, ordinal());
- }
- }
-
- public boolean isPipeWire(ItemStack stack) {
- if (stack == null) {
- return false;
- } else if (stack.getItem() != item) {
- return false;
- } else {
- return stack.getItemDamage() == ordinal();
- }
- }
-
- public static PipeWire fromOrdinal(int ordinal) {
- if (ordinal < 0 || ordinal >= VALUES.length) {
- return RED;
- } else {
- return VALUES[ordinal];
- }
- }
-}
diff --git a/src/api/java/buildcraft/api/transport/package-info.java b/src/api/java/buildcraft/api/transport/package-info.java
deleted file mode 100644
index b670143c6..000000000
--- a/src/api/java/buildcraft/api/transport/package-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
- * http://www.mod-buildcraft.com
- *
- * The BuildCraft API is distributed under the terms of the MIT License.
- * Please check the contents of the license, which should be located
- * as "LICENSE.API" in the BuildCraft source code distribution.
- */
-@API(apiVersion = "4.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|transport")
-package buildcraft.api.transport;
-import cpw.mods.fml.common.API;
-
diff --git a/src/api/java/buildcraft/api/transport/pluggable/IFacadePluggable.java b/src/api/java/buildcraft/api/transport/pluggable/IFacadePluggable.java
deleted file mode 100644
index 6289714ac..000000000
--- a/src/api/java/buildcraft/api/transport/pluggable/IFacadePluggable.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package buildcraft.api.transport.pluggable;
-
-import net.minecraft.block.Block;
-
-public interface IFacadePluggable {
- Block getCurrentBlock();
-
- int getCurrentMetadata();
-
- boolean isTransparent();
-
- boolean isHollow();
-}
diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java
deleted file mode 100644
index 614c65ff9..000000000
--- a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package buildcraft.api.transport.pluggable;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-import buildcraft.api.transport.IPipe;
-
-public interface IPipePluggableDynamicRenderer {
- void renderPluggable(IPipe pipe, ForgeDirection side, PipePluggable pipePluggable, double x, double y, double z);
-}
diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java
deleted file mode 100644
index 0ac208905..000000000
--- a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package buildcraft.api.transport.pluggable;
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import buildcraft.api.transport.IPipe;
-
-public interface IPipePluggableItem {
- PipePluggable createPipePluggable(IPipe pipe, ForgeDirection side, ItemStack stack);
-}
diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java
deleted file mode 100644
index 2cd4bc276..000000000
--- a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package buildcraft.api.transport.pluggable;
-
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import buildcraft.api.core.render.ITextureStates;
-import buildcraft.api.transport.IPipe;
-
-public interface IPipePluggableRenderer {
- void renderPluggable(RenderBlocks renderblocks, IPipe pipe, ForgeDirection side,
- PipePluggable pipePluggable, ITextureStates blockStateMachine,
- int renderPass, int x, int y, int z);
-}
diff --git a/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java b/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java
deleted file mode 100644
index 223ce7096..000000000
--- a/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
- * http://www.mod-buildcraft.com
- *
- * The BuildCraft API is distributed under the terms of the MIT License.
- * Please check the contents of the license, which should be located
- * as "LICENSE.API" in the BuildCraft source code distribution.
- */
-package buildcraft.api.transport.pluggable;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.AxisAlignedBB;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import buildcraft.api.core.INBTStoreable;
-import buildcraft.api.core.ISerializable;
-import buildcraft.api.transport.IPipeTile;
-
-/**
- * An IPipePluggable MUST have an empty constructor for client-side
- * rendering!
- */
-public abstract class PipePluggable implements INBTStoreable, ISerializable {
- public abstract ItemStack[] getDropItems(IPipeTile pipe);
-
- public void update(IPipeTile pipe, ForgeDirection direction) {
-
- }
-
- public void onAttachedPipe(IPipeTile pipe, ForgeDirection direction) {
- validate(pipe, direction);
- }
-
- public void onDetachedPipe(IPipeTile pipe, ForgeDirection direction) {
- invalidate();
- }
-
- public abstract boolean isBlocking(IPipeTile pipe, ForgeDirection direction);
-
- public void invalidate() {
-
- }
-
- public void validate(IPipeTile pipe, ForgeDirection direction) {
-
- }
-
- public boolean isSolidOnSide(IPipeTile pipe, ForgeDirection direction) {
- return false;
- }
-
- public abstract AxisAlignedBB getBoundingBox(ForgeDirection side);
-
- @SideOnly(Side.CLIENT)
- public abstract IPipePluggableRenderer getRenderer();
-
- @SideOnly(Side.CLIENT)
- public IPipePluggableDynamicRenderer getDynamicRenderer() {
- return null;
- }
-
- public boolean requiresRenderUpdate(PipePluggable old) {
- return true;
- }
-}
diff --git a/src/api/java/cofh/api/energy/IEnergyConnection.java b/src/api/java/cofh/api/energy/IEnergyConnection.java
deleted file mode 100644
index fd2968537..000000000
--- a/src/api/java/cofh/api/energy/IEnergyConnection.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-/**
- * Implement this interface on TileEntities which should connect to energy transportation blocks. This is intended for blocks which generate energy but do not
- * accept it; otherwise just use IEnergyHandler.
- *
- * Note that {@link IEnergyHandler} is an extension of this.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyConnection {
-
- /**
- * Returns TRUE if the TileEntity can connect on a given side.
- */
- boolean canConnectEnergy(ForgeDirection from);
-
-}
\ No newline at end of file
diff --git a/src/api/java/cofh/api/energy/IEnergyReceiver.java b/src/api/java/cofh/api/energy/IEnergyReceiver.java
deleted file mode 100644
index a048056b8..000000000
--- a/src/api/java/cofh/api/energy/IEnergyReceiver.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package cofh.api.energy;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-/**
- * Implement this interface on Tile Entities which should receive energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
- *
- * A reference implementation is provided {@link TileEnergyHandler}.
- *
- * @author King Lemming
- *
- */
-public interface IEnergyReceiver extends IEnergyConnection {
-
- /**
- * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver.
- *
- * @param from
- * Orientation the energy is received from.
- * @param maxReceive
- * Maximum amount of energy to receive.
- * @param simulate
- * If TRUE, the charge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) received.
- */
- int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate);
-
- /**
- * Returns the amount of energy currently stored.
- */
- int getEnergyStored(ForgeDirection from);
-
- /**
- * Returns the maximum amount of energy that can be stored.
- */
- int getMaxEnergyStored(ForgeDirection from);
-
-}
diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IDrawerInventory.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IDrawerInventory.java
deleted file mode 100644
index 47396c799..000000000
--- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IDrawerInventory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.api.inventory;
-
-import net.minecraft.inventory.ISidedInventory;
-import net.minecraft.item.ItemStack;
-
-public interface IDrawerInventory extends ISidedInventory
-{
- /**
- * Gets a drawer's group slot index from an IInventory slot index.
- *
- * @param inventorySlot An IInventory slot index returned from getInventorySlot.
- */
- int getDrawerSlot (int inventorySlot);
-
- /**
- * Gets an IInventory slot index suitable for operations for the given type.
- *
- * @param drawerSlot The index of the drawer within its group.
- * @param type The type of IInventory slot to return an index for.
- */
- int getInventorySlot (int drawerSlot, SlotType type);
-
- /**
- * Gets the type associated with a given IInventory slot index.
- *
- * @param inventorySlot An IInventory slot index returned from getInventorySlot.
- */
- SlotType getInventorySlotType (int inventorySlot);
-
- boolean canInsertItem (int slot, ItemStack stack);
-
- boolean canExtractItem (int slot, ItemStack stack);
-
- boolean syncInventoryIfNeeded ();
-}
diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java
deleted file mode 100644
index dbb002ed8..000000000
--- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.api.inventory;
-
-/**
- * Classifies different IInventory slots according to how they should be used.
- */
-public enum SlotType
-{
- /** An inventory slot for input-only operations; stack sizes artificially held low. */
- INPUT,
-
- /** An inventory slot for output-only operations; stack sizes artificially held high. */
- OUTPUT;
-
- public static final SlotType[] values = values();
-}
diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java
deleted file mode 100644
index 9afb8b20f..000000000
--- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.api.storage;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-public interface IDrawer
-{
- /**
- * Gets an ItemStack of size 1 representing the type, metadata, and tags of the stored items.
- * The returned ItemStack should not be modified for any reason. Make a copy if you need to store or modify it.
- */
- ItemStack getStoredItemPrototype ();
-
- /**
- * Gets an ItemStack initialized to the number of items stored in this drawer.
- * The returned ItemStack is guaranteed to be a new copy and can be used for any purpose. Does not affect drawer contents.
- */
- ItemStack getStoredItemCopy ();
-
- /**
- * Sets the type of the stored item and initializes it to the given amount. Any existing item will be replaced.
- *
- * @param itemPrototype An ItemStack representing the type, metadata, and tags of the item to store.
- * @param amount The amount to initialize the stored item count to.
- */
- void setStoredItem (ItemStack itemPrototype, int amount);
-
- /**
- * Gets the number of items stored in this drawer.
- */
- int getStoredItemCount ();
-
- /**
- * Sets the number of items stored in this drawer. Triggers syncing of inventories and client data.
- * Setting a drawer's count to 0 may also result in the item type being cleared, depending in implementation.
- *
- * @param amount The new amount of items stored in this drawer.
- */
- void setStoredItemCount (int amount);
-
- /**
- * Gets the maximum number of items that can be stored in this drawer.
- * This value will vary depending on the max stack size of the stored item type.
- */
- int getMaxCapacity ();
-
- /**
- * Gets the maximum number of items that could be stored in this drawer if it held the given item.
- *
- * @param itemPrototype The item type to query.
- */
- int getMaxCapacity (ItemStack itemPrototype);
-
- /**
- * Gets the number of items that could still be added to this drawer before it is full.
- */
- int getRemainingCapacity ();
-
- /**
- * Gets the max stack size of the item type stored in this drawer. Convenience method.
- */
- int getStoredItemStackSize ();
-
- /**
- * Gets whether or not an item of the given type and data can be stored in this drawer.
- *
- * Stack size and available capacity are not considered. For drawers that are not empty, this
- * method can allow ore-dictionary compatible items to be accepted into the drawer, as defined by what
- * the drawer considers to be an equivalent item.
- * For drawers that are empty, locking status is considered.
- *
- * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item.
- */
- boolean canItemBeStored (ItemStack itemPrototype);
-
- /**
- * Gets whether or not an item of the given type and data can be extracted from this drawer.
- *
- * This is intended to allow outbound ore-dictionary conversions of compatible items, as defined by what
- * the drawer considers to be an equivalent item.
- *
- * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item.
- */
- boolean canItemBeExtracted (ItemStack itemPrototype);
-
- /**
- * Gets whether or not the drawer has items.
- * A drawer set with an item type and 0 count is not considered empty.
- */
- boolean isEmpty ();
-
- /**
- * Gets auxiliary data that has been associated with this drawer.
- *
- * @param key The key used to identify the data.
- * @return An opaque object that was previously stored.
- */
- Object getExtendedData (String key);
-
- /**
- * Stores auxiliary data with this drawer, mainly for use in integration.
- * @param key The key to identify the data with.
- * @param data The data to store.
- */
- void setExtendedData (String key, Object data);
-
- void writeToNBT (NBTTagCompound tag);
-
- void readFromNBT (NBTTagCompound tag);
-}
diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java
deleted file mode 100644
index 1f1eefef9..000000000
--- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.api.storage;
-
-import com.jaquadro.minecraft.storagedrawers.api.inventory.IDrawerInventory;
-
-public interface IDrawerGroup
-{
- /**
- * Gets the number of drawers contained within this group.
- */
- int getDrawerCount ();
-
- /**
- * Gets the drawer at the given slot within this group.
- */
- IDrawer getDrawer (int slot);
-
- /**
- * Gets whether the drawer in the given slot is usable.
- */
- boolean isDrawerEnabled (int slot);
-
- IDrawerInventory getDrawerInventory ();
-
- boolean markDirtyIfNeeded ();
-}
diff --git a/src/api/java/mods/railcraft/api/core/items/IMinecartItem.java b/src/api/java/mods/railcraft/api/core/items/IMinecartItem.java
deleted file mode 100644
index 8f8652022..000000000
--- a/src/api/java/mods/railcraft/api/core/items/IMinecartItem.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * ******************************************************************************
- * Copyright 2011-2015 CovertJaguar
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.md for details.
- * ***************************************************************************
- */
-
-package mods.railcraft.api.core.items;
-
-import com.mojang.authlib.GameProfile;
-import net.minecraft.entity.item.EntityMinecart;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-/**
- * This interface should be implemented by any cart item,
- * but it is generally optional.
- *
- * @author CovertJaguar
- */
-public interface IMinecartItem
-{
-
- /**
- * Controls whether this cart item can be placed by the Cart and Train Dispensers.
- *
- * Generally, you can ignore the placeCart() function if this returns false.
- *
- * @param cart
- * @return true if it can be placed, false otherwise
- */
- public boolean canBePlacedByNonPlayer(ItemStack cart);
-
- /**
- * Places a cart at the specified location.
- *
- * Implementing this function is optional.
- *
- * @param owner the name of the player placing the cart or "[MyMod]" with the brackets
- * @param cart An ItemStack that contains the cart
- * @param world The World
- * @param i x-Coord
- * @param j y-Coord
- * @param k z-Coord
- * @return the cart placed or null if failed
- */
- public EntityMinecart placeCart(GameProfile owner, ItemStack cart, World world, int i, int j, int k);
-}
\ No newline at end of file
diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java
deleted file mode 100644
index 4626f71ea..000000000
--- a/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package powercrystals.minefactoryreloaded.api;
-
-import net.minecraft.item.ItemStack;
-
-public interface IDeepStorageUnit
-{
- /**
- * @return A populated ItemStack with stackSize for the full amount of materials in the DSU.
- * May have a stackSize > getMaxStackSize(). May have a stackSize of 0 (indicating locked contents).
- */
- ItemStack getStoredItemType();
-
- /**
- * Sets the total amount of the item currently being stored, or zero if all items are to be removed.
- */
- void setStoredItemCount(int amount);
-
- /**
- * Sets the type of the stored item and initializes the number of stored items to amount.
- * Will overwrite any existing stored items.
- */
- void setStoredItemType(ItemStack type, int amount);
-
- /**
- * @return The maximum number of items the DSU can hold.
- * May change based on the current type stored.
- */
- int getMaxStoredCount();
-}
\ No newline at end of file
diff --git a/src/api/java/thaumcraft/api/IGoggles.java b/src/api/java/thaumcraft/api/IGoggles.java
deleted file mode 100644
index 2f53d8163..000000000
--- a/src/api/java/thaumcraft/api/IGoggles.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package thaumcraft.api;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-
-/**
- *
- * @author Azanor
- *
- * Equipped head slot items that extend this class will be able to perform most functions that
- * goggles of revealing can apart from view nodes which is handled by IRevealer.
- *
- */
-
-public interface IGoggles {
-
- /*
- * If this method returns true things like block essentia contents will be shown.
- */
- public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player);
-
-}
diff --git a/src/api/java/thaumcraft/api/IRunicArmor.java b/src/api/java/thaumcraft/api/IRunicArmor.java
deleted file mode 100644
index 5dd311006..000000000
--- a/src/api/java/thaumcraft/api/IRunicArmor.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package thaumcraft.api;
-
-import net.minecraft.item.ItemStack;
-
-/**
- *
- * @author Azanor
- *
- * Armor or bauble slot items that implement this interface can provide runic shielding.
- * Recharging, hardening, etc. is handled internally by thaumcraft.
- *
- */
-
-public interface IRunicArmor {
-
- /**
- * returns how much charge this item can provide. This is the base shielding value - any hardening is stored and calculated internally.
- */
- public int getRunicCharge(ItemStack itemstack);
-
-
-}
diff --git a/src/api/java/thaumcraft/api/IScribeTools.java b/src/api/java/thaumcraft/api/IScribeTools.java
deleted file mode 100644
index 7a450056e..000000000
--- a/src/api/java/thaumcraft/api/IScribeTools.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package thaumcraft.api;
-
-
-/**
- *
- * @author Azanor
- *
- * Interface used to identify scribing tool items used in research table
- *
- */
-
-public interface IScribeTools {
-
-}
\ No newline at end of file
diff --git a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java
deleted file mode 100644
index 768b25ffc..000000000
--- a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package thaumcraft.api.crafting;
-
-import net.minecraft.world.World;
-
-/**
- *
- * @author Azanor
- *
- * Blocks that implement this interface act as infusion crafting stabilisers like candles and skulls
- *
- */
-public interface IInfusionStabiliser {
-
- /**
- * returns true if the block can stabilise things
- */
- public boolean canStabaliseInfusion(World world, int x, int y, int z);
-
-}
\ No newline at end of file
diff --git a/src/api/java/thaumcraft/api/nodes/IRevealer.java b/src/api/java/thaumcraft/api/nodes/IRevealer.java
deleted file mode 100644
index 14a19b54d..000000000
--- a/src/api/java/thaumcraft/api/nodes/IRevealer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package thaumcraft.api.nodes;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-
-/**
- *
- * @author Azanor
- *
- * Equipped head slot items that extend this class will make nodes visible in world.
- *
- */
-
-public interface IRevealer {
-
- /*
- * If this method returns true the nodes will be visible.
- */
- public boolean showNodes(ItemStack itemstack, EntityLivingBase player);
-
-
-}
diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java
index 91210ade0..2a652019b 100644
--- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java
+++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java
@@ -31,7 +31,6 @@ import vazkii.botania.api.item.IBaubleRender.Helper;
import vazkii.botania.api.subtile.signature.SubTileSignature;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.common.block.ModBlocks;
-import vazkii.botania.common.core.version.VersionChecker;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.item.material.ItemManaResource;
@@ -192,7 +191,6 @@ public final class ContributorFancinessHandler {
FMLLog.info("[Botania] Could not load contributors list. Either you're offline or github is down. Nothing to worry about, carry on~");
e.printStackTrace();
}
- VersionChecker.doneChecking = true;
}
}
diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java
index 265950bf3..ac491c3e1 100644
--- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java
+++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java
@@ -157,8 +157,6 @@ import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.core.proxy.CommonProxy;
-import vazkii.botania.common.core.version.AdaptorNotifier;
-import vazkii.botania.common.core.version.VersionChecker;
import vazkii.botania.common.entity.EntityBabylonWeapon;
import vazkii.botania.common.entity.EntityCorporeaSpark;
import vazkii.botania.common.entity.EntityDoppleganger;
@@ -222,11 +220,6 @@ public class ClientProxy extends CommonProxy {
MinecraftForge.EVENT_BUS.register(new MultiblockRenderHandler());
MinecraftForge.EVENT_BUS.register(new SkyblockRenderEvents());
FMLCommonHandler.instance().bus().register(new CorporeaAutoCompleteHandler());
-
- if(ConfigHandler.useAdaptativeConfig)
- FMLCommonHandler.instance().bus().register(new AdaptorNotifier());
- if(ConfigHandler.versionCheckEnabled)
- new VersionChecker().init();
if(ConfigHandler.enableSeasonalFeatures) {
Calendar calendar = Calendar.getInstance();
@@ -422,19 +415,6 @@ public class ClientProxy extends CommonProxy {
return false;
}
- @Override
- public String getLastVersion() {
- String s = PersistentVariableHelper.lastBotaniaVersion;
-
- if(s == null)
- return "N/A";
-
- if(s.indexOf("-") > 0)
- return s.split("-")[1];
-
- return s;
- }
-
@Override
public void playRecordClientSided(World world, int x, int y, int z, ItemRecord record) {
Minecraft mc = Minecraft.getMinecraft();
diff --git a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java
deleted file mode 100644
index e7a477b49..000000000
--- a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * This class was created by . It's distributed as
- * part of the Botania Mod. Get the Source Code in github:
- * https://github.com/Vazkii/Botania
- *
- * Botania is Open Source and distributed under the
- * Botania License: http://botaniamod.net/license.php
- *
- * File Created @ [May 31, 2014, 11:43:13 PM (GMT)]
- */
-package vazkii.botania.common.core.command;
-
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraft.util.ChatStyle;
-import net.minecraft.util.EnumChatFormatting;
-import vazkii.botania.common.core.version.ThreadDownloadMod;
-import vazkii.botania.common.core.version.VersionChecker;
-
-public class CommandDownloadLatest extends CommandBase {
-
- private static final boolean ENABLED = true;
-
- @Override
- public String getCommandName() {
- return "botania-download-latest";
- }
-
- @Override
- public String getCommandUsage(ICommandSender var1) {
- return "/botania-download-latest ";
- }
-
- @Override
- public void processCommand(ICommandSender var1, String[] var2) {
- if(!ENABLED)
- var1.addChatMessage(new ChatComponentTranslation("botania.versioning.disabled").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
-
- else if(var2.length == 1)
- if(VersionChecker.downloadedFile)
- var1.addChatMessage(new ChatComponentTranslation("botania.versioning.downloadedAlready").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
- else if(VersionChecker.startedDownload)
- var1.addChatMessage(new ChatComponentTranslation("botania.versioning.downloadingAlready").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
- else new ThreadDownloadMod("Botania " + var2[0] + ".jar");
- }
-
-}
diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java
index 84761a3db..b8ab9cf50 100644
--- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java
+++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java
@@ -74,7 +74,6 @@ public final class ConfigHandler {
public static boolean matrixMode = false;
public static boolean referencesEnabled = true;
- public static boolean versionCheckEnabled = true;
public static int spreaderPositionShift = 1;
public static boolean flowerForceCheck = true;
public static boolean enderPickpocketEnabled = true;
@@ -210,9 +209,6 @@ public final class ConfigHandler {
desc = "Set this to false to disable the references in the flower tooltips. (You monster D:)";
referencesEnabled = loadPropBool("references.enabled", desc, referencesEnabled);
- desc = "Set this to false to disable checking and alerting when new Botania versions come out. (keywords for noobs: update notification message)";
- versionCheckEnabled = loadPropBool("versionChecking.enabled", desc, versionCheckEnabled);
-
desc = "Do not ever touch this value if not asked to. Possible symptoms of doing so include your head turning backwards, the appearance of Titans near the walls or you being trapped in a game of Sword Art Online.";
spreaderPositionShift = loadPropInt("spreader.posShift", desc, spreaderPositionShift);
@@ -358,22 +354,12 @@ public final class ConfigHandler {
public static class ConfigAdaptor {
private boolean enabled;
- private int lastBuild;
- private int currentBuild;
private Map> adaptableValues = new HashMap();
private List changes = new ArrayList();
public ConfigAdaptor(boolean enabled) {
this.enabled = enabled;
-
- String lastVersion = Botania.proxy.getLastVersion();
- try {
- lastBuild = Integer.parseInt(lastVersion);
- currentBuild = Integer.parseInt(LibMisc.BUILD);
- } catch(NumberFormatException e) {
- this.enabled = false;
- }
}
public void adaptProperty(Property prop, T val) {
@@ -387,9 +373,6 @@ public final class ConfigHandler {
AdaptableValue bestValue = null;
for(AdaptableValue value : adaptableValues.get(name)) {
- if(value.version >= lastBuild) // If version is newer than what we last used we don't care about it
- continue;
-
if(bestValue == null || value.version > bestValue.version)
bestValue = value;
}
diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java
index 906433dd6..cb8a3d6ed 100644
--- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java
+++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java
@@ -42,7 +42,6 @@ import vazkii.botania.common.block.tile.TileLightRelay.EntityPlayerMover;
import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;
import vazkii.botania.common.brew.ModBrews;
import vazkii.botania.common.brew.ModPotions;
-import vazkii.botania.common.core.command.CommandDownloadLatest;
import vazkii.botania.common.core.command.CommandOpen;
import vazkii.botania.common.core.command.CommandShare;
import vazkii.botania.common.core.command.CommandSkyblockSpread;
@@ -79,7 +78,6 @@ import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin;
import vazkii.botania.common.integration.etfuturum.ModBanners;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lexicon.LexiconData;
-import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.common.network.GuiHandler;
import vazkii.botania.common.world.SkyblockWorldEvents;
import vazkii.botania.common.world.WorldTypeSkyblock;
@@ -218,7 +216,6 @@ public class CommonProxy {
}
public void serverStarting(FMLServerStartingEvent event) {
- event.registerServerCommand(new CommandDownloadLatest());
event.registerServerCommand(new CommandShare());
event.registerServerCommand(new CommandOpen());
if(Botania.gardenOfGlassLoaded)
@@ -249,10 +246,6 @@ public class CommonProxy {
return false;
}
- public String getLastVersion() {
- return LibMisc.BUILD;
- }
-
public void setExtraReach(EntityLivingBase entity, float reach) {
if(entity instanceof EntityPlayerMP)
((EntityPlayerMP) entity).theItemInWorldManager.setBlockReachDistance(Math.max(5, ((EntityPlayerMP) entity).theItemInWorldManager.getBlockReachDistance() + reach));
diff --git a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java
deleted file mode 100644
index 4db165e9b..000000000
--- a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * This class was created by . It's distributed as
- * part of the Botania Mod. Get the Source Code in github:
- * https://github.com/Vazkii/Botania
- *
- * Botania is Open Source and distributed under the
- * Botania License: http://botaniamod.net/license.php
- *
- * File Created @ [05/12/2015, 15:31:51 (GMT)]
- */
-package vazkii.botania.common.core.version;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-import vazkii.botania.common.core.handler.ConfigHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
-
-public final class AdaptorNotifier {
-
- boolean triedToWarnPlayer;
-
- @SubscribeEvent
- public void onTick(ClientTickEvent event) {
- if(!triedToWarnPlayer && Minecraft.getMinecraft().thePlayer != null) {
- EntityPlayer player = Minecraft.getMinecraft().thePlayer;
- ConfigHandler.adaptor.tellChanges(player);
-
- triedToWarnPlayer = true;
- }
- }
-
-}
diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java
deleted file mode 100644
index 4bdb6fce7..000000000
--- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * This class was created by . It's distributed as
- * part of the Botania Mod. Get the Source Code in github:
- * https://github.com/Vazkii/Botania
- *
- * Botania is Open Source and distributed under the
- * Botania License: http://botaniamod.net/license.php
- *
- * File Created @ [May 31, 2014, 10:22:44 PM (GMT)]
- */
-package vazkii.botania.common.core.version;
-
-import java.awt.Desktop;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraft.util.ChatStyle;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.util.StatCollector;
-
-public class ThreadDownloadMod extends Thread {
-
- String fileName;
-
- byte[] buffer = new byte[10240];
-
- int totalBytesDownloaded;
- int bytesJustDownloaded;
-
- InputStream webReader;
-
- public ThreadDownloadMod(String fileName) {
- setName("Botania Download File Thread");
- this.fileName = fileName;
-
- setDaemon(true);
- start();
- }
-
- @Override
- public void run() {
- try {
- IChatComponent component = IChatComponent.Serializer.func_150699_a(String.format(StatCollector.translateToLocal("botania.versioning.startingDownload"), fileName));
- if(Minecraft.getMinecraft().thePlayer != null)
- Minecraft.getMinecraft().thePlayer.addChatMessage(component);
-
- VersionChecker.startedDownload = true;
-
- String base = "http://botaniamod.net/";
- String file = fileName.replaceAll(" ", "%20");
- URL url = new URL(base + "dl.php?file=" + file);
-
- try {
- url.openStream().close(); // Add to DL Counter
- } catch(IOException e) { }
-
- url = new URL(base + "files/" + file);
- webReader = url.openStream();
-
- File dir = new File(".", "mods");
- File f = new File(dir, fileName + ".dl");
- f.createNewFile();
-
- FileOutputStream outputStream = new FileOutputStream(f.getAbsolutePath());
-
- while((bytesJustDownloaded = webReader.read(buffer)) > 0) {
- outputStream.write(buffer, 0, bytesJustDownloaded);
- buffer = new byte[10240];
- totalBytesDownloaded += bytesJustDownloaded;
- }
- outputStream.close();
- webReader.close();
-
- File f1 = new File(dir, fileName);
- if(!f1.exists())
- f.renameTo(f1);
-
- if(Minecraft.getMinecraft().thePlayer != null)
- Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentTranslation("botania.versioning.doneDownloading", fileName).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GREEN)));
-
- Desktop.getDesktop().open(dir);
- VersionChecker.downloadedFile = true;
-
- finalize();
- } catch(Throwable e) {
- e.printStackTrace();
- sendError();
- try {
- finalize();
- } catch(Throwable e1) {
- e1.printStackTrace();
- }
- }
- }
-
- private void sendError() {
- if(Minecraft.getMinecraft().thePlayer != null)
- Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new ChatComponentTranslation("botania.versioning.error").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
- }
-}
\ No newline at end of file
diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java
deleted file mode 100644
index 909434221..000000000
--- a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * This class was created by . It's distributed as
- * part of the Botania Mod. Get the Source Code in github:
- * https://github.com/Vazkii/Botania
- *
- * Botania is Open Source and distributed under the
- * Botania License: http://botaniamod.net/license.php
- *
- * File Created @ [May 31, 2014, 10:31:46 PM (GMT)]
- */
-package vazkii.botania.common.core.version;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-import net.minecraftforge.common.MinecraftForge;
-
-public class ThreadVersionChecker extends Thread {
-
- public ThreadVersionChecker() {
- setName("Botania Version Checker Thread");
- setDaemon(true);
- start();
- }
-
- @Override
- public void run() {
- try {
- URL url = new URL("https://raw.githubusercontent.com/Vazkii/Botania/master/version/" + MinecraftForge.MC_VERSION + ".txt");
- BufferedReader r = new BufferedReader(new InputStreamReader(url.openStream()));
- VersionChecker.onlineVersion = r.readLine();
- r.close();
- } catch(Exception e) {
- e.printStackTrace();
- }
- VersionChecker.doneChecking = true;
- }
-}
diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java
deleted file mode 100644
index 9f4f5351b..000000000
--- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * This class was created by . It's distributed as
- * part of the Botania Mod. Get the Source Code in github:
- * https://github.com/Vazkii/Botania
- *
- * Botania is Open Source and distributed under the
- * Botania License: http://botaniamod.net/license.php
- *
- * File Created @ [May 31, 2014, 9:58:26 PM (GMT)]
- */
-package vazkii.botania.common.core.version;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraft.util.ChatStyle;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.util.StatCollector;
-import vazkii.botania.common.lib.LibMisc;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
-import cpw.mods.fml.common.gameevent.TickEvent.Phase;
-
-public final class VersionChecker {
-
- private static final int FLAVOUR_MESSAGES = 65;
-
- public static boolean doneChecking = false;
- public static String onlineVersion = "";
- public static boolean triedToWarnPlayer = false;
-
- public static boolean startedDownload = false;
- public static boolean downloadedFile = false;
-
- public void init() {
- new ThreadVersionChecker();
- FMLCommonHandler.instance().bus().register(this);
- }
-
- @SubscribeEvent
- public void onTick(ClientTickEvent event) {
- if(doneChecking && event.phase == Phase.END && Minecraft.getMinecraft().thePlayer != null && !triedToWarnPlayer) {
- if(!onlineVersion.isEmpty()) {
- EntityPlayer player = Minecraft.getMinecraft().thePlayer;
- int onlineBuild = Integer.parseInt(onlineVersion.split("-")[1]);
- int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MAX_VALUE : Integer.parseInt(LibMisc.BUILD);
- if(onlineBuild > clientBuild) {
- player.addChatComponentMessage(new ChatComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.LIGHT_PURPLE)));
- player.addChatComponentMessage(new ChatComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild));
-
- IChatComponent component = IChatComponent.Serializer.func_150699_a(StatCollector.translateToLocal("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion));
- player.addChatComponentMessage(component);
- }
- }
-
- triedToWarnPlayer = true;
- }
- }
-
-}
diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java
index 0c57f3c3e..a2a442868 100644
--- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java
+++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java
@@ -120,9 +120,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem {
}
public static String getEdition() {
- String version = LibMisc.BUILD;
- int build = version.contains("GRADLE") ? 0 : Integer.parseInt(version);
- return build == 0 ? StatCollector.translateToLocal("botaniamisc.devEdition") : MathHelper.numberToOrdinal(build);
+ return "GTNH";
}
@Override
diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java
index f8a98eaa8..2bbc98d15 100644
--- a/src/main/java/vazkii/botania/common/lib/LibMisc.java
+++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java
@@ -17,8 +17,7 @@ public final class LibMisc {
// Mod Constants
public static final String MOD_ID = "Botania";
public static final String MOD_NAME = MOD_ID;
- public static final String BUILD = "GRADLE:BUILD";
- public static final String VERSION = "GRADLE:VERSION-" + BUILD;
+ public static final String VERSION = "GRADLETOKEN_VERSION";
public static final String DEPENDENCIES = "required-after:Baubles;after:Thaumcraft";
// Network Contants
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 5fbcc2dbb..f93ceb55a 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,10 +1,10 @@
[
{
- "modid": "Botania",
- "name": "Botania",
+ "modid": "${modId}",
+ "name": "${modName}",
"description": "Botania is a mod that adds nature magic to Minecraft.",
- "version": "${version}",
- "mcversion": "${mcversion}",
+ "version": "${modVersion}",
+ "mcversion": "${minecraftVersion}",
"logoFile": "assets/botania/textures/logo.png",
"url": "http://www.botaniamod.net",
"updateUrl": "",
diff --git a/version/1.6.4.txt b/version/1.6.4.txt
deleted file mode 100644
index 31970f148..000000000
--- a/version/1.6.4.txt
+++ /dev/null
@@ -1 +0,0 @@
-beta-16
\ No newline at end of file
diff --git a/version/1.7.10.txt b/version/1.7.10.txt
deleted file mode 100644
index e6b893898..000000000
--- a/version/1.7.10.txt
+++ /dev/null
@@ -1 +0,0 @@
-r1.8-249
\ No newline at end of file
diff --git a/version/1.7.2.txt b/version/1.7.2.txt
deleted file mode 100644
index 90c8e8882..000000000
--- a/version/1.7.2.txt
+++ /dev/null
@@ -1 +0,0 @@
-r1.2-132
\ No newline at end of file