upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-13 16:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing references to Forestry classes outside the API. Oops.

Browse Source
This commit is contained in:
MysteriousAges committed 2015-06-19 11:25:29 -07:00
1 parent e9c1e5cf8c
commit e0432846d5
2 files changed
+24 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/magicbees/item/ItemMagicHive.java
+22 -9
View File
@@ -2,18 +2,37 @@ package magicbees.item;
import magicbees.block.types.HiveType;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import forestry.core.items.ItemForestryBlock;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* Created by Allen on 7/29/2014.
*/
public class ItemMagicHive extends ItemForestryBlock
public class ItemMagicHive extends ItemBlock
{
public ItemMagicHive(Block block)
{
super(block);
setMaxDamage(0);
setHasSubtypes(true);
}
@Override
public int getMetadata(int i) {
return i;
}
protected Block getBlock() {
return field_150939_a;
}
@SideOnly(Side.CLIENT)
@Override
public IIcon getIconFromDamage(int meta) {
return this.getBlock().getIcon(1, meta);
}
@Override
@@ -21,10 +40,4 @@ public class ItemMagicHive extends ItemForestryBlock
{
return getBlock().getUnlocalizedName() + "." + HiveType.getHiveFromMeta(itemstack.getItemDamage()).name().toLowerCase();
}
@Override
public String getItemStackDisplayName(ItemStack p_77653_1_)
{
return ("" + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(p_77653_1_) + ".name")).trim();
}
}
src/main/java/magicbees/main/utils/net/EventBase.java
+2 -3
View File
@@ -1,6 +1,5 @@
package magicbees.main.utils.net;
import forestry.core.proxy.Proxies;
import io.netty.buffer.Unpooled;
import java.io.ByteArrayInputStream;
@@ -69,7 +68,7 @@ public class EventBase {
short meta = data.readShort();
itemstack = new ItemStack(item, stackSize, meta);
if (item.isDamageable() || Proxies.common.needsTagCompoundSynched(item)) {
if (item.isDamageable() || item.getShareTag()) {
itemstack.stackTagCompound = this.readNBTTagCompound(data);
}
}
@@ -85,7 +84,7 @@ public class EventBase {
data.writeByte(itemstack.stackSize);
data.writeShort(itemstack.getItemDamage());
if (itemstack.getItem().isDamageable() || Proxies.common.needsTagCompoundSynched(itemstack.getItem())) {
if (itemstack.getItem().isDamageable() || itemstack.getItem().getShareTag()) {
this.writeNBTTagCompound(itemstack.stackTagCompound, data);
}
}