First 1.8.9 Version

This commit is contained in:
Nedelosk committed 2016-01-22 19:33:35 +01:00
1 parent d35cc1df09
commit 5a3850c264
1657 files changed
+26844 -13269

No files matched your search

@@ -19,14 +19,12 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.registry.GameData;
import forestry.api.apiculture.BeeManager;
import forestry.api.lepidopterology.ButterflyManager;
import forestry.api.storage.IBackpackDefinition;
import forestry.core.utils.ItemStackUtil;
public class BackpackDefinition implements IBackpackDefinition {
@@ -60,8 +58,8 @@ public class BackpackDefinition implements IBackpackDefinition {
Item item = backpack.getItem();
String display = ("" + StatCollector.translateToLocal(item.getUnlocalizedNameInefficiently(backpack) + ".name")).trim();
if (backpack.stackTagCompound != null && backpack.stackTagCompound.hasKey("display", 10)) {
NBTTagCompound nbt = backpack.stackTagCompound.getCompoundTag("display");
if (backpack.hasTagCompound() && backpack.getTagCompound().hasKey("display", 10)) {
NBTTagCompound nbt = backpack.getTagCompound().getCompoundTag("display");
if (nbt.hasKey("Name", 8)) {
display = nbt.getString("Name");
@@ -92,7 +90,7 @@ public class BackpackDefinition implements IBackpackDefinition {
return;
}
String itemStackString = GameData.getItemRegistry().getNameForObject(item);
String itemStackString = ItemStackUtil.getItemNameFromRegistryAsSting(item);
int meta = validItem.getItemDamage();
if (meta != OreDictionary.WILDCARD_VALUE) {
@@ -178,7 +176,7 @@ public class BackpackDefinition implements IBackpackDefinition {
return false;
}
String itemStackStringWild = GameData.getItemRegistry().getNameForObject(item);
String itemStackStringWild = ItemStackUtil.getItemNameFromRegistryAsSting(item);
if (validItemStacks.contains(itemStackStringWild)) {
return true;
}
@@ -13,9 +13,7 @@ package forestry.storage;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry;
import forestry.api.storage.ICrateRegistry;
import forestry.core.items.ItemCrated;
import forestry.core.utils.Log;
@@ -19,9 +19,7 @@ import net.minecraft.inventory.ContainerPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.common.eventhandler.Event;
import net.minecraftforge.fml.common.eventhandler.Event;
import forestry.api.storage.BackpackResupplyEvent;
import forestry.core.IResupplyHandler;
import forestry.core.inventory.ItemInventory;
@@ -13,21 +13,23 @@ package forestry.storage.items;
import java.util.List;
import java.util.Locale;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.common.eventhandler.Event;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IModelManager;
import forestry.api.storage.BackpackStowEvent;
import forestry.api.storage.EnumBackpackType;
import forestry.api.storage.IBackpackDefinition;
@@ -38,7 +40,6 @@ import forestry.core.inventory.ItemInventory;
import forestry.core.inventory.wrappers.IInvSlot;
import forestry.core.inventory.wrappers.InventoryIterator;
import forestry.core.items.ItemWithGui;
import forestry.core.render.TextureManager;
import forestry.core.tiles.TileUtil;
import forestry.core.utils.InventoryUtil;
import forestry.core.utils.StringUtil;
@@ -85,13 +86,13 @@ public class ItemBackpack extends ItemWithGui {
}
@Override
public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
return getInventoryHit(world, x, y, z, side) != null;
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
return getInventoryHit(world, pos, side) != null;
}
@Override
public boolean onItemUseFirst(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
if (world.isRemote) {
return false;
}
@@ -101,7 +102,7 @@ public class ItemBackpack extends ItemWithGui {
return false;
}
return evaluateTileHit(itemstack, player, world, x, y, z, side);
return evaluateTileHit(stack, player, world, pos, side);
}
public static ItemStack tryStowing(EntityPlayer player, ItemStack backpackStack, ItemStack stack) {
@@ -137,16 +138,16 @@ public class ItemBackpack extends ItemWithGui {
itemstack.setItemDamage(nextMode);
}
private static IInventory getInventoryHit(World world, int x, int y, int z, int side) {
TileEntity targeted = world.getTileEntity(x, y, z);
return TileUtil.getInventoryFromTile(targeted, ForgeDirection.getOrientation(side));
private static IInventory getInventoryHit(World world, BlockPos pos, EnumFacing side) {
TileEntity targeted = world.getTileEntity(pos);
return TileUtil.getInventoryFromTile(targeted, side);
}
private boolean evaluateTileHit(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side) {
private boolean evaluateTileHit(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side) {
// Shift right-clicking on an inventory tile will attempt to transfer
// items contained in the backpack
IInventory inventory = getInventoryHit(world, x, y, z, side);
IInventory inventory = getInventoryHit(world, pos, side);
// Process only inventories
if (inventory != null) {
@@ -227,35 +228,42 @@ public class ItemBackpack extends ItemWithGui {
return definition.getName(itemstack);
}
/* ICONS */
/* MODELS */
@SideOnly(Side.CLIENT)
private IIcon[] icons;
private ModelResourceLocation[] models;
@SideOnly(Side.CLIENT)
public static int i = 0;
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister register) {
icons = new IIcon[6];
public void registerModel(Item item, IModelManager manager) {
EnumBackpackType t = type == EnumBackpackType.APIARIST ? EnumBackpackType.T1 : type;
String typeTag = "backpacks/" + t.toString().toLowerCase(Locale.ENGLISH);
icons[0] = TextureManager.registerTex(register, typeTag + ".cloth");
icons[1] = TextureManager.registerTex(register, typeTag + ".outline");
icons[2] = TextureManager.registerTex(register, "backpacks/neutral");
icons[3] = TextureManager.registerTex(register, "backpacks/locked");
icons[4] = TextureManager.registerTex(register, "backpacks/receive");
icons[5] = TextureManager.registerTex(register, "backpacks/resupply");
models = new ModelResourceLocation[4];
models[0] = new ModelResourceLocation("forestry:" + typeTag + "_neutral", "inventory");
models[1] = new ModelResourceLocation("forestry:" + typeTag + "_locked", "inventory");
models[2] = new ModelResourceLocation("forestry:" + typeTag + "_receive", "inventory");
models[3] = new ModelResourceLocation("forestry:" + typeTag + "_resupply", "inventory");
if (i == 0 && (type == EnumBackpackType.T1 || type == EnumBackpackType.APIARIST) || i == 1 && type == EnumBackpackType.T2) {
manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_neutral"));
manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_locked"));
manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_receive"));
manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_resupply"));
i++;
}
manager.registerItemModel(item, new BackpackMeshDefinition());
}
// Return true to enable color overlay - client side only
@Override
public boolean requiresMultipleRenderPasses() {
return true;
}
@SideOnly(Side.CLIENT)
private class BackpackMeshDefinition implements ItemMeshDefinition {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack) {
EnumBackpackType t = type == EnumBackpackType.APIARIST ? EnumBackpackType.T1 : type;
return models[stack.getItemDamage()];
}
@Override
public int getRenderPasses(int metadata) {
return 3;
}
@Override
@@ -270,27 +278,6 @@ public class ItemBackpack extends ItemWithGui {
}
}
@SideOnly(Side.CLIENT)
@Override
public IIcon getIconFromDamageForRenderPass(int i, int j) {
if (j == 0) {
return icons[0];
}
if (j == 1) {
return icons[1];
}
if (i > 2) {
return icons[5];
} else if (i > 1) {
return icons[4];
} else if (i > 0) {
return icons[3];
} else {
return icons[2];
}
}
private static int getSlotsForType(EnumBackpackType type) {
switch (type) {
case APIARIST:
@@ -10,11 +10,9 @@
******************************************************************************/
package forestry.storage.proxy;
import forestry.core.items.ItemCrated;
public class ProxyStorage {
public void registerCrateForRendering(ItemCrated crate) {
public void registerCrateModelLoader() {
}
}
@@ -10,17 +10,13 @@
******************************************************************************/
package forestry.storage.proxy;
import net.minecraftforge.client.MinecraftForgeClient;
import forestry.core.items.ItemCrated;
import forestry.core.render.RenderCrateItem;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import forestry.core.render.model.ModelCrate;
public class ProxyStorageClient extends ProxyStorage {
private static final RenderCrateItem crateRenderer = new RenderCrateItem();
@Override
public void registerCrateForRendering(ItemCrated crate) {
MinecraftForgeClient.registerItemRenderer(crate, crateRenderer);
public void registerCrateModelLoader() {
ModelLoaderRegistry.registerLoader(ModelCrate.Loader.instance);
}
}