mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-18 19:39:37 +00:00
Improve .gitignore and Adding ModelManager like that from Forestry
This commit is contained in:
1 parent
ce2629a9f4
commit
2adc2e3562
33 files changed
+361
-92
No files matched your search
@@ -1,6 +1,8 @@
|
||||
package binnie;
|
||||
|
||||
public final class Constants {
|
||||
public static final String CORE_MOD_ID = "binniecore";
|
||||
|
||||
public static final String LiquidJuice = "juice";
|
||||
public static final String LiquidWater = "water";
|
||||
public static final String LiquidSeedOil = "seedoil";
|
||||
|
||||
@@ -140,7 +140,8 @@ public class BlockPlant extends BlockBush {
|
||||
return values()[id % values().length];
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
@Override
|
||||
public String getName() {
|
||||
return this.name;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@ package binnie.botany.genetics;
|
||||
|
||||
import binnie.botany.CreativeTabBotany;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package binnie.core;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.Constants;
|
||||
import binnie.core.block.TileEntityMetadata;
|
||||
import binnie.core.gui.BinnieCoreGUI;
|
||||
import binnie.core.gui.BinnieGUIHandler;
|
||||
@@ -45,7 +46,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Mod(modid = "BinnieCore", name = "Binnie Core", useMetadata = true, dependencies = "required-after:forestry")
|
||||
@Mod(modid = Constants.CORE_MOD_ID, name = "Binnie Core", useMetadata = true, dependencies = "required-after:forestry")
|
||||
public final class BinnieCore extends AbstractMod {
|
||||
@Mod.Instance("BinnieCore")
|
||||
public static BinnieCore instance;
|
||||
@@ -70,11 +71,13 @@ public final class BinnieCore extends AbstractMod {
|
||||
this.addModule(new ModuleTrigger());
|
||||
}
|
||||
this.preInit();
|
||||
proxy.registerModels();
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
public void init(final FMLInitializationEvent evt) {
|
||||
this.init();
|
||||
proxy.registerItemAndBlockColors();
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
|
||||
@@ -6,7 +6,6 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fml.common.Loader;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import net.minecraftforge.fml.common.versioning.ArtifactVersion;
|
||||
import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion;
|
||||
import net.minecraftforge.fml.common.versioning.Restriction;
|
||||
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
package binnie.core.item;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public interface IColoredItem {
|
||||
int getColorFromItemstack(ItemStack stack, int tintIndex);
|
||||
}
|
||||
@@ -2,7 +2,6 @@ package binnie.core.machines;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
class ModelBlock extends ModelBase {
|
||||
private ModelRenderer Block;
|
||||
|
||||
@@ -0,0 +1,274 @@
|
||||
package binnie.core.models;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
|
||||
import binnie.Constants;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.vecmath.Vector3f;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.ItemMeshDefinition;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.color.BlockColors;
|
||||
import net.minecraft.client.renderer.color.IBlockColor;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.client.renderer.color.ItemColors;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.registry.IRegistry;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import net.minecraftforge.client.event.ModelBakeEvent;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.client.model.SimpleModelState;
|
||||
import net.minecraftforge.common.model.IModelState;
|
||||
import net.minecraftforge.common.model.TRSRTransformation;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.core.ForestryAPI;
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.core.IStateMapperRegister;
|
||||
import forestry.core.blocks.IColoredBlock;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import forestry.core.models.BlockModelEntry;
|
||||
import forestry.core.models.ModelEntry;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ModelManager implements IModelManager {
|
||||
|
||||
private static final ModelManager instance = new ModelManager();
|
||||
|
||||
private final List<BlockModelEntry> customBlockModels = new ArrayList<>();
|
||||
private final List<ModelEntry> customModels = new ArrayList<>();
|
||||
|
||||
private final List<IItemModelRegister> itemModelRegisters = new ArrayList<>();
|
||||
private final List<IStateMapperRegister> stateMapperRegisters = new ArrayList<>();
|
||||
private final List<IColoredBlock> blockColorList = new ArrayList<>();
|
||||
private final List<IColoredItem> itemColorList = new ArrayList<>();
|
||||
|
||||
private TRSRTransformation flipX = new TRSRTransformation(null, null, new Vector3f(-1, 1, 1), null);
|
||||
public final IModelState DEFAULT_BLOCK;
|
||||
public final IModelState DEFAULT_ITEM;
|
||||
public final IModelState DEFAULT_TOOL;
|
||||
|
||||
public ModelManager() {
|
||||
TRSRTransformation blockThirdperson = get(0, 2.5f, 0, 75, 45, 0, 0.375f);
|
||||
ImmutableMap.Builder<TransformType, TRSRTransformation> blockBuilder = ImmutableMap.builder();
|
||||
blockBuilder.put(TransformType.GUI, get(0, 0, 0, 30, 225, 0, 0.625f));
|
||||
blockBuilder.put(TransformType.GROUND, get(0, 3, 0, 0, 0, 0, 0.25f));
|
||||
blockBuilder.put(TransformType.FIXED, get(0, 0, 0, 0, 0, 0, 0.5f));
|
||||
blockBuilder.put(TransformType.THIRD_PERSON_RIGHT_HAND, blockThirdperson);
|
||||
blockBuilder.put(TransformType.THIRD_PERSON_LEFT_HAND, leftify(blockThirdperson));
|
||||
blockBuilder.put(TransformType.FIRST_PERSON_RIGHT_HAND, get(0, 0, 0, 0, 45, 0, 0.4f));
|
||||
blockBuilder.put(TransformType.FIRST_PERSON_LEFT_HAND, get(0, 0, 0, 0, 225, 0, 0.4f));
|
||||
DEFAULT_BLOCK = new SimpleModelState(blockBuilder.build());
|
||||
|
||||
TRSRTransformation itemThirdperson = get(0, 3, 1, 0, 0, 0, 0.55f);
|
||||
TRSRTransformation firstperson = get(1.13f, 3.2f, 1.13f, 0, -90, 25, 0.68f);
|
||||
ImmutableMap.Builder<TransformType, TRSRTransformation> itemBuilder = ImmutableMap.builder();
|
||||
itemBuilder.put(TransformType.GROUND, get(0, 2, 0, 0, 0, 0, 0.5f));
|
||||
itemBuilder.put(TransformType.HEAD, get(0, 13, 7, 0, 180, 0, 1));
|
||||
itemBuilder.put(TransformType.THIRD_PERSON_RIGHT_HAND, itemThirdperson);
|
||||
itemBuilder.put(TransformType.THIRD_PERSON_LEFT_HAND, leftify(itemThirdperson));
|
||||
itemBuilder.put(TransformType.FIRST_PERSON_RIGHT_HAND, firstperson);
|
||||
itemBuilder.put(TransformType.FIRST_PERSON_LEFT_HAND, leftify(firstperson));
|
||||
DEFAULT_ITEM = new SimpleModelState(itemBuilder.build());
|
||||
|
||||
DEFAULT_TOOL = new SimpleModelState(ImmutableMap.of(
|
||||
TransformType.THIRD_PERSON_RIGHT_HAND, get(0, 4, 0.5f, 0, -90, 55, 0.85f),
|
||||
TransformType.THIRD_PERSON_LEFT_HAND, get(0, 4, 0.5f, 0, 90, -55, 0.85f),
|
||||
TransformType.FIRST_PERSON_RIGHT_HAND, get(1.13f, 3.2f, 1.13f, 0, -90, 25, 0.68f),
|
||||
TransformType.FIRST_PERSON_LEFT_HAND, get(1.13f, 3.2f, 1.13f, 0, 90, -25, 0.68f)));
|
||||
}
|
||||
|
||||
static {
|
||||
ForestryAPI.modelManager = instance;
|
||||
}
|
||||
|
||||
public static ModelManager getInstance() {
|
||||
return instance;
|
||||
}
|
||||
|
||||
private TRSRTransformation get(float tx, float ty, float tz, float ax, float ay, float az, float s){
|
||||
return TRSRTransformation.blockCenterToCorner(new TRSRTransformation(
|
||||
new Vector3f(tx / 16, ty / 16, tz / 16),
|
||||
TRSRTransformation.quatFromXYZDegrees(new Vector3f(ax, ay, az)),
|
||||
new Vector3f(s, s, s),
|
||||
null));
|
||||
}
|
||||
|
||||
private TRSRTransformation leftify(TRSRTransformation transform){
|
||||
if(flipX == null){
|
||||
flipX = new TRSRTransformation(null, null, new Vector3f(-1, 1, 1), null);
|
||||
}
|
||||
return TRSRTransformation.blockCenterToCorner(flipX.compose(TRSRTransformation.blockCornerToCenter(transform)).compose(flipX));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerItemModel(Item item, int meta, String identifier) {
|
||||
ModelLoader.setCustomModelResourceLocation(item, meta, getModelLocation(identifier));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerItemModel(Item item, int meta, String modID, String identifier) {
|
||||
ModelLoader.setCustomModelResourceLocation(item, meta, getModelLocation(modID, identifier));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerItemModel(Item item, int meta) {
|
||||
ModelLoader.setCustomModelResourceLocation(item, meta, getModelLocation(item));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerItemModel(Item item, ItemMeshDefinition definition) {
|
||||
ModelLoader.setCustomMeshDefinition(item, definition);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ModelResourceLocation getModelLocation(Item item) {
|
||||
String itemName = ItemStackUtil.getItemNameFromRegistry(item).getResourcePath();
|
||||
return getModelLocation(itemName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ModelResourceLocation getModelLocation(String identifier) {
|
||||
return getModelLocation(Constants.CORE_MOD_ID, identifier);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ModelResourceLocation getModelLocation(String modID, String identifier) {
|
||||
return new ModelResourceLocation(modID + ":" + identifier, "inventory");
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockClient(Block block) {
|
||||
if (block instanceof IItemModelRegister) {
|
||||
itemModelRegisters.add((IItemModelRegister) block);
|
||||
}
|
||||
if (block instanceof IStateMapperRegister) {
|
||||
stateMapperRegisters.add((IStateMapperRegister) block);
|
||||
}
|
||||
if (block instanceof IColoredBlock) {
|
||||
blockColorList.add((IColoredBlock) block);
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerItemClient(Item item) {
|
||||
if (item instanceof IItemModelRegister) {
|
||||
itemModelRegisters.add((IItemModelRegister) item);
|
||||
}
|
||||
if (item instanceof IColoredItem) {
|
||||
itemColorList.add((IColoredItem) item);
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerModels() {
|
||||
for (IItemModelRegister itemModelRegister : itemModelRegisters) {
|
||||
Item item = null;
|
||||
if (itemModelRegister instanceof Block) {
|
||||
item = Item.getItemFromBlock((Block) itemModelRegister);
|
||||
} else if (itemModelRegister instanceof Item) {
|
||||
item = (Item) itemModelRegister;
|
||||
}
|
||||
|
||||
if (item != null) {
|
||||
itemModelRegister.registerModel(item, this);
|
||||
}
|
||||
}
|
||||
|
||||
for (IStateMapperRegister stateMapperRegister : stateMapperRegisters) {
|
||||
stateMapperRegister.registerStateMapper();
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerItemAndBlockColors() {
|
||||
Minecraft minecraft = Minecraft.getMinecraft();
|
||||
|
||||
BlockColors blockColors = minecraft.getBlockColors();
|
||||
for (IColoredBlock blockColor : blockColorList) {
|
||||
if (blockColor instanceof Block) {
|
||||
blockColors.registerBlockColorHandler(ColoredBlockBlockColor.INSTANCE, (Block) blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
ItemColors itemColors = minecraft.getItemColors();
|
||||
for (IColoredItem itemColor : itemColorList) {
|
||||
if (itemColor instanceof Item) {
|
||||
itemColors.registerItemColorHandler(ColoredItemItemColor.INSTANCE, (Item) itemColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private static class ColoredItemItemColor implements IItemColor {
|
||||
public static final ColoredItemItemColor INSTANCE = new ColoredItemItemColor();
|
||||
|
||||
private ColoredItemItemColor() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColorFromItemstack(ItemStack stack, int tintIndex) {
|
||||
Item item = stack.getItem();
|
||||
if (item instanceof IColoredItem) {
|
||||
return ((IColoredItem) item).getColorFromItemstack(stack, tintIndex);
|
||||
}
|
||||
return 0xffffff;
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private static class ColoredBlockBlockColor implements IBlockColor {
|
||||
public static final ColoredBlockBlockColor INSTANCE = new ColoredBlockBlockColor();
|
||||
|
||||
private ColoredBlockBlockColor() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) {
|
||||
Block block = state.getBlock();
|
||||
if (block instanceof IColoredBlock) {
|
||||
return ((IColoredBlock) block).colorMultiplier(state, worldIn, pos, tintIndex);
|
||||
}
|
||||
return 0xffffff;
|
||||
}
|
||||
}
|
||||
|
||||
public void registerCustomModels(ModelBakeEvent event) {
|
||||
IRegistry<ModelResourceLocation, IBakedModel> registry = event.getModelRegistry();
|
||||
for (final BlockModelEntry entry : customBlockModels) {
|
||||
registry.putObject(entry.blockModelLocation, entry.model);
|
||||
if (entry.itemModelLocation != null) {
|
||||
registry.putObject(entry.itemModelLocation, entry.model);
|
||||
}
|
||||
}
|
||||
|
||||
for (final ModelEntry entry : customModels) {
|
||||
registry.putObject(entry.modelLocation, entry.model);
|
||||
}
|
||||
}
|
||||
|
||||
public void registerCustomBlockModel(@Nonnull BlockModelEntry index) {
|
||||
customBlockModels.add(index);
|
||||
}
|
||||
|
||||
public void registerCustomModel(@Nonnull ModelEntry index) {
|
||||
customModels.add(index);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -10,7 +10,6 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
|
||||
|
||||
public class BinnieModProxy implements IBinnieModProxy {
|
||||
private AbstractMod mod;
|
||||
|
||||
@@ -2,7 +2,6 @@ package binnie.core.proxy;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.item.IColoredItem;
|
||||
import binnie.core.network.BinnieCorePacketID;
|
||||
import binnie.core.network.INetworkedEntity;
|
||||
import binnie.core.network.packet.MessageUpdate;
|
||||
@@ -29,10 +28,16 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy {
|
||||
super(BinnieCore.instance);
|
||||
this.uniqueTextureUID = 1200;
|
||||
}
|
||||
|
||||
public void registerItemColors(IColoredItem itemColor) {
|
||||
|
||||
|
||||
public Item registerItem(Item item){
|
||||
return GameRegistry.register(item);
|
||||
}
|
||||
|
||||
public void registerModels() {
|
||||
}
|
||||
|
||||
public void registerItemAndBlockColors() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
|
||||
@@ -1,15 +1,12 @@
|
||||
package binnie.core.proxy;
|
||||
|
||||
import binnie.core.item.IColoredItem;
|
||||
import binnie.core.machines.RendererMachine;
|
||||
import binnie.core.machines.TileEntityMachine;
|
||||
import binnie.core.models.ModelManager;
|
||||
import binnie.core.resource.BinnieResource;
|
||||
import binnie.craftgui.resource.minecraft.CraftGUIResourceManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.client.renderer.color.ItemColors;
|
||||
import net.minecraft.client.renderer.texture.ITextureObject;
|
||||
import net.minecraft.client.renderer.texture.SimpleTexture;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
@@ -17,7 +14,6 @@ import net.minecraft.client.resources.IReloadableResourceManager;
|
||||
import net.minecraft.client.resources.IResourceManager;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.World;
|
||||
@@ -25,8 +21,6 @@ import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.fml.client.FMLClientHandler;
|
||||
import net.minecraftforge.fml.client.registry.ClientRegistry;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@@ -34,37 +28,28 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy {
|
||||
public void registerItemColors(IColoredItem itemColor) {
|
||||
ItemColors itemColors = Minecraft.getMinecraft().getItemColors();
|
||||
if (itemColor instanceof Item) {
|
||||
itemColors.registerItemColorHandler(ColoredItemItemColor.INSTANCE, (Item) itemColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item registerItem(Item item) {
|
||||
ModelManager.getInstance().registerItemClient(item);
|
||||
return super.registerItem(item);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModels() {
|
||||
ModelManager.getInstance().registerModels();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerItemAndBlockColors() {
|
||||
ModelManager.getInstance().registerItemAndBlockColors();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerIcon(ResourceLocation location) {
|
||||
Minecraft.getMinecraft().getTextureMapBlocks().registerSprite(location);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private static class ColoredItemItemColor implements IItemColor {
|
||||
public static final ColoredItemItemColor INSTANCE = new ColoredItemItemColor();
|
||||
|
||||
private ColoredItemItemColor() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColorFromItemstack(ItemStack stack, int tintIndex) {
|
||||
Item item = stack.getItem();
|
||||
if (item instanceof IColoredItem) {
|
||||
return ((IColoredItem) item).getColorFromItemstack(stack, tintIndex);
|
||||
}
|
||||
return 0xffffff;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void registermodel(Item item, int meta) {
|
||||
registermodel(item, meta, new ModelResourceLocation(item.getRegistryName(), "inventory"));
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package binnie.craftgui.botany;
|
||||
|
||||
import binnie.botany.api.IColourMix;
|
||||
import binnie.craftgui.controls.listbox.ControlList;
|
||||
import binnie.craftgui.controls.listbox.ControlListBox;
|
||||
import binnie.craftgui.controls.scroll.ControlScrollableContent;
|
||||
import binnie.craftgui.core.IWidget;
|
||||
|
||||
public class ControlColourMixBox extends ControlListBox<IColourMix> {
|
||||
|
||||
@@ -5,9 +5,7 @@ import binnie.botany.Botany;
|
||||
import binnie.botany.api.IFlowerColour;
|
||||
import binnie.botany.genetics.EnumFlowerColor;
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.craftgui.controls.listbox.ControlList;
|
||||
import binnie.craftgui.controls.listbox.ControlListBox;
|
||||
import binnie.craftgui.controls.scroll.ControlScrollableContent;
|
||||
import binnie.craftgui.core.IWidget;
|
||||
import binnie.craftgui.core.geometry.IArea;
|
||||
import binnie.craftgui.minecraft.Window;
|
||||
|
||||
@@ -22,8 +22,6 @@ import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IAlleleSpecies;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -3,9 +3,7 @@ package binnie.craftgui.extratrees.dictionary;
|
||||
import binnie.Binnie;
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.genetics.TreeBreedingSystem;
|
||||
import binnie.craftgui.controls.listbox.ControlList;
|
||||
import binnie.craftgui.controls.listbox.ControlListBox;
|
||||
import binnie.craftgui.controls.scroll.ControlScrollableContent;
|
||||
import binnie.craftgui.core.IWidget;
|
||||
import binnie.craftgui.core.geometry.IArea;
|
||||
import binnie.craftgui.minecraft.Window;
|
||||
|
||||
@@ -11,7 +11,6 @@ import binnie.extratrees.ExtraTrees;
|
||||
import binnie.extratrees.machines.Press;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
||||
|
||||
@@ -283,7 +283,8 @@ public class ContainerCraftGUI extends Container {
|
||||
/**
|
||||
* sets whether the player can craft in this inventory or not
|
||||
*/
|
||||
public void setCanCraft(EntityPlayer player, boolean canCraft) {
|
||||
@Override
|
||||
public void setCanCraft(EntityPlayer player, boolean canCraft) {
|
||||
super.setCanCraft(player, canCraft);
|
||||
}
|
||||
//end
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
package binnie.craftgui.mod.database;
|
||||
|
||||
import binnie.craftgui.controls.listbox.ControlList;
|
||||
import binnie.craftgui.controls.listbox.ControlListBox;
|
||||
import binnie.craftgui.controls.scroll.ControlScrollableContent;
|
||||
import binnie.craftgui.core.IWidget;
|
||||
import forestry.api.genetics.IClassification;
|
||||
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package binnie.craftgui.mod.database;
|
||||
|
||||
import binnie.core.genetics.BreedingSystem;
|
||||
import binnie.craftgui.controls.listbox.ControlList;
|
||||
import binnie.craftgui.controls.listbox.ControlListBox;
|
||||
import binnie.craftgui.controls.scroll.ControlScrollableContent;
|
||||
import binnie.craftgui.core.IWidget;
|
||||
import binnie.craftgui.minecraft.Window;
|
||||
import forestry.api.genetics.IAlleleSpecies;
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
package binnie.craftgui.mod.database;
|
||||
|
||||
import binnie.craftgui.controls.listbox.ControlList;
|
||||
import binnie.craftgui.controls.listbox.ControlListBox;
|
||||
import binnie.craftgui.controls.scroll.ControlScrollableContent;
|
||||
import binnie.craftgui.core.IWidget;
|
||||
import binnie.craftgui.minecraft.Window;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package binnie.extrabees.products;
|
||||
|
||||
import binnie.core.Mods;
|
||||
import binnie.core.item.IColoredItem;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.core.ExtraBeeItems;
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -3,7 +3,6 @@ package binnie.extrabees.products;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.IInitializable;
|
||||
import binnie.core.Mods;
|
||||
import binnie.core.item.IColoredItem;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -19,9 +18,9 @@ public class ModuleProducts implements IInitializable {
|
||||
ExtraBees.comb = new ItemHoneyComb();
|
||||
ExtraBees.propolis = new ItemPropolis();
|
||||
|
||||
GameRegistry.register(ExtraBees.honeyCrystal);
|
||||
GameRegistry.register(ExtraBees.honeyCrystalEmpty);
|
||||
GameRegistry.register(ExtraBees.comb);
|
||||
BinnieCore.proxy.registerItem(ExtraBees.honeyCrystal);
|
||||
BinnieCore.proxy.registerItem(ExtraBees.honeyCrystalEmpty);
|
||||
BinnieCore.proxy.registerItem(ExtraBees.comb);
|
||||
|
||||
|
||||
ExtraBees.proxy.registermodel(ExtraBees.honeyCrystal, 0);
|
||||
@@ -40,7 +39,6 @@ public class ModuleProducts implements IInitializable {
|
||||
@Override
|
||||
public void init() {
|
||||
ItemHoneyComb.addSubtypes();
|
||||
BinnieCore.proxy.registerItemColors((IColoredItem) ExtraBees.comb);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -8,7 +8,8 @@ import net.minecraft.item.Item;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
|
||||
public class ExtraBeesProxyClient extends ExtraBeesProxy {
|
||||
public void registerBeeModel(ExtraBeesSpecies type) {
|
||||
@Override
|
||||
public void registerBeeModel(ExtraBeesSpecies type) {
|
||||
for (EnumBeeType t : EnumBeeType.VALUES)
|
||||
type.registerModels(BeeManager.beeRoot.getMemberStack(BeeManager.beeRoot.templateAsIndividual(type.getTemplate()), t).getItem(), null);
|
||||
}
|
||||
|
||||
@@ -60,7 +60,8 @@ public enum EnumExtraTreeLog implements IWoodType {
|
||||
this.plank = plank;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
@Override
|
||||
public String getName() {
|
||||
return name().toLowerCase();
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@ import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
@@ -7,7 +7,6 @@ import binnie.extratrees.api.IDesign;
|
||||
import binnie.extratrees.api.IDesignMaterial;
|
||||
import binnie.extratrees.block.EnumExtraTreeLog;
|
||||
import binnie.extratrees.block.PlankType;
|
||||
import binnie.extratrees.carpentry.EnumPattern;
|
||||
import binnie.extratrees.genetics.ExtraTreeFruitGene;
|
||||
import binnie.extratrees.genetics.ExtraTreeSpecies;
|
||||
import forestry.api.arboriculture.IAlleleTreeSpecies;
|
||||
|
||||
@@ -28,16 +28,19 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu
|
||||
return this.getNursery() != null;
|
||||
}
|
||||
|
||||
public World getWorld() {
|
||||
@Override
|
||||
public World getWorld() {
|
||||
return this.worldObj;
|
||||
}
|
||||
|
||||
|
||||
public EnumTemperature getTemperature() {
|
||||
@Override
|
||||
public EnumTemperature getTemperature() {
|
||||
return null;
|
||||
}
|
||||
|
||||
public EnumHumidity getHumidity() {
|
||||
@Override
|
||||
public EnumHumidity getHumidity() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -67,7 +70,8 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu
|
||||
return this.getCaterpillar() == null;
|
||||
}
|
||||
|
||||
public Biome getBiome() {
|
||||
@Override
|
||||
public Biome getBiome() {
|
||||
return this.getWorld().getBiome(getPos());
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package binnie.extratrees.worldgen;
|
||||
|
||||
import binnie.core.Mods;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import forestry.api.world.ITreeGenData;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
@@ -3,6 +3,8 @@ package binnie.genetics.item;
|
||||
import binnie.genetics.CreativeTabGenetics;
|
||||
import binnie.genetics.Genetics;
|
||||
import binnie.genetics.core.GeneticsGUI;
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -16,7 +18,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemDatabase extends Item {
|
||||
public class ItemDatabase extends Item implements IItemModelRegister{
|
||||
// IIcon iconMaster;
|
||||
//
|
||||
// @Override
|
||||
@@ -45,6 +47,12 @@ public class ItemDatabase extends Item {
|
||||
this.setMaxStackSize(1);
|
||||
setRegistryName("geneticdatabase");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
manager.registerItemModel(item, 0);
|
||||
manager.registerItemModel(item, 1, "master");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStack, World worldIn, EntityPlayer player, EnumHand hand) {
|
||||
|
||||
@@ -14,8 +14,6 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemSerumArray extends ItemGene implements IItemSerum {
|
||||
|
||||
@@ -44,10 +44,10 @@ public class ModuleItem implements IInitializable {
|
||||
Genetics.itemSerumArray = new ItemSerumArray();
|
||||
Genetics.itemSequencer = new ItemSequence();
|
||||
Genetics.itemGenetics = Binnie.Item.registerMiscItems(GeneticsItems.values(), CreativeTabGenetics.instance);
|
||||
BinnieCore.proxy.registermodel(GameRegistry.register(Genetics.itemSerum), 0);
|
||||
BinnieCore.proxy.registermodel(GameRegistry.register(Genetics.itemSerumArray), 0);
|
||||
BinnieCore.proxy.registermodel(GameRegistry.register(Genetics.itemSequencer), 0);
|
||||
GameRegistry.register(Genetics.itemGenetics);
|
||||
BinnieCore.proxy.registermodel(BinnieCore.proxy.registerItem(Genetics.itemSerum), 0);
|
||||
BinnieCore.proxy.registermodel(BinnieCore.proxy.registerItem(Genetics.itemSerumArray), 0);
|
||||
BinnieCore.proxy.registermodel(BinnieCore.proxy.registerItem(Genetics.itemSequencer), 0);
|
||||
BinnieCore.proxy.registerItem(Genetics.itemGenetics);
|
||||
for (GeneticsItems type : GeneticsItems.values()) {
|
||||
BinnieCore.proxy.registermodel(Genetics.itemGenetics, type.ordinal(), new ModelResourceLocation(Genetics.itemGenetics.getRegistryName(), "type=" + type.name().toLowerCase()));
|
||||
}
|
||||
@@ -56,10 +56,10 @@ public class ModuleItem implements IInitializable {
|
||||
Genetics.analyst = new ItemAnalyst();
|
||||
Genetics.registry = new ItemRegistry();
|
||||
Genetics.masterRegistry = new ItemMasterRegistry();
|
||||
GameRegistry.register(Genetics.database);
|
||||
GameRegistry.register(Genetics.analyst);
|
||||
GameRegistry.register(Genetics.registry);
|
||||
GameRegistry.register(Genetics.masterRegistry);
|
||||
BinnieCore.proxy.registerItem(Genetics.database);
|
||||
BinnieCore.proxy.registerItem(Genetics.analyst);
|
||||
BinnieCore.proxy.registerItem(Genetics.registry);
|
||||
BinnieCore.proxy.registerItem(Genetics.masterRegistry);
|
||||
BinnieCore.proxy.registermodel(GameRegistry.register(Genetics.database), 0, new ModelResourceLocation(Genetics.database.getRegistryName(), "type=database"));
|
||||
BinnieCore.proxy.registermodel(GameRegistry.register(Genetics.database), 1, new ModelResourceLocation(Genetics.database.getRegistryName(), "type=master_database"));
|
||||
BinnieCore.proxy.registermodel(GameRegistry.register(Genetics.analyst), 0);
|
||||
|
||||
@@ -2,7 +2,6 @@ package binnie.genetics.machine;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
public class ModelMachine extends ModelBase {
|
||||
ModelRenderer Base;
|
||||
|
||||
Reference in new issue
Block a user