mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 20:52:42 +00:00
Merge branch 'master' of https://github.com/CrazyPants/EnderIO
This commit is contained in:
commit
80d51e5b79
4 files changed
+19
-9
No files matched your search
@@ -54,9 +54,9 @@ public final class Config {
|
||||
public static final Section sectionAesthetic = new Section("Aesthetic Settings", "aesthetic");
|
||||
public static final Section sectionAdvanced = new Section("Advanced Settings", "advanced");
|
||||
public static final Section sectionMagnet = new Section("Magnet Settings", "magnet");
|
||||
public static final Section sectionFluid = new Section("Fluid Settings", "fluid");
|
||||
public static final Section sectionSpawner = new Section("PoweredSpawner Settings", "spawner");
|
||||
|
||||
|
||||
static int BID = 700;
|
||||
static int IID = 8524;
|
||||
|
||||
@@ -228,6 +228,8 @@ public final class Config {
|
||||
|
||||
public static int wirelessChargerRange = 24;
|
||||
|
||||
public static long nutrientFoodBoostDelay = 400;
|
||||
|
||||
public static void load(FMLPreInitializationEvent event) {
|
||||
|
||||
FMLCommonHandler.instance().bus().register(new Config());
|
||||
@@ -590,6 +592,7 @@ public final class Config {
|
||||
useModMetals = config.get(sectionRecipe.name, "useModMetals", useModMetals,
|
||||
"If true copper and tin will be used in recipes when registered in the ore dictionary").getBoolean(useModMetals);
|
||||
|
||||
nutrientFoodBoostDelay = config.get(sectionFluid.name, "nutrientFluidFoodBoostDelay", nutrientFoodBoostDelay, "The delay in ticks between when nutrient distillation boosts your food value.").getInt();
|
||||
}
|
||||
|
||||
private Config() {
|
||||
|
||||
@@ -19,6 +19,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.config.Config;
|
||||
|
||||
public class BlockFluidEio extends BlockFluidClassic {
|
||||
|
||||
@@ -87,7 +88,7 @@ public class BlockFluidEio extends BlockFluidClassic {
|
||||
} else if(this == EnderIO.blockNutrientDistillation && entity instanceof EntityPlayerMP) {
|
||||
long time = entity.worldObj.getTotalWorldTime();
|
||||
EntityPlayerMP player = (EntityPlayerMP) entity;
|
||||
if(time % 200 == 0 && player.getEntityData().getLong("eioLastFoodBoost") != time)
|
||||
if(time % Config.nutrientFoodBoostDelay == 0 && player.getEntityData().getLong("eioLastFoodBoost") != time)
|
||||
{
|
||||
int food = player.getFoodStats().getFoodLevel();
|
||||
float sat = player.getFoodStats().getSaturationLevel();
|
||||
|
||||
@@ -27,12 +27,15 @@ public class MaterialRecipes {
|
||||
OreDictionary.registerOre("gearStone", new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()));
|
||||
|
||||
OreDictionary.registerOre("itemSilicon", new ItemStack(EnderIO.itemMaterial, 1, Material.SILICON.ordinal()));
|
||||
OreDictionary.registerOre("ingotConductiveIron", new ItemStack(EnderIO.itemMaterial, 1, Alloy.CONDUCTIVE_IRON.ordinal()));
|
||||
OreDictionary.registerOre("ingotElectricalSteel", new ItemStack(EnderIO.itemMaterial, 1, Alloy.ELECTRICAL_STEEL.ordinal()));
|
||||
OreDictionary.registerOre("ingotEnergeticAlloy", new ItemStack(EnderIO.itemMaterial, 1, Alloy.ENERGETIC_ALLOY.ordinal()));
|
||||
OreDictionary.registerOre("ingotVibrantAlloy", new ItemStack(EnderIO.itemMaterial, 1, Alloy.PHASED_GOLD.ordinal()));
|
||||
OreDictionary.registerOre("ingotPulsatingIron", new ItemStack(EnderIO.itemMaterial, 1, Alloy.PHASED_IRON.ordinal()));
|
||||
OreDictionary.registerOre("ingotDarkSteel", new ItemStack(EnderIO.itemMaterial, 1, Alloy.DARK_STEEL.ordinal()));
|
||||
|
||||
OreDictionary.registerOre("ingotConductiveIron", new ItemStack(EnderIO.itemAlloy, 1, Alloy.CONDUCTIVE_IRON.ordinal()));
|
||||
OreDictionary.registerOre("ingotElectricalSteel", new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()));
|
||||
OreDictionary.registerOre("ingotEnergeticAlloy", new ItemStack(EnderIO.itemAlloy, 1, Alloy.ENERGETIC_ALLOY.ordinal()));
|
||||
OreDictionary.registerOre("ingotRedstoneAlloy", new ItemStack(EnderIO.itemAlloy, 1, Alloy.REDSTONE_ALLOY.ordinal()));
|
||||
OreDictionary.registerOre("ingotRedAlloy", new ItemStack(EnderIO.itemAlloy, 1, Alloy.REDSTONE_ALLOY.ordinal()));
|
||||
OreDictionary.registerOre("ingotVibrantAlloy", new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal()));
|
||||
OreDictionary.registerOre("ingotPulsatingIron", new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_IRON.ordinal()));
|
||||
OreDictionary.registerOre("ingotDarkSteel", new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()));
|
||||
|
||||
OreDictionary.registerOre("glass", Blocks.glass);
|
||||
OreDictionary.registerOre("stickWood", Items.stick);
|
||||
|
||||
Reference in new issue
Block a user