Merge branch 'master' into plugins-rcstyle

Conflicts:
	api
	lang
This commit is contained in:
CovertJaguar committed 2014-09-20 18:26:01 -07:00
commit 8278f4688a
212 files changed
+4247 -2662

No files matched your search

@@ -89,6 +89,7 @@ import forestry.arboriculture.genetics.TreeTemplates;
import forestry.arboriculture.genetics.TreekeepingMode;
import forestry.arboriculture.items.ItemGermlingGE;
import forestry.arboriculture.items.ItemGrafter;
import forestry.arboriculture.items.ItemLeavesBlock;
import forestry.arboriculture.items.ItemStairs;
import forestry.arboriculture.items.ItemTreealyzer;
import forestry.arboriculture.items.ItemWoodBlock;
@@ -233,7 +234,7 @@ public class PluginArboriculture extends NativePlugin implements IFuelHandler {
ForestryBlock.saplingGE.registerBlock(new BlockSapling(), ItemForestryBlock.class, "saplingGE");
// Leaves
ForestryBlock.leaves.registerBlock(new BlockLeaves(), ItemForestryBlock.class, "leaves");
ForestryBlock.leaves.registerBlock(new BlockLeaves(), ItemLeavesBlock.class, "leaves");
// Pods
ForestryBlock.pods.registerBlock(new BlockFruitPod(), ItemForestryBlock.class, "pods");
@@ -53,6 +53,7 @@ public class PluginBuildCraft implements IPlugin, 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 PluginBuildCraft() {
if (PluginBuildCraft.instance == null)
@@ -64,7 +65,7 @@ public class PluginBuildCraft implements IPlugin, ITriggerProvider {
*/
@Override
public boolean isAvailable() {
return (Proxies.common.isModLoaded("BuildCraft|Core") && Proxies.common.isModLoaded("BuildCraft|Transport"));
return (Proxies.common.isModLoaded("BuildCraft|Core", validVersionRange) && Proxies.common.isModLoaded("BuildCraft|Transport", validVersionRange));
}
@Override
@@ -64,6 +64,7 @@ import forestry.core.items.ItemAssemblyKit;
import forestry.core.items.ItemCrated;
import forestry.core.items.ItemForestry;
import forestry.core.items.ItemForestryBlock;
import forestry.core.items.ItemTypedBlock;
import forestry.core.items.ItemForestryPickaxe;
import forestry.core.items.ItemForestryShovel;
import forestry.core.items.ItemFruit;
@@ -111,7 +112,7 @@ public class PluginCore extends NativePlugin implements IFuelHandler {
definitionEscritoire = ((BlockBase) ForestryBlock.core.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_ESCRITOIRE_META, "forestry.Escritoire", TileEscritoire.class,
Proxies.render.getRenderEscritoire()));
ForestryBlock.soil.registerBlock(new BlockSoil(), ItemForestryBlock.class, "soil");
ForestryBlock.soil.registerBlock(new BlockSoil(), ItemTypedBlock.class, "soil");
ForestryBlock.soil.block().setHarvestLevel("shovel", 0, 0);
ForestryBlock.soil.block().setHarvestLevel("shovel", 0, 1);
@@ -354,9 +355,6 @@ public class PluginCore extends NativePlugin implements IFuelHandler {
ForestryItem.cratedWheat.registerItem(new ItemCrated(new ItemStack(Items.wheat)), "cratedWheat");
ForestryItem.cratedMycelium.registerItem(new ItemCrated(new ItemStack(Blocks.mycelium)), "cratedMycelium");
ForestryItem.cratedMulch.registerItem(new ItemCrated(ForestryItem.mulch.getItemStack()), "cratedMulch");
ForestryItem.cratedSilver.registerItem(new ItemCrated(), "cratedSilver");
ForestryItem.cratedBrass.registerItem(new ItemCrated(), "cratedBrass");
ForestryItem.cratedNikolite.registerItem(new ItemCrated(), "cratedNikolite");
ForestryItem.cratedCookies.registerItem(new ItemCrated(new ItemStack(Items.cookie)), "cratedCookies");
ForestryItem.cratedRedstone.registerItem(new ItemCrated(new ItemStack(Items.redstone)), "cratedRedstone");
ForestryItem.cratedLapis.registerItem(new ItemCrated(new ItemStack(Items.dye, 1, 4)), "cratedLapis");
@@ -365,10 +363,6 @@ public class PluginCore extends NativePlugin implements IFuelHandler {
ForestryItem.cratedGlowstone.registerItem(new ItemCrated(new ItemStack(Items.glowstone_dust)), "cratedGlowstone");
ForestryItem.cratedApples.registerItem(new ItemCrated(new ItemStack(Items.apple)), "cratedApples");
ForestryItem.cratedNetherwart.registerItem(new ItemCrated(new ItemStack(Items.nether_wart)), "cratedNetherwart");
ForestryItem.cratedResin.registerItem(new ItemCrated(), "cratedResin");
ForestryItem.cratedRubber.registerItem(new ItemCrated(), "cratedRubber");
ForestryItem.cratedScrap.registerItem(new ItemCrated(), "cratedScrap");
ForestryItem.cratedUUM.registerItem(new ItemCrated(), "cratedUUM");
ForestryItem.cratedPhosphor.registerItem(new ItemCrated(ForestryItem.phosphor.getItemStack()), "cratedPhosphor");
ForestryItem.cratedAsh.registerItem(new ItemCrated(ForestryItem.ash.getItemStack()), "cratedAsh");
ForestryItem.cratedCharcoal.registerItem(new ItemCrated(new ItemStack(Items.coal, 1, 1)), "cratedCharcoal");
@@ -13,7 +13,8 @@ package forestry.plugins;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.network.IGuiHandler;
@@ -21,6 +22,7 @@ import cpw.mods.fml.common.network.IGuiHandler;
import forestry.api.circuits.ChipsetManager;
import forestry.api.circuits.ICircuitLayout;
import forestry.api.core.PluginInfo;
import forestry.api.fuels.FuelManager;
import forestry.api.fuels.GeneratorFuel;
import forestry.core.GameMode;
import forestry.core.circuits.Circuit;
@@ -146,18 +148,19 @@ public class PluginEnergy extends NativePlugin {
definitionGenerator.register();
definitionEngineClockwork.register();
GeneratorFuel.fuels.put(LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, 1).getFluid().getID(), new GeneratorFuel(LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, 1),
(int) (32 * GameMode.getGameMode().getFloatSetting("fuel.ethanol.generator")), 4));
GeneratorFuel.fuels.put(LiquidHelper.getLiquid(Defaults.LIQUID_BIOMASS, 1).getFluid().getID(), new GeneratorFuel(LiquidHelper.getLiquid(Defaults.LIQUID_BIOMASS, 1),
(int) (8 * GameMode.getGameMode().getFloatSetting("fuel.biomass.generator")), 1));
FluidStack ethanol = LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, 1);
GeneratorFuel ethanolFuel = new GeneratorFuel(ethanol, (int) (32 * GameMode.getGameMode().getFloatSetting("fuel.ethanol.generator")), 4);
FuelManager.generatorFuel.put(ethanol.getFluid(), ethanolFuel);
Circuit.energyElectricChoke1 = new CircuitElectricChoke("energyChoke1");
Circuit.energyFireDampener1 = new CircuitFireDampener("energyDampener1");
Circuit.energyElectricEfficiency1 = new CircuitElectricEfficiency("energyEfficiency1");
Circuit.energyElectricBoost1 = new CircuitElectricBoost("energyBoost1", 2, 7, 2, "electric.boost.1", new String[]{"Increases output by 2 MJ/t",
"Increases intake by 7 EU/t"});
Circuit.energyElectricBoost2 = new CircuitElectricBoost("energyBoost2", 2, 15, 4, "electric.boost.2", new String[]{"Increases output by 4 MJ/t",
"Increases intake by 15 EU/t"});
FluidStack biomass = LiquidHelper.getLiquid(Defaults.LIQUID_BIOMASS, 1);
GeneratorFuel biomassFuel = new GeneratorFuel(biomass, (int) (8 * GameMode.getGameMode().getFloatSetting("fuel.biomass.generator")), 1);
FuelManager.generatorFuel.put(biomass.getFluid(), biomassFuel);
Circuit.energyElectricChoke1 = new CircuitElectricChoke("electric.choke.1");
Circuit.energyFireDampener1 = new CircuitFireDampener("dampener.1");
Circuit.energyElectricEfficiency1 = new CircuitElectricEfficiency("electric.efficiency.1");
Circuit.energyElectricBoost1 = new CircuitElectricBoost("electric.boost.1", 2, 7, 2);
Circuit.energyElectricBoost2 = new CircuitElectricBoost("electric.boost.2", 2, 15, 4);
}
@Override
@@ -40,7 +40,7 @@ import forestry.core.config.ForestryBlock;
import forestry.core.config.ForestryItem;
import forestry.core.interfaces.IOreDictionaryHandler;
import forestry.core.interfaces.ISaveEventHandler;
import forestry.core.items.ItemForestryBlock;
import forestry.core.items.ItemTypedBlock;
import forestry.core.proxy.Proxies;
import forestry.core.triggers.Trigger;
import forestry.core.utils.ShapedRecipeCustom;
@@ -107,7 +107,7 @@ public class PluginFarming extends NativePlugin {
Farmables.farmInterface = new FarmHelper();
ForestryBlock.mushroom.registerBlock(new BlockMushroom(), ItemForestryBlock.class, "mushroom");
ForestryBlock.mushroom.registerBlock(new BlockMushroom(), ItemTypedBlock.class, "mushroom");
Farmables.farmables.put("farmArboreal", new ArrayList<IFarmable>());
Farmables.farmables.get("farmArboreal").add(new FarmableVanillaSapling());
@@ -171,24 +171,24 @@ public class PluginFarming extends NativePlugin {
GameRegistry.registerTileEntity(TileValve.class, "forestry.FarmValve");
GameRegistry.registerTileEntity(TileControl.class, "forestry.FarmControl");
Circuit.farmArborealManaged = new CircuitFarmLogic("managedArboreal", FarmLogicArboreal.class, new String[]{"Arboreal Plants"});
Circuit.farmShroomManaged = new CircuitFarmLogic("managedShroom", FarmLogicShroom.class, new String[]{"Mushrooms"});
Circuit.farmPeatManaged = new CircuitFarmLogic("managedPeat", FarmLogicPeat.class, new String[]{"Peat Bog"});
Circuit.farmCerealManaged = new CircuitFarmLogic("managedCereal", FarmLogicCereal.class, new String[]{"Crops"});
Circuit.farmVegetableManaged = new CircuitFarmLogic("managedVegetable", FarmLogicVegetable.class, new String[]{"Vegetables"});
Circuit.farmInfernalManaged = new CircuitFarmLogic("managedInfernal", FarmLogicInfernal.class, new String[]{"Infernal Crops"});
Circuit.farmArborealManaged = new CircuitFarmLogic("managedArboreal", FarmLogicArboreal.class);
Circuit.farmShroomManaged = new CircuitFarmLogic("managedShroom", FarmLogicShroom.class);
Circuit.farmPeatManaged = new CircuitFarmLogic("managedPeat", FarmLogicPeat.class);
Circuit.farmCerealManaged = new CircuitFarmLogic("managedCereal", FarmLogicCereal.class);
Circuit.farmVegetableManaged = new CircuitFarmLogic("managedVegetable", FarmLogicVegetable.class);
Circuit.farmInfernalManaged = new CircuitFarmLogic("managedInfernal", FarmLogicInfernal.class);
Circuit.farmPeatManual = new CircuitFarmLogic("manualPeat", FarmLogicPeat.class, new String[]{"Peat Bog"}).setManual();
Circuit.farmShroomManual = new CircuitFarmLogic("manualShroom", FarmLogicShroom.class, new String[]{"Mushrooms"}).setManual();
Circuit.farmCerealManual = new CircuitFarmLogic("manualCereal", FarmLogicCereal.class, new String[]{"Crops"}).setManual();
Circuit.farmVegetableManual = new CircuitFarmLogic("manualVegetable", FarmLogicVegetable.class, new String[]{"Vegetables"}).setManual();
Circuit.farmSucculentManual = new CircuitFarmLogic("manualSucculent", FarmLogicSucculent.class, new String[]{"Succulents"}).setManual();
Circuit.farmPoalesManual = new CircuitFarmLogic("manualPoales", FarmLogicPoale.class, new String[]{"Reeds"}).setManual();
Circuit.farmGourdManual = new CircuitFarmLogic("manualGourd", FarmLogicGourd.class, new String[]{"Gourds"}).setManual();
Circuit.farmCocoaManual = new CircuitFarmLogic("manualCocoa", FarmLogicCocoa.class, new String[]{"Cocoa Plantation"}).setManual();
Circuit.farmPeatManual = new CircuitFarmLogic("manualPeat", FarmLogicPeat.class).setManual();
Circuit.farmShroomManual = new CircuitFarmLogic("manualShroom", FarmLogicShroom.class).setManual();
Circuit.farmCerealManual = new CircuitFarmLogic("manualCereal", FarmLogicCereal.class).setManual();
Circuit.farmVegetableManual = new CircuitFarmLogic("manualVegetable", FarmLogicVegetable.class).setManual();
Circuit.farmSucculentManual = new CircuitFarmLogic("manualSucculent", FarmLogicSucculent.class).setManual();
Circuit.farmPoalesManual = new CircuitFarmLogic("manualPoales", FarmLogicPoale.class).setManual();
Circuit.farmGourdManual = new CircuitFarmLogic("manualGourd", FarmLogicGourd.class).setManual();
Circuit.farmCocoaManual = new CircuitFarmLogic("manualCocoa", FarmLogicCocoa.class).setManual();
Circuit.farmOrchardManual = new CircuitFarmLogic("manualOrchard", FarmLogicOrchard.class, new String[]{"Orchard"});
Circuit.farmRubberManual = new CircuitFarmLogic("manualRubber", FarmLogicRubber.class, new String[]{"Rubber Plantation"});
Circuit.farmOrchardManual = new CircuitFarmLogic("manualOrchard", FarmLogicOrchard.class);
Circuit.farmRubberManual = new CircuitFarmLogic("manualRubber", FarmLogicRubber.class);
MinecraftForge.EVENT_BUS.register(new EventHandlerFarming());
}
+80 -42
View File
@@ -59,6 +59,9 @@ public class PluginIC2 implements IPlugin {
public static ItemStack waterCell;
public static ItemStack rubber;
public static ItemStack scrap;
public static ItemStack silver;
public static ItemStack brass;
public static ItemStack uuMatter;
public static int fuelcanMeta;
public PluginIC2() {
@@ -101,16 +104,6 @@ public class PluginIC2 implements IPlugin {
// Remove some items from the recycler
registerBackpackItems();
if (rubbersapling != null && resin != null) {
String imc = String.format("farmArboreal@%s.%s.%s.%s",
GameData.getBlockRegistry().getNameForObject(StackUtils.getBlock(rubbersapling)),
rubbersapling.getItemDamage(),
GameData.getItemRegistry().getNameForObject(resin.getItem()),
resin.getItemDamage());
Proxies.log.finest("Sending IMC '%s'.", imc);
FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", imc);
}
}
private void initFermentation() {
@@ -128,68 +121,113 @@ public class PluginIC2 implements IPlugin {
private void initLiquidContainers() {
emptyCell = IC2Items.getItem("cell");
lavaCell = IC2Items.getItem("lavaCell");
waterCell = IC2Items.getItem("waterCell");
if (emptyCell == null || lavaCell == null || waterCell == null) {
Proxies.log.fine("Any of the following IC2 items could not be found: empty cell, water cell, lava cell. Skipped adding IC2 liquid containers.");
if (emptyCell == null) {
Proxies.log.fine("IC2 empty cell could not be found. Skipped adding IC2 liquid containers.");
return;
}
LiquidHelper.injectTinContainer(Defaults.LIQUID_LAVA, Defaults.BUCKET_VOLUME, lavaCell, emptyCell);
LiquidHelper.injectTinContainer(Defaults.LIQUID_WATER, Defaults.BUCKET_VOLUME, waterCell, emptyCell);
if (GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can").stackSize > 0)
Proxies.common
.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"), "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', waterCell, 'Y', Blocks.sand);
lavaCell = IC2Items.getItem("lavaCell");
if (lavaCell != null)
LiquidHelper.injectTinContainer(Defaults.LIQUID_LAVA, Defaults.BUCKET_VOLUME, lavaCell, emptyCell);
waterCell = IC2Items.getItem("waterCell");
if (waterCell != null) {
LiquidHelper.injectTinContainer(Defaults.LIQUID_WATER, Defaults.BUCKET_VOLUME, waterCell, emptyCell);
ItemStack bogEarthCan = GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can");
if (bogEarthCan.stackSize > 0)
Proxies.common.addRecipe(bogEarthCan, "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', waterCell, 'Y', Blocks.sand);
}
}
private void initRubberChain() {
treetap = IC2Items.getItem("treetap");
resin = IC2Items.getItem("resin");
rubberwood = IC2Items.getItem("rubberWood");
resin = IC2Items.getItem("resin");
if (resin != null)
RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.propolis.getItemStack(), resin);
else
Proxies.log.fine("Missing IC2 resin, skipping centrifuge recipe for propolis to resin.");
rubbersapling = IC2Items.getItem("rubberSapling");
rubberleaves = IC2Items.getItem("rubberLeaves");
fuelcanFilled = IC2Items.getItem("filledFuelCan");
fuelcanEmpty = IC2Items.getItem("fuelCan");
if (treetap == null || resin == null || rubberwood == null || rubbersapling == null || rubberleaves == null || fuelcanFilled == null
|| fuelcanEmpty == null) {
Proxies.log
.fine("Any of the following IC2 blocks and items could not be found: resin, rubber wood, saplings or leaves, filled fuel cans, empty fuel cans. Skipped adding rubber chain.");
return;
if (rubbersapling != null) {
RecipeUtil.injectLeveledRecipe(rubbersapling, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Defaults.LIQUID_BIOMASS);
BackpackManager.backpackItems[2].add(rubbersapling);
} else {
Proxies.log.fine("Missing IC2 rubber sapling, skipping fermenter recipe for converting rubber sapling to biomass.");
}
// Add extra recipes
RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.propolis.getItemStack(), resin);
ItemStack fuelcanStack = new ItemStack(fuelcanFilled.getItem(), 1, 0);
NBTTagCompound compound = new NBTTagCompound();
compound.setInteger("value", 15288);
fuelcanStack.setTagCompound(compound);
RecipeManagers.bottlerManager.addRecipe(20, LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, Defaults.BOTTLER_FUELCAN_VOLUME), fuelcanEmpty, fuelcanStack);
if (rubbersapling != null && resin != null) {
String saplingName = GameData.getBlockRegistry().getNameForObject(StackUtils.getBlock(rubbersapling));
String resinName = GameData.getItemRegistry().getNameForObject(resin.getItem());
String imc = String.format("farmArboreal@%s.%s.%s.%s",
saplingName, rubbersapling.getItemDamage(),
resinName, resin.getItemDamage());
Proxies.log.finest("Sending IMC '%s'.", imc);
FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", imc);
}
RecipeUtil.injectLeveledRecipe(rubbersapling, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Defaults.LIQUID_BIOMASS);
rubberleaves = IC2Items.getItem("rubberLeaves");
if (rubberleaves != null)
BackpackManager.backpackItems[2].add(rubberleaves);
else
Proxies.log.fine("Missing IC2 rubber leaves");
fuelcanFilled = IC2Items.getItem("filledFuelCan");
fuelcanEmpty = IC2Items.getItem("fuelCan");
if (fuelcanEmpty != null && fuelcanFilled != null) {
ItemStack fuelcanStack = new ItemStack(fuelcanFilled.getItem(), 1, 0);
NBTTagCompound compound = new NBTTagCompound();
compound.setInteger("value", 15288);
fuelcanStack.setTagCompound(compound);
RecipeManagers.bottlerManager.addRecipe(20, LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, Defaults.BOTTLER_FUELCAN_VOLUME), fuelcanEmpty, fuelcanStack);
} else {
Proxies.log.fine("Missing IC2 fuelcanEmpty or fuelcanFilled, skipping bottler recipe for ethanol to filled fuel can.");
}
// Add backpack items
BackpackManager.backpackItems[2].add(rubbersapling);
BackpackManager.backpackItems[2].add(rubberleaves);
// Rubber wood is added via ore dictionary.
}
private void initCrates() {
resin = IC2Items.getItem("resin");
rubber = IC2Items.getItem("rubber");
scrap = IC2Items.getItem("scrap");
// Add crates for the IC2 items that exist.
resin = IC2Items.getItem("resin");
if (resin != null) {
ForestryItem.cratedResin.registerItem(new ItemCrated(), "cratedResin");
((ItemCrated) ForestryItem.cratedResin.item()).setContained(ForestryItem.cratedResin.getItemStack(), resin);
}
rubber = IC2Items.getItem("rubber");
if (rubber != null) {
ForestryItem.cratedRubber.registerItem(new ItemCrated(), "cratedRubber");
((ItemCrated) ForestryItem.cratedRubber.item()).setContained(ForestryItem.cratedRubber.getItemStack(), rubber);
}
scrap = IC2Items.getItem("scrap");
if (scrap != null) {
ForestryItem.cratedScrap.registerItem(new ItemCrated(), "cratedScrap");
((ItemCrated) ForestryItem.cratedScrap.item()).setContained(ForestryItem.cratedScrap.getItemStack(), scrap);
}
uuMatter = IC2Items.getItem("matter");
if (uuMatter != null) {
ForestryItem.cratedUUM.registerItem(new ItemCrated(), "cratedUUM");
((ItemCrated) ForestryItem.cratedUUM.item()).setContained(ForestryItem.cratedUUM.getItemStack(), uuMatter);
}
silver = IC2Items.getItem("silverIngot");
if (silver != null) {
ForestryItem.cratedSilver.registerItem(new ItemCrated(), "cratedSilver");
((ItemCrated) ForestryItem.cratedSilver.item()).setContained(ForestryItem.cratedSilver.getItemStack(), silver);
}
brass = IC2Items.getItem("bronzeIngot");
if (brass != null) {
ForestryItem.cratedBrass.registerItem(new ItemCrated(), "cratedBrass");
((ItemCrated) ForestryItem.cratedBrass.item()).setContained(ForestryItem.cratedBrass.getItemStack(), brass);
}
}
private void registerBackpackItems() {
@@ -38,7 +38,7 @@ import forestry.core.triggers.Trigger;
import forestry.core.utils.LiquidHelper;
import forestry.core.utils.ShapedRecipeCustom;
import forestry.mail.CommandMail;
import forestry.mail.EnumAddressee;
import forestry.api.mail.EnumAddressee;
import forestry.mail.GuiHandlerMail;
import forestry.mail.PacketHandlerMail;
import forestry.mail.PostRegistry;
@@ -65,8 +65,8 @@ public class PluginMail extends NativePlugin {
@SidedProxy(clientSide = "forestry.mail.proxy.ClientProxyMail", serverSide = "forestry.mail.proxy.ProxyMail")
public static ProxyMail proxy;
public static Trigger triggerHasMail;
public static Trigger lowPaper25;
public static Trigger lowPaper10;
public static Trigger lowPaper64;
public static Trigger lowPaper32;
public static Trigger lowPostage40;
public static Trigger lowPostage20;
public static Trigger lowInput25;
@@ -90,8 +90,8 @@ public class PluginMail extends NativePlugin {
new TickHandlerMailClient();
triggerHasMail = new TriggerHasMail();
lowPaper25 = new TriggerLowPaper("mail.lowPaper.25", 0.25f);
lowPaper10 = new TriggerLowPaper("mail.lowPaper.10", 0.1f);
lowPaper64 = new TriggerLowPaper("mail.lowPaper.64", 64);
lowPaper32 = new TriggerLowPaper("mail.lowPaper.32", 32);
lowPostage40 = new TriggerLowStamps("mail.lowStamps.40", 40);
lowPostage20 = new TriggerLowStamps("mail.lowStamps.20", 20);
lowInput25 = new TriggerLowInput("mail.lowInput.25", 0.25f);
@@ -12,7 +12,9 @@ package forestry.plugins;
import java.util.ArrayList;
import cpw.mods.fml.common.registry.GameData;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.event.FMLInterModComms;
@@ -33,6 +35,7 @@ public class PluginNatura extends NativePlugin {
public static Block leavesNatura;
public static Block saplingNatura;
public static Block saplingNaturaRare;
@Override
public boolean isAvailable() {
@@ -47,9 +50,20 @@ public class PluginNatura extends NativePlugin {
logWillow = GameRegistry.findBlock(NATURA, "willow");
leavesNatura = GameRegistry.findBlock(NATURA, "floraleaves");
saplingNatura = GameRegistry.findBlock(NATURA, "florasapling");
saplingNaturaRare = GameRegistry.findBlock(NATURA, "Rare Sapling");
ArrayList<String> saplingItemKeys = new ArrayList<String>();
if(saplingNatura != null)
FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingNatura));
saplingItemKeys.add("florasapling");
if(saplingNaturaRare != null)
saplingItemKeys.add("Rare Sapling");
for (String key : saplingItemKeys) {
Item saplingItem = GameRegistry.findItem(NATURA, key);
String saplingName = GameData.getItemRegistry().getNameForObject(saplingItem);
FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName));
}
}
@Override protected void registerItems() {}
@@ -38,7 +38,7 @@ public class PluginPropolisPipe extends NativePlugin {
@Override
public boolean isAvailable() {
return Proxies.common.isModLoaded("BuildCraft|Transport");
return Proxies.common.isModLoaded("BuildCraft|Transport", PluginBuildCraft.validVersionRange);
}
@Override
@@ -62,7 +62,7 @@ public class PluginPropolisPipe extends NativePlugin {
if (FMLCommonHandler.instance().getSide().isClient())
proxyClass = "forestry.pipes.proxy.ClientProxyPipes";
proxy = (ProxyPipes) Proxies.common.instantiateIfModLoaded("BuildCraft|Transport", proxyClass);
proxy = (ProxyPipes) Proxies.common.instantiateIfModLoaded("BuildCraft|Transport", PluginBuildCraft.validVersionRange, proxyClass);
if (proxy == null)
return;
@@ -589,6 +589,12 @@ public class PluginStorage extends NativePlugin implements IOreDictionaryHandler
minerItems.add(ore);
else if (name.startsWith("crystal"))
minerItems.add(ore);
else if (name.startsWith("cluster"))
minerItems.add(ore);
else if (name.startsWith("shard"))
minerItems.add(ore);
else if (name.startsWith("clump"))
minerItems.add(ore);
else if (name.matches("dropUranium"))
minerItems.add(ore);
else if (name.equals("treeLeaves") || name.equals("treeSapling") || name.equals("logWood"))