mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 20:12:19 +00:00
Use IconItemStack for farm logic icon
This commit is contained in:
1 parent
eb9ef642cd
commit
b8be42548e
17 files changed
+36
-137
No files matched your search
@@ -38,6 +38,8 @@ public interface IFarmLogic {
|
||||
|
||||
String getName();
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
ItemStack getStack();
|
||||
/**
|
||||
* @return the itemStack that represents this farm logic. Used as an icon for the farm logic.
|
||||
*/
|
||||
ItemStack getIconItemStack();
|
||||
}
|
||||
@@ -40,7 +40,7 @@ public class FarmLogicSlot extends Widget {
|
||||
if (getLogic() == null) {
|
||||
return null;
|
||||
}
|
||||
return getLogic().getStack();
|
||||
return getLogic().getIconItemStack();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -19,7 +19,6 @@ import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
@@ -53,18 +52,7 @@ public abstract class FarmLogic implements IFarmLogic {
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public ItemStack getStack() {
|
||||
return new ItemStack(getItem(), 1, getMetadata());
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public abstract Item getItem();
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public int getMetadata() {
|
||||
return 0;
|
||||
}
|
||||
public abstract ItemStack getIconItemStack();
|
||||
|
||||
public abstract boolean isAcceptedWindfall(ItemStack stack);
|
||||
|
||||
|
||||
@@ -20,14 +20,10 @@ import java.util.Stack;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.Farmables;
|
||||
import forestry.api.farming.ICrop;
|
||||
@@ -48,11 +44,10 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous {
|
||||
public String getName() {
|
||||
return "Managed Arboretum";
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@Override
|
||||
public Item getItem() {
|
||||
return Item.getItemFromBlock(Blocks.SAPLING);
|
||||
public ItemStack getIconItemStack() {
|
||||
return new ItemStack(Blocks.SAPLING);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -11,10 +11,7 @@
|
||||
package forestry.farming.logic;
|
||||
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import forestry.api.farming.Farmables;
|
||||
|
||||
@@ -34,9 +31,7 @@ public class FarmLogicCereal extends FarmLogicCrops {
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Item getItem() {
|
||||
return Items.WHEAT;
|
||||
public ItemStack getIconItemStack() {
|
||||
return new ItemStack(Items.WHEAT);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -25,15 +25,11 @@ import net.minecraft.block.BlockPlanks;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.ICrop;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
@@ -43,15 +39,8 @@ public class FarmLogicCocoa extends FarmLogic {
|
||||
private final IFarmable cocoa = new FarmableCocoa();
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Item getItem() {
|
||||
return Items.DYE;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public int getMetadata() {
|
||||
return 3;
|
||||
public ItemStack getIconItemStack() {
|
||||
return new ItemStack(Items.DYE, 1, 3);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,14 +16,10 @@ import java.util.Stack;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.Farmables;
|
||||
import forestry.api.farming.ICrop;
|
||||
@@ -43,9 +39,8 @@ public class FarmLogicEnder extends FarmLogicHomogeneous {
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Item getItem() {
|
||||
return Items.ENDER_EYE;
|
||||
public ItemStack getIconItemStack() {
|
||||
return new ItemStack(Items.ENDER_EYE);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -15,14 +15,10 @@ import java.util.Stack;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.Farmables;
|
||||
import forestry.api.farming.ICrop;
|
||||
@@ -39,9 +35,8 @@ public class FarmLogicGourd extends FarmLogic {
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Item getItem() {
|
||||
return Items.MELON;
|
||||
public ItemStack getIconItemStack() {
|
||||
return new ItemStack(Items.MELON);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,14 +16,10 @@ import java.util.Stack;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.Farmables;
|
||||
import forestry.api.farming.ICrop;
|
||||
@@ -43,9 +39,8 @@ public class FarmLogicInfernal extends FarmLogicHomogeneous {
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Item getItem() {
|
||||
return Items.NETHER_WART;
|
||||
public ItemStack getIconItemStack() {
|
||||
return new ItemStack(Items.NETHER_WART);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -14,13 +14,9 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.farming.Farmables;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
|
||||
@@ -40,9 +36,8 @@ public class FarmLogicMushroom extends FarmLogicArboreal {
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Item getItem() {
|
||||
return Item.getItemFromBlock(Blocks.RED_MUSHROOM);
|
||||
public ItemStack getIconItemStack() {
|
||||
return new ItemStack(Blocks.RED_MUSHROOM);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -22,15 +22,11 @@ import java.util.Stack;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.Farmables;
|
||||
import forestry.api.farming.ICrop;
|
||||
@@ -126,9 +122,8 @@ public class FarmLogicOrchard extends FarmLogic {
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Item getItem() {
|
||||
return PluginCore.items.fruits;
|
||||
public ItemStack getIconItemStack() {
|
||||
return new ItemStack(PluginCore.items.fruits);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -15,14 +15,10 @@ import java.util.Stack;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.ICrop;
|
||||
import forestry.core.PluginCore;
|
||||
@@ -89,9 +85,7 @@ public class FarmLogicPeat extends FarmLogicWatered {
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Item getItem() {
|
||||
return PluginCore.items.peat;
|
||||
public ItemStack getIconItemStack() {
|
||||
return new ItemStack(PluginCore.items.peat);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -16,14 +16,10 @@ import java.util.Stack;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.Farmables;
|
||||
import forestry.api.farming.ICrop;
|
||||
@@ -35,9 +31,8 @@ public class FarmLogicReeds extends FarmLogic {
|
||||
private final Collection<IFarmable> germlings = Farmables.farmables.get("farmPoales");
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Item getItem() {
|
||||
return Items.REEDS;
|
||||
public ItemStack getIconItemStack() {
|
||||
return new ItemStack(Items.REEDS);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -21,15 +21,10 @@ import java.util.Stack;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.ICrop;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
@@ -49,22 +44,8 @@ public class FarmLogicRubber extends FarmLogic {
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Item getItem() {
|
||||
if (active) {
|
||||
return PluginIC2.resin.getItem();
|
||||
} else {
|
||||
return Items.GUNPOWDER;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetadata() {
|
||||
if (active) {
|
||||
return PluginIC2.resin.getMetadata();
|
||||
} else {
|
||||
return super.getMetadata();
|
||||
}
|
||||
public ItemStack getIconItemStack() {
|
||||
return PluginIC2.resin;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,14 +16,10 @@ import java.util.Stack;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.Farmables;
|
||||
import forestry.api.farming.ICrop;
|
||||
@@ -35,15 +31,8 @@ public class FarmLogicSucculent extends FarmLogic {
|
||||
private final Collection<IFarmable> germlings = Farmables.farmables.get("farmSucculentes");
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Item getItem() {
|
||||
return Items.DYE;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public int getMetadata() {
|
||||
return 2;
|
||||
public ItemStack getIconItemStack() {
|
||||
return new ItemStack(Items.DYE, 1, 2);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -11,10 +11,7 @@
|
||||
package forestry.farming.logic;
|
||||
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import forestry.api.farming.Farmables;
|
||||
|
||||
@@ -25,9 +22,8 @@ public class FarmLogicVegetable extends FarmLogicCrops {
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Item getItem() {
|
||||
return Items.CARROT;
|
||||
public ItemStack getIconItemStack() {
|
||||
return new ItemStack(Items.CARROT);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user