mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 20:22:35 +00:00
Adding flower blockstate and blockstatemapper
This commit is contained in:
1 parent
5a64454906
commit
2a23e60cdb
60 files changed
+405
-201
No files matched your search
@@ -63,6 +63,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
getProxy().setMod(this);
|
||||
if (!this.isActive()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ public final class BinnieCore extends AbstractMod {
|
||||
|
||||
@Override
|
||||
public String getModID() {
|
||||
return "binniecore";
|
||||
return Constants.CORE_MOD_ID;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
package binnie.core.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IItemMisc extends IItemEnum {
|
||||
// IIcon getIcon(final ItemStack p0);
|
||||
//
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// void registerIcons(final IIconRegister p0);
|
||||
|
||||
void addInformation(final List p0);
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package binnie.core.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IItemMiscProvider extends IItemEnum {
|
||||
|
||||
void addInformation(List tooltip);
|
||||
|
||||
String getModelPath();
|
||||
}
|
||||
@@ -1,9 +1,15 @@
|
||||
package binnie.core.item;
|
||||
|
||||
import binnie.Constants;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.gui.BinnieCoreGUI;
|
||||
import forestry.api.core.IModelManager;
|
||||
import net.minecraft.client.renderer.ItemMeshDefinition;
|
||||
import net.minecraft.client.renderer.block.model.ModelBakery;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.EnumHand;
|
||||
@@ -15,10 +21,10 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
|
||||
public class ItemFieldKit extends ItemCore {
|
||||
// private IIcon fieldKit0;
|
||||
// private IIcon fieldKit1;
|
||||
// private IIcon fieldKit2;
|
||||
// private IIcon fieldKit3;
|
||||
private ModelResourceLocation fieldKit;
|
||||
private ModelResourceLocation fieldKit1;
|
||||
private ModelResourceLocation fieldKit2;
|
||||
private ModelResourceLocation fieldKit3;
|
||||
|
||||
public ItemFieldKit() {
|
||||
super("fieldKit");
|
||||
@@ -27,32 +33,35 @@ public class ItemFieldKit extends ItemCore {
|
||||
this.setMaxStackSize(1);
|
||||
this.setMaxDamage(64);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
manager.registerItemModel(item, new FieldKitMeshDefinition());
|
||||
fieldKit = new ModelResourceLocation(Constants.CORE_MOD_ID + ":fieldKit", "inventory");
|
||||
fieldKit1 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":fieldKit1", "inventory");
|
||||
fieldKit2 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":fieldKit2", "inventory");
|
||||
fieldKit3 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":fieldKit3", "inventory");
|
||||
ModelBakery.registerItemVariants(item, fieldKit, fieldKit1, fieldKit2, fieldKit3);
|
||||
}
|
||||
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public void registerIcons(final IIconRegister register) {
|
||||
// this.fieldKit0 = BinnieCore.proxy.getIcon(register, "fieldKit");
|
||||
// this.fieldKit1 = BinnieCore.proxy.getIcon(register, "fieldKit1");
|
||||
// this.fieldKit2 = BinnieCore.proxy.getIcon(register, "fieldKit2");
|
||||
// this.fieldKit3 = BinnieCore.proxy.getIcon(register, "fieldKit3");
|
||||
// this.itemIcon = this.fieldKit0;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public IIcon getIcon(final ItemStack stack, final int pass) {
|
||||
// final int damage = stack.getItemDamage();
|
||||
// if (damage < 24) {
|
||||
// return this.fieldKit3;
|
||||
// }
|
||||
// if (damage < 48) {
|
||||
// return this.fieldKit2;
|
||||
// }
|
||||
// if (damage < 64) {
|
||||
// return this.fieldKit1;
|
||||
// }
|
||||
// return this.fieldKit0;
|
||||
// }
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private class FieldKitMeshDefinition implements ItemMeshDefinition{
|
||||
@Override
|
||||
public ModelResourceLocation getModelLocation(ItemStack stack) {
|
||||
final int damage = stack.getItemDamage();
|
||||
if (damage < 24) {
|
||||
return fieldKit3;
|
||||
}
|
||||
if (damage < 48) {
|
||||
return fieldKit2;
|
||||
}
|
||||
if (damage < 64) {
|
||||
return fieldKit1;
|
||||
}
|
||||
return fieldKit;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) {
|
||||
|
||||
@@ -6,6 +6,7 @@ import forestry.api.core.Tabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.EnumActionResult;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
@@ -22,7 +23,7 @@ public class ItemGenesis extends ItemCore {
|
||||
@Override
|
||||
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) {
|
||||
BinnieCore.proxy.openGui(BinnieCoreGUI.Genesis, player, new BlockPos((int) player.posX, (int) player.posY, (int) player.posZ));
|
||||
return super.onItemRightClick(itemStack, world, player, hand);
|
||||
return new ActionResult(EnumActionResult.SUCCESS, itemStack);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -9,38 +9,37 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
public class ItemMisc extends ItemCore {
|
||||
private IItemMisc[] items;
|
||||
private IItemMiscProvider[] items;
|
||||
|
||||
public ItemMisc() {
|
||||
super("misc");
|
||||
}
|
||||
|
||||
protected ItemMisc(final CreativeTabs tab, final IItemMisc[] items2) {
|
||||
protected ItemMisc(final CreativeTabs tab, final IItemMiscProvider[] items) {
|
||||
super("misc");
|
||||
this.setCreativeTab(tab);
|
||||
this.setHasSubtypes(true);
|
||||
this.setUnlocalizedName("misc");
|
||||
this.items = items2;
|
||||
this.items = items;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) {
|
||||
for (final IItemMisc item : this.items) {
|
||||
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, List par3List) {
|
||||
for (IItemMiscProvider item : this.items) {
|
||||
if (item.isActive()) {
|
||||
par3List.add(this.getStack(item, 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private IItemMisc getItem(final int damage) {
|
||||
private IItemMiscProvider getItem(int damage) {
|
||||
return (damage >= this.items.length) ? this.items[0] : this.items[damage];
|
||||
}
|
||||
|
||||
public ItemStack getStack(final IItemMisc type, final int size) {
|
||||
public ItemStack getStack(IItemMiscProvider type, int size) {
|
||||
return new ItemStack(this, size, type.ordinal());
|
||||
}
|
||||
|
||||
@@ -48,7 +47,7 @@ public class ItemMisc extends ItemCore {
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
|
||||
super.addInformation(stack, playerIn, tooltip, advanced);
|
||||
final IItemMisc item = this.getItem(stack.getItemDamage());
|
||||
IItemMiscProvider item = this.getItem(stack.getItemDamage());
|
||||
if (item != null) {
|
||||
item.addInformation(tooltip);
|
||||
}
|
||||
@@ -57,35 +56,15 @@ public class ItemMisc extends ItemCore {
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
for (IItemMisc type : items) {
|
||||
manager.registerItemModel(item, type.ordinal(), "misc/" + type.name().toLowerCase(Locale.ENGLISH));
|
||||
for (IItemMiscProvider type : items) {
|
||||
manager.registerItemModel(item, type.ordinal(), "misc/" + type.getModelPath());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemStackDisplayName(final ItemStack stack) {
|
||||
final IItemMisc item = this.getItem(stack.getItemDamage());
|
||||
IItemMiscProvider item = this.getItem(stack.getItemDamage());
|
||||
return (item != null) ? item.getName(stack) : "null";
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public IIcon getIcon(final ItemStack stack, final int pass) {
|
||||
// final IItemMisc item = this.getItem(stack.getItemDamage());
|
||||
// return (item != null) ? item.getIcon(stack) : null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public IIcon getIconFromDamage(final int damage) {
|
||||
// final IItemMisc item = this.getItem(damage);
|
||||
// return (item != null) ? item.getIcon(null) : null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public void registerIcons(final IIconRegister register) {
|
||||
// for (final IItemMisc item : this.items) {
|
||||
// item.registerIcons(register);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
@@ -3,7 +3,7 @@ package binnie.core.item;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
|
||||
public class ManagerItem {
|
||||
public ItemMisc registerMiscItems(final IItemMisc[] items, final CreativeTabs tab) {
|
||||
public ItemMisc registerMiscItems(final IItemMiscProvider[] items, final CreativeTabs tab) {
|
||||
return new ItemMisc(tab, items);
|
||||
}
|
||||
}
|
||||
@@ -16,10 +16,14 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
public class BinnieModProxy implements IBinnieModProxy {
|
||||
private AbstractMod mod;
|
||||
|
||||
public BinnieModProxy(final AbstractMod mod) {
|
||||
this.mod = mod;
|
||||
public BinnieModProxy() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setMod(final AbstractMod mod) {
|
||||
this.mod = mod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item registerItem(Item item){
|
||||
return GameRegistry.register(item);
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package binnie.core.proxy;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.network.BinnieCorePacketID;
|
||||
import binnie.core.network.INetworkedEntity;
|
||||
import binnie.core.network.packet.MessageUpdate;
|
||||
@@ -23,9 +22,7 @@ import java.io.File;
|
||||
public class BinnieProxy extends BinnieModProxy implements IBinnieProxy {
|
||||
private short uniqueTextureUID;
|
||||
|
||||
|
||||
public BinnieProxy() {
|
||||
super(BinnieCore.instance);
|
||||
this.uniqueTextureUID = 1200;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
package binnie.core.proxy;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.IInitializable;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
public interface IProxyCore extends IInitializable {
|
||||
|
||||
void setMod(AbstractMod mod);
|
||||
|
||||
Item registerItem(Item item);
|
||||
|
||||
Block registerBlock(Block block);
|
||||
|
||||
Reference in new issue
Block a user