Merge branch 'master' of https://github.com/ForestryMC/ForestryMC into master-origin

Conflicts:
	api
This commit is contained in:
Vexatos committed 2014-08-18 17:41:26 +02:00
commit c419674cdc
6 files changed
+16 -10

No files matched your search

@@ -41,16 +41,16 @@ public class CreativeTabForestry extends CreativeTabs {
Item iconItem;
switch (icon) {
case 1:
iconItem = GameRegistry.findItem("Forestry", "for.beeDroneGE");
iconItem = GameRegistry.findItem("Forestry", "beeDroneGE");
break;
case 2:
iconItem = GameRegistry.findItem("Forestry", "for.sapling");
iconItem = GameRegistry.findItem("Forestry", "sapling");
break;
case 3:
iconItem = GameRegistry.findItem("Forestry", "for.butterflyGE");
iconItem = GameRegistry.findItem("Forestry", "butterflyGE");
break;
default:
iconItem = GameRegistry.findItem("Forestry", "for.fertilizerCompound");
iconItem = GameRegistry.findItem("Forestry", "fertilizerCompound");
break;
}
if (iconItem == null)
@@ -208,8 +208,7 @@ public class ForestryCore {
LiquidHelper.injectLiquidContainer(Defaults.LIQUID_MILK, Defaults.BUCKET_VOLUME, new ItemStack(Items.milk_bucket), new ItemStack(Items.bucket));
// Lava
LiquidHelper.injectTinContainer(Defaults.LIQUID_LAVA, Defaults.BUCKET_VOLUME, ForestryItem.canLava.getItemStack(),
ForestryItem.canEmpty.getItemStack());
LiquidHelper.injectTinContainer(Defaults.LIQUID_LAVA, Defaults.BUCKET_VOLUME, ForestryItem.canLava.getItemStack(), ForestryItem.canEmpty.getItemStack());
LiquidHelper.injectRefractoryContainer(Defaults.LIQUID_LAVA, Defaults.BUCKET_VOLUME, ForestryItem.refractoryLava.getItemStack(), ForestryItem.refractoryEmpty.getItemStack());
// Water
@@ -24,6 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.genetics.ISpeciesRoot;
import forestry.core.config.Defaults;
import forestry.core.config.ForestryBlock;
import forestry.core.config.ForestryItem;
import forestry.core.interfaces.ICrafter;
import forestry.core.render.TextureManager;
@@ -126,6 +127,8 @@ public class SlotCustom extends SlotForestry {
if (itemstack.getItem() == (Item) filter) return true;
} else if (filter instanceof ForestryItem) {
if (((ForestryItem) filter).isItemEqual(itemstack)) return true;
} else if (filter instanceof ForestryBlock) {
if (((ForestryBlock) filter).isItemEqual(itemstack)) return true;
} else if (filter instanceof ISpeciesRoot) {
if (((ISpeciesRoot) filter).isMember(itemstack)) return true;
} else {
@@ -44,6 +44,7 @@ import forestry.core.network.PacketCoordinates;
import forestry.core.network.PacketFXSignal;
import forestry.core.network.PacketIds;
import forestry.core.render.SpriteSheet;
import forestry.core.utils.StringUtil;
public class ProxyCommon {
@@ -56,11 +57,11 @@ public class ProxyCommon {
}
public void registerBlock(Block block, Class<? extends ItemBlock> itemClass) {
GameRegistry.registerBlock(block, itemClass, block.getUnlocalizedName());
GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block));
}
public void registerItem(Item item) {
GameRegistry.registerItem(item, item.getUnlocalizedName().replace("item.", ""));
GameRegistry.registerItem(item, StringUtil.cleanItemName(item));
}
/**
@@ -36,8 +36,8 @@ import forestry.core.render.TextureManager;
public class LiquidHelper {
private static LinkedList<String> myLiquids = new LinkedList<String>();
private static HashMap<String, Fluid> liquidMap = new HashMap<String, Fluid>();
private static final LinkedList<String> myLiquids = new LinkedList<String>();
private static final HashMap<String, Fluid> liquidMap = new HashMap<String, Fluid>();
public static boolean isEmptyLiquidData() {
return FluidContainerRegistry.getRegisteredFluidContainerData().length <= 0;
@@ -24,6 +24,7 @@ import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
import forestry.core.config.Defaults;
import forestry.core.config.ForestryBlock;
import forestry.core.config.ForestryItem;
import forestry.core.interfaces.IDescriptiveRecipe;
@@ -222,6 +223,8 @@ public class ShapedRecipeCustom implements IDescriptiveRecipe {
hashmap.put(character, new ItemStack((Item) materials[index + 1]));
else if (materials[index + 1] instanceof ForestryItem)
hashmap.put(character, ((ForestryItem) materials[index + 1]).getItemStack());
else if (materials[index + 1] instanceof ForestryBlock)
hashmap.put(character, ((ForestryBlock) materials[index + 1]).getItemStack());
else if (materials[index + 1] instanceof Block)
hashmap.put(character, new ItemStack((Block) materials[index + 1], 1, Defaults.WILDCARD));
else if (materials[index + 1] instanceof ItemStack)