mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 11:49:14 +00:00
Clean Up
This commit is contained in:
1 parent
0b31054a58
commit
83e01c71a2
39 files changed
+279
-363
No files matched your search
@@ -8,11 +8,12 @@ package forestry.api.apiculture;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.client.resources.model.ModelResourceLocation;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.genetics.IAlleleSpecies;
|
||||
|
||||
public interface IAlleleBeeSpecies extends IAlleleSpecies {
|
||||
@@ -46,6 +47,9 @@ public interface IAlleleBeeSpecies extends IAlleleSpecies {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
ModelResourceLocation getModel(EnumBeeType type);
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
void registerModels(Item item, IModelManager manager);
|
||||
|
||||
/**
|
||||
* @deprecated since Forestry 3.6.
|
||||
|
||||
@@ -8,7 +8,7 @@ package forestry.api.arboriculture;
|
||||
import java.util.Collection;
|
||||
|
||||
import net.minecraft.client.resources.model.ModelResourceLocation;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.common.EnumPlantType;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
@@ -37,28 +37,28 @@ public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty<IAll
|
||||
* @return Tree generator for this species.
|
||||
*/
|
||||
ITreeGenerator getGenerator();
|
||||
|
||||
/**
|
||||
* @return The ModID from the mod.
|
||||
*/
|
||||
String getModID();
|
||||
|
||||
/**
|
||||
* @return The name of the model from the tree.
|
||||
*/
|
||||
String getModelName();
|
||||
|
||||
/**
|
||||
* @return The modid from the mod of the species.
|
||||
*/
|
||||
String getModID();
|
||||
|
||||
/* TEXTURES AND OVERRIDES */
|
||||
/* MODELS AND OVERRIDES */
|
||||
@SideOnly(Side.CLIENT)
|
||||
ILeafSpriteProvider getLeafSpriteProvider();
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
int getGermlingColour(EnumGermlingType type, int renderPass);
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
ModelResourceLocation getGermlingModel(EnumGermlingType type);
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
void registerModels(IModelManager manager);
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
int getGermlingColour(EnumGermlingType type, int renderPass);
|
||||
void registerModels(Item item, IModelManager manager);
|
||||
|
||||
}
|
||||
@@ -6,7 +6,7 @@
|
||||
package forestry.api.arboriculture;
|
||||
|
||||
import net.minecraft.client.resources.model.ModelResourceLocation;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import forestry.api.core.IModelManager;
|
||||
|
||||
/**
|
||||
@@ -15,7 +15,7 @@ import forestry.api.core.IModelManager;
|
||||
* There is no default implementation because every sapling has a unique icon.
|
||||
*/
|
||||
public interface IGermlingModelProvider {
|
||||
void registerModels(IModelManager manager);
|
||||
void registerModels(Item item, IModelManager manager);
|
||||
|
||||
ModelResourceLocation getModel(EnumGermlingType type);
|
||||
}
|
||||
@@ -22,13 +22,14 @@ public interface ITreeFactory {
|
||||
* @param dominant Whether this species is genetically dominant (false means it is recessive)
|
||||
* @param branch Classification of this species
|
||||
* @param binomial Binomial name of the species sans genus. "humboldti" will have the bee species flavour name be "Apis humboldti". Feel free to use fun names or null.
|
||||
* @param mdoelName The name of the model name for this species
|
||||
* @param modID The modID from the mod of the species
|
||||
* @param modelName The model name for this species
|
||||
* @param leafSpriteProvider The leaf sprite provider for this species
|
||||
* @param germlingModelProvider The germling model provider for this species
|
||||
* @param generator The tree generator
|
||||
* @return a new tree species allele.
|
||||
*/
|
||||
IAlleleTreeSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String mdoelName, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator);
|
||||
IAlleleTreeSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String modID, String modelName, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator);
|
||||
|
||||
/** Get one of the built-in Forestry leaf types. Default type is deciduous. */
|
||||
ILeafSpriteProvider getLeafIconProvider(EnumLeafType enumLeafType, Color color, Color colorPollinated);
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
/*******************************************************************************
|
||||
* Copyright 2011-2014 SirSengir
|
||||
*
|
||||
* This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
|
||||
******************************************************************************/
|
||||
package forestry.api.core;
|
||||
|
||||
import net.minecraft.client.resources.model.ModelResourceLocation;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
/**
|
||||
* Provides modles, needed in some interfaces, most notably for bees and trees.
|
||||
*/
|
||||
public interface IModelProvider {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
ModelResourceLocation getModel();
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
void registerModels(Item item, IModelManager manager);
|
||||
|
||||
}
|
||||
@@ -13,6 +13,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
/**
|
||||
* Provides icons, needed in some interfaces, most notably for bees and trees.
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
public interface ISpriteProvider {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -10,12 +10,8 @@ import net.minecraft.world.World;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.core.EnumHumidity;
|
||||
import forestry.api.core.EnumTemperature;
|
||||
import forestry.api.core.IModelProvider;
|
||||
|
||||
/**
|
||||
* Basic species allele.
|
||||
@@ -112,8 +108,4 @@ public interface IAlleleSpecies extends IAllele {
|
||||
* @return Colour to use for the render pass.
|
||||
*/
|
||||
int getSpriteColour(int renderPass);
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
IModelProvider getModelProvider();
|
||||
|
||||
}
|
||||
@@ -28,6 +28,11 @@ public interface IAlleleButterflySpecies extends IAlleleSpecies {
|
||||
*/
|
||||
String getEntityTexture();
|
||||
|
||||
/**
|
||||
* @return Path of the texture to use for item model.
|
||||
*/
|
||||
String getItemTexture();
|
||||
|
||||
/**
|
||||
* Allows butterflies to restrict random spawns beyond the restrictions set by getTemperature() and getHumidity().
|
||||
*
|
||||
@@ -60,4 +65,9 @@ public interface IAlleleButterflySpecies extends IAlleleSpecies {
|
||||
Map<ItemStack, Float> getCaterpillarLoot();
|
||||
|
||||
ISpriteProvider getSpriteProvider();
|
||||
|
||||
/**
|
||||
* @return The modid from the mod of the species.
|
||||
*/
|
||||
String getModID();
|
||||
}
|
||||
@@ -24,6 +24,7 @@ public interface IButterflyFactory {
|
||||
* @param unlocalizedName Unlocalized name for this species
|
||||
* @param authority Authority for the binomial name, e.g. "Sengir" on species of base Forestry.
|
||||
* @param unlocalizedDescription Unlocalized description for this species
|
||||
* @param modID The modID form the mod of the butterfly
|
||||
* @param texturePath String texture path for this butterfly e.g. "forestry:textures/entities/butterfly/..."
|
||||
* @param dominant Whether this species is genetically dominant (false means it is recessive)
|
||||
* @param branch Classification of this species
|
||||
@@ -31,5 +32,5 @@ public interface IButterflyFactory {
|
||||
* @param serumColour The color of this butterfly's serum.
|
||||
* @return a new butterfly species allele.
|
||||
*/
|
||||
IAlleleButterflySpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String texturePath, boolean dominant, IClassification branch, String binomial, Color serumColour);
|
||||
IAlleleButterflySpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String modID, String texturePath, boolean dominant, IClassification branch, String binomial, Color serumColour);
|
||||
}
|
||||
Reference in new issue
Block a user