From 2adc2e35622356d877d6dedd1d8578510ea586a5 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Fri, 21 Oct 2016 12:07:12 +0200 Subject: [PATCH] Improve .gitignore and Adding ModelManager like that from Forestry --- .gitignore | 18 ++ src/main/java/binnie/Constants.java | 2 + .../binnie/botany/gardening/BlockPlant.java | 3 +- .../botany/genetics/ItemDictionary.java | 1 - src/main/java/binnie/core/BinnieCore.java | 5 +- src/main/java/binnie/core/Mods.java | 1 - .../java/binnie/core/item/IColoredItem.java | 7 - .../java/binnie/core/machines/ModelBlock.java | 1 - .../java/binnie/core/models/ModelManager.java | 274 ++++++++++++++++++ .../binnie/core/proxy/BinnieModProxy.java | 1 - .../java/binnie/core/proxy/BinnieProxy.java | 13 +- .../binnie/core/proxy/BinnieProxyClient.java | 49 ++-- .../craftgui/botany/ControlColourMixBox.java | 2 - .../botany/WindowBotanistDatabase.java | 2 - .../dictionary/PageSpeciesTreeGenome.java | 2 - .../dictionary/WindowArboristDatabase.java | 2 - .../extratrees/dictionary/WindowPress.java | 1 - .../craftgui/minecraft/ContainerCraftGUI.java | 3 +- .../mod/database/ControlBranchBox.java | 2 - .../mod/database/ControlMutationBox.java | 2 - .../mod/database/ControlSpeciesBox.java | 2 - .../extrabees/products/ItemHoneyComb.java | 2 +- .../extrabees/products/ModuleProducts.java | 8 +- .../extrabees/proxy/ExtraBeesProxyClient.java | 3 +- .../extratrees/block/EnumExtraTreeLog.java | 3 +- .../block/decor/NBTShapedRecipe.java | 1 - .../binnie/extratrees/core/ModuleCore.java | 1 - .../machines/TileEntityNursery.java | 12 +- .../extratrees/worldgen/BlockTypeLeaf.java | 1 - .../binnie/genetics/item/ItemDatabase.java | 10 +- .../binnie/genetics/item/ItemSerumArray.java | 2 - .../java/binnie/genetics/item/ModuleItem.java | 16 +- .../binnie/genetics/machine/ModelMachine.java | 1 - 33 files changed, 361 insertions(+), 92 deletions(-) delete mode 100644 src/main/java/binnie/core/item/IColoredItem.java create mode 100644 src/main/java/binnie/core/models/ModelManager.java diff --git a/.gitignore b/.gitignore index 87063a0a..ca2b43dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# everything +/* + .gradle # IntelliJ /build @@ -8,3 +11,18 @@ *.ipr *.iws classes/ + + +# folders +!/gradle/wrapper +!/src + +# files +!/.gitignore +!/LICENSE.txt +!/license-header.txt +!/README.md +!/gradle.properties +!/build.gradle +!/gradlew +!/gradlew.bat diff --git a/src/main/java/binnie/Constants.java b/src/main/java/binnie/Constants.java index 8763a139..23150f81 100644 --- a/src/main/java/binnie/Constants.java +++ b/src/main/java/binnie/Constants.java @@ -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"; diff --git a/src/main/java/binnie/botany/gardening/BlockPlant.java b/src/main/java/binnie/botany/gardening/BlockPlant.java index 56cca4a0..32fd1be7 100644 --- a/src/main/java/binnie/botany/gardening/BlockPlant.java +++ b/src/main/java/binnie/botany/gardening/BlockPlant.java @@ -140,7 +140,8 @@ public class BlockPlant extends BlockBush { return values()[id % values().length]; } - public String getName() { + @Override + public String getName() { return this.name; } } diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index 8681b8e1..3b85a78f 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -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; diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index c19f23af..32e4893c 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -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 diff --git a/src/main/java/binnie/core/Mods.java b/src/main/java/binnie/core/Mods.java index c9604719..adfa822a 100644 --- a/src/main/java/binnie/core/Mods.java +++ b/src/main/java/binnie/core/Mods.java @@ -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; diff --git a/src/main/java/binnie/core/item/IColoredItem.java b/src/main/java/binnie/core/item/IColoredItem.java deleted file mode 100644 index 8fcaacd8..00000000 --- a/src/main/java/binnie/core/item/IColoredItem.java +++ /dev/null @@ -1,7 +0,0 @@ -package binnie.core.item; - -import net.minecraft.item.ItemStack; - -public interface IColoredItem { - int getColorFromItemstack(ItemStack stack, int tintIndex); -} diff --git a/src/main/java/binnie/core/machines/ModelBlock.java b/src/main/java/binnie/core/machines/ModelBlock.java index 3326abbc..006e416a 100644 --- a/src/main/java/binnie/core/machines/ModelBlock.java +++ b/src/main/java/binnie/core/machines/ModelBlock.java @@ -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; diff --git a/src/main/java/binnie/core/models/ModelManager.java b/src/main/java/binnie/core/models/ModelManager.java new file mode 100644 index 00000000..cda70676 --- /dev/null +++ b/src/main/java/binnie/core/models/ModelManager.java @@ -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 customBlockModels = new ArrayList<>(); + private final List customModels = new ArrayList<>(); + + private final List itemModelRegisters = new ArrayList<>(); + private final List stateMapperRegisters = new ArrayList<>(); + private final List blockColorList = new ArrayList<>(); + private final List 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 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 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 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); + } + +} \ No newline at end of file diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index 7c25451f..1615da94 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -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; diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index 9d69116a..79c18909 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -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() { diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 0d5d9f83..81ddd90d 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -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")); diff --git a/src/main/java/binnie/craftgui/botany/ControlColourMixBox.java b/src/main/java/binnie/craftgui/botany/ControlColourMixBox.java index d59405df..b5fbcc63 100644 --- a/src/main/java/binnie/craftgui/botany/ControlColourMixBox.java +++ b/src/main/java/binnie/craftgui/botany/ControlColourMixBox.java @@ -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 { diff --git a/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java b/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java index f55af7f9..f495adf7 100644 --- a/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java +++ b/src/main/java/binnie/craftgui/botany/WindowBotanistDatabase.java @@ -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; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java b/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java index 98b774e5..ef16eab6 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java @@ -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; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowArboristDatabase.java b/src/main/java/binnie/craftgui/extratrees/dictionary/WindowArboristDatabase.java index b41fc741..7467e88c 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowArboristDatabase.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/WindowArboristDatabase.java @@ -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; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowPress.java b/src/main/java/binnie/craftgui/extratrees/dictionary/WindowPress.java index 74562f7d..eb37a32a 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowPress.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/WindowPress.java @@ -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; diff --git a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java index ee3e297a..373fa1fa 100644 --- a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java @@ -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 diff --git a/src/main/java/binnie/craftgui/mod/database/ControlBranchBox.java b/src/main/java/binnie/craftgui/mod/database/ControlBranchBox.java index 1f98385a..a57f2c44 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlBranchBox.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlBranchBox.java @@ -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; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlMutationBox.java b/src/main/java/binnie/craftgui/mod/database/ControlMutationBox.java index 8790e355..c6094ef9 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlMutationBox.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlMutationBox.java @@ -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; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java b/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java index 72bbd02f..89f1964e 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java @@ -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; diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java index dd6263bc..82c5cd83 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java @@ -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; diff --git a/src/main/java/binnie/extrabees/products/ModuleProducts.java b/src/main/java/binnie/extrabees/products/ModuleProducts.java index 3be06d6d..cf3f9221 100644 --- a/src/main/java/binnie/extrabees/products/ModuleProducts.java +++ b/src/main/java/binnie/extrabees/products/ModuleProducts.java @@ -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 diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java index ffc98e9d..a67e4f83 100644 --- a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java +++ b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java @@ -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); } diff --git a/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java b/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java index 3b6b0dad..d7aafa1a 100644 --- a/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java +++ b/src/main/java/binnie/extratrees/block/EnumExtraTreeLog.java @@ -60,7 +60,8 @@ public enum EnumExtraTreeLog implements IWoodType { this.plank = plank; } - public String getName() { + @Override + public String getName() { return name().toLowerCase(); } diff --git a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java index da9eda47..02336458 100644 --- a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java +++ b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java @@ -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; diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/src/main/java/binnie/extratrees/core/ModuleCore.java index ac0e0234..e055a482 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -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; diff --git a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java index 4fd9e21c..25c5bae5 100644 --- a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java +++ b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java @@ -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()); } diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java b/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java index 67076084..8ad7b791 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java @@ -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; diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index 3de997aa..389c6208 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -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 onItemRightClick(ItemStack itemStack, World worldIn, EntityPlayer player, EnumHand hand) { diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index ce5c079b..cb892fec 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -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 { diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index 4469d867..6fbb6179 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -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); diff --git a/src/main/java/binnie/genetics/machine/ModelMachine.java b/src/main/java/binnie/genetics/machine/ModelMachine.java index 8765ad6f..0504d2fb 100644 --- a/src/main/java/binnie/genetics/machine/ModelMachine.java +++ b/src/main/java/binnie/genetics/machine/ModelMachine.java @@ -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;