Added fluid power manager, imports from forestry and bc

This commit is contained in:
modmuss50 2015-09-08 18:39:59 +01:00
parent 72799a9474
commit 8aafd118f5
9 changed files with 71 additions and 70 deletions

View file

@ -25,7 +25,6 @@ public class CompatManager {
registerCompact(RecipesBiomesOPlenty.class, "BiomesOPlenty");
registerCompact(RecipesThaumcraft.class, "Thaumcraft");
registerCompact(RecipesForestry.class, "Forestry");
registerCompact(FuelsNoForestry.class, "!Forestry");
registerCompact(MinetweakerCompat.class, "MineTweaker3");
}

View file

@ -1,36 +0,0 @@
package techreborn.compat.recipes;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import forestry.api.fuels.FuelManager;
import forestry.api.fuels.GeneratorFuel;
import net.minecraftforge.fluids.Fluid;
import techreborn.compat.ICompatModule;
import java.util.HashMap;
public class FuelsNoForestry implements ICompatModule {
@Override
public void preInit(FMLPreInitializationEvent event) {
if(FuelManager.generatorFuel == null){
FuelManager.generatorFuel = new HashMap<Fluid, GeneratorFuel>();
}
}
@Override
public void init(FMLInitializationEvent event) {
}
@Override
public void postInit(FMLPostInitializationEvent event) {
}
@Override
public void serverStarting(FMLServerStartingEvent event) {
}
}

View file

@ -1,23 +1,20 @@
package techreborn.compat.recipes;
import buildcraft.BuildCraftEnergy;
import buildcraft.api.core.BuildCraftAPI;
import buildcraft.api.fuels.BuildcraftFuelRegistry;
import buildcraft.api.fuels.IFuel;
import buildcraft.core.Version;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import forestry.api.fuels.FuelManager;
import forestry.api.fuels.GeneratorFuel;
import ic2.api.item.IC2Items;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import techreborn.api.fuel.FluidPowerManager;
import techreborn.compat.ICompatModule;
import techreborn.config.ConfigTechReborn;
import techreborn.util.CraftingHelper;
import techreborn.util.LogHelper;
import techreborn.util.RecipeRemover;
@ -54,9 +51,7 @@ public class RecipesBuildcraft implements ICompatModule {
@Override
public void init(FMLInitializationEvent event) {
if(!FuelManager.generatorFuel.containsKey(BuildCraftEnergy.fluidFuel)){
FuelManager.generatorFuel.put(BuildCraftEnergy.fluidFuel, new GeneratorFuel(new FluidStack(BuildCraftEnergy.fluidFuel, 1000), 38400, 6000));
}
}
@Override
@ -87,6 +82,9 @@ public class RecipesBuildcraft implements ICompatModule {
}
removeRecipes();
addRecipies();
for(IFuel fuel : buildcraft.energy.fuels.FuelManager.INSTANCE.getFuels()){
FluidPowerManager.fluidPowerValues.put(fuel.getFluid(), (double) (fuel.getPowerPerCycle() / fuel.getTotalBurningTime()) * ConfigTechReborn.euPerRF);
}
}
@Override

View file

@ -4,6 +4,8 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import forestry.api.fuels.FuelManager;
import forestry.api.fuels.GeneratorFuel;
import forestry.core.config.ForestryBlock;
import ic2.api.item.IC2Items;
import net.minecraft.init.Items;
@ -11,11 +13,14 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import techreborn.api.fuel.FluidPowerManager;
import techreborn.api.recipe.RecipeHandler;
import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
import techreborn.compat.ICompatModule;
import techreborn.config.ConfigTechReborn;
import java.rmi.UnexpectedException;
public class RecipesForestry implements ICompatModule {
@Override
public void preInit(FMLPreInitializationEvent event) {
@ -266,7 +271,18 @@ public class RecipesForestry implements ICompatModule {
@Override
public void postInit(FMLPostInitializationEvent event) {
for(Object fuel : FuelManager.generatorFuel.entrySet().toArray()){
if(fuel instanceof GeneratorFuel){
GeneratorFuel generatorFuel = (GeneratorFuel) fuel;
FluidPowerManager.fluidPowerValues.put(generatorFuel.fuelConsumed.getFluid(), (double) (generatorFuel.eu / generatorFuel.rate));
} else {
try {
throw new UnexpectedException(fuel + " should be an instace of GeneratorFuel");
} catch (UnexpectedException e) {
e.printStackTrace();
}
}
}
}
@Override