From 3e8fda0f26fff4088f53bd2c491fb673d27237ae Mon Sep 17 00:00:00 2001 From: Adubbz Date: Wed, 16 Oct 2013 16:29:49 +1100 Subject: [PATCH] Completely ripped out the MFR API as it is no longer needed (BOP integration is now in MFR itself) --- .../api/FactoryRegistry27.java | 74 ---- .../api/FarmingRegistry.java | 398 ------------------ .../api/FertilizerType.java | 22 - .../minefactoryreloaded/api/HarvestType.java | 33 -- .../api/IDeepStorageUnit.java | 25 -- .../api/IFactoryFertilizable.java | 39 -- .../api/IFactoryFertilizer.java | 32 -- .../api/IFactoryFruit.java | 72 ---- .../api/IFactoryGrindable.java | 30 -- .../api/IFactoryGrindable2.java | 37 -- .../api/IFactoryHarvestable.java | 72 ---- .../api/IFactoryPlantable.java | 68 --- .../api/IFactoryRanchable.java | 28 -- .../api/IFluidDrinkHandler.java | 7 - .../api/IMobEggHandler.java | 17 - .../minefactoryreloaded/api/INeedleAmmo.java | 13 - .../api/IRandomMobProvider.java | 10 - .../api/ISafariNetHandler.java | 27 -- .../minefactoryreloaded/api/ISyringe.java | 36 -- .../minefactoryreloaded/api/IToolHammer.java | 8 - .../api/IToolHammerAdvanced.java | 15 - .../minefactoryreloaded/api/MobDrop.java | 18 - .../minefactoryreloaded/api/RandomMob.java | 18 - .../api/rednet/IConnectableRedNet.java | 90 ---- .../api/rednet/IRedNetLogicCircuit.java | 21 - .../api/rednet/IRedNetNetworkContainer.java | 30 -- .../api/rednet/IRedNetNoConnection.java | 5 - .../api/rednet/RedNetConnectionType.java | 9 - .../integration/BOPCrossIntegration.java | 11 - .../integration/MFRIntegration.java | 91 ---- .../minefactoryreloaded/Fertilizable.java | 38 -- .../minefactoryreloaded/FruitLeaves.java | 62 --- .../minefactoryreloaded/Harvestable.java | 103 ----- .../tileentities/TileEntityAltar.java | 29 +- 34 files changed, 13 insertions(+), 1575 deletions(-) delete mode 100755 apis/powercrystals/minefactoryreloaded/api/FactoryRegistry27.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/FarmingRegistry.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/FertilizerType.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/HarvestType.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IFactoryFruit.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IFactoryGrindable2.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IFluidDrinkHandler.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IMobEggHandler.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/INeedleAmmo.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/ISyringe.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IToolHammer.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/MobDrop.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/RandomMob.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java delete mode 100755 apis/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java delete mode 100644 common/biomesoplenty/integration/MFRIntegration.java delete mode 100644 common/biomesoplenty/integration/minefactoryreloaded/Fertilizable.java delete mode 100644 common/biomesoplenty/integration/minefactoryreloaded/FruitLeaves.java delete mode 100644 common/biomesoplenty/integration/minefactoryreloaded/Harvestable.java diff --git a/apis/powercrystals/minefactoryreloaded/api/FactoryRegistry27.java b/apis/powercrystals/minefactoryreloaded/api/FactoryRegistry27.java deleted file mode 100755 index ca7876350..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/FactoryRegistry27.java +++ /dev/null @@ -1,74 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; - -import java.lang.reflect.Method; - -/** - * @author PowerCrystals - *

- * Class used to register plants and other farming-related things with MFR. Will do nothing if MFR does not exist, but your mod should be set to load - * after MFR or things may not work properly. - *

- * To avoid breaking the API, additional FarmingRegistry##s will appear on major MFR versions that contain API additions. On a Minecraft version change, - * these will be rolled back into this class. - */ -public class FactoryRegistry27 { - /** - * Registers a grindable entity with the Grinder using the new grinder interface. This method will be renamed to the standard "registerGrindable" - * on MC 1.6. - * - * @param grindable The entity to grind. - */ - public static void registerGrindable(IFactoryGrindable2 grindable) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerGrindable", IFactoryGrindable2.class); - reg.invoke(registry, grindable); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a grindable entity with the Grinder using the new grinder interface. This method will be renamed to the standard "registerGrindable" - * on MC 1.6. - * - * @param grindable The entity to grind. - */ - public static void registerGrinderBlacklist(Class... ungrindables) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerGrinderBlacklist", Class[].class); - reg.invoke(registry, (Object[]) ungrindables); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a preferred ore with the laser drill. Focuses with the specified color will make the specified ore more likely. - * Used by MFR itself for vanilla: Black (Coal), Light Blue (Diamond), Lime (Emerald), Yellow (Gold), Brown (Iron), Blue (Lapis), - * Red (Redstone), and White (nether quartz). - *

- * This will replace setLaserPreferredOre on MC 1.6. - * - * @param color The color that the preferred ore is being set for. White is 0. - * @param ore The ore that will be preferred by the drill when a focus with the specified color is present. - */ - public static void addLaserPreferredOre(int color, ItemStack ore) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("addLaserPreferredOre", int.class, ItemStack.class); - reg.invoke(registry, color, ore); - } - } catch (Exception e) { - e.printStackTrace(); - } - } -} diff --git a/apis/powercrystals/minefactoryreloaded/api/FarmingRegistry.java b/apis/powercrystals/minefactoryreloaded/api/FarmingRegistry.java deleted file mode 100755 index b7eec92bc..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/FarmingRegistry.java +++ /dev/null @@ -1,398 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; -import powercrystals.minefactoryreloaded.api.rednet.IRedNetLogicCircuit; - -import java.lang.reflect.Method; - -/** - * @author PowerCrystals - *

- * Class used to register plants and other farming-related things with MFR. Will do nothing if MFR does not exist, but your mod should be set to load - * after MFR or things may not work properly. - *

- * To avoid breaking the API, additional FactoryRegistry##s will appear on major MFR versions that contain API additions. On a Minecraft version change, - * these will be rolled back into this class. - *

- * This class will be replaced by FactoryRegistry in 1.6. - */ -public class FarmingRegistry { - /** - * Registers a plantable object with the Planter. - * - * @param plantable The thing to plant. - */ - public static void registerPlantable(IFactoryPlantable plantable) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerPlantable", IFactoryPlantable.class); - reg.invoke(registry, plantable); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a harvestable block with the Harvester. - * - * @param harvestable The thing to harvest. - */ - public static void registerHarvestable(IFactoryHarvestable harvestable) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerHarvestable", IFactoryHarvestable.class); - reg.invoke(registry, harvestable); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a fertilizable block with the Fertilizer. - * - * @param fertilizable The thing to fertilize. - */ - public static void registerFertilizable(IFactoryFertilizable fertilizable) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerFertilizable", IFactoryFertilizable.class); - reg.invoke(registry, fertilizable); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a fertilizer item Fertilizer. - * - * @param fertilizable The thing to fertilize with. - */ - public static void registerFertilizer(IFactoryFertilizer fertilizer) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerFertilizer", IFactoryFertilizer.class); - reg.invoke(registry, fertilizer); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a ranchable entity with the Rancher. - * - * @param ranchable The entity to ranch. - */ - public static void registerRanchable(IFactoryRanchable ranchable) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerRanchable", IFactoryRanchable.class); - reg.invoke(registry, ranchable); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a grindable entity with the Grinder. - * - * @param grindable The entity to grind. - */ - @SuppressWarnings("deprecation") - public static void registerGrindable(IFactoryGrindable grindable) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerGrindable", IFactoryGrindable.class); - reg.invoke(registry, grindable); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a possible output with the sludge boiler. - * - * @param weight Likelihood that this item will be produced. Lower means rarer. - * @param drop The thing being produced by the sludge boiler. - */ - public static void registerSludgeDrop(int weight, ItemStack drop) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerSludgeDrop", int.class, ItemStack.class); - reg.invoke(registry, weight, drop); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers specific food to use in the Breeder (instead of wheat) for a given mob. - * - * @param entityToBreed Entity this food will be used with. - * @param food The item to use when breeding this entity. - */ - public static void registerBreederFood(Class entityToBreed, ItemStack food) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerBreederFood", Class.class, ItemStack.class); - reg.invoke(registry, entityToBreed, food); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a Safari Net handler to properly serialize a type of mob. - * - * @param handler The Safari Net handler. - */ - public static void registerSafariNetHandler(ISafariNetHandler handler) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerSafariNetHandler", ISafariNetHandler.class); - reg.invoke(registry, handler); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - - /** - * Registers a mob egg handler, which allows the Safari Net to properly change colors. - * - * @param handler The mob egg handler - */ - public static void registerMobEggHandler(IMobEggHandler handler) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerMobEggHandler", IMobEggHandler.class); - reg.invoke(registry, handler); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Allows Rubber Trees to spawn in the specified biome. - * - * @param biome The biome name. - */ - public static void registerRubberTreeBiome(String biome) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerRubberTreeBiome", String.class); - reg.invoke(registry, biome); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Bans an entity class from being collected by Safari Nets - * - * @param blacklistedEntity Class to blacklist - */ - public static void registerSafariNetBlacklist(Class blacklistedEntity) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerSafariNetBlacklist", Class.class); - reg.invoke(registry, blacklistedEntity); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Bans an entity class from being automatically ground by the Grinder - * - * @param blacklistedEntity Class to blacklist - */ - /*public static void registerGrinderBlacklist(Class blacklistedEntity) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerGrinderBlacklist", Class.class); - reg.invoke(registry, blacklistedEntity); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - }//*/ - - /** - * Registers an entity as a possible output from villager random safari nets. Note that the "id" field must be initialized - * (i.e. with Entity.addEntityID()) for it to work correctly. - * - * @param savedMob A serialized mob that will be unloaded by the safari net - * @param weight The weight of this mob in the random selection - */ - public static void registerVillagerTradeMob(IRandomMobProvider mobProvider) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerVillagerTradeMob", IRandomMobProvider.class); - reg.invoke(registry, mobProvider); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a handler for drinking fluids with the straw. - * - * @param fluidId The block ID the handler handles. - * @param fluidDrinkHandler The drink handler instance. - */ - public static void registerFluidDrinkHandler(int fluidId, IFluidDrinkHandler fluidDrinkHandler) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerFluidDrinkHandler", int.class, IFluidDrinkHandler.class); - reg.invoke(registry, fluidId, fluidDrinkHandler); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a possible output with the laser drill. - * - * @param weight Likelihood that this item will be produced. Lower means rarer. - * @param drop The thing being produced by the laser drill. - */ - public static void registerLaserOre(int weight, ItemStack drop) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerLaserOre", int.class, ItemStack.class); - reg.invoke(registry, weight, drop); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a preferred ore with the laser drill. Focuses with the specified color will make the specified ore more likely. - * Note that this will overwrite existing ore preferences - you may want to coordinate with PC before using this one. - * Used by MFR itself for vanilla: Black (Coal), Light Blue (Diamond), Lime (Emerald), Yellow (Gold), Brown (Iron), Blue (Lapis), - * Red (Redstone), and White (nether quartz). - *

- * In 2.7 this will be replaced by addLaserPreferredOre, because it'll no longer overwrite existing ore preferences. - * - * @param color The color that the preferred ore is being set for. White is 0. - * @param ore The ore that will be preferred by the drill when a focus with the specified color is present. - */ - @Deprecated - public static void setLaserPreferredOre(int color, ItemStack ore) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("setLaserPreferredOre", int.class, ItemStack.class); - reg.invoke(registry, color, ore); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a block ID as a fruit tree log. When the Fruit Picker sees this block on the ground, it will - * begin a search in tree mode for any fruit nearby. - * - * @param fruitLogBlockId The block ID to mark as a fruit tree log. - */ - public static void registerFruitLogBlockId(Integer fruitLogBlockId) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerFruitLogBlockId", Integer.class); - reg.invoke(registry, fruitLogBlockId); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers a fruit for the Fruit Picker. - * - * @param fruit The fruit to be picked. - */ - public static void registerFruit(IFactoryFruit fruit) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerFruit", IFactoryFruit.class); - reg.invoke(registry, fruit); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers an entity string as an invalid entry for the autospawner. - * See also: {@link net.minecraft.entity.EntityList}'s classToStringMapping and stringToClassMapping. - * - * @param entityString The entity string to blacklist. - */ - public static void registerAutoSpawnerBlacklist(String entityString) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerAutoSpawnerBlacklist", String.class); - reg.invoke(registry, entityString); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Registers logic circuit to be usable in the Programmable RedNet Controller. - * - * @param circuit The circuit to be registered. - */ - public static void registerRedNetLogicCircuit(IRedNetLogicCircuit circuit) { - try { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if (registry != null) { - Method reg = registry.getMethod("registerRedNetLogicCircuit", IRedNetLogicCircuit.class); - reg.invoke(registry, circuit); - } - } catch (Exception e) { - e.printStackTrace(); - } - } -} diff --git a/apis/powercrystals/minefactoryreloaded/api/FertilizerType.java b/apis/powercrystals/minefactoryreloaded/api/FertilizerType.java deleted file mode 100755 index 47f8655c9..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/FertilizerType.java +++ /dev/null @@ -1,22 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -/** - * @author PowerCrystals - *

- * Determines what kind of action a given fertilizer can perform. Your IFactoryFertilizable instances should check this before - * performing any action to maintain future compatibility. - */ -public enum FertilizerType { - /** - * The fertilizer will fertilize grass. - */ - Grass, - /** - * The fertilizer will grow a plant. - */ - GrowPlant, - /** - * The fertilizer will grow magical crops. - */ - GrowMagicalCrop, -} \ No newline at end of file diff --git a/apis/powercrystals/minefactoryreloaded/api/HarvestType.java b/apis/powercrystals/minefactoryreloaded/api/HarvestType.java deleted file mode 100755 index 4e0f024e8..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/HarvestType.java +++ /dev/null @@ -1,33 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -/** - * @author PowerCrystals - *

- * Determines what algorithm the Harvester uses when it encounters this IFactoryHarvestable in the world. - */ -public enum HarvestType { - /** - * Just break the single block - no special action needed. Carrots, flowers, etc. - */ - Normal, - /** - * Search for identical blocks above. - */ - Column, - /** - * Search for identical blocks above but leave this bottom one for the future. Cactus and sugarcane. - */ - LeaveBottom, - /** - * This block is the base of a tree and the harvester should enter tree-cutting mode. - */ - Tree, - /** - * This block is the base of the tree and the harvester should enter tree-cutting mode, but the tree grows upside-down. - */ - TreeFlipped, - /** - * This block is part of a tree as above, but leaves are cut before tree logs so that leaves do not decay more than necessary. - */ - TreeLeaf -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/apis/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java deleted file mode 100755 index 996512a1f..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java +++ /dev/null @@ -1,25 +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(). - */ - ItemStack getStoredItemType(); - - /** - * Sets the total amount of the item currently being stored, or zero if it wants to remove all items. - */ - void setStoredItemCount(int amount); - - /** - * Sets the type of the stored item and initializes the number of stored items to count. Will overwrite any existing stored items. - */ - void setStoredItemType(int itemID, int meta, int Count); - - /** - * @return The maximum number of items the DSU can hold. - */ - int getMaxStoredCount(); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java b/apis/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java deleted file mode 100755 index 504cd7b45..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java +++ /dev/null @@ -1,39 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.world.World; - -import java.util.Random; - -/** - * @author PowerCrystals - *

- * Defines a fertilizable block, and the process to fertilize it. You can assume that you will never have to check that block ID matches the one returned by - * getFertilizableBlockId(). - */ -public interface IFactoryFertilizable { - /** - * @return The block ID this instance is managing. - */ - public int getFertilizableBlockId(); - - /** - * @param world The world this block belongs to. - * @param x The X coordinate of this block. - * @param y The Y coordinate of this block. - * @param z The Z coordinate of this block. - * @param fertilizerType The kind of fertilizer being used. - * @return True if the block at (x,y,z) can be fertilized with the given type of fertilizer. - */ - public boolean canFertilizeBlock(World world, int x, int y, int z, FertilizerType fertilizerType); - - /** - * @param world The world this block belongs to. - * @param rand A Random instance to use when fertilizing, if necessary. - * @param x The X coordinate of this block. - * @param y The Y coordinate of this block. - * @param z The Z coordinate of this block. - * @param fertilizerType The kind of fertilizer being used. - * @return True if fertilization was successful. If false, the Fertilizer will not consume a fertilizer item and will not drain power. - */ - public boolean fertilize(World world, Random rand, int x, int y, int z, FertilizerType fertilizerType); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java b/apis/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java deleted file mode 100755 index 9483895c3..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java +++ /dev/null @@ -1,32 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; - -/** - * @author PowerCrystals - *

- * Defines a fertilizer item for use in the Fertilizer. - */ -public interface IFactoryFertilizer { - /** - * @return The ID of this fertilizer item. - */ - int getFertilizerId(); - - /** - * @return The metadata of this fertilizer item. - */ - int getFertilizerMeta(); - - /** - * @return The type of fertilizer this is. - */ - FertilizerType getFertilizerType(); - - /** - * Called when a fertilization is successful. If you set the ItemStack size to 0, it will be deleted by the fertilizer. - * - * @param fertilizer The ItemStack used to fertilize. - */ - void consume(ItemStack fertilizer); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IFactoryFruit.java b/apis/powercrystals/minefactoryreloaded/api/IFactoryFruit.java deleted file mode 100755 index 727471880..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IFactoryFruit.java +++ /dev/null @@ -1,72 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; - -/** - * Defines a fruit entry for the Fruit Picker. - * - * @author powercrystals - */ -public interface IFactoryFruit { - /** - * @return The block ID this fruit has in the world. - */ - public int getSourceBlockId(); - - /** - * Used to determine if this fruit can be picked (is it ripe yet, etc) - * - * @param world The world where the fruit is being picked - * @param x The x-coordinate of the fruit - * @param y The y-coordinate of the fruit - * @param z The z-coordinate of the fruit - * @return True if the fruit can be picked - */ - public boolean canBePicked(World world, int x, int y, int z); - - /** - * Called by the Fruit Picker to determine what block to replace the picked block with. Only ID and meta/damage will be used. - * At the time this method is called, the fruit still exists. Do not pass an item ID as the return value. - * - * @param world The world where the fruit is being picked - * @param x The x-coordinate of the fruit - * @param y The y-coordinate of the fruit - * @param z The z-coordinate of the fruit - * @return The block to replace the fruit block with, or null for air. - */ - public ItemStack getReplacementBlock(World world, int x, int y, int z); - - /** - * Called by the Fruit Picker before the fruit is picked. - * - * @param world The world where the fruit is being picked - * @param x The x-coordinate of the fruit - * @param y The y-coordinate of the fruit - * @param z The z-coordinate of the fruit - */ - public void prePick(World world, int x, int y, int z); - - /** - * Called by the Fruit Picker to determine what drops to generate. At the time this method is called, the fruit still exists. - * - * @param world The world where the fruit is being picked - * @param x The x-coordinate of the fruit - * @param y The y-coordinate of the fruit - * @param z The z-coordinate of the fruit - */ - public List getDrops(World world, Random rand, int x, int y, int z); - - /** - * Called by the Fruit Picker after the fruit is picked. - * - * @param world The world where the fruit is being picked - * @param x The x-coordinate of the fruit - * @param y The y-coordinate of the fruit - * @param z The z-coordinate of the fruit - */ - public void postPick(World world, int x, int y, int z); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java b/apis/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java deleted file mode 100755 index 20ac18ac1..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java +++ /dev/null @@ -1,30 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.EntityLiving; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; - -/** - * @author PowerCrystals - *

- * Defines a grindable entity for the Grinder. - */ -@Deprecated -public interface IFactoryGrindable { - /** - * @return The class that this grindable instance is handling. This must be a subtype of EntityLiving or the entity will never - * be noticed by the Grinder. - */ - public Class getGrindableEntity(); - - /** - * @param world The world this entity is in. - * @param entity The entity instance being ground. - * @param random A Random instance. - * @return The drops generated when this entity is killed. - */ - public List grind(World world, EntityLiving entity, Random random); - -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IFactoryGrindable2.java b/apis/powercrystals/minefactoryreloaded/api/IFactoryGrindable2.java deleted file mode 100755 index 8b38b6b44..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IFactoryGrindable2.java +++ /dev/null @@ -1,37 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.EntityLiving; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; - -/** - * @author PowerCrystals - *

- * Defines a grindable entity for the Grinder. - */ -@SuppressWarnings("deprecation") -public interface IFactoryGrindable2 extends IFactoryGrindable { - /** - * @return The class that this grindable instance is handling. This must be a subtype of EntityLiving or the entity will never - * be noticed by the Grinder. - */ - @Override - public Class getGrindableEntity(); - - /** - * @param world The world this entity is in. - * @param entity The entity instance being ground. - * @param random A Random instance. - * @return The drops generated when this entity is killed. - */ - @Override - public List grind(World world, EntityLiving entity, Random random); - - /** - * @param entity The entity instance being ground. - * @return Whether this entity has been fully processed or not. - */ - public boolean processEntity(EntityLiving entity); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java b/apis/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java deleted file mode 100755 index 22e5f8818..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java +++ /dev/null @@ -1,72 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import java.util.List; -import java.util.Map; -import java.util.Random; - -/** - * @author PowerCrystals - *

- * Defines a harvestable block for the Harvester. - */ -public interface IFactoryHarvestable { - /** - * @return The block ID this harvestable instance is managing. - */ - public int getPlantId(); - - /** - * @return The type of harvest the Harvester should perform on this block. - */ - public HarvestType getHarvestType(); - - - /** - * @return Whether or not the Harvester should break the block when harvesting. If false, no changes will be performed by the Harvester itself. - */ - public boolean breakBlock(); - - /** - * @param world The world this block is in. - * @param harvesterSettings The harvester's current settings. Do not modify these. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - * @return True if this block can be harvested. - */ - public boolean canBeHarvested(World world, Map harvesterSettings, int x, int y, int z); - - /** - * @param world The world this block is in. - * @param rand A Random instance to use when generating drops. - * @param harvesterSettings The harvester's current settings. Do not modify these. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - * @return The drops generated by breaking this block. For a default implementation, calling Block.getBlockDropped() is usually sufficient. - */ - public List getDrops(World world, Random rand, Map harvesterSettings, int x, int y, int z); - - /** - * Called before the block is going to be harvested. Usually empty. - * - * @param world The world this block is in. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - */ - public void preHarvest(World world, int x, int y, int z); - - /** - * Called after the block is going to be harvested. Used to re-till soil, for example. - * - * @param world The world this block is in. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - */ - public void postHarvest(World world, int x, int y, int z); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java b/apis/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java deleted file mode 100755 index a07de8e2b..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java +++ /dev/null @@ -1,68 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * @author PowerCrystals - *

- * Defines a plantable object for use in the Planter. - */ -public interface IFactoryPlantable { - /** - * @return The block or item ID this plantable is managing. - */ - public int getSeedId(); - - /** - * @param world The world instance this block or item will be placed into. - * @param x The destination X coordinate. - * @param y The destination Y coordinate. - * @param z The destination Z coordinate. - * @param stack The stack being planted. - * @return The block ID that will be placed into the world. - */ - public int getPlantedBlockId(World world, int x, int y, int z, ItemStack stack); - - /** - * @param world The world instance this block or item will be placed into. - * @param x The destination X coordinate. - * @param y The destination Y coordinate. - * @param z The destination Z coordinate. - * @param stack The stack being planted. - * @return The block metadata that will be placed into the world. - */ - public int getPlantedBlockMetadata(World world, int x, int y, int z, ItemStack stack); - - /** - * @param world The world instance this block or item will be placed into. - * @param x The destination X coordinate. - * @param y The destination Y coordinate. - * @param z The destination Z coordinate. - * @param stack The stack being planted. - * @return True if this plantable can be placed at the provided coordinates. - */ - public boolean canBePlantedHere(World world, int x, int y, int z, ItemStack stack); - - /** - * Called before planting is performed. Used to till soil, for example. - * - * @param world The world instance this block or item will be placed into. - * @param x The destination X coordinate. - * @param y The destination Y coordinate. - * @param z The destination Z coordinate. - * @param stack The stack being planted. - */ - public void prePlant(World world, int x, int y, int z, ItemStack stack); - - /** - * Called after planting is performed. Usually empty. - * - * @param world The world instance this block or item will be placed into. - * @param x The destination X coordinate. - * @param y The destination Y coordinate. - * @param z The destination Z coordinate. - * @param stack The stack being planted. - */ - public void postPlant(World world, int x, int y, int z, ItemStack stack); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java b/apis/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java deleted file mode 100755 index 95d8974dd..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java +++ /dev/null @@ -1,28 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.EntityLiving; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import java.util.List; - -/** - * @author PowerCrystals - *

- * Defines a ranchable entity for use in the Rancher. - */ -public interface IFactoryRanchable { - /** - * @return The entity being ranched. Must be a subtype of EntityLiving. - */ - public Class getRanchableEntity(); - - /** - * @param world The world this entity is in. - * @param entity The entity instance being ranched. - * @param rancher The rancher instance doing the ranching. Used to access the Rancher's inventory when milking cows, for example. - * @return A list of drops. - */ - public List ranch(World world, EntityLiving entity, IInventory rancher); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IFluidDrinkHandler.java b/apis/powercrystals/minefactoryreloaded/api/IFluidDrinkHandler.java deleted file mode 100755 index 241ad8ac1..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IFluidDrinkHandler.java +++ /dev/null @@ -1,7 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.player.EntityPlayer; - -public interface IFluidDrinkHandler { - public void onDrink(EntityPlayer player); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IMobEggHandler.java b/apis/powercrystals/minefactoryreloaded/api/IMobEggHandler.java deleted file mode 100755 index 8e9623055..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IMobEggHandler.java +++ /dev/null @@ -1,17 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.EntityEggInfo; -import net.minecraft.item.ItemStack; - -/** - * @author PowerCrystals - *

- * Defines a class that MFR will use to local egg info for a given mob. This is used to color the Safari Net based on the captured mob. - */ -public interface IMobEggHandler { - /** - * @param safariNet The Safari Net that is looking for egg info. - * @return An EntityEggInfo, or null if this instance cannot handle this mob. - */ - public EntityEggInfo getEgg(ItemStack safariNet); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/INeedleAmmo.java b/apis/powercrystals/minefactoryreloaded/api/INeedleAmmo.java deleted file mode 100755 index 8cee24417..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/INeedleAmmo.java +++ /dev/null @@ -1,13 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -public interface INeedleAmmo { - public boolean onHitEntity(EntityPlayer owner, Entity hit, double distance); - - public void onHitBlock(EntityPlayer owner, World world, int x, int y, int z, int side, double distance); - - public float getSpread(); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java b/apis/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java deleted file mode 100755 index 96ae6854e..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java +++ /dev/null @@ -1,10 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.world.World; - -import java.util.List; - - -public interface IRandomMobProvider { - public List getRandomMobs(World world); -} \ No newline at end of file diff --git a/apis/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java b/apis/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java deleted file mode 100755 index a2d2f8834..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java +++ /dev/null @@ -1,27 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import java.util.List; - -/** - * @author PowerCrystals - *

- * Defines an object that can display information about a captured mob in a Safari net. - */ -public interface ISafariNetHandler { - /** - * @return The class of mob that this handler applies to. - */ - public Class validFor(); - - /** - * @param safariNetStack The Safari Net that is requesting information. - * @param player The player holding the Safari Net. - * @param infoList The current list of information strings. Add yours to this. - * @param advancedTooltips True if the advanced tooltips option is on. - */ - @SuppressWarnings("rawtypes") - public void addInformation(ItemStack safariNetStack, EntityPlayer player, List infoList, boolean advancedTooltips); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/ISyringe.java b/apis/powercrystals/minefactoryreloaded/api/ISyringe.java deleted file mode 100755 index 2ea317a05..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/ISyringe.java +++ /dev/null @@ -1,36 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.EntityLiving; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * @author PowerCrystals - *

- * Defines a syringe for use in the Vet machine. - */ -public interface ISyringe { - /** - * Called when the vet is deciding if it should use this syringe. - * - * - * - * @param world The world instance. - * @param entity The entity being injected. - * @param syringe The syringe ItemStack. - * @return True if the entity can be injected by this syringe. - */ - public boolean canInject(World world, EntityLiving entity, ItemStack syringe); - - /** - * Called to perform an injection. - * - * - * - * @param world The world instance. - * @param entity The entity being injected. - * @param syringe The syringe ItemStack. - * @return True if injection was successful. - */ - public boolean inject(World world, EntityLiving entity, ItemStack syringe); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IToolHammer.java b/apis/powercrystals/minefactoryreloaded/api/IToolHammer.java deleted file mode 100755 index 3890da79e..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IToolHammer.java +++ /dev/null @@ -1,8 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -/** - * @author PowerCrystals - * Defines a tool that can rotate MFR machines. Implement on an Item class. Requires no additional work on your part. - */ -public interface IToolHammer { -} diff --git a/apis/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java b/apis/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java deleted file mode 100755 index 0134741bc..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java +++ /dev/null @@ -1,15 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; - -/** - * @author PowerCrystals - *

- * This interface is like IToolHammer, but is for items that change state on a per-stack basis. Implement this - * instead of IToolHammer - not both! - *

- * This interface will replace IToolHammer in MC 1.6. - */ -public interface IToolHammerAdvanced { - public boolean isActive(ItemStack stack); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/MobDrop.java b/apis/powercrystals/minefactoryreloaded/api/MobDrop.java deleted file mode 100755 index 8e52eb7ed..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/MobDrop.java +++ /dev/null @@ -1,18 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandomItem; - -public class MobDrop extends WeightedRandomItem { - private ItemStack _stack; - - public MobDrop(int weight, ItemStack stack) { - super(weight); - _stack = stack; - } - - public ItemStack getStack() { - if (_stack == null) return null; - return _stack.copy(); - } -} diff --git a/apis/powercrystals/minefactoryreloaded/api/RandomMob.java b/apis/powercrystals/minefactoryreloaded/api/RandomMob.java deleted file mode 100755 index 6e04c052e..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/RandomMob.java +++ /dev/null @@ -1,18 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.Entity; -import net.minecraft.util.WeightedRandomItem; - -public class RandomMob extends WeightedRandomItem { - private Entity _mob; - - public RandomMob(Entity savedMob, int weight) { - super(weight); - _mob = savedMob; - } - - public Entity getMob() { - if (_mob == null) return null; - return _mob; - } -} diff --git a/apis/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java b/apis/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java deleted file mode 100755 index 4f71df814..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java +++ /dev/null @@ -1,90 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; - -/** - * Defines a Block that can connect to RedNet cables. This must be implemented on your Block class. - * Note that when you implement this, the RedNet network makes several assumptions about your code - - * primarily, it will not clamp values to 0 <= x <= 15. This means you must be able to accept any - * possible integer without crashing, even negatives. It will also assume that calling the onInput(s)Changed() - * methods are sufficient, and will not issue block updates. Finally, it will never call the vanilla redstone - * output methods in All mode, and will only query the methods contained in this interface in that case. In Single - * mode, it will call onInputChanged, and will check for strong power (or weak if in Plate mode) through the vanilla - * method calls. - *

- * RedNet cables have their subnets indicated to the user by colored bands on the cable. - * The color of a given subnet is the same as the wool with metadata equal to the subnet number. - * For reference: - * 0:White, 1:Orange, 2:Magenta, 3:LightBlue, 4:Yellow, 5:Lime, 6:Pink, 7:Gray, - * 8:LightGray, 9:Cyan, 10:Purple, 11:Blue, 12:Brown, 13:Green, 14:Red, 15:Black - */ -public interface IConnectableRedNet { - /** - * Returns the connection type of this Block. "All" types will cause getOutputValues() and onInputsChanged() to be used, - * whereas "Single" types will onInputChanged() to be called for input changes and the normal redstone power output methods - * to be called for output. If this value must be changed while the block is alive, it must perform a block update on any - * adjacent RedNet wires. - * - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side that connection information is required for. - * @return The connection type. - */ - public RedNetConnectionType getConnectionType(World world, int x, int y, int z, ForgeDirection side); - - /** - * Returns the output values of this RedNet node. This array must be 16 elements long. Only called if your block is connected in "All" mode. - * - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side the output values are required for. - * @return The output values. - */ - public int[] getOutputValues(World world, int x, int y, int z, ForgeDirection side); - - /** - * Returns the output value of this RedNet node for a given subnet. Only called if your block is connected in "All" mode. - * - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side the output value is required for. - * @param subnet The subnet to get the output value for (0-15). - * @return The output value. - */ - public int getOutputValue(World world, int x, int y, int z, ForgeDirection side, int subnet); - - /** - * Called when the input values to this block change. Only called if your block is connected in "All" mode. - * Do not issue a network value update from inside this method call; it will be ignored. Issue your updates - * on the next tick. - * - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side the input values are being changed on. - * @param inputValues The new set of input values. This array will be 16 elements long. - */ - public void onInputsChanged(World world, int x, int y, int z, ForgeDirection side, int[] inputValues); - - /** - * Called when the input value to this block changes. Only called if your block is connected in "Single" mode. - * Do not issue a network value update from inside this method call; it will be ignored. Issue your updates - * on the next tick. - * - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side the input values are being changed on. - * @param inputValue The new input value - */ - public void onInputChanged(World world, int x, int y, int z, ForgeDirection side, int inputValue); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java b/apis/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java deleted file mode 100755 index 309eacb5a..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java +++ /dev/null @@ -1,21 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -import net.minecraft.nbt.NBTTagCompound; - -public interface IRedNetLogicCircuit { - public int getInputCount(); - - public int getOutputCount(); - - public int[] recalculateOutputValues(long worldTime, int[] inputValues); - - public String getUnlocalizedName(); - - public String getInputPinLabel(int pin); - - public String getOutputPinLabel(int pin); - - public void readFromNBT(NBTTagCompound tag); - - public void writeToNBT(NBTTagCompound tag); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java b/apis/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java deleted file mode 100755 index ff4b8bdb3..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java +++ /dev/null @@ -1,30 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -import net.minecraft.world.World; - -/** - * You should not implement this yourself. Instead, use this to look for cables to notify from your IConnectableRedNet as this does not - * require a block update. This will be implemented on the cable's Block class. - */ -public interface IRedNetNetworkContainer { - /** - * Tells the network to recalculate all subnets. - * - * @param world The world this cable is in. - * @param x The x-coordinate of this cable. - * @param x The y-coordinate of this cable. - * @param x The z-coordinate of this cable. - */ - public void updateNetwork(World world, int x, int y, int z); - - /** - * Tells the network to recalculate a specific subnet. - * - * @param world The world this cable is in. - * @param x The x-coordinate of this cable. - * @param x The y-coordinate of this cable. - * @param x The z-coordinate of this cable. - * @param subnet The subnet to recalculate. - */ - public void updateNetwork(World world, int x, int y, int z, int subnet); -} diff --git a/apis/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java b/apis/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java deleted file mode 100755 index fad68962a..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java +++ /dev/null @@ -1,5 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -public interface IRedNetNoConnection { - -} diff --git a/apis/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java b/apis/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java deleted file mode 100755 index f0e72419e..000000000 --- a/apis/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java +++ /dev/null @@ -1,9 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -public enum RedNetConnectionType { - None, - CableSingle, - PlateSingle, - CableAll, - PlateAll -} diff --git a/common/biomesoplenty/integration/BOPCrossIntegration.java b/common/biomesoplenty/integration/BOPCrossIntegration.java index 9addd9814..2e9de2f32 100644 --- a/common/biomesoplenty/integration/BOPCrossIntegration.java +++ b/common/biomesoplenty/integration/BOPCrossIntegration.java @@ -88,16 +88,5 @@ public class BOPCrossIntegration { e.printStackTrace(System.err); } } - - if (Loader.isModLoaded("MineFactoryReloaded")) - { - try { -// MFRIntegration.init(); - } - catch (Exception e) { - System.out.println("[BiomesOPlenty] There was an error while integrating MineFactory Reloaded with Biomes O' Plenty!"); - e.printStackTrace(System.err); - } - } } } diff --git a/common/biomesoplenty/integration/MFRIntegration.java b/common/biomesoplenty/integration/MFRIntegration.java deleted file mode 100644 index 6e05f3680..000000000 --- a/common/biomesoplenty/integration/MFRIntegration.java +++ /dev/null @@ -1,91 +0,0 @@ -package biomesoplenty.integration; - -import biomesoplenty.api.Biomes; -import biomesoplenty.api.BlockReferences; -import biomesoplenty.api.Blocks; -import biomesoplenty.api.Items; -import biomesoplenty.integration.minefactoryreloaded.Fertilizable; -import biomesoplenty.integration.minefactoryreloaded.FruitLeaves; -import biomesoplenty.integration.minefactoryreloaded.Harvestable; -import com.google.common.base.Optional; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import powercrystals.minefactoryreloaded.api.FarmingRegistry; -import powercrystals.minefactoryreloaded.api.HarvestType; - -public class MFRIntegration -{ - protected static void init() - { - registerRubberTreeBiomes(); - registerFarmables(); - registerSludgeDrops(); - } - - private static void registerRubberTreeBiomes() - { - FarmingRegistry.registerRubberTreeBiome(Biomes.bayou.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.birchForest.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.bog.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.borealForest.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.deciduousForest.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.forestNew.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.grove.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.jungleNew.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.lushSwamp.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.mapleWoods.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.rainforest.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.seasonalForest.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.shield.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.swamplandNew.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.temperateRainforest.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.thicket.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.tropicalRainforest.get().biomeName); - FarmingRegistry.registerRubberTreeBiome(Biomes.woodland.get().biomeName); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - private static void registerFarmables() - { - Optional[] bopLeaves = { Blocks.leaves1, Blocks.leaves2, Blocks.leavesColorized, Blocks.treeMoss, Blocks.willow, Blocks.ivy, Blocks.moss }; - Optional[] bopFruitLeaves = { Blocks.leavesFruit }; - Optional[] bopLogs = { Blocks.logs1, Blocks.logs2, Blocks.logs3, Blocks.logs4, Blocks.bamboo }; - Optional[] bopMiscStandardHarvestables = { Blocks.flowers, Blocks.plants, Blocks.foliage, Blocks.mushrooms }; - Optional[] bopSaplings = { Blocks.saplings, Blocks.colorizedSaplings }; - - for(Optional leaves : bopLeaves) - { - FarmingRegistry.registerHarvestable(new Harvestable(leaves.get().blockID, HarvestType.TreeLeaf)); - } - - for(Optional log : bopLogs) - { - FarmingRegistry.registerHarvestable(new Harvestable(log.get().blockID, HarvestType.Tree)); - } - - for(Optional harvestable : bopMiscStandardHarvestables) - { - FarmingRegistry.registerHarvestable(new Harvestable(harvestable.get().blockID, HarvestType.Normal)); - } - - for(Optional sapling : bopSaplings) - { - FarmingRegistry.registerFertilizable(new Fertilizable(sapling.get().blockID)); - } - - for(Optional leaves : bopFruitLeaves) - { - FarmingRegistry.registerHarvestable(new Harvestable(leaves.get().blockID, HarvestType.TreeLeaf)); - FarmingRegistry.registerFruit(new FruitLeaves(leaves.get().blockID)); - } - } - - private static void registerSludgeDrops() - { - FarmingRegistry.registerSludgeDrop(15, BlockReferences.getBlockItemStack("driedDirt")); - FarmingRegistry.registerSludgeDrop(15, BlockReferences.getBlockItemStack("hardSand")); - FarmingRegistry.registerSludgeDrop(15, BlockReferences.getBlockItemStack("hardDirt")); - FarmingRegistry.registerSludgeDrop(15, new ItemStack(Items.miscItems.get(), 4, 1)); - FarmingRegistry.registerSludgeDrop(25, new ItemStack(Items.mudball.get(), 4)); - } -} diff --git a/common/biomesoplenty/integration/minefactoryreloaded/Fertilizable.java b/common/biomesoplenty/integration/minefactoryreloaded/Fertilizable.java deleted file mode 100644 index a618380a2..000000000 --- a/common/biomesoplenty/integration/minefactoryreloaded/Fertilizable.java +++ /dev/null @@ -1,38 +0,0 @@ -package biomesoplenty.integration.minefactoryreloaded; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockSapling; -import net.minecraft.world.World; -import powercrystals.minefactoryreloaded.api.FertilizerType; -import powercrystals.minefactoryreloaded.api.IFactoryFertilizable; - -public class Fertilizable implements IFactoryFertilizable -{ - private int blockId; - - public Fertilizable(int blockId) - { - this.blockId = blockId; - } - - @Override - public int getFertilizableBlockId() - { - return blockId; - } - - @Override - public boolean canFertilizeBlock(World world, int x, int y, int z, FertilizerType fertilizerType) - { - return fertilizerType == FertilizerType.GrowPlant; - } - - @Override - public boolean fertilize(World world, Random rand, int x, int y, int z, FertilizerType fertilizerType) - { - ((BlockSapling)Block.blocksList[world.getBlockId(x, y, z)]).growTree(world, x, y, z, world.rand); - return world.getBlockId(x, y, z) != blockId; - } -} diff --git a/common/biomesoplenty/integration/minefactoryreloaded/FruitLeaves.java b/common/biomesoplenty/integration/minefactoryreloaded/FruitLeaves.java deleted file mode 100644 index b31481cf8..000000000 --- a/common/biomesoplenty/integration/minefactoryreloaded/FruitLeaves.java +++ /dev/null @@ -1,62 +0,0 @@ -package biomesoplenty.integration.minefactoryreloaded; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import powercrystals.minefactoryreloaded.api.IFactoryFruit; - -public class FruitLeaves implements IFactoryFruit -{ - private int sourceId; - - public FruitLeaves(int sourceId) - { - if(sourceId > Block.blocksList.length) - { - throw new IllegalArgumentException("Passed an Item ID to FactoryHarvestableStandard's source block argument"); - } - this.sourceId = sourceId; - } - - @Override - public int getSourceBlockId() - { - return sourceId; - } - - @Override - public boolean canBePicked(World world, int x, int y, int z) - { - return (world.getBlockMetadata(x, y, z) & 3) == 3; - } - - @Override - public ItemStack getReplacementBlock(World world, int x, int y, int z) - { - return new ItemStack(world.getBlockId(x, y, z), 1, world.getBlockMetadata(x,y,z)); - } - - @Override - public void prePick(World world, int x, int y, int z) - { - } - - @Override - public List getDrops(World world, Random rand, int x, int y, int z) - { - ArrayList result = new ArrayList(); - result.add(new ItemStack(Item.appleRed)); - return result; - } - - @Override - public void postPick(World world, int x, int y, int z) - { - world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x,y,z) - 3, 2); - } -} diff --git a/common/biomesoplenty/integration/minefactoryreloaded/Harvestable.java b/common/biomesoplenty/integration/minefactoryreloaded/Harvestable.java deleted file mode 100644 index 0f4a3f3b7..000000000 --- a/common/biomesoplenty/integration/minefactoryreloaded/Harvestable.java +++ /dev/null @@ -1,103 +0,0 @@ -package biomesoplenty.integration.minefactoryreloaded; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import powercrystals.minefactoryreloaded.api.HarvestType; -import powercrystals.minefactoryreloaded.api.IFactoryHarvestable; - -public class Harvestable implements IFactoryHarvestable -{ - private int sourceId; - private HarvestType harvestType; - - public Harvestable(int sourceId, HarvestType harvestType) - { - if(sourceId > Block.blocksList.length) - { - throw new IllegalArgumentException("Passed an Item ID to FactoryHarvestableStandard's source block argument"); - } - this.sourceId = sourceId; - this.harvestType = harvestType; - } - - @Override - public int getPlantId() - { - return sourceId; - } - - @Override - public HarvestType getHarvestType() - { - return harvestType; - } - - @Override - public boolean breakBlock() - { - return true; - } - - @Override - public boolean canBeHarvested(World world, Map harvesterSettings, int x, int y, int z) - { - return true; - } - - @Override - public List getDrops(World world, Random rand, Map harvesterSettings, int x, int y, int z) - { - if(harvesterSettings.get("silkTouch") != null && harvesterSettings.get("silkTouch") && harvestType == HarvestType.TreeLeaf) - { - ArrayList drops = new ArrayList(); - drops.add(new ItemStack(sourceId, 1, world.getBlockMetadata(x, y, z))); - return drops; - } -// else if(getPlantId() == Blocks.leavesFruit.get().blockID) -// { -// ArrayList drops = new ArrayList(); -// -// int meta = world.getBlockMetadata(x, y, z); -// if ((meta & 3) == 3) -// { -// drops.add(new ItemStack(Item.appleRed)); -// } -// else if ((meta & 3) == 2) -// { -// if(rand.nextInt(16) == 0) drops.add(new ItemStack(Item.appleRed)); -// if(rand.nextInt(80) == 0) drops.add(new ItemStack(Block.sapling)); -// } -// else if ((meta & 3) == 1) -// { -// if(rand.nextInt(64) == 0) drops.add(new ItemStack(Item.appleRed)); -// if(rand.nextInt(40) == 0) drops.add(new ItemStack(Block.sapling)); -// } -// else if ((meta & 3) == 0) -// { -// if(rand.nextInt(20) == 0) drops.add(new ItemStack(Block.sapling)); -// } -// -// return drops; -// } - else - { - return Block.blocksList[getPlantId()].getBlockDropped(world, x, y, z, world.getBlockMetadata(x, y, z), 0); - } - } - - @Override - public void preHarvest(World world, int x, int y, int z) - { - } - - @Override - public void postHarvest(World world, int x, int y, int z) - { - } -} diff --git a/common/biomesoplenty/tileentities/TileEntityAltar.java b/common/biomesoplenty/tileentities/TileEntityAltar.java index 50e85bed3..fdc056f1e 100644 --- a/common/biomesoplenty/tileentities/TileEntityAltar.java +++ b/common/biomesoplenty/tileentities/TileEntityAltar.java @@ -55,23 +55,20 @@ public class TileEntityAltar extends TileEntity } @Override - public void onDataPacket(INetworkManager var1, Packet132TileEntityData packet) - { - //if (this.worldObj.isRemote) - //{ - if (packet.actionType == 0) - { - this.apatitePresent = packet.data.getBoolean("apatitePresent"); - this.peridotPresent = packet.data.getBoolean("peridotPresent"); - this.rubyPresent = packet.data.getBoolean("rubyPresent"); - this.sapphirePresent = packet.data.getBoolean("sapphirePresent"); - this.tanzanitePresent = packet.data.getBoolean("tanzanitePresent"); - this.topazPresent = packet.data.getBoolean("topazPresent"); - } - //} - + public void onDataPacket(INetworkManager var1, Packet132TileEntityData packet) + { + if (packet.actionType == 0) + { + this.apatitePresent = packet.data.getBoolean("apatitePresent"); + this.peridotPresent = packet.data.getBoolean("peridotPresent"); + this.rubyPresent = packet.data.getBoolean("rubyPresent"); + this.sapphirePresent = packet.data.getBoolean("sapphirePresent"); + this.tanzanitePresent = packet.data.getBoolean("tanzanitePresent"); + this.topazPresent = packet.data.getBoolean("topazPresent"); + } + this.worldObj.markBlockForUpdate(packet.xPosition, packet.yPosition, packet.zPosition); - } + } public void setPresent(int presentGem, boolean state) {