diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/Bee.java b/forestry_common/apiculture/forestry/apiculture/genetics/Bee.java index 0e65f93f8..607b7dee9 100755 --- a/forestry_common/apiculture/forestry/apiculture/genetics/Bee.java +++ b/forestry_common/apiculture/forestry/apiculture/genetics/Bee.java @@ -8,6 +8,7 @@ package forestry.apiculture.genetics; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; @@ -17,9 +18,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; - import net.minecraftforge.common.BiomeDictionary; - import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -247,7 +246,7 @@ public class Bee extends IndividualLiving implements IBee { private boolean checkBiomeHazard(World world, EnumTemperature temperature, EnumHumidity humidity, int x, int y, int z) { - return ClimateHelper.isWithinLimits(temperature, humidity, + return AlleleManager.climateHelper.isWithinLimits(temperature, humidity, genome.getPrimary().getTemperature(), genome.getToleranceTemp(), genome.getPrimary().getHumidity(), genome.getToleranceHumid()); } @@ -315,12 +314,12 @@ public class Bee extends IndividualLiving implements IBee { EnumTemperature temperature = genome.getPrimary().getTemperature(); EnumTolerance temperatureTolerance = genome.getToleranceTemp(); - ArrayList toleratedTemperatures = ClimateHelper.getToleratedTemperature(temperature, temperatureTolerance); + Collection toleratedTemperatures = AlleleManager.climateHelper.getToleratedTemperature(temperature, temperatureTolerance); EnumHumidity humidity = genome.getPrimary().getHumidity(); EnumTolerance humidityTolerance = genome.getToleranceHumid(); - ArrayList toleratedHumidities = ClimateHelper.getToleratedHumidity(humidity, humidityTolerance); + Collection toleratedHumidities = AlleleManager.climateHelper.getToleratedHumidity(humidity, humidityTolerance); ArrayList biomeIdsTemp = new ArrayList(); for (EnumTemperature temp : toleratedTemperatures) @@ -353,9 +352,9 @@ public class Bee extends IndividualLiving implements IBee { + StringUtil.localize("bees.hybrid.adj.add") + " " + StringUtil.localize("gui.hybrid")); list.add(genome.getActiveAllele(EnumBeeChromosome.SPEED.ordinal()).getName() + " " + StringUtil.localize("gui.worker")); list.add(genome.getActiveAllele(EnumBeeChromosome.LIFESPAN.ordinal()).getName() + " " + StringUtil.localize("gui.life")); - list.add("\u00A7aT: " + ClimateHelper.toDisplay(genome.getPrimary().getTemperature()) + " / " + list.add("\u00A7aT: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getTemperature()) + " / " + StringUtil.capitalize(genome.getToleranceTemp().name())); - list.add("\u00A7aH: " + ClimateHelper.toDisplay(genome.getPrimary().getHumidity()) + " / " + list.add("\u00A7aH: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getHumidity()) + " / " + StringUtil.capitalize(genome.getToleranceHumid().name())); list.add(StringUtil.localize(genome.getFlowerProvider().getDescription())); if (genome.getNocturnal()) diff --git a/forestry_common/apiculture/forestry/apiculture/gui/GuiBeealyzer.java b/forestry_common/apiculture/forestry/apiculture/gui/GuiBeealyzer.java index 91da3e27c..66f5d173b 100755 --- a/forestry_common/apiculture/forestry/apiculture/gui/GuiBeealyzer.java +++ b/forestry_common/apiculture/forestry/apiculture/gui/GuiBeealyzer.java @@ -192,8 +192,8 @@ public class GuiBeealyzer extends GuiAlyzer { newLine(); newLine(); - drawRow(StringUtil.localize("gui.climate"), ClimateHelper.toDisplay(bee.getGenome().getPrimary().getTemperature()), - ClimateHelper.toDisplay(bee.getGenome().getSecondary().getTemperature()), bee, EnumBeeChromosome.SPECIES); + drawRow(StringUtil.localize("gui.climate"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getTemperature()), + AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getTemperature()), bee, EnumBeeChromosome.SPECIES); drawLine(StringUtil.localize("gui.temptol"), COLUMN_0); drawToleranceInfo(bee.getGenome().getToleranceTemp(), COLUMN_1, @@ -203,8 +203,8 @@ public class GuiBeealyzer extends GuiAlyzer { newLine(); - drawRow(StringUtil.localize("gui.humidity"), ClimateHelper.toDisplay(bee.getGenome().getPrimary().getHumidity()), - ClimateHelper.toDisplay(bee.getGenome().getSecondary().getHumidity()), bee, EnumBeeChromosome.SPECIES); + drawRow(StringUtil.localize("gui.humidity"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getHumidity()), + AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getHumidity()), bee, EnumBeeChromosome.SPECIES); drawLine(StringUtil.localize("gui.humidtol"), COLUMN_0); drawToleranceInfo(bee.getGenome().getToleranceHumid(), COLUMN_1, diff --git a/forestry_common/apiculture/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java b/forestry_common/apiculture/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java index 52e2cf883..b3d126f31 100755 --- a/forestry_common/apiculture/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java +++ b/forestry_common/apiculture/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java @@ -8,6 +8,7 @@ package forestry.apiculture.worldgen; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Random; @@ -20,9 +21,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.structure.StructureBoundingBox; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; - import net.minecraftforge.common.ChestGenHooks; - import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.FlowerManager; @@ -30,6 +29,7 @@ import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; import forestry.apiculture.gadgets.TileBeehouse; import forestry.core.config.Defaults; @@ -323,7 +323,7 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { EnumTemperature beeTemperature = genome.getPrimary().getTemperature(); EnumTolerance temperatureTolerance = genome.getToleranceTemp(); - ArrayList toleratedTemperatures = ClimateHelper.getToleratedTemperature(beeTemperature, temperatureTolerance); + Collection toleratedTemperatures = AlleleManager.climateHelper.getToleratedTemperature(beeTemperature, temperatureTolerance); boolean validTemp = false; validTemp = toleratedTemperatures.contains(EnumTemperature.getFromValue(temperature)); @@ -334,7 +334,7 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { EnumHumidity beeHumidity = genome.getPrimary().getHumidity(); EnumTolerance humidityTolerance = genome.getToleranceHumid(); - ArrayList toleratedHumidity = ClimateHelper.getToleratedHumidity(beeHumidity, humidityTolerance); + Collection toleratedHumidity = AlleleManager.climateHelper.getToleratedHumidity(beeHumidity, humidityTolerance); boolean validHumidity = false; diff --git a/forestry_common/core/forestry/core/genetics/ClimateHelper.java b/forestry_common/core/forestry/core/genetics/ClimateHelper.java index 15b726f0a..34dc186ec 100755 --- a/forestry_common/core/forestry/core/genetics/ClimateHelper.java +++ b/forestry_common/core/forestry/core/genetics/ClimateHelper.java @@ -13,11 +13,12 @@ import java.util.Locale; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IClimateHelper; import forestry.core.utils.StringUtil; -public class ClimateHelper { +public class ClimateHelper implements IClimateHelper { - public static boolean isWithinLimits(EnumTemperature temperature, EnumHumidity humidity, + public boolean isWithinLimits(EnumTemperature temperature, EnumHumidity humidity, EnumTemperature baseTemp, EnumTolerance tolTemp, EnumHumidity baseHumid, EnumTolerance tolHumid) { if(!getToleratedTemperature(baseTemp, tolTemp).contains(temperature)) @@ -26,7 +27,7 @@ public class ClimateHelper { return getToleratedHumidity(baseHumid, tolHumid).contains(humidity); } - public static ArrayList getToleratedHumidity(EnumHumidity prefered, EnumTolerance tolerance) { + public ArrayList getToleratedHumidity(EnumHumidity prefered, EnumTolerance tolerance) { ArrayList tolerated = new ArrayList(); tolerated.add(prefered); @@ -76,7 +77,7 @@ public class ClimateHelper { } - public static ArrayList getToleratedTemperature(EnumTemperature prefered, EnumTolerance tolerance) { + public ArrayList getToleratedTemperature(EnumTemperature prefered, EnumTolerance tolerance) { ArrayList tolerated = new ArrayList(); tolerated.add(prefered); @@ -149,11 +150,11 @@ public class ClimateHelper { } } - public static String toDisplay(EnumTemperature temperature) { + public String toDisplay(EnumTemperature temperature) { return StringUtil.localize("gui." + temperature.toString().toLowerCase(Locale.ENGLISH)); } - public static String toDisplay(EnumHumidity humidity) { + public String toDisplay(EnumHumidity humidity) { return StringUtil.localize("gui." + humidity.toString().toLowerCase(Locale.ENGLISH)); } } diff --git a/forestry_common/core/forestry/core/gui/ClimateLedger.java b/forestry_common/core/forestry/core/gui/ClimateLedger.java index 143d673e2..77316d87f 100755 --- a/forestry_common/core/forestry/core/gui/ClimateLedger.java +++ b/forestry_common/core/forestry/core/gui/ClimateLedger.java @@ -8,6 +8,7 @@ package forestry.core.gui; import forestry.api.core.EnumTemperature; +import forestry.api.genetics.AlleleManager; import forestry.core.genetics.ClimateHelper; import forestry.core.interfaces.IClimatised; import forestry.core.utils.StringUtil; @@ -44,17 +45,17 @@ public class ClimateLedger extends Ledger { manager.gui.fontColor.get("ledger.climate.header")); manager.minecraft.fontRenderer.drawStringWithShadow(StringUtil.localize("gui.temperature") + ":", x + 22, y + 20, manager.gui.fontColor.get("ledger.climate.subheader")); - manager.minecraft.fontRenderer.drawString(ClimateHelper.toDisplay(temperature) + " " + StringUtil.floatAsPercent(tile.getExactTemperature()), x + 22, + manager.minecraft.fontRenderer.drawString(AlleleManager.climateHelper.toDisplay(temperature) + " " + StringUtil.floatAsPercent(tile.getExactTemperature()), x + 22, y + 32, manager.gui.fontColor.get("ledger.climate.text")); manager.minecraft.fontRenderer.drawStringWithShadow(StringUtil.localize("gui.humidity") + ":", x + 22, y + 44, manager.gui.fontColor.get("ledger.climate.subheader")); - manager.minecraft.fontRenderer.drawString(ClimateHelper.toDisplay(tile.getHumidity()) + " " + StringUtil.floatAsPercent(tile.getExactHumidity()), + manager.minecraft.fontRenderer.drawString(AlleleManager.climateHelper.toDisplay(tile.getHumidity()) + " " + StringUtil.floatAsPercent(tile.getExactHumidity()), x + 22, y + 56, manager.gui.fontColor.get("ledger.climate.text")); } @Override public String getTooltip() { - return "T: " + ClimateHelper.toDisplay(tile.getTemperature()) + " / H: " + ClimateHelper.toDisplay(tile.getHumidity()); + return "T: " + AlleleManager.climateHelper.toDisplay(tile.getTemperature()) + " / H: " + AlleleManager.climateHelper.toDisplay(tile.getHumidity()); } } diff --git a/forestry_common/core/forestry/plugins/PluginCore.java b/forestry_common/core/forestry/plugins/PluginCore.java index cf93aaf6b..b05ad0630 100755 --- a/forestry_common/core/forestry/plugins/PluginCore.java +++ b/forestry_common/core/forestry/plugins/PluginCore.java @@ -19,7 +19,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.item.crafting.IRecipe; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.Loader; @@ -27,10 +26,8 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.OreDictionary; - import forestry.api.circuits.ChipsetManager; import forestry.api.core.PluginInfo; import forestry.api.core.Tabs; @@ -56,6 +53,7 @@ import forestry.core.gadgets.TileAnalyzer; import forestry.core.gadgets.TileEscritoire; import forestry.core.genetics.Allele; import forestry.core.genetics.AlleleRegistry; +import forestry.core.genetics.ClimateHelper; import forestry.core.genetics.ItemResearchNote; import forestry.core.interfaces.IOreDictionaryHandler; import forestry.core.interfaces.IPickupHandler; @@ -101,6 +99,7 @@ public class PluginCore extends NativePlugin implements IFuelHandler { AlleleRegistry alleleRegistry = new AlleleRegistry(); AlleleManager.alleleRegistry = alleleRegistry; + AlleleManager.climateHelper = new ClimateHelper(); alleleRegistry.initialize(); Allele.initialize(); @@ -114,11 +113,6 @@ public class PluginCore extends NativePlugin implements IFuelHandler { definitionEscritoire = ForestryBlock.core.addDefinition(new MachineDefinition(Defaults.DEFINITION_ESCRITOIRE_META, "forestry.Escritoire", TileEscritoire.class, Proxies.render.getRenderEscritoire(), new IRecipe[0])); - if (FMLCommonHandler.instance().getEffectiveSide().isClient()) - $$______$$(); - - - ForestryBlock.soil = new BlockSoil().setBlockName("soil"); Proxies.common.registerBlock(ForestryBlock.soil, ItemForestryBlock.class); ForestryBlock.soil.setHarvestLevel("shovel", 0, 0); @@ -130,9 +124,6 @@ public class PluginCore extends NativePlugin implements IFuelHandler { ForestryBlock.resources.setHarvestLevel("pickaxe", 1, 1); ForestryBlock.resources.setHarvestLevel("pickaxe", 1, 2); - if (FMLCommonHandler.instance().getEffectiveSide().isClient()) - $$____$$(); - OreDictionary.registerOre("oreApatite", new ItemStack(ForestryBlock.resources, 1, 0)); OreDictionary.registerOre("oreCopper", new ItemStack(ForestryBlock.resources, 1, 1)); OreDictionary.registerOre("oreTin", new ItemStack(ForestryBlock.resources, 1, 2)); @@ -151,11 +142,7 @@ public class PluginCore extends NativePlugin implements IFuelHandler { @Override public void doInit() { super.doInit(); - definitionAnalyzer.recipes = $$_____$$(ForestryBlock.core, Defaults.DEFINITION_ANALYZER_META); - - for ($___$ prop : $________$) { - prop.$$_______$$(); - } + definitionAnalyzer.recipes = createAlyzerRecipes(ForestryBlock.core, Defaults.DEFINITION_ANALYZER_META); definitionAnalyzer.register(); definitionEscritoire.register(); @@ -223,56 +210,6 @@ public class PluginCore extends NativePlugin implements IFuelHandler { ForestryItem.vialCatalyst.registerItem((new ItemForestry()), "vialCatalyst"); - $$_________$$(); - - // / EMPTY LIQUID CONTAINERS - ForestryItem.waxCapsule.registerItem(new ItemLiquidContainer(EnumContainerType.CAPSULE, -1).setMaxStackSize(64), "waxCapsule"); - ForestryItem.canEmpty.registerItem(new ItemLiquidContainer(EnumContainerType.CAN, -1).setMaxStackSize(64), "canEmpty"); - ForestryItem.refractoryEmpty.registerItem(new ItemLiquidContainer(EnumContainerType.REFRACTORY, -1).setMaxStackSize(64), "refractoryEmpty"); - - // / BUCKETS - ForestryItem.bucketBiomass.registerItem(new ItemForestry().setContainerItem(Items.bucket).setMaxStackSize(1), "bucketBiomass"); - ForestryItem.bucketBiofuel.registerItem(new ItemForestry().setContainerItem(Items.bucket).setMaxStackSize(1), "bucketBiofuel"); - - // / WAX CAPSULES - ForestryItem.waxCapsuleWater.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0x2432ec)), "waxCapsuleWater"); - ForestryItem.waxCapsuleBiomass.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0x83d41c)), "waxCapsuleBiomass"); - ForestryItem.waxCapsuleBiofuel.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xff7909)), "waxCapsuleBiofuel"); - ForestryItem.waxCapsuleOil.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0x404040)), "waxCapsuleOil"); - ForestryItem.waxCapsuleFuel.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xffff00)), "waxCapsuleFuel"); - ForestryItem.waxCapsuleSeedOil.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xffffa9)), "waxCapsuleSeedOil"); - ForestryItem.waxCapsuleHoney.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xffda47)).setDrink(Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION), "waxCapsuleHoney"); - ForestryItem.waxCapsuleJuice.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0x99d04e)).setDrink(Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION), "waxCapsuleJuice"); - ForestryItem.waxCapsuleIce.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xdcffff)), "waxCapsuleIce"); - - // / CANS - ForestryItem.canWater.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0x2432ec)), "waterCan"); - ForestryItem.canBiomass.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0x83d41c)), "biomassCan"); - ForestryItem.canBiofuel.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xff7909)), "biofuelCan"); - ForestryItem.canOil.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0x404040)), "canOil"); - ForestryItem.canFuel.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xffff00)), "canFuel"); - ForestryItem.canLava.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xfd461f)), "canLava"); - ForestryItem.canSeedOil.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xffffa9)), "canSeedOil"); - ForestryItem.canHoney.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xffda47)).setDrink(Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION), "canHoney"); - ForestryItem.canJuice.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0x99d04e)).setDrink(Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION), "canJuice"); - ForestryItem.canIce.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xdcffff)), "canIce"); - - // / REFRACTORY CAPSULES - ForestryItem.refractoryWater.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0x2432ec)), "refractoryWater"); - ForestryItem.refractoryBiomass.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0x83d41c)), "refractoryBiomass"); - ForestryItem.refractoryBiofuel.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xff7909)), "refractoryBiofuel"); - ForestryItem.refractoryOil.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0x404040)), "refractoryOil"); - ForestryItem.refractoryFuel.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xffff00)), "refractoryFuel"); - ForestryItem.refractoryLava.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xfd461f)), "refractoryLava"); - ForestryItem.refractorySeedOil.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xffffa9)), "refractorySeedOil"); - ForestryItem.refractoryHoney.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xffda47)).setDrink(Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION), "refractoryHoney"); - ForestryItem.refractoryJuice.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0x99d04e)).setDrink(Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION), "refractoryJuice"); - ForestryItem.refractoryIce.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xdcffff)), "refractoryIce"); - - } - - private void $$_________$$() { - // / PEAT PRODUCTION ForestryItem.peat.registerItem((new ItemForestry()), "peat"); OreDictionary.registerOre("brickPeat", ForestryItem.peat.getItemStack()); @@ -345,6 +282,50 @@ public class PluginCore extends NativePlugin implements IFuelHandler { // FRUITS ForestryItem.fruits.registerItem(new ItemFruit(), "fruits"); + // / EMPTY LIQUID CONTAINERS + ForestryItem.waxCapsule.registerItem(new ItemLiquidContainer(EnumContainerType.CAPSULE, -1).setMaxStackSize(64), "waxCapsule"); + ForestryItem.canEmpty.registerItem(new ItemLiquidContainer(EnumContainerType.CAN, -1).setMaxStackSize(64), "canEmpty"); + ForestryItem.refractoryEmpty.registerItem(new ItemLiquidContainer(EnumContainerType.REFRACTORY, -1).setMaxStackSize(64), "refractoryEmpty"); + + // / BUCKETS + ForestryItem.bucketBiomass.registerItem(new ItemForestry().setContainerItem(Items.bucket).setMaxStackSize(1), "bucketBiomass"); + ForestryItem.bucketBiofuel.registerItem(new ItemForestry().setContainerItem(Items.bucket).setMaxStackSize(1), "bucketBiofuel"); + + // / WAX CAPSULES + ForestryItem.waxCapsuleWater.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0x2432ec)), "waxCapsuleWater"); + ForestryItem.waxCapsuleBiomass.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0x83d41c)), "waxCapsuleBiomass"); + ForestryItem.waxCapsuleBiofuel.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xff7909)), "waxCapsuleBiofuel"); + ForestryItem.waxCapsuleOil.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0x404040)), "waxCapsuleOil"); + ForestryItem.waxCapsuleFuel.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xffff00)), "waxCapsuleFuel"); + ForestryItem.waxCapsuleSeedOil.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xffffa9)), "waxCapsuleSeedOil"); + ForestryItem.waxCapsuleHoney.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xffda47)).setDrink(Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION), "waxCapsuleHoney"); + ForestryItem.waxCapsuleJuice.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0x99d04e)).setDrink(Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION), "waxCapsuleJuice"); + ForestryItem.waxCapsuleIce.registerItem((new ItemLiquidContainer(EnumContainerType.CAPSULE, 0xdcffff)), "waxCapsuleIce"); + + // / CANS + ForestryItem.canWater.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0x2432ec)), "waterCan"); + ForestryItem.canBiomass.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0x83d41c)), "biomassCan"); + ForestryItem.canBiofuel.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xff7909)), "biofuelCan"); + ForestryItem.canOil.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0x404040)), "canOil"); + ForestryItem.canFuel.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xffff00)), "canFuel"); + ForestryItem.canLava.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xfd461f)), "canLava"); + ForestryItem.canSeedOil.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xffffa9)), "canSeedOil"); + ForestryItem.canHoney.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xffda47)).setDrink(Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION), "canHoney"); + ForestryItem.canJuice.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0x99d04e)).setDrink(Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION), "canJuice"); + ForestryItem.canIce.registerItem((new ItemLiquidContainer(EnumContainerType.CAN, 0xdcffff)), "canIce"); + + // / REFRACTORY CAPSULES + ForestryItem.refractoryWater.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0x2432ec)), "refractoryWater"); + ForestryItem.refractoryBiomass.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0x83d41c)), "refractoryBiomass"); + ForestryItem.refractoryBiofuel.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xff7909)), "refractoryBiofuel"); + ForestryItem.refractoryOil.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0x404040)), "refractoryOil"); + ForestryItem.refractoryFuel.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xffff00)), "refractoryFuel"); + ForestryItem.refractoryLava.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xfd461f)), "refractoryLava"); + ForestryItem.refractorySeedOil.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xffffa9)), "refractorySeedOil"); + ForestryItem.refractoryHoney.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xffda47)).setDrink(Defaults.FOOD_HONEY_HEAL, Defaults.FOOD_HONEY_SATURATION), "refractoryHoney"); + ForestryItem.refractoryJuice.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0x99d04e)).setDrink(Defaults.FOOD_JUICE_HEAL, Defaults.FOOD_JUICE_SATURATION), "refractoryJuice"); + ForestryItem.refractoryIce.registerItem((new ItemLiquidContainer(EnumContainerType.REFRACTORY, 0xdcffff)), "refractoryIce"); + } @Override @@ -503,13 +484,7 @@ public class PluginCore extends NativePlugin implements IFuelHandler { return 0; } - /*@Override - public boolean processIMCMessage(IMCMessage message) { - if (message.key.equals(new String(new byte[] { 115, 101, 99, 117, 114, 105, 116, 121, 86, 105, 111, 108, 97, 116, 105, 111, 110 }))) - Config.invalidFingerprint = true; - return false; - }*/ - public IRecipe[] $$_____$$(Block block, int meta) { + public IRecipe[] createAlyzerRecipes(Block block, int meta) { ArrayList recipes = new ArrayList(); if (ForestryItem.beealyzer != null) recipes.add(ShapedRecipeCustom.createShapedRecipe(new ItemStack(block, 1, meta), "XTX", " Y ", "X X", 'Y', ForestryItem.sturdyCasing, 'T', ForestryItem.beealyzer, 'X', "ingotBronze")); @@ -520,89 +495,4 @@ public class PluginCore extends NativePlugin implements IFuelHandler { return recipes.toArray(new IRecipe[0]); } - private abstract class $___$ { - - private final String fingerprint; - private final String corename; - - public $___$(String fingerprint) { - this("", fingerprint); - } - - public $___$(String coreName, String fingerprint) { - this.fingerprint = fingerprint; - this.corename = coreName; - } - - protected String $$__________$$() { - return corename; - } - - public void $$_______$$() { - try { - Class core = Class.forName($$__________$$()); - if (core != null) { - Certificate[] cert = core.getProtectionDomain().getCodeSource().getCertificates(); - if (cert == null || !Utils.getFingerprint(cert[0]).equals(new String(fingerprint))) { - Proxies.log - .severe("%s failed validation. Halting runtime for security reasons. Please replace your mods with untampered versions from the official download sites.", - $$__________$$()); - //Runtime.getRuntime().halt(1); - } - } - } catch (ClassNotFoundException ex) { - } - } - } - private static ArrayList<$___$> $________$ = new ArrayList<$___$>(); - - private void $$____$$() { - - $________$.add(new $___$(new String(new byte[] { 100, 101, 48, 52, 49, 102, 57, 102, 54, 49, 56, 55, 100, 101, 98, 98, 99, 55, 55, 48, 51, 52, 97, 51, - 52, 52, 49, 51, 52, 48, 53, 51, 50, 55, 55, 97, 97, 51, 98, 48 })) { - @Override - protected String $$__________$$() { - return "ic2.core.IC2"; - } - }); - $________$.add(new $___$(new String(new byte[] { 97, 48, 99, 50, 53, 53, 97, 99, 53, 48, 49, 98, 50, 55, 52, 57, 53, 51, 55, 100, 53, 56, 50, 52, 98, - 98, 48, 102, 48, 53, 56, 56, 98, 102, 48, 51, 50, 48, 102, 97 })) { - @Override - protected String $$__________$$() { - return "mods.railcraft.common.core.Railcraft"; - } - }); - } - - private void $$______$$() { - LinkedList fossExceptions = new LinkedList(); - fossExceptions.add("logisticspipes.LogisticsPipes"); - fossExceptions.add("com.pahimar.ee3.EquivalentExchange3"); - - for (ModContainer modContainer : Loader.instance().getModList()) { - - Object modInstance = modContainer.getMod(); - if (modInstance == null) - continue; - Mod modAnnotation = modInstance.getClass().getAnnotation(Mod.class); - if (modAnnotation == null) - continue; - - String fingerprint = modAnnotation.certificateFingerprint(); - if (fingerprint == null || fingerprint.equals("") || fingerprint.startsWith("@") || fingerprint.startsWith("%")) - continue; - - boolean isExcepted = false; - for (String exception : fossExceptions) { - if (exception.startsWith(modInstance.getClass().getCanonicalName())) { - isExcepted = true; - break; - } - } - - if (!isExcepted) - $________$.add(new $___$(modInstance.getClass().getCanonicalName(), fingerprint) { - }); - } - } } diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/genetics/Butterfly.java b/forestry_common/lepidopterology/forestry/lepidopterology/genetics/Butterfly.java index 0d9ba7cf5..678fad0ad 100755 --- a/forestry_common/lepidopterology/forestry/lepidopterology/genetics/Butterfly.java +++ b/forestry_common/lepidopterology/forestry/lepidopterology/genetics/Butterfly.java @@ -17,11 +17,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; - import net.minecraftforge.common.BiomeDictionary; - import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosome; import forestry.api.genetics.IGenome; @@ -73,9 +72,9 @@ public class Butterfly extends IndividualLiving implements IButterfly { list.add("\u00A7e" + genome.getActiveAllele(EnumButterflyChromosome.SIZE.ordinal()).getName()); list.add("\u00A7f" + genome.getActiveAllele(EnumButterflyChromosome.SPEED.ordinal()).getName() + " " + StringUtil.localize("gui.flyer")); list.add(genome.getActiveAllele(EnumButterflyChromosome.LIFESPAN.ordinal()).getName() + " " + StringUtil.localize("gui.life")); - list.add("\u00A7aT: " + ClimateHelper.toDisplay(genome.getPrimary().getTemperature()) + " / " + list.add("\u00A7aT: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getTemperature()) + " / " + StringUtil.capitalize(genome.getToleranceTemp().name())); - list.add("\u00A7aH: " + ClimateHelper.toDisplay(genome.getPrimary().getHumidity()) + " / " + list.add("\u00A7aH: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getHumidity()) + " / " + StringUtil.capitalize(genome.getToleranceHumid().name())); list.add("\u00A7c" + GenericRatings.rateActivityTime(genome.getNocturnal(), genome.getPrimary().isNocturnal())); } @@ -168,7 +167,7 @@ public class Butterfly extends IndividualLiving implements IButterfly { } private boolean isAcceptedEnvironment(BiomeGenBase biome) { - return ClimateHelper.isWithinLimits(EnumTemperature.getFromValue(biome.temperature), + return AlleleManager.climateHelper.isWithinLimits(EnumTemperature.getFromValue(biome.temperature), EnumHumidity.getFromValue(biome.rainfall), getGenome().getPrimary().getTemperature(), getGenome().getToleranceTemp(), getGenome().getPrimary().getHumidity(), getGenome().getToleranceHumid()); diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/gui/GuiFlutterlyzer.java b/forestry_common/lepidopterology/forestry/lepidopterology/gui/GuiFlutterlyzer.java index 7562d274b..0e776bde3 100755 --- a/forestry_common/lepidopterology/forestry/lepidopterology/gui/GuiFlutterlyzer.java +++ b/forestry_common/lepidopterology/forestry/lepidopterology/gui/GuiFlutterlyzer.java @@ -180,8 +180,8 @@ public class GuiFlutterlyzer extends GuiAlyzer { newLine(); newLine(); - drawRow(StringUtil.localize("gui.climate"), ClimateHelper.toDisplay(butterfly.getGenome().getPrimary().getTemperature()), - ClimateHelper.toDisplay(butterfly.getGenome().getPrimary().getTemperature()), butterfly, EnumButterflyChromosome.SPECIES); + drawRow(StringUtil.localize("gui.climate"), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getTemperature()), + AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getTemperature()), butterfly, EnumButterflyChromosome.SPECIES); drawLine(StringUtil.localize("gui.temptol"), COLUMN_0); drawToleranceInfo(butterfly.getGenome().getToleranceTemp(), COLUMN_1, @@ -191,8 +191,8 @@ public class GuiFlutterlyzer extends GuiAlyzer { newLine(); - drawRow(StringUtil.localize("gui.humidity"), ClimateHelper.toDisplay(butterfly.getGenome().getPrimary().getHumidity()), - ClimateHelper.toDisplay(butterfly.getGenome().getPrimary().getHumidity()), butterfly, EnumButterflyChromosome.SPECIES); + drawRow(StringUtil.localize("gui.humidity"), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getHumidity()), + AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getHumidity()), butterfly, EnumButterflyChromosome.SPECIES); drawLine(StringUtil.localize("gui.humidtol"), COLUMN_0); drawToleranceInfo(butterfly.getGenome().getToleranceHumid(), COLUMN_1,