Close #84. Fix #302. Fix #309. Update BuildCraft API to 6.1.x

This commit is contained in:
mezz committed 2014-11-02 15:00:28 -08:00
1 parent 486b7a8f80
commit c9bd15a20d
36 files changed
+395 -478

No files matched your search

@@ -10,24 +10,13 @@
******************************************************************************/
package forestry.plugins;
import java.util.LinkedList;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import buildcraft.api.fuels.IronEngineCoolant;
import buildcraft.api.fuels.IronEngineFuel;
import buildcraft.api.gates.ActionManager;
import buildcraft.api.gates.ITrigger;
import buildcraft.api.gates.ITriggerProvider;
import buildcraft.api.recipes.BuildcraftRecipes;
import buildcraft.api.transport.IPipeTile;
import buildcraft.api.fuels.BuildcraftFuelRegistry;
import buildcraft.api.recipes.BuildcraftRecipeRegistry;
import buildcraft.api.statements.IStatementContainer;
import buildcraft.api.statements.ITriggerExternal;
import buildcraft.api.statements.ITriggerInternal;
import buildcraft.api.statements.ITriggerProvider;
import buildcraft.api.statements.StatementManager;
import forestry.core.GameMode;
import forestry.core.config.Config;
import forestry.core.config.Configuration;
@@ -37,8 +26,16 @@ import forestry.core.config.Property;
import forestry.core.gadgets.TileForestry;
import forestry.core.proxy.Proxies;
import forestry.core.utils.LiquidHelper;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
@Plugin(pluginID = "BC6", name = "BuildCraft 6", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.buildcraft6.description")
import java.util.Collection;
@Plugin(pluginID = "BC6.1", name = "BuildCraft 6.1", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.buildcraft6.description")
public class PluginBuildCraft extends ForestryPlugin implements ITriggerProvider {
public static PluginBuildCraft instance;
@@ -48,7 +45,7 @@ public class PluginBuildCraft extends ForestryPlugin implements ITriggerProvider
public static Item wrench;
public static Item stoneGear;
public static Item pipeWaterproof;
public static final String validVersionRange = "[6.0.0,6.1.0)";
public static final String validVersionRange = "[6.1.0,6.2.0)";
public PluginBuildCraft() {
if (PluginBuildCraft.instance == null)
@@ -75,17 +72,16 @@ public class PluginBuildCraft extends ForestryPlugin implements ITriggerProvider
Property buildcraftignore = config.get("buildcraft.ignore", Config.CATEGORY_COMMON, false);
buildcraftignore.Comment = "set to true to ignore buildcraft";
PluginBuildCraft.ignore = Boolean.parseBoolean(buildcraftignore.Value);
IronEngineCoolant.addCoolant(LiquidHelper.getLiquid(Defaults.LIQUID_ICE, 1).getFluid(), 10.0f);
BuildcraftFuelRegistry.coolant.addCoolant(LiquidHelper.getFluid(Defaults.LIQUID_ICE), 10.0f);
addIronEngineFuel(LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, 1).getFluid(), 4,
Defaults.ENGINE_CYCLE_DURATION_ETHANOL * GameMode.getGameMode().getFloatSetting("fuel.ethanol.combustion"));
// Add recipe for ethanol
addRefineryRecipe(LiquidHelper.getLiquid(Defaults.LIQUID_BIOMASS, 4), null, LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, 1), 10, 1);
addRefineryRecipe("forestry:BiomassToEthanol", LiquidHelper.getLiquid(Defaults.LIQUID_BIOMASS, 4), LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, 1), 10, 1);
// Add custom trigger handler
ActionManager.registerTriggerProvider(this);
StatementManager.registerTriggerProvider(this);
initStoneGear();
initWaterproof();
@@ -103,12 +99,11 @@ public class PluginBuildCraft extends ForestryPlugin implements ITriggerProvider
}
private void addIronEngineFuel(Fluid fuel, float powerPerCycle, float totalBurningTime) {
IronEngineFuel.addFuel(fuel, (int) powerPerCycle, (int) totalBurningTime);
BuildcraftFuelRegistry.fuel.addFuel(fuel, (int) powerPerCycle, (int) totalBurningTime);
}
private void addRefineryRecipe(FluidStack ingredient1, FluidStack ingredient2, FluidStack result, int energy, int delay) {
BuildcraftRecipes.refinery.addRecipe(ingredient1, ingredient2, result, energy, delay);
private void addRefineryRecipe(String id, FluidStack ingredient1, FluidStack result, int energy, int delay) {
BuildcraftRecipeRegistry.refinery.addRecipe(id, ingredient1, result, energy, delay);
}
private void initStoneGear() {
@@ -133,12 +128,12 @@ public class PluginBuildCraft extends ForestryPlugin implements ITriggerProvider
// / ITRIGGERPROVIDER
@Override
public LinkedList<ITrigger> getPipeTriggers(IPipeTile pipe) {
public Collection<ITriggerInternal> getInternalTriggers(IStatementContainer container) {
return null;
}
@Override
public LinkedList<ITrigger> getNeighborTriggers(Block block, TileEntity tile) {
public Collection<ITriggerExternal> getExternalTriggers(ForgeDirection side, TileEntity tile) {
if (tile instanceof TileForestry)
return ((TileForestry) tile).getCustomTriggers();