Add the unified FluidGenerator recipe system + Restructure FluidGenerators tiles

They should all be pretty now
This commit is contained in:
Ourten 2016-12-17 01:25:32 +01:00
parent 3bf346f39a
commit 97192ee3f4
12 changed files with 442 additions and 607 deletions

View file

@ -166,7 +166,7 @@ public class ModFluids {
BlockFluidLithium = new BlockFluidTechReborn(fluidLithium, Material.WATER, "techreborn.lithium");
registerBlock(BlockFluidLithium,
ModInfo.MOD_ID + "_" + BlockFluidLithium.getUnlocalizedName().substring(5));
FluidPowerManager.fluidPowerValues.put(fluidNitrofuel, 24.0);
FluidPowerManager.fluidPowerValues.put(fluidLithium, 24.0);
FluidRegistry.registerFluid(fluidMercury);
BlockFluidMercury = new BlockFluidTechReborn(fluidMercury, Material.WATER, "techreborn.mercury");
@ -268,13 +268,13 @@ public class ModFluids {
BlockFluidNitroDiesel = new BlockFluidTechReborn(fluidNitroDiesel, Material.WATER, "techreborn.nitrodiesel");
registerBlock(BlockFluidNitroDiesel,
ModInfo.MOD_ID + "_" + BlockFluidNitroDiesel.getUnlocalizedName().substring(5));
FluidPowerManager.fluidPowerValues.put(fluidNitrofuel, 36.0);
FluidPowerManager.fluidPowerValues.put(fluidNitroDiesel, 36.0);
FluidRegistry.registerFluid(fluidOil);
BlockFluidOil = new BlockFluidTechReborn(fluidOil, Material.WATER, "techreborn.oil");
registerBlock(BlockFluidOil,
ModInfo.MOD_ID + "_" + BlockFluidOil.getUnlocalizedName().substring(5));
FluidPowerManager.fluidPowerValues.put(fluidNitrofuel, 16.0);
FluidPowerManager.fluidPowerValues.put(fluidOil, 16.0);
FluidRegistry.registerFluid(fluidSulfuricAcid);
BlockFluidSulfuricAcid = new BlockFluidTechReborn(fluidSulfuricAcid, Material.WATER, "techreborn.sulfuricacid");

View file

@ -11,6 +11,7 @@ import net.minecraftforge.common.ForgeModContainer;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.fluids.UniversalBucket;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.oredict.OreDictionary;
@ -22,6 +23,8 @@ import reborncore.common.util.StringUtils;
import techreborn.Core;
import techreborn.api.ScrapboxList;
import techreborn.api.TechRebornAPI;
import techreborn.api.generator.EFluidGenerator;
import techreborn.api.generator.GeneratorRecipeHelper;
import techreborn.api.reactor.FusionReactorRecipe;
import techreborn.api.reactor.FusionReactorRecipeHelper;
import techreborn.api.recipe.RecyclerRecipe;
@ -99,6 +102,7 @@ public class ModRecipes {
addCompressorRecipes();
addWireRecipes();
addScrapBoxloot();
addFluidGeneratorRecipes();
}
static void addScrapBoxloot() {
@ -3220,6 +3224,23 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(gemboots, "G G", "G G", 'G', gem);
}
static void addFluidGeneratorRecipes() {
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.DIESEL, ModFluids.fluidNitrofuel, 24);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.DIESEL, ModFluids.fluidNitrocoalfuel, 48);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.DIESEL, ModFluids.fluidLithium, 24);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.DIESEL, ModFluids.fluidNitroDiesel, 36);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.DIESEL, ModFluids.fluidOil, 16);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.SEMIFLUID, ModFluids.fluidOil, 64);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.SEMIFLUID, ModFluids.fluidSodium, 30);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.SEMIFLUID, ModFluids.fluidLithium, 60);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.THERMAL, FluidRegistry.LAVA, 60);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.GAS, ModFluids.fluidHydrogen, 15);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.GAS, ModFluids.fluidMethane, 45);
}
public static ItemStack getBucketWithFluid(Fluid fluid) {
return UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, fluid);
}